xwtorrents: add new cats

torrentqq: bump domain
opencd: update cats and details detection. (#13037 )
2025-09-16 08:54:24 +02:00 · 2022-03-11 14:10:01 +13:00 · 2022-03-11 13:52:47 +13:00 · 2022-03-11 06:21:41 +13:00 · 2022-03-11 06:17:18 +13:00 · 2022-03-10 08:40:15 +13:00
189 changed files with 8082 additions and 3957 deletions
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ on:
 jobs:
  analyze:
    name: Analyze
-    runs-on: windows-latest
+    runs-on: windows-2019
    permissions:
      actions: read
      contents: read
--- a/Installer.iss
+++ b/Installer.iss
@@ -30,6 +30,7 @@ UninstallDisplayName={#MyAppName}
 Compression=lzma
 SolidCompression=yes
 DisableDirPage=yes
+WizardStyle=modern

 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -38,8 +39,11 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "windowsService"; Description: "Install as a Windows Service"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

+[Dirs]  
+Name: "{commonappdata}\Jackett"; Permissions: everyone-modify 
+
 [Files]
-Source: "{#MySourceFolder}\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MySourceFolder}\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs; Permissions: everyone-modify
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

 [Icons]
@@ -47,6 +51,15 @@ Name: "{group}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}"; Tasks: desktopicon

+[Code]
+function PrepareToInstall(var NeedsRestart: Boolean): String;
+var
+ErrorCode: Integer;
+begin
+  ShellExec('open', 'taskkill.exe', '/f /im {#MyAppExeName}', '', SW_HIDE, ewNoWait, ErrorCode);
+  ShellExec('open', 'taskkill.exe', '/f /im JackettConsole.exe', '', SW_HIDE, ewNoWait, ErrorCode);
+end;
+
 [Run]
 Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated runhidden;
 Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--ReserveUrls"; Flags: waituntilterminated runhidden;
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ØMagnet
 * 1337x
 * 24rolika
- * 7torrents
 * ACG.RIP
 * ACGsou (36DM)
 * Anidex
@@ -53,14 +52,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ConCen
 * cpasbien
 * cpasbienClone
+ * CrackingPatching
 * Demonoid
 * DivxTotal
 * dmhy
+ * DonTorrent
 * E-Hentai
 * elitetorrent
 * EpubLibre
 * Erai-Raws
- * ETTV
 * EXT Torrents
 * ExtraTorrent.st
 * EZTV
@@ -68,6 +68,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * FireBit
 * freshMeat
 * Frozen Layer
+ * FTUApps
 * GamesTorrents
 * GkTorrent
 * GloDLS
@@ -80,6 +81,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Internet Archive (archive.org)
 * Isohunt2
 * iTorrent
+ * JAV-Torrent
 * kickasstorrents.ws
 * kickasstorrents.to
 * KissSub
@@ -110,7 +112,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ParnuXi
 * PC-torrent
 * PiratBit
- * Pirateiro
 * Pornforall
 * PornLeech
 * PornoLive
@@ -136,7 +137,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * sosulki
 * SubsPlease
 * sukebei.Nyaa.si
- * TodoTorrents
 * The Pirate Bay (TPB)
 * Tokyo Tosho
 * Torlock
@@ -144,7 +144,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TOROS
 * Torrent Downloads (TD)
 * Torrent Oyun indir
- * Torrent Paradise (ML)
 * torrent.by
 * torrent-pirat
 * Torrent9
@@ -169,6 +168,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * UnionDHT
 * VSTHouse
 * VST Torrents
+ * xBiT
 * xxxAdultTorrent
 * xxxtor
 * xxxtorrents
@@ -275,9 +275,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BeyondHD (BHD)
 * Bibliotik
 * Bit-Bázis
- * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
+ * Bit-City Reloaded
 * BIT-HDTV
 * BiT-TiTAN
+ * BitBR
 * Bitded
 * Bithorlo (BHO)
 * BitHUmen [![(invite needed)][inviteneeded]](#)
@@ -358,7 +359,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Gay-Torrents.org
 * GAYtorrent.ru
 * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
- * Generation-Free [![(invite needed)][inviteneeded]](#)
+ * Generation-Free
 * GFXPeers
 * GigaTorrents
 * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
@@ -368,7 +369,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HaiDan
 * Haitang
 * HappyFappy
- * Hawke-uno
+ * Hawke-uno [![(invite needed)][inviteneeded]](#)
 * HD Dolby
 * HD-Bits.com [![(invite needed)][inviteneeded]](#)
 * HD-Forever (HDF)
@@ -410,6 +411,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * JPTV
 * Karagarga
 * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * Korsar
 * KrazyZone
 * LastFiles
 * Lat-Team [![(invite needed)][inviteneeded]](#)
@@ -451,7 +453,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * NorBits
 * oMg[WtF]trackr
 * OpenCD [![(invite needed)][inviteneeded]](#)
- * Oppaitime [![(invite needed)][inviteneeded]](#)
+ * Oppaitime
 * Orpheus
 * OshenPT
 * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
@@ -502,7 +504,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * SceneRush
 * SceneTime
 * SDBits [![(invite needed)][inviteneeded]](#)
- * Seals
+ * GreatPosterWall (GPW)
 * Secret Cinema
 * SeedFile (SF)
 * Shareisland
@@ -531,7 +533,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * TellyTorrent
 * teracod (Movie Zone)
- * The-Devils-Lounge
 * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
 * The Geeks
 * The Horror Charnel (THC)
@@ -574,6 +575,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Trezzor [![(invite needed)][inviteneeded]](#)
 * TurkSeed
 * TurkTorrent (TT)
+ * turktracker
 * TV Chaos UK (TVCUK)
 * TvRoad
 * TVstore
@@ -581,6 +583,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Twilights Zoom
 * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
 * UHDBits
+ * UHD-HEAVEN [![(invite needed)][inviteneeded]](#)
 * UnionGang [![(invite needed)][inviteneeded]](#)
 * UnlimitZ
 * Vizuk
@@ -666,6 +669,12 @@ Jackett can also be run from the command line if you would like to see log messa
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md

 ### Install as service
+A) Command to download and install latest package and run the Jackett service:
+
+`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && release=$(wget -q https://github.com/Jackett/Jackett/releases/latest -O - | grep "title>Release" | cut -d " " -f 4) && sudo wget -Nc https://github.com/Jackett/Jackett/releases/download/$release/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`
+
+B) Or manually:
+
 1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.

--- a/src/Jackett.Common/Content/custom.css
+++ b/src/Jackett.Common/Content/custom.css
@@ -301,6 +301,10 @@ table td.fit{
    background-color: #d0ab44;
 }

+.tooltip {
+    pointer-events: none;
+}
+
 .tooltip-inner {
    max-width: 500px !important;
 }
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -1,4 +1,5 @@
 var basePath = '';
+var baseUrl = '';

 var indexers = [];
 var configuredIndexers = [];
@@ -114,6 +115,12 @@ function loadJackettSettings() {
            basePath = '';
        }

+        $("#jackett-baseurloverride").val(data.baseurloverride);
+        baseUrl = data.baseurloverride;
+        if (baseUrl === null || baseUrl === undefined) {
+            baseUrl = '';
+        }
+
        api.key = data.api_key;

        $("#jackett-savedir").val(data.blackholedir);
@@ -163,9 +170,9 @@ function reloadIndexers() {
        availableFilters = [];
        for (var i = 0; i < data.length; i++) {
            var item = data[i];
-            item.rss_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q=");
-            item.torznab_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/");
-            item.potato_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/");
+            item.rss_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q=");
+            item.torznab_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/");
+            item.potato_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/");

            if (item.last_error)
                item.state = "error";
@@ -288,6 +295,12 @@ function displayConfiguredIndexersList(indexers) {
                "visible": true,
                "searchable": true,
                "orderable": true
+            },
+            {
+                "targets": 2,
+                "visible": false,
+                "searchable": true,
+                "orderable": false
            }
        ]
    });
@@ -430,6 +443,13 @@ function displayUnconfiguredIndexersList() {
                "visible": true,
                "searchable": false,
                "orderable": false
+            },
+            {
+                "name": "url",
+                "targets": 7,
+                "visible": false,
+                "searchable": true,
+                "orderable": false
            }
        ]
    });
@@ -909,10 +929,14 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
    configForm.modal("show");
 }

-function resolveUrl(url) {
-    var a = document.createElement('a');
-    a.href = url;
-    url = a.href;
+function resolveUrl(baseUrl, url) {
+    if (baseUrl != '') {
+        url = baseUrl + url;
+    }else{
+        var a = document.createElement('a');
+        a.href = url;
+        url = a.href;
+    }
    return url;
 }

@@ -965,7 +989,8 @@ function updateReleasesRow(row) {
        TitleLink.data("toggle", "tooltip");
        TitleLink.tooltip({
            title: TitleTooltip,
-            html: true
+            html: true,
+            placement: "auto"
        });
    }

@@ -1353,6 +1378,13 @@ function bindUIButtons() {
        return false;
    });

+    $('#api-key-copy-button').click(function () {
+        var apiKey = api.key;
+        if (apiKey !== null || apiKey !== undefined) {
+            copyToClipboard(apiKey);
+        }
+    });
+
    $('#jackett-add-indexer').click(function () {
        $("#modals").empty();
        displayUnconfiguredIndexersList();
@@ -1493,6 +1525,7 @@ function bindUIButtons() {
    $("#change-jackett-port").click(function () {
        var jackett_port = Number($("#jackett-port").val());
        var jackett_basepathoverride = $("#jackett-basepathoverride").val();
+        var jackett_baseurloverride = $("#jackett-baseurloverride").val();
        var jackett_external = $("#jackett-allowext").is(':checked');
        var jackett_update = $("#jackett-allowupdate").is(':checked');
        var jackett_prerelease = $("#jackett-prerelease").is(':checked');
@@ -1519,6 +1552,7 @@ function bindUIButtons() {
            blackholedir: $("#jackett-savedir").val(),
            logging: jackett_logging,
            basepathoverride: jackett_basepathoverride,
+            baseurloverride: jackett_baseurloverride,
            logging: jackett_logging,
            cache_enabled: jackett_cache_enabled,
            cache_ttl: jackett_cache_ttl,
--- a/src/Jackett.Common/Content/custom_mobile.css
+++ b/src/Jackett.Common/Content/custom_mobile.css
@@ -284,6 +284,10 @@ table td.fit{
    background-color: #d0ab44;
 }

+.tooltip {
+    pointer-events: none;
+}
+
 .tooltip-inner {
    max-width: 500px !important;
 }
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -28,8 +28,8 @@
    <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../css/tagify.css?changed=11662">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=PR12772" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=PR12772" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20220123" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20220123" 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">
@@ -43,6 +43,9 @@
        <div class="pull-right jackett-apikey">
            <span class="input-header">API Key: </span>
            <input id="api-key-input" class="form-control input-right" type="text" value="" placeholder="API Key" readonly="">
+            <button id="api-key-copy-button" title="Copy API Key to clipboard" class="btn btn-primary btn-xs">
+                <span class="glyphicon glyphicon-copy" aria-hidden="true"></span>
+            </button>
        </div>
        <hr />

@@ -127,6 +130,10 @@
            <span class="input-header">Base path override: </span>
            <input id="jackett-basepathoverride" class="form-control input-right" type="text" value="" placeholder="/jackett">
        </div>
+        <div class="input-area">
+            <span class="input-header">Base URL override: </span>
+            <input id="jackett-baseurloverride" class="form-control input-right" type="text" value="" placeholder="http://jackett:9117">
+        </div>
        <div class="input-area">
            <span class="input-header">Server port: </span>
            <input id="jackett-port" class="form-control input-right" type="text" value="" placeholder="9117">
@@ -306,11 +313,12 @@

    <script id="configured-indexer-table" type="text/x-handlebars-template">
        <div class="tab-content configured-indexer-div">
-            <table id="configured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
+            <table id="configured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive" style="width: 100%">
                <thead>
                    <tr>
                        <th>Indexer</th>
                        <th>Actions</th>
+                        <th data-type="hiddendata">URL</th>
                    </tr>
                </thead>
                <tbody>
@@ -338,12 +346,15 @@
                                </button>
                            </div>
                        </td>
+                        <td data-type="hiddendata">{{site_link}}</td>
                    </tr>
                    {{/each}}
                </tbody>
                <tfoot>
                    <tr>
-                        <td colspan="2"></td>
+                      <th></th>
+                      <th></th>
+                      <th data-type="hiddendata"></th>
                    </tr>
                </tfoot>
            </table>
@@ -352,7 +363,7 @@

    <script id="unconfigured-indexer-table" type="text/x-handlebars-template">
        <div class="unconfigured-indexer-div">
-            <table id="unconfigured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
+            <table id="unconfigured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive" style="width: 100%">
                <thead>
                    <tr>
                        <th></th>
@@ -362,6 +373,7 @@
                        <th data-type="hiddendata">Type string</th>
                        <th>Language</th>
                        <th></th>
+                        <th data-type="hiddendata">URL</th>
                    </tr>
                </thead>
                <tbody>
@@ -389,6 +401,7 @@
                                {{/if_eq}}
                            </div>
                        </td>
+                        <td data-type="hiddendata">{{site_link}}</td>
                    </tr>
                    {{/each}}
                </tbody>
@@ -401,6 +414,7 @@
                        <th data-type="hiddendata">Type string</th>
                        <th>Language</th>
                        <th></th>
+                        <th data-type="hiddendata">URL</th>
                    </tr>
                </tfoot>
            </table>
@@ -736,6 +750,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2022010901"></script>
+    <script type="text/javascript" src="../custom.js?changed=2022012602"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Content/login.html
+++ b/src/Jackett.Common/Content/login.html
@@ -16,7 +16,7 @@

    <link href="../bootstrap/bootstrap.min.css" rel="stylesheet">
    <link href="../animate.css" rel="stylesheet">
-    <link href="../custom.css?changed=PR12083" rel="stylesheet">
+    <link href="../custom.css?changed=20220123" rel="stylesheet">

    <title>Jackett</title>
 </head>
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -13,11 +13,9 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337x.unblockit.how/
+  - https://1337x.unblockit.day/
  - https://1337x.nocensor.biz/
 legacylinks:
-  - https://1337x.unblockit.app/
-  - https://1337.root.yt/
  - https://1337x.unblocked.rest/
  - https://1337x.unblockit.dev/
  - https://1337x.unblockit.ltd/
@@ -36,6 +34,8 @@ legacylinks:
  - https://1337x.unblockit.kim/
  - https://1337x.unblockit.bz/
  - https://1337x.unblockit.tv/
+  - https://1337x.unblockit.how/
+  - https://1337x.unblockit.cam/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/7torrents.yml
+++ b/src/Jackett.Common/Definitions/7torrents.yml
@@ -1,85 +0,0 @@
---
-id: 7torrents
-name: 7torrents
-description: "7torrents is a Public BitTorrent DHT search engine."
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://www.7torrents.cc/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created
-    options:
-      created: created
-      length: size
-      seeders: seeders
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
-  - name: info_8000
-    type: info
-    label: About 7torrents Categories
-    default: 7torrents does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-
-search:
-  # https://www.7torrents.cc/search?query=2020&sort=created
-  paths:
-    - path: search
-  inputs:
-    query: "{{ if .Keywords }}{{ .Keywords }}{{ else }} {{ end }}"
-    sort: "{{ .Config.sort }}"
-
-  rows:
-    selector: div.media
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: div.media
-      attribute: data-name
-    details:
-      selector: div.media h5 a
-      attribute: href
-# #7966
-#    download:
-#      selector: div.media-right a[href*="/torrent/"]
-#      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: div.media
-      attribute: data-added
-      filters:
-        - name: timeago
-    size:
-      selector: div.media
-      attribute: data-size
-    seeders:
-      selector: div.media
-      attribute: data-seeders
-    leechers:
-      selector: div.media
-      attribute: data-leechers
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/abtorrents.yml
+++ b/src/Jackett.Common/Definitions/abtorrents.yml
@@ -10,14 +10,14 @@ links:

 caps:
  categorymappings:
-    - {id: 10, cat: Audio/Audiobook, desc: "Adventure"}
-    - {id: 20, cat: Audio/Audiobook, desc: "Biographies & Memoirs"}
+    - {id: 10, cat: Audio/Audiobook, desc: "Action/Adventure"}
+    - {id: 20, cat: Audio/Audiobook, desc: "Biography/Memoirs"}
    - {id: 30, cat: Audio/Audiobook, desc: "Business "}
    - {id: 40, cat: Audio/Audiobook, desc: "Childrens"}
-    - {id: 50, cat: Audio/Audiobook, desc: "Comedy"}
+    - {id: 50, cat: Audio/Audiobook, desc: "Humor (Comedy)"}
    - {id: 60, cat: Audio/Audiobook, desc: "Comics"}
    - {id: 70, cat: Audio/Audiobook, desc: "Computers "}
-    - {id: 80, cat: Audio/Audiobook, desc: "Erotica"}
+    - {id: 80, cat: Audio/Audiobook, desc: "Adult/Erotica"}
    - {id: 90, cat: Audio/Audiobook, desc: "Fantasy-General"}
    - {id: 100, cat: Audio/Audiobook, desc: "Fantasy-Youth"}
    - {id: 110, cat: Audio/Audiobook, desc: "Files"}
@@ -26,7 +26,8 @@ caps:
    - {id: 140, cat: Audio/Audiobook, desc: "Historical Fiction"}
    - {id: 150, cat: Audio/Audiobook, desc: "History"}
    - {id: 160, cat: Audio/Audiobook, desc: "Horror"}
-    - {id: 170, cat: Audio/Audiobook, desc: "Literature "}
+    - {id: 170, cat: Audio/Audiobook, desc: "Literature"}
+    - {id: 175, cat: Audio/Audiobook, desc: "LitRPG"}
    - {id: 180, cat: Audio/Audiobook, desc: "Mystery "}
    - {id: 190, cat: Audio/Audiobook, desc: "Non-Fiction"}
    - {id: 200, cat: Audio/Audiobook, desc: "Radio Drama"}
@@ -37,12 +38,12 @@ caps:
    - {id: 250, cat: Audio/Audiobook, desc: "Self Improvement"}
    - {id: 270, cat: Audio/Audiobook, desc: "Suspense"}
    - {id: 280, cat: Audio/Audiobook, desc: "Talk Radio"}
-    - {id: 260, cat: Audio/Audiobook, desc: "Thriller and Suspense"}
+    - {id: 260, cat: Audio/Audiobook, desc: "Crime/Thriller/Mystery"}
    - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy"}
    - {id: 300, cat: Audio/Audiobook, desc: "Western"}
    - {id: 400, cat: Books/EBook, desc: "[E] Action/Adventure"}
    - {id: 410, cat: Books/EBook, desc: "[E] Adult / Erotica"}
-    - {id: 420, cat: Books/EBook, desc: "[E] Arts &amp; Crafts (Hobbies)"}
+    - {id: 420, cat: Books/EBook, desc: "[E] Arts & Crafts (Hobbies)"}
    - {id: 430, cat: Books/EBook, desc: "[E] Biography/Memoirs"}
    - {id: 730, cat: Books/EBook, desc: "[E] Collections"}
    - {id: 440, cat: Books/EBook, desc: "[E] Comic Books"}
@@ -55,11 +56,13 @@ caps:
    - {id: 510, cat: Books/EBook, desc: "[E] Historical Fiction"}
    - {id: 520, cat: Books/EBook, desc: "[E] History/Documentary"}
    - {id: 530, cat: Books/EBook, desc: "[E] Horror"}
-    - {id: 540, cat: Books/EBook, desc: "[E] Humor ( Comedy)"}
+    - {id: 540, cat: Books/EBook, desc: "[E] Humor (Comedy)"}
    - {id: 550, cat: Books/EBook, desc: "[E] LGBT"}
    - {id: 560, cat: Books/EBook, desc: "[E] Literary Fiction"}
+    - {id: 565, cat: Books/EBook, desc: "[E] LitRPG"}
    - {id: 570, cat: Books/EBook, desc: "[E] Magazines - all"}
    - {id: 580, cat: Books/EBook, desc: "[E] Non-Fiction"}
+    - {id: 585, cat: Books/EBook, desc: "[E] Other Languages"}
    - {id: 590, cat: Books/EBook, desc: "[E] Paranormal Romance"}
    - {id: 600, cat: Books/EBook, desc: "[E] Reference/Educational"}
    - {id: 610, cat: Books/EBook, desc: "[E] Religion and Spirituality"}
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -9,7 +9,6 @@ links:
  - https://aither.cc/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movie"}
    - {id: 9, cat: TV/Sport, desc: "Sport"}
@@ -58,34 +57,47 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        "Movie": 1
-        "Sport": 9
-        "TV": 2
-        "Music": 3
-        "Games": 4
-        "Software & Apps": 10
-        "Ebooks & Magazines": 11
-        "Audiobooks": 14
-        "Education": 15
-        "XXX": 6
    title:
      selector: name
    details:
@@ -97,8 +109,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
@@ -119,21 +129,25 @@ search:
    size:
      selector: size
    downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
    uploadvolumefactor:
      # api returns 0=false, 1=true
      selector: double_upload
      case:
        0: 1 # normal
        1: 2 # double
-# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
+# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# json UNIT3D 5.3.0
+      # 5 days (as seconds = 3 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.0.1
--- a/src/Jackett.Common/Definitions/anilibria.yml
+++ b/src/Jackett.Common/Definitions/anilibria.yml
@@ -24,8 +24,6 @@ search:
    - path: "https://api.anilibria.tv/v2/{{ if .Keywords }}searchTitles?filter=names,poster.url,code,torrents.list,season.year&limit=100&search={{ .Keywords }}{{ else }}getUpdates?filter=names,poster.url,code,torrents.list,season.year&limit=100{{ end }}"
      response:
        type: json
-        attribute: torrents.list
-        multiple: true

  keywordsfilters:
    # strip season and ep
@@ -34,6 +32,8 @@ search:

  rows:
    selector: $
+    attribute: torrents.list
+    multiple: true

  fields:
    category:
--- a/src/Jackett.Common/Definitions/animeclipse.yml
+++ b/src/Jackett.Common/Definitions/animeclipse.yml
@@ -45,7 +45,7 @@ search:
    category: 0
    # 0 all, 1 active, 2 dead
    active: 0
-    tor_page: 100
+    tor_page: 50
    order: "{{ .Config.sort }}"
    by: "{{ .Config.type }}"

--- a/src/Jackett.Common/Definitions/animeworld-api.yml
+++ b/src/Jackett.Common/Definitions/animeworld-api.yml
@@ -9,7 +9,6 @@ links:
  - https://animeworld.cx/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 1, cat: Movies/Other, desc: "Anime Filme"}
    - {id: 2, cat: TV/Anime, desc: "Anime Serien"}
@@ -63,39 +62,43 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        "Anime Filme": 1
-        "Anime Serien": 2
-        "Anime Musik / OSTs": 3
-        "Anime Spiele": 4
-        "Anime Hentai": 5
-        "Software": 6
-        "Sonstiges": 7
-        "Serien": 9
-        "Spiele": 10
-        "Musik": 11
-        "Manga": 12
-        "Cartoon Filme": 13
-        "Cartoon Serie": 14
-        "H-Manga / Doujinshi": 15
-        "Filme": 8
    title:
      selector: name
    details:
@@ -107,8 +110,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
@@ -129,11 +130,15 @@ search:
    size:
      selector: size
    downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
    uploadvolumefactor:
      # api returns 0=false, 1=true
      selector: double_upload
@@ -143,4 +148,4 @@ search:
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 5.3.0
+# json UNIT3D 6.0.0
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -6,13 +6,12 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
-  - http://audiobookbay.nl/ # site forces http, does not support https
-  - http://audiobookbay.ws/
+  - http://audiobookbay.fi/ # site forces http, does not support https
+  - http://audiobookbay.se/
  - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.how/
+  - https://audiobookbay.unblockit.day/
 legacylinks:
  - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.lat/
  - https://audiobookbay.unblockit.app/
  - https://audiobookbay.unblockit.dev/
  - https://audiobookbay.unblockit.ltd/
@@ -28,6 +27,10 @@ legacylinks:
  - https://audiobookbay.unblockit.kim/
  - https://audiobookbay.unblockit.bz/
  - https://audiobookbay.unblockit.tv/
+  - http://audiobookbay.nl/
+  - http://audiobookbay.ws/
+  - https://audiobookbay.unblockit.how/
+  - https://audiobookbay.unblockit.cam/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
@@ -1,115 +0,0 @@
---
-id: beyond-hd-oneurl
-name: Beyond-HD (OneURL)
-description: "This is BeyondHD using OneURL (for those that have enabled 2FA)"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://beyond-hd.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: oneurl
-    type: text
-    label: OneURL
-  - name: info_oid
-    type: info
-    label: "About One-URL"
-    default: "<li>OneURL is found by accessing your Beyond-HD web site,</li><li>hovering over the <b>user icon</b></li><li>and going to <b>My Security</b></li><li>then going to the <b>One URL (OID)</b> tab,</li><li>and if it's not already active, you need to hit <b>Reset One URL</b> to activate it.</li><li>Then use that link here.</li>"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  method: oneurl
-  inputs:
-    oneurl: "{{ .Config.oneurl }}"
-  test:
-    path: torrents
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-
-  rows:
-    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
-
-  fields:
-    category_optional:
-      selector: a[href*="/categories/"]
-      optional: true
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/.*?\\.(\\d+)"
-    category:
-      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}1{{ end }}"
-    title:
-      selector: a.torrent-name
-    details:
-      selector: a.torrent-name
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    date:
-      selector: td:not(a[href$="/history"]) span.text-orange
-      filters:
-        - name: timeago
-    size:
-      selector: td span.text-blue
-    seeders:
-      selector: a[href$="/peers"] span.text-green
-    leechers:
-      selector: a[href$="/peers"] span.text-red
-    grabs:
-      selector: a[href$="/history"]
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        i[data-original-title="100% Free"]: 0
-        i[data-original-title="100% Free (Limited UL)"]: 0
-        i[data-original-title="25% Promo"]: 0.75
-        i[data-original-title="50% Promo"]: 0.5
-        i[data-original-title="75% Promo"]: 0.25
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# UNIT3D (custom)
--- a/src/Jackett.Common/Definitions/bit-titan.yml
+++ b/src/Jackett.Common/Definitions/bit-titan.yml
@@ -107,7 +107,7 @@ settings:
    default: false
  - name: sort
    type: select
-    label: Sort requested from site
+    label: Sort type requested from site
    default: 1
    options:
      1: created
@@ -116,11 +116,11 @@ settings:
      9: title
  - name: type
    type: select
-    label: Order requested from site
-    default: DESC
+    label: Order direction requested from site
+    default: 1
    options:
-      DESC: desc
-      ASC: asc
+      1: desc
+      2: asc

 search:
  paths:
@@ -132,14 +132,21 @@ search:
    apiKey: "{{ .Config.apikey }}"
    categories: "{{ if .Categories }}{{ join .Categories \",\" }}{{ else }}0{{ end }}"
    search: "{{ .Keywords }}"
-    # searchIn: 0 all, 1 active, 2 dead, 3 highlights, 4 own uploads, 5 uploads bots, 6 onlyupload, 7 multiplier, 8 %download, 9 freeleech
+    # searchIn: 0 all, 1 active, 2 dead, 3 highlights, 4 uploads, 5 BOT uploads, 6 onlyupload, 7 multiplier, 8 %download, 9 freeleech
    searchIn: "{{ if .Config.freeleech }}9{{ else }}0{{ end }}"
    # 1 25, 2 50, 3 75, 4 100
-    # api only responds with results if limit=1 is used !?! (as at 22-Nov-2021)
-    limit: 1
+    limit: 2
+    page: 1
+    # 1 JSON, 2 XML, 3 HTML
+    response: 1
+    # 0 NO, 1 YES
    downloadLink: 1
    # 1 = Sat, 28 Nov 2020 23:29:38 +0100 (DEFAULT VALUE) , 2 = 1606606178 (UNIX TIMESTAMP) , 3 = 28.11.2020 23:29.38 (German Timestamp) ,  4 = 2020-11-28 23:29:38 (Default Datetime)
    timeFormat: 2
+    # 1 bytes, 2 units
+    sizeFormat: 1
+    # 0 NO, 1 YES
+    categoryName: 0
    orderBy: "{{ .Config.sort }}"
    order: "{{ .Config.type }}"

@@ -181,4 +188,4 @@ search:
    minimumseedtime:
      # 2 day (as seconds = 2 x 24 x 60 x 60)
      text: 172800
-# json engine v.2.011.021
+# json engine v.2.011.022
--- a/src/Jackett.Common/Definitions/bitbazis.yml
+++ b/src/Jackett.Common/Definitions/bitbazis.yml
@@ -11,40 +11,43 @@ links:

 caps:
  categorymappings:
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun"}
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng"}
    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
-    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 64, cat: Movies, desc: "Film/Pack"}
    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
-    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun"}
+    - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng"}
+    - {id: 64, cat: Movies, desc: "Film/Pack"}
    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 69, cat: TV/Anime, desc: "Mese/XviD"}
    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 69, cat: TV/Anime, desc: "Mese/SD"}
    - {id: 68, cat: TV/Anime, desc: "Mese/DVD"}
    - {id: 91, cat: TV/Anime, desc: "Mese/HD"}
    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
    - {id: 31, cat: PC/Games, desc: "Játék/PC"}
-    - {id: 81, cat: PC/0day, desc: "Program/PC"}
-    - {id: 14, cat: PC, desc: "Program/Egyéb"}
-    - {id: 49, cat: PC/0day, desc: "Program/Rip"}
    - {id: 54, cat: Console, desc: "Játék/Konzol"}
+    - {id: 81, cat: PC/0day, desc: "Program/PC"}
+    - {id: 49, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Android"}
+    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
+    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
+    - {id: 65, cat: Other, desc: "Egyéb"}
+    # the following are no longer in the cat list in the search page, but are still in the profile cat list
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
    - {id: 33, cat: XXX/SD, desc: "Film/SD/XXX"}
    - {id: 89, cat: XXX/x264, desc: "Film/HD/XXX"}
    - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX"}
-    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
-    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
-    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
-    - {id: 65, cat: Other, desc: "Egyéb"}

  modes:
    search: [q]
@@ -102,7 +105,7 @@ search:
    # site does not support imdbid searching or appear to have freeleech

  rows:
-    selector: table[width="900px"]:last-child tbody tr:has(a[href^="userdetails.php?id="])
+    selector: table[width="100%"]:last-child tbody tr:has(a[href^="userdetails.php?id="])

  fields:
    category:
@@ -112,7 +115,8 @@ search:
        - name: querystring
          args: cat
    title:
-      selector: a[href^="details.php?id="]
+      selector: div.tooltip
+      remove: span
    details:
      selector: a[href^="details.php?id="]
      attribute: href
@@ -120,41 +124,44 @@ search:
      selector: a.preview
      attribute: href
    download:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="download.php?torrent="]
      attribute: href
-      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
    size:
-      selector: td:nth-last-child(2)
+      selector: td:nth-child(6)
    date:
      # 2021-11-09 16:51:24
-      selector: td:last-child
+      selector: td:nth-child(7)
      filters:
        - name: append
          args: " +01:00" # CET
        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "06/01/02 -07:00"
    grabs:
-      selector: td:nth-child(6)
+      selector: td:nth-child(5)
      filters:
        - name: regexp
          args: "D:(\\d+)"
    seeders:
-      selector: td:nth-child(4)
+      selector: td:nth-child(3)
      filters:
        - name: regexp
          args: "S:(\\d+)"
    leechers:
-      selector: td:nth-child(5)
+      selector: td:nth-child(4)
      filters:
        - name: regexp
          args: "L:(\\d+)"
    downloadvolumefactor:
-      text: 1
+      case:
+        "i:contains(\"(Free)\")": 0
+        "*": 1
    uploadvolumefactor:
-      text: 1
+      case:
+        "i:contains(\"(2x)\")": 2
+        "i:contains(\"(3x)\")": 3
+        "i:contains(\"(4x)\")": 4
+        "*": 1
    minimumseedtime:
-      # 3 day (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
 # engine n/a
--- a/src/Jackett.Common/Definitions/bitbr.yml
+++ b/src/Jackett.Common/Definitions/bitbr.yml
@@ -0,0 +1,189 @@
+---
+id: bitbr
+name: BitBR
+description: "BitBR is a BRAZILIAN Private Torrent Tracker for HD MOVIES / TV"
+language: pt-BR
+type: private
+encoding: UTF-8
+links:
+  - https://bitbr.cc/
+
+caps:
+  categorymappings:
+    - {id: 405, cat: TV/Anime, desc: "Anime"}
+    - {id: 414, cat: PC/Mobile-Other, desc: "App"}
+    - {id: 413, cat: Audio/Audiobook, desc: "Audiobooks"}
+    - {id: 409, cat: XXX, desc: "Adulto XxX"}
+    - {id: 410, cat: Other, desc: "Desenhos"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentários"}
+    - {id: 407, cat: TV/Sport, desc: "Esportes"}
+    - {id: 401, cat: Movies, desc: "Filmes"}
+    - {id: 416, cat: Books/Comics, desc: "HQ/Mangá"}
+    - {id: 418, cat: Books/EBook, desc: "eBooks"}
+    - {id: 408, cat: PC/Games, desc: "Jogos"}
+    - {id: 417, cat: Audio, desc: "Músicas"}
+    - {id: 412, cat: Other, desc: "Scripts Android/iOS"}
+    - {id: 411, cat: Other, desc: "Scripts PHP"}
+    - {id: 402, cat: TV, desc: "Séries"}
+    - {id: 406, cat: PC, desc: "Softwares"}
+    - {id: 415, cat: PC/0day, desc: "istema Operacional"}
+    - {id: 403, cat: TV, desc: "TV"}
+
+  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: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the BitBR Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - 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
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents por página:</b> setting to <b>100</b> on your account profile <b>Configurações do Tracker</b>.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("Falha")) # code or username or password incorrect
+    - selector: td.embedded:has(h2:contains("Negada")) # you are already logged on
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ 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
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not return imdb link in results
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " -03:00" # BRT
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " -03:00" # BRT
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    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
+    minimumratio:
+      text: 0.8
+# NexusPHP Standard v1.5 Beta 4 (custom)
--- a/src/Jackett.Common/Definitions/bitcityreloaded.yml
+++ b/src/Jackett.Common/Definitions/bitcityreloaded.yml
@@ -0,0 +1,161 @@
+---
+id: bitcityreloaded
+name: Bit-City Reloaded
+description: "Bit-City Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: ISO-8859-1
+links:
+  - https://bc-reloaded.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Other, desc: "Anderes"}
+    - {id: 34, cat: PC, desc: "Appz/Linux"}
+    - {id: 35, cat: PC/Mac, desc: "Appz/Mac"}
+    - {id: 36, cat: PC, desc: "Appz/Other"}
+    - {id: 20, cat: PC/0day, desc: "Appz/Win"}
+    - {id: 4, cat: Books/EBook, desc: "EBooks"}
+    - {id: 10, cat: PC/Games, desc: "Games/PC"}
+    - {id: 15, cat: PC/Mobile-Android, desc: "Handy & PDA"}
+    - {id: 16, cat: Audio/Audiobook, desc: "Hörspiel/Hörbuch"}
+    - {id: 30, cat: Movies/Foreign, desc: "International"}
+    - {id: 43, cat: Movies/3D, desc: "Movie/3D"}
+    - {id: 6, cat: Movies/HD, desc: "Movie/HD 1080p"}
+    - {id: 7, cat: Movies/HD, desc: "Movie/HD 720p"}
+    - {id: 17, cat: Movies/Other, desc: "Movie/MegaPack"}
+    - {id: 9, cat: Movies/SD, desc: "Movie/SD"}
+    - {id: 26, cat: XXX, desc: "Movie/XXX"}
+    - {id: 41, cat: XXX/Other, desc: "Movie/XXX/Other"}
+    - {id: 42, cat: XXX/Pack, desc: "Movie/XXX/Pack"}
+    - {id: 45, cat: Movies/UHD, desc: "Movies/4K"}
+    - {id: 33, cat: Movies/BluRay, desc: "Movies/BluRay"}
+    - {id: 19, cat: Audio/Video, desc: "Musik Videos"}
+    - {id: 18, cat: Audio, desc: "Musik/MP3/Flac"}
+    - {id: 13, cat: Console/WiiU, desc: "Nintendo"}
+    - {id: 12, cat: Console/PS4, desc: "Playstation"}
+    - {id: 22, cat: TV/HD, desc: "Serie/HD"}
+    - {id: 38, cat: TV, desc: "Serie/Pack"}
+    - {id: 23, cat: TV/SD, desc: "Serie/SD"}
+    - {id: 25, cat: TV/Sport, desc: "Sport"}
+
+  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
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Anzahl der Torrents beim Durchsuchen</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login/index.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://bc-reloaded.net/uebersicht.php?c7=1&c17=1&showsearch=1&search=2021+720p&blah=0&incldead=1&orderby=added&sort=desc
+    - path: uebersicht.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both, 3 noDVDRip
+    blah: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid searching or display imdb links in results.
+
+  rows:
+    selector: "table.tableinborder[cellpadding=0] > tbody > tr{{ if .Config.freeleech }}:has(img[src$=\"torrent_ou.gif\"]){{ else }}{{ end }}"
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="uebersicht.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    date:
+      selector: table tbody tr:nth-of-type(2) td:nth-of-type(5)
+      filters:
+        - name: re_replace
+          args: ["\u00a0", " "]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    size:
+      selector: table tbody tr:nth-of-type(2) > td > b
+    files:
+      selector: td:has(a[href*="&filelist=1"])> b:nth-child(2)
+    grabs:
+      selector: td:has(a[href*="&tosnatchers=1"])> b:nth-child(1)
+    seeders:
+      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(1) font
+    leechers:
+      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(2) font
+    downloadvolumefactor:
+      case:
+        img[src$="torrent_ou.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="torrent_2u.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 0.7
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a
--- a/src/Jackett.Common/Definitions/bitsearch.yml
+++ b/src/Jackett.Common/Definitions/bitsearch.yml
@@ -72,8 +72,12 @@ search:
    sort: "{{ .Config.sort }}"
    order: "{{ .Config.type }}"

+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
  rows:
-    selector: div.search-result
+    selector: div.search-result:has(a.dl-torrent), li.search-result:has(a.dl-torrent)

  fields:
    category:
@@ -84,7 +88,7 @@ search:
      selector: h5 a
      attribute: href
    download:
-      selector: a[class="dl-torrent"]
+      selector: a.dl-torrent
      attribute: href
    infohash:
      selector: a[href^="magnet:?xt"]
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -162,9 +162,9 @@ search:
      selector: a[href*="?p=torrents&pid=10&action=download"]
      attribute: href
    date_year:
-      optional: true
      # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at "))
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      optional: true
      filters:
        - name: regexp
          args: "Uploaded (.+?) by"
@@ -173,20 +173,24 @@ search:
        - name: dateparse
          args: "02-01-2006 15:04 -07:00"
    date_day:
-      optional: true
      # Uploaded Friday at 05:11 by
      # Uploaded Today at 00:48 by
      # Uploaded Yesterday at 23:57 by
-      selector: td.torrent_name:contains(" at ")
+      selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      optional: true
      filters:
        - name: regexp
          args: "Uploaded (.+?) by"
        - name: replace
          args: [" at ", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
+        - name: fuzzytime
+    date_unix:
+      # within the hour (unix)
+      selector: abbr[data-time]
+      attribute: data-time
+      optional: true
    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_unix .Result.date_day }}{{ or .Result.date_year .Result.date_unix .Result.date_day }}{{ else }}now{{ end }}"
    size:
      selector: a[rel="torrent_size"]
    seeders:
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -9,7 +9,6 @@ links:
  - https://blutopia.xyz/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movie"}
    - {id: 2, cat: TV, desc: "TV Show"}
@@ -50,14 +49,33 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1

  keywordsfilters:
    - name: re_replace
@@ -65,17 +83,13 @@ search:

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        Movie: 1
-        TV Show: 2
-        FANRES: 3
-        Trailer: 5
    title:
      selector: name
    details:
@@ -87,8 +101,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
@@ -130,4 +142,4 @@ search:
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 5.3.1b
+# json UNIT3D 6.0.0 beta
--- a/src/Jackett.Common/Definitions/brsociety-api.yml
+++ b/src/Jackett.Common/Definitions/brsociety-api.yml
@@ -9,13 +9,13 @@ links:
  - https://brsociety.club/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
-    - {id: 1, cat: TV, desc: "Cursos (courses)"}
+    - {id: 1, cat: TV, desc: "Cursos"}
    - {id: 2, cat: Books/EBook, desc: "eBooks"}
-    - {id: 5, cat: Books/Mags, desc: "Revistas (Magazines)"}
+    - {id: 5, cat: Books/Mags, desc: "Revistas"}
    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 4, cat: Other, desc: "Arquivos de Auxilio (Help Files)"}
+    - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
+    - {id: 6, cat: Other, desc: "Graduação"}

  modes:
    search: [q]
@@ -51,6 +51,16 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
@@ -58,22 +68,16 @@ search:
    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
      response:
        type: json
-        attribute: attributes

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        "Cursos": 1
-        "eBooks": 2
-        "Revistas": 5
-        "Audiobooks": 3
-        "Arquivos de Auxilio": 4
    title:
      selector: name
    details:
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -49,6 +49,10 @@ settings:
      0: Active
      1: "Active and Inactive"
      2: Inactive
+  - name: dropbumped
+    type: checkbox
+    label: Ignore Bumped Torrents
+    default: false
  - name: info_results
    type: info
    label: Results Per Page
@@ -77,7 +81,7 @@ search:
    srchdtls: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"

  rows:
-    selector: table[border="1"] tr:not(:first-child)
+    selector: "table[border=\"1\"] tr:not(:first-child){{ if .Config.dropbumped }}:not(:has(span.bumped)){{ else }}{{ end }}"

  fields:
    category:
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -7,7 +7,7 @@ type: semi-private
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.cpasbien-fr.nz/
+  - https://vwwvwvwvvw.cpasbien-fr.nz/
 legacylinks:
  - http://www.cpasbiens.cc/
  - http://www.cpabien.cm/
@@ -42,6 +42,7 @@ legacylinks:
  - https://wvw.cpasbien-fr.fr/
  - https://wwwv.cpasbien-fr.fr/
  - https://www2.cpasbien-fr.fr/
+  - https://www.cpasbien-fr.nz/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/cpasbienclone.yml
+++ b/src/Jackett.Common/Definitions/cpasbienclone.yml
@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbien.to/
+  - https://www.cpasbien.gg/
 legacylinks:
  - https://www1.cpasbiens.ws/
  - https://www2.cpasbiens.ws/
@@ -19,6 +19,7 @@ legacylinks:
  - https://cpasbiens.proxyportal.fun/
  - https://cpasbiens.uk-unblock.xyz/
  - https://cpasbiens.ind-unblock.xyz/
+  - https://cpasbien.to/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/crackingpatching.yml
+++ b/src/Jackett.Common/Definitions/crackingpatching.yml
@@ -0,0 +1,98 @@
+---
+id: crackingpatching
+name: CrackingPatching
+description: "CrackingPatching is a Public tracker for Software and Apps"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://crackingpatching.com/
+
+caps:
+  categorymappings:
+    - {id: "adobe-software", cat: PC, desc: "Adobe Software"}
+    - {id: "adobe-tools", cat: PC, desc: "Adobe Tools"}
+    - {id: "android", cat: PC/Mobile-Android, desc: "Android"}
+    - {id: "animations-3d-graphics", cat: PC, desc: "Animations/ 3D Graphics"}
+    - {id: "antivirus", cat: PC, desc: "Antivirus"}
+    - {id: "cd-dvd-burners", cat: PC, desc: "CD/ DVD Burners"}
+    - {id: "compression-tools", cat: PC, desc: "Compression Tools"}
+    - {id: "crack-serials", cat: PC, desc: "Crack &amp;Serials"}
+    - {id: "downloader", cat: PC, desc: "Downloader"}
+    - {id: "drivers-update", cat: PC, desc: "Drivers Update"}
+    - {id: "idm", cat: PC, desc: "IDM Crack | Patch"}
+    - {id: "home", cat: PC, desc: "Home"}
+    - {id: "other", cat: Other, desc: "Other"}
+    - {id: "recovery-software", cat: PC, desc: "Recovery Software"}
+    - {id: "screen-recorders", cat: PC, desc: "Screen Recorders"}
+    - {id: "security", cat: PC, desc: "Security"}
+    - {id: "system-optimizers", cat: PC, desc: "System Optimizers"}
+    - {id: "vpn", cat: PC, desc: "VPN"}
+    - {id: "windows-app", cat: PC, desc: "Windows App"}
+    - {id: "converters", cat: PC, desc: "Converters"}
+    - {id: "games", cat: PC/Games, desc: "Games"}
+    - {id: "idm-crack-patch", cat: PC, desc: "IDM Crack/ Patch"}
+    - {id: "ios-mac-os-x-2", cat: PC/Mac, desc: "iOS/ MAC OS X"}
+    - {id: "keygen-loader", cat: PC, desc: "Keygen / Loader"}
+    - {id: "keygen-serial", cat: PC, desc: "KeyGen / Serial"}
+    - {id: "microsoft-office", cat: PC, desc: "Microsoft Office"}
+    - {id: "multimedia", cat: PC, desc: "Multimedia"}
+    - {id: "pdf-tools", cat: PC, desc: "PDF Tools"}
+    - {id: "photo-editing-tools", cat: PC, desc: "Photo Editing Tools"}
+    - {id: "request-crack-patch", cat: PC, desc: "Request Crack/ Patch"}
+    - {id: "uncategorized", cat: Other, desc: "Uncategorized"}
+    - {id: "windows", cat: PC, desc: "Windows"}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: "?s={{ .Keywords }}"
+
+  rows:
+    selector: article.post-entry
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: article.post-entry
+      attribute: class
+      filters:
+        - name: regexp
+          args: "category-(.+?) "
+    title:
+      selector: h2 > a
+    details:
+      selector: h2 > a
+      attribute: href
+    download:
+      selector: h2 > a
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    date:
+      text: now
+    size:
+      text: "512 MB"
+    description:
+      selector: p
+      remove: a
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# WordPress 5.9.1
--- a/src/Jackett.Common/Definitions/danishbytes-api.yml
+++ b/src/Jackett.Common/Definitions/danishbytes-api.yml
@@ -0,0 +1,136 @@
+---
+id: danishbytes-api
+name: DanishBytes (API)
+description: "DanishBytes is a Private Danish Tracker"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://danishbytes.club/
+  - https://danishbytes2.org/
+  - https://dbytes.org/
+  - https://danishbytes.art/
+legacylinks:
+  - https://danishbytes.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Sound"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
+    - {id: 8, cat: Books, desc: "Bookz"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_apikey
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: rsskey
+    type: text
+    label: RSSKey
+  - name: info_rsskey
+    type: info
+    label: About your RSS key
+    default: "Find or Generate a new RSS key by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</a> account <i>My Security</i> page and clicking on the <b>RSS Key (RID)</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    - path: "/api/torrents/v2/filter?api_token={{ .Config.apikey }}&search={{ .Keywords }}{{ if .Query.IMDBIDShort }}&imdb={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdb={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdb={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&freeleech=1{{ else }}{{ end }}&sorting={{ .Config.sort }}&direction={{ .Config.type }}&qty=100&page=1"
+      response:
+        type: json
+
+  rows:
+    selector: torrents
+    count:
+      selector: $.resultsCount
+
+  fields:
+    id:
+      selector: .id
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      text: "{{ .Config.sitelink }}torrents/{{ .Result.id }}"
+    download:
+      text: "{{ .Config.sitelink }}torrent/download/{{ .Result.id }}.{{ .Config.rsskey }}"
+    poster:
+      selector: poster_image
+    imdbid:
+      selector: imdb
+    tmdbid:
+      selector: tmdb
+    tvdbid:
+      selector: tvdb
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2022-02-28T19:09:44.000000Z
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: free
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: doubleup
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json DBy v0.95
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -14,31 +14,29 @@ caps:
  categorymappings:
    # Dont forget to update the category case block on the search section below.
    # Movie
-    - {id: 119, cat: Movies/DVD, desc: "Movie DVD"}
-    - {id: 114, cat: Movies/UHD, desc: "Movie 4K /2160p"}
-    - {id: 28, cat: Movies/SD, desc: "Movie XviD/x264"}
-    - {id: 32, cat: Movies/HD, desc: "Movie 720p/1080p"}
-    - {id: 26, cat: Movies/3D, desc: "Movie 3D"}
-    - {id: 138, cat: Movies, desc: "Movie Packs"}
+    - {id: 28, cat: Movies/SD, desc: "Filme SD"}
+    - {id: 32, cat: Movies/HD, desc: "Filme HD"}
+    - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
+    - {id: 138, cat: Movies, desc: "Filme Pack`s"}
    # Serien
-    - {id: 57, cat: TV/HD, desc: "Serien HD"}
-    - {id: 59, cat: TV, desc: "Serien Pack"}
    - {id: 60, cat: TV/SD, desc: "Serien SD"}
-    - {id: 122, cat: TV, desc: "Serien Show"}
-    - {id: 123, cat: TV/Documentary, desc: "Serien Doku"}
+    - {id: 57, cat: TV/HD, desc: "Serien HD"}
+    - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
+    - {id: 59, cat: TV, desc: "Serien Pack`s"}
    # Audio
-    - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
    - {id: 52, cat: Audio, desc: "Audio Pack"}
-    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+    - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
    # App
    - {id: 12, cat: PC/0day, desc: "App PC"}
    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
    - {id: 125, cat: PC/Mac, desc: "App macOS"}
    # Doku
-    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku Reihe"}
    # Spiel
    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
@@ -48,19 +46,18 @@ caps:
    - {id: 61, cat: TV/Sport, desc: "Sport HD"}
    - {id: 62, cat: TV/Sport, desc: "Sport SD"}
    # Paper
-    - {id: 96, cat: Books/Mags, desc: "Paper Zeitungen"}
-    - {id: 136, cat: Books/EBook, desc: "Paper E-Book"}
-    - {id: 137, cat: Books/Comics, desc: "Paper Comics"}
+    - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"}
+    - {id: 137, cat: Books/Comics, desc: "ePaper Comics"}
    # XXX
+    - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
    - {id: 73, cat: XXX/x264, desc: "XXX HD"}
    - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
-    - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
-    - {id: 124, cat: XXX/Other, desc: "XXX Clips"}
    #  Internal
-    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
-    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
    - {id: 132, cat: Other, desc: "Internal Sonstiges"}

  modes:
@@ -154,31 +151,29 @@ search:
      selector: div.kat_cat_pic
      case:
        # Movie
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 119
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"2160p\"))": 114
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"x264\"))": 28
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": 32
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": 26
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Packs\"))": 138
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 28
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 114
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 32
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"Pack`s\"))": 138
        # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 57
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 59
        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 60
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Show\"))": 122
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Doku\"))": 123
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 139
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 57
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack`s\"))": 59
        # Audio
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": 120
+        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": 110
        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": 48
        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 52
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": 110
        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": 63
+        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": 120
        # App
        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 12
        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": 11
        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"macOS\"))": 125
        # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 14
        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 15
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 14
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Reihe\"))": 123
        # Spiel
        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": 126
        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 17
@@ -188,19 +183,18 @@ search:
        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 61
        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 62
        # Paper
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 96
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 136
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Comics\"))": 137
+        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 96
+        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 136
+        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"Comics\"))": 137
        # XXX
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 76
        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 73
        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 75
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 76
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Clips\"))": 124
        # Internal
-        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film HD\"))": 128
        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film SD\"))": 129
-        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien HD\"))": 130
+        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film HD\"))": 128
        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien SD\"))": 131
+        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien HD\"))": 130
        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 132
    title:
      selector: a.selection_a
--- a/src/Jackett.Common/Definitions/datascene-api.yml
+++ b/src/Jackett.Common/Definitions/datascene-api.yml
@@ -12,9 +12,8 @@ legacylinks:
  - https://datascene.net/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}
    - {id: 2, cat: TV, desc: "TV"}
    - {id: 3, cat: Audio, desc: "Music"}
    - {id: 4, cat: PC/Games, desc: "Game"}
@@ -59,6 +58,16 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
@@ -66,25 +75,16 @@ search:
    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
      response:
        type: json
-        attribute: attributes

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        "Movie": 1
-        "TV": 2
-        "Music": 3
-        "Game": 4
-        "Application": 5
-        "XXX": 6
-        "Mobile": 7
-        "E-Book": 8
    title:
      selector: name
    details:
@@ -96,8 +96,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -11,12 +11,10 @@ links:
  - https://www.dnoid.to/
  - https://www.dnoid.pw/
  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.how/
+  - https://demonoid.unblockit.day/
  - https://demonoid.torrentbay.to/
  - https://demonoid.nocensor.biz/
 legacylinks:
-  - https://demonoid.unblockit.id/
-  - https://demonoid.unblockit.win/
  - https://demonoid.unblockit.top/
  - https://demonoid.unblockit.lat/
  - https://demonoid.unblockit.app/
@@ -35,6 +33,8 @@ legacylinks:
  - https://demonoid.unblockit.kim/
  - https://demonoid.unblockit.bz/
  - https://demonoid.unblockit.tv/
+  - https://demonoid.unblockit.how/
+  - https://demonoid.unblockit.cam/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/desitorrents-api.yml
+++ b/src/Jackett.Common/Definitions/desitorrents-api.yml
@@ -10,7 +10,6 @@ links:
  - https://desitorrents.rocks/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "TV"}
@@ -51,6 +50,16 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
@@ -58,7 +67,6 @@ search:
    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
      response:
        type: json
-        attribute: attributes

  keywordsfilters:
    - name: re_replace
@@ -66,16 +74,13 @@ search:

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        Movies: 1
-        TV: 2
-        Music: 3
    title:
      selector: name
    details:
@@ -87,8 +92,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
--- a/src/Jackett.Common/Definitions/docspedia.yml
+++ b/src/Jackett.Common/Definitions/docspedia.yml
@@ -15,6 +15,7 @@ caps:
    - {id: 64, cat: Books/EBook, desc: "Books"}
    - {id: 66, cat: Books, desc: "Business"}
    - {id: 68, cat: Books/Comics, desc: "Comics"}
+    - {id: 80, cat: Books, desc: "Coooking"}
    - {id: 59, cat: TV/Documentary, desc: "Docs/Movies"}
    - {id: 60, cat: TV/Documentary, desc: "Docs/TV"}
    - {id: 79, cat: TV, desc: "Educational"}
--- a/src/Jackett.Common/Definitions/ebookparadijs.yml
+++ b/src/Jackett.Common/Definitions/ebookparadijs.yml
@@ -44,13 +44,16 @@ caps:
    book-search: [q]

 settings:
-  - name: cookie
+  - name: username
    type: text
-    label: Cookie
-  - name: info_cookie
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
    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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
  - name: freeleech
    type: checkbox
    label: Filter freeleech only
@@ -64,9 +67,15 @@ settings:
    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.

 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
  inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
  test:
    path: /
    selector: a[href="logout.php"]
--- a/src/Jackett.Common/Definitions/ebooks-shares.yml
+++ b/src/Jackett.Common/Definitions/ebooks-shares.yml
@@ -242,8 +242,8 @@ caps:
    - {id: 307, cat: Books/Other, desc: "VIP: Thriller"}
    - {id: 306, cat: Books/Other, desc: "VIP: Mystery"}
    - {id: 308, cat: Books/Other, desc: "VIP: Crime"}
-    - {id: 309, cat: Books/Other, desc: "VIP: Fantasy "}
-    - {id: 204, cat: Books/Other, desc: "VIP: Collections "}
+    - {id: 309, cat: Books/Other, desc: "VIP: Fantasy"}
+    - {id: 204, cat: Books/Other, desc: "VIP: Collections"}
    - {id: 205, cat: Books/Other, desc: "VIP: Audiobooks"}
    - {id: 206, cat: Books/Other, desc: "VIP: Comics"}
    - {id: 207, cat: Books/Other, desc: "VIP: Computers"}
@@ -274,6 +274,10 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: vip
+    type: checkbox
+    label: Include VIP results
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -316,10 +320,9 @@ search:
  paths:
    - path: torrents-search.php
  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
    # 0 only active 1 incl dead 2 only dead
-    incldead: 0
+    incldead: 1
    # 0 all 1 not freeleech 2 only freeleech
    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
    # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
@@ -328,7 +331,7 @@ search:
    order: "{{ .Config.type }}"

  rows:
-    selector: tr.t-row
+    selector: "tr.t-row{{ if .Config.vip }}{{ else }}:not(:has(a[href^=\"torrents.php?cat=\"]):contains(\"VIP\")){{ end }}"

  fields:
    category:
--- a/src/Jackett.Common/Definitions/elitetorrent-biz.yml
+++ b/src/Jackett.Common/Definitions/elitetorrent-biz.yml
@@ -6,7 +6,7 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://elitetorrent.app/
+  - https://elitetorrent.la/
  - https://elitetorrent.nocensor.biz/
 legacylinks:
  - https://www.elitetorrent.biz/
@@ -27,6 +27,7 @@ legacylinks:
  - https://elitetorrent.si/
  - https://elitetorrent.nocensor.work/
  - https://elitetorrent.com/
+  - https://elitetorrent.app/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/src/Jackett.Common/Definitions/eniahd.yml
@@ -6,9 +6,9 @@ language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
-  - https://eniatv.com/
-legacylinks:
  - https://eniahd.com/
+legacylinks:
+  - https://eniatv.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -1,181 +0,0 @@
---
-id: ettv
-name: ETTV
-description: "ETTV is a Public torrent site for TV / MOVIES, home of the  ETTV, ETHD and DTOne groups."
-language: en-US
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://www.ettvcentral.com/
-  - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.how/
-  - https://ettv.nocensor.biz/
-legacylinks:
-  - https://www.ettv.tv/
-  - https://www.ettv.to/
-  - https://www.ettvdl.com/
-  - https://www.ettv.be/
-  - https://ettv.unblockit.dev/
-  - https://ettv.unblockit.ltd/
-  - https://ettv.unblockit.link/
-  - https://ettv.unblockit.buzz/
-  - https://ettv.unblocked.monster/
-  - https://ettv.unblockit.club/
-  - https://ettv.unblockit.onl/
-  - https://ettv.unblockit.li/
-  - https://ettv.unblockit.uno/
-  - https://ettv.unblockit.ch/
-  - https://ettv.nocensor.space/
-  - https://ettv.unblockit.ws/
-  - https://ettv.nocensor.work/
-  - https://ettv.unblockit.kim/
-  - https://ettv.unblockit.bz/
-  - https://ettv.unblockit.tv/
-
-caps:
-  categorymappings:
-    - {id: 88, cat: XXX, desc: "Adult - Books"}
-    - {id: 84, cat: XXX, desc: "Adult - Games"}
-    - {id: 82, cat: XXX, desc: "Adult - HD-Movies"}
-    - {id: 83, cat: XXX, desc: "Adult - Hentai"}
-    - {id: 86, cat: XXX, desc: "Adult - Magazines"}
-    - {id: 81, cat: XXX, desc: "Adult - Movies"}
-    - {id: 87, cat: XXX, desc: "Adult - Other"}
-    - {id: 85, cat: XXX, desc: "Adult - Pictures"}
-    - {id: 74, cat: TV/Anime, desc: "Anime - Dubbed/Subbed"}
-    - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
-    - {id: 75, cat: TV/Anime, desc: "Anime - Others"}
-    - {id: 56, cat: Audio/Audiobook, desc: "Books - Audio"}
-    - {id: 55, cat: Books/Comics, desc: "Books - Comics"}
-    - {id: 53, cat: Books/EBook, desc: "Books - Ebooks"}
-    - {id: 54, cat: Books/Mags, desc: "Books - Magazines"}
-    - {id: 68, cat: Books/Other, desc: "Books - Others"}
-    - {id: 90, cat: Books/Other, desc: "Books - Others"}
-    - {id: 58, cat: PC/Games, desc: "Games - Android"}
-    - {id: 71, cat: PC/Games, desc: "Games - Others"}
-    - {id: 57, cat: PC/Games, desc: "Games - Windows"}
-    - {id: 49, cat: Movies/3D, desc: "Movies - 3D"}
-    - {id: 66, cat: Movies/BluRay, desc: "Movies - BluRay Disc/Remux"}
-    - {id: 91, cat: Movies, desc: "Movies - Bollywood"}
-    - {id: 65, cat: Movies/SD, desc: "Movies - CAM/TS"}
-    - {id: 80, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 51, cat: Movies, desc: "Movies - Dubs/Dual Audio"}
-    - {id: 67, cat: Movies/DVD, desc: "Movies - DVDR"}
-    - {id: 1, cat: Movies/HD, desc: "Movies - HD 1080p"}
-    - {id: 2, cat: Movies/HD, desc: "Movies - HD 720p"}
-    - {id: 76, cat: Movies/HD, desc: "Movies - HEVC/x265"}
-    - {id: 47, cat: Movies/HD, desc: "Movies - X264/H264"}
-    - {id: 3, cat: Movies/UHD, desc: "Movies - UltraHD/4K"}
-    - {id: 42, cat: Movies/SD, desc: "Movies - XviD"}
-    - {id: 60, cat: Audio/Lossless, desc: "Music - FLAC"}
-    - {id: 59, cat: Audio/MP3, desc: "Music - MP3"}
-    - {id: 61, cat: Audio/Video, desc: "Music - Music Videos"}
-    - {id: 69, cat: Audio/Other, desc: "Music - Others"}
-    - {id: 95, cat: Other/Misc, desc: "Others - Misc"}
-    - {id: 78, cat: Other, desc: "Others - Unsorted"}
-    - {id: 63, cat: PC/Mobile-Android, desc: "Software - Android"}
-    - {id: 64, cat: PC/Mac, desc: "Software - Mac"}
-    - {id: 70, cat: PC, desc: "Software - Others"}
-    - {id: 62, cat: PC/0day, desc: "Software - Windows"}
-    - {id: 94, cat: Books, desc: "Tutorials - Tutorials"}
-    - {id: 79, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 41, cat: TV/HD, desc: "TV - HD/X264/H264"}
-    - {id: 77, cat: TV/HD, desc: "TV - HEVC/x265"}
-    - {id: 5, cat: TV/SD, desc: "TV - SD/X264/H264"}
-    - {id: 50, cat: TV/SD, desc: "TV - SD/XVID"}
-    - {id: 72, cat: TV/Sport, desc: "TV - Sport"}
-    - {id: 7, cat: TV, desc: "TV - TV Packs"}
-    - {id: 89, cat: TV/UHD, desc: "TV - UltraHD/4K"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - 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
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  path: "{{ if .Keywords }}torrents-search.php{{ else }}torrents.php{{ end }}"
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    incldead: 1
-  keywordsfilters:
-    - name: replace
-      args: ["-", " "] # remove special search character (negative search)
-    - name: replace
-      args: ["+", " "] # remove special search character (positive search)
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-    - name: re_replace
-      args: ["\\s+", " "] # clean up whitespaces (multiple consecutive spaces confuses the search engine)
-
-  rows:
-    selector: div.myFrame-content > div > table > tbody > tr[class]
-    filters:
-      - name: andmatch # they ignore keywords <= characters, so we still andmatch it, see https://www.ettv.tv/forum/view/topic/and-search-operator-broken--70
-
-  fields:
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    title:
-      selector: a[href^="/torrent/"][title]
-      attribute: title
-      filters:
-        - name: re_replace
-          args: ["( torrent)$", ""]
-    category:
-      text: 78 # issue #7110
-    category|noappend:
-      optional: true
-      selector: a[href^="/torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    date:
-      selector: td:nth-child(3)
-    size:
-      selector: td:nth-child(4)
-      filters:
-        - name: replace
-          args: ["N/A", "0 B"]
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/extratorrent-st.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-st.yml
@@ -7,13 +7,15 @@ type: public
 encoding: UTF-8
 links:
  - https://extratorrent.st/
-  - https://extratorrent.unblockit.how/
+  - https://extratorrent.unblockit.day/
  - https://extratorrent.nocensor.biz/
 legacylinks:
  - https://extratorrent.nocensor.work/
  - https://extratorrent.unblockit.kim/
  - https://extratorrent.unblockit.bz/
  - https://extratorrent.unblockit.tv/
+  - https://extratorrent.unblockit.how/
+  - https://extratorrent.unblockit.cam/

 caps:
  categorymappings:
@@ -36,6 +38,7 @@ caps:
    - {id: Other Music, cat: Audio/Other, desc: Music Other}
    - {id: Radio Shows, cat: Audio/Other, desc: Music Radio}
    - {id: Video, cat: XXX, desc: Adult / Porn}
+    - {id: "Adult / Porn", cat: XXX, desc: Adult / Porn}
    - {id: Pictures, cat: XXX/ImageSet, desc: Adult Pictures}
    - {id: Magazines, cat: XXX/Other, desc: Adult Magazines}
    - {id: Games, cat: XXX/Other, desc: Adult Games}
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -12,15 +12,13 @@ links:
  - https://eztv.tf/
  - https://eztv.yt/
  - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.how/
+  - https://eztv.unblockit.day/
  - https://eztv.nocensor.biz/
 legacylinks:
  - https://eztv.ag/ # redirects to .re
  - https://eztv.it/ # redirects to .re
  - https://eztv.ch/ # redirects to .re
  - https://eztv.io/
-  - https://eztv.unblockit.dev/
-  - https://eztv.unblockit.ltd/
  - https://eztv.unblockit.link/
  - https://eztv.unblockit.buzz/
  - https://eztv.unblocked.monster/
@@ -35,6 +33,8 @@ legacylinks:
  - https://eztv.unblockit.kim/
  - https://eztv.unblockit.bz/
  - https://eztv.unblockit.tv/
+  - https://eztv.unblockit.how/
+  - https://eztv.unblockit.cam/

 caps:
  categories:
@@ -48,14 +48,18 @@ settings: []

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}/{{ end }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}{{ end }}"

  keywordsfilters:
    - name: re_replace
      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)

+  headers:
+    cookie: ["sort_no=100"] # show 100 results for keywordless search
+
  rows:
-    selector: "table.forum_header_border tr[name='hover'].forum_header_border:has(a.magnet)" # some torrents don't have any download links, skip them
+    # only use latest added torrents table for keywordless search to avoid duplicates, some torrents don't have any download links so skip them
+    selector: "table.forum_header_border:contains('Latest') tr[name='hover'].forum_header_border:has(a.magnet), table.forum_header_border:contains('Releases') tr[name='hover'].forum_header_border:has(a.magnet)"
    filters:
      - name: andmatch

--- a/src/Jackett.Common/Definitions/film-paleis.yml
+++ b/src/Jackett.Common/Definitions/film-paleis.yml
@@ -42,13 +42,16 @@ caps:
    book-search: [q]

 settings:
-  - name: cookie
+  - name: username
    type: text
-    label: Cookie
-  - name: info_cookie
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
    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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
  - name: thankyou
    type: text
    label: Thank You Comment
@@ -58,9 +61,15 @@ settings:
    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above. Minimum of at least 10 characters.

 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
  inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
  test:
    path: /
    selector: a[href="logout.php"]
--- a/src/Jackett.Common/Definitions/finelite.yml
+++ b/src/Jackett.Common/Definitions/finelite.yml
@@ -38,7 +38,7 @@ settings:

 caps:
  categorymappings:
-    - {id: 8, cat: PC/0day, desc: "0day/Apps"}
+    - {id: 33, cat: Audio/Audiobook, desc: "Audiobooks"}
    - {id: 29, cat: TV/Documentary, desc: "Documentary"}
    - {id: 24, cat: Books/EBook, desc: "Ebooks"}
    - {id: 28, cat: Movies, desc: "FE-INT"}
--- a/src/Jackett.Common/Definitions/finvip.yml
+++ b/src/Jackett.Common/Definitions/finvip.yml
@@ -13,35 +13,33 @@ caps:
  categorymappings:
    - {id: 5, cat: TV/Anime, desc: "Anime"}
    - {id: 25, cat: TV/Documentary, desc: "Dokumentit (docs)"}
-    - {id: 6, cat: Books/EBook, desc: "eBooks"}
-    - {id: 26, cat: TV, desc: "Kannet/Tekstit (subs)"}
+    - {id: 6, cat: Books/EBook, desc: "e-Kirjat (ebooks)"}
+    - {id: 49, cat: Audio/Audiobook, desc: "Äänikirjat (audiobook)"}
    - {id: 20, cat: TV/SD, desc: "Lasten DVD (kids)"}
-    - {id: 33, cat: TV/SD, desc: "Lasten XviD (kids)"}
+    - {id: 33, cat: TV/SD, desc: "Lasten SD (kids)"}
+    - {id: 50, cat: TV/HD, desc: "Lasten HD (kids)"}
+    - {id: 51, cat: TV/UHD, desc: "Lasten 4K (kids)"}
    - {id: 11, cat: Movies/DVD, desc: "Leffat DVD (movies)"}
-    - {id: 13, cat: Movies/SD, desc: "Leffat XviD  (movies)"}
-    - {id: 21, cat: Movies/HD, desc: "Leffat HD  (movies)"}
-    - {id: 32, cat: Movies/DVD, desc: "Custom DVD  (movies)"}
-    - {id: 42, cat: Movies, desc: "FVC"}
-    - {id: 15, cat: Audio, desc: "Musiikki (music)"}
+    - {id: 13, cat: Movies/SD, desc: "Leffat SD (movies)"}
+    - {id: 21, cat: Movies/HD, desc: "Leffat HD (movies)"}
+    - {id: 48, cat: Movies/UHD, desc: "Leffat 4K (movies)"}
+    - {id: 15, cat: Audio/MP3, desc: "Musiikki (music)"}
+    - {id: 53, cat: Audio/Lossless, desc: "Musiikki Flac (music)"}
    - {id: 12, cat: Audio/Video, desc: "Musavideot (clips)"}
-    - {id: 7, cat: PC/0day, desc: "Ohjelmat Windows (apps)"}
-    - {id: 8, cat: PC, desc: "Ohjelmat Linux (apps)"}
-    - {id: 9, cat: PC/Mac, desc: "Ohjelmat Mac (apps)"}
+    - {id: 7, cat: PC/0day, desc: "Ohjelmat (apps)"}
    - {id: 17, cat: PC/Games, desc: "Pelit PC (games)"}
-    - {id: 18, cat: Console/PSP, desc: "Pelit PlayStation (games)"}
-    - {id: 19, cat: Console/XBox, desc: "Pelit Xbox (games)"}
-    - {id: 35, cat: Console/Wii, desc: "Pelit Wii (games)"}
-    - {id: 22, cat: XXX, desc: "Pr0n DVD (xxx)"}
-    - {id: 23, cat: XXX, desc: "Pr0n XviD (xxx)"}
-    - {id: 36, cat: XXX, desc: "Pr0n Muut (xxx)"}
-    - {id: 47, cat: XXX, desc: "Pr0n HD (xxx)"}
-    - {id: 24, cat: PC/Mobile-Other, desc: "Puhelimeen (phone)"}
-    - {id: 1, cat: TV/SD, desc: "Sarjat DVD (series)"}
-    - {id: 30, cat: TV, desc: "Sarjat (series)"}
+    - {id: 18, cat: Console, desc: "Pelit Konsoli (console)"}
+    - {id: 23, cat: XXX/SD, desc: "Porn SD"}
+    - {id: 36, cat: XXX/Other, desc: "Porn Muut"}
+    - {id: 47, cat: XXX/x264, desc: "Porn HD"}
+    - {id: 54, cat: XXX/UHD, desc: "Porn 4K"}
+    - {id: 1, cat: TV/SD, desc: "Sarjat Boxset (series)"}
+    - {id: 30, cat: TV/SD, desc: "Sarjat SD (series)"}
    - {id: 41, cat: TV/HD, desc: "Sarjat HD (series)"}
-    - {id: 43, cat: TV, desc: "Salkkarit (Soap Opera)"}
+    - {id: 52, cat: TV/UHD, desc: "Sarjat 4K (series)"}
    - {id: 40, cat: TV/Sport, desc: "Urheilu (sport)"}
    - {id: 31, cat: Other, desc: "Muut (other)"}
+    - {id: 43, cat: TV, desc: "Salkkarit (drama)"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/ftuapps.yml
+++ b/src/Jackett.Common/Definitions/ftuapps.yml
@@ -0,0 +1,87 @@
+---
+id: ftuapps
+name: FTUApps
+description: "FTUApps is a Public tracker for Software and Apps"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://ftuapps.dev/
+
+caps:
+  categorymappings:
+    - {id: 52, cat: PC, desc: "Net", default: true}
+    - {id: 3648, cat: PC/Mobile-Android, desc: "Android Applications", default: true}
+    - {id: 55, cat: PC/Mobile-Other, desc: "Application", default: true}
+    - {id: 46, cat: PC, desc: "Database", default: true}
+    - {id: 331, cat: PC, desc: "Delphi", default: true}
+    - {id: 4120, cat: PC, desc: "DriverPack Solution Offline", default: true}
+    - {id: 2142, cat: PC/Mac, desc: "MacOS", default: true}
+    - {id: 2431, cat: PC, desc: "Operating Systems", default: true}
+    - {id: 2172, cat: PC, desc: "Portable Apps", default: true}
+    - {id: 2435, cat: PC, desc: "PreActivated Apps", default: true}
+    - {id: 3, cat: PC/0day, desc: "Software", default: true}
+    - {id: 165, cat: Other, desc: "Web & Script", default: true}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href$=".torrent"]
+      attribute: href
+
+search:
+  paths:
+    - path: "?s={{ .Keywords }}&asl_active=1&p_asid=1&p_asl_data=1&qtranslate_lang=0&asl_gen[]=title&customset[]=post&customset[]=page{{ range .Categories }}&categoryset[]={{.}}{{end}}"
+
+  rows:
+    selector: article[id^="post-"]:has(a[href*="/category/"])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href*="/category/"]
+      case:
+        ":contains(\"Net\")": 52
+        ":contains(\"Android\")": 3648
+        ":contains(\"Application\")": 55
+        ":contains(\"Database\")": 46
+        ":contains(\"Delphi\")": 331
+        ":contains(\"DriverPack\")": 4120
+        ":contains(\"MacOS\")": 2142
+        ":contains(\"Operating\")": 2431
+        ":contains(\"Other\")": 56
+        ":contains(\"Portable\")": 2172
+        ":contains(\"PreActivated\")": 2435
+        ":contains(\"Software\")": 3
+        ":contains(\"Script\")": 165
+    title:
+      selector: a
+      attribute: title
+    details:
+      selector: a
+      attribute: href
+    download:
+      selector: a
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    date:
+      selector: time.published
+      attribute: datetime
+    size:
+      text: "512 MB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# WordPress 5.9
--- a/src/Jackett.Common/Definitions/generationfree-api.yml
+++ b/src/Jackett.Common/Definitions/generationfree-api.yml
@@ -0,0 +1,171 @@
+---
+id: generationfree-api
+name: Generation-Free (API)
+description: "Generation-Free (GF-Free) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://generation-free.org/
+legacylinks:
+  - https://generation-free.biz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Film"}
+    - {id: 2, cat: TV, desc: "Série"}
+    - {id: 3, cat: Audio, desc: "Musique"}
+    - {id: 4, cat: Console, desc: "Jeux"}
+    - {id: 5, cat: PC, desc: "Logiciel"}
+    - {id: 6, cat: Books, desc: "Ebook"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://generation-free.org/\" target =_blank>Generation-Free</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: vfq
+    type: checkbox
+    label: Replace VFQ with FRENCH in release name
+    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: VOSTFR
+    options:
+      FRENCH: FRENCH
+      "MULTI FRENCH": "MULTI FRENCH"
+      ENGLISH: ENGLISH
+      "MULTI ENGLISH": "MULTI ENGLISH"
+      VOSTFR: VOSTFR
+      "MULTI VOSTFR": "MULTI VOSTFR"
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title_original:
+      selector: name
+      filters:
+        - name: replace
+          args: [".", " "]
+    title_vfq:
+      text: "{{ .Result.title_original }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\sVFQ\\s)", " FRENCH "]
+    title_step2:
+      text: "{{ if .Config.vfq }}{{ .Result.title_vfq }}{{ else }}{{ .Result.title_original }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_step2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\sMULTI\\s)", " {{ .Config.multilanguage }} "]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_step2 }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    size:
+      selector: size
+    magnet:
+      selector: magnet_link
+      optional: true
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 5.3.0
--- a/src/Jackett.Common/Definitions/generationfree.yml
+++ b/src/Jackett.Common/Definitions/generationfree.yml
@@ -1,211 +0,0 @@
---
-id: generationfree
-name: Generation-Free
-description: "Generation-Free is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://generation-free.biz/
-
-caps:
-  categorymappings:
-    - {id: 106, cat: TV/Anime, desc: "Animation: FR"}
-    - {id: 13, cat: TV/Anime, desc: "Animation: VO"}
-    - {id: 140, cat: PC, desc: "Applications: Noel"}
-    - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
-    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
-    - {id: 18, cat: PC/0day, desc: "Applications: PC"}
-    - {id: 40, cat: PC, desc: "Applications: Linux"}
-    - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
-    - {id: 67, cat: TV/Other, desc: "Autres: Emission TV"}
-    - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"}
-    - {id: 141, cat: TV/Other, desc: "Autres: Noel"}
-    - {id: 90, cat: Books/EBook, desc: "BD: Bande Dessinée"}
-    - {id: 76, cat: TV/Documentary, desc: "Documentaires: FR"}
-    - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"}
-    - {id: 134, cat: TV/Documentary, desc: "Documentaires: VO"}
-    - {id: 138, cat: Books/EBook, desc: "E-Books: Noel"}
-    - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
-    - {id: 36, cat: Books/EBook, desc: "E-Books: Livres Français"}
-    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
-    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
-    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
-    - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"}
-    - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 54, cat: Movies/HD, desc: "Films: MHD HDlight"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
-    - {id: 69, cat: Movies/3D, desc: "Films: 3D"}
-    - {id: 2, cat: Movies/HD, desc: "Films: HD"}
-    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
-    - {id: 154, cat: Movies/UHD, desc: "Films: AV1-2160p"}
-    - {id: 89, cat: Movies/SD, desc: "Films: SD"}
-    - {id: 153, cat: Movies/HD, desc: "Films: AV1-1080p"}
-    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
-    - {id: 70, cat: Movies/HD, desc: "Films: X265"}
-    - {id: 135, cat: Movies, desc: "Films: Noel"}
-    - {id: 155, cat: Movies/UHD, desc: "films: 4K X265"}
-    - {id: 87, cat: XXX, desc: "Films: XXX"}
-    - {id: 4, cat: Movies, desc: "Films: ISO"}
-    - {id: 151, cat: TV, desc: "Films: .Série animation"}
-    - {id: 150, cat: TV, desc: "Films: .Film série"}
-    - {id: 77, cat: PC/Mobile-Other, desc: "GPS: Cartes"}
-    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
-    - {id: 97, cat: Audio, desc: "Musique: Podcast"}
-    - {id: 137, cat: Audio, desc: "Musique: Noel"}
-    - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
-    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
-    - {id: 98, cat: Audio, desc: "Musique: karaoké"}
-    - {id: 58, cat: Audio, desc: "Musique: Concert"}
-    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
-    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
-    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
-    - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
-    - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 63, cat: TV, desc: "Serie TV: Saison VO"}
-    - {id: 152, cat: TV, desc: "Serie TV: Episode VO"}
-    - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
-    - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
-    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
-    - {id: 136, cat: TV, desc: "Serie TV: Noel"}
-
-  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: 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: VOSTFR
-    options:
-      FRENCH: FRENCH
-      "MULTI FRENCH": "MULTI FRENCH"
-      ENGLISH: ENGLISH
-      "MULTI ENGLISH": "MULTI ENGLISH"
-      VOSTFR: VOSTFR
-      "MULTI VOSTFR": "MULTI VOSTFR"
-  - 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:
-    login_name: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td#msgError
-  test:
-    path: index.php
-    selector: a[href="account-logout.php"]
-
-download:
-  before:
-    path: list_thanks.php
-    inputs:
-      id: "{{ .DownloadUri.Query.id }}"
-      to: give
-      torrent: "{{ .DownloadUri.Query.id }}"
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    # 40 results per page, but only fetching one page due to issue #8702
-    - path: torrents-search.php
-  inputs:
-    # multi cats unsupported, defaulting to all
-    cat: 0
-    search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead
-    incldead: 1
-    # 0 all 1 notfree 2 freeonly
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all 1 French 2 English 3 etc
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not support imdbid search and does not return imdb link in results
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr.t-row
-
-  fields:
-    title_original:
-      selector: a[href^="torrents-details.php?id="] b
-    title_multilang:
-      text: "{{ .Result.title_original }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\sMULTI\\s)", " {{ .Config.multilanguage }} "]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_original }}{{ end }}"
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      text: now
-    downloadvolumefactor:
-      case:
-        img[src="images/fl.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine n/a
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.gktorrents.net/
+  - https://www.gktorrents.org/
  - https://gktorrent.nocensor.biz/
 legacylinks:
  - https://www.gktorrent.com/
@@ -36,6 +36,7 @@ legacylinks:
  - https://gktorrent.nocensor.space/
  - https://www.gktorrents.com/
  - https://gktorrent.nocensor.work/
+  - https://www.gktorrents.net/

 caps:
  categorymappings:
@@ -78,6 +79,8 @@ settings:

 download:
  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
    - selector: script:contains("magnet:?")
      filters:
        - name: regexp
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -9,13 +9,11 @@ followredirect: true
 links:
  - https://glodls.to/
  - https://www.gtdb.to/
-  - https://glotorrents.unblockit.how/
+  - https://glotorrents.unblockit.day/
  - https://glotorrents.nocensor.biz/
 legacylinks:
  - https://glodls.rocks/
  - https://gtdb.to/
-  - https://glotorrents.unblockit.app/
-  - https://glodls.unblocked.rest/
  - https://glotorrents.unblockit.dev/
  - https://glotorrents.unblockit.ltd/
  - https://glotorrents.unblockit.link/
@@ -32,6 +30,8 @@ legacylinks:
  - https://glotorrents.unblockit.kim/
  - https://glotorrents.unblockit.bz/
  - https://glotorrents.unblockit.tv/
+  - https://glotorrents.unblockit.how/
+  - https://glotorrents.unblockit.cam/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/hawke-uno.yml
+++ b/src/Jackett.Common/Definitions/hawke-uno.yml
@@ -9,7 +9,6 @@ links:
  - https://www.hawke.uno/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movie"}
    - {id: 2, cat: TV, desc: "TV"}
@@ -48,6 +47,16 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
@@ -55,19 +64,16 @@ search:
    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
      response:
        type: json
-        attribute: attributes

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        Movie: 1
-        TV: 2
    title:
      selector: name
    details:
@@ -76,11 +82,11 @@ search:
      selector: download_link
    poster:
      selector: poster
-    imdbid:
-      selector: imdb_id
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
    tmdbid:
      selector: tmdb_id
    tvdbid:
--- a/src/Jackett.Common/Definitions/hdme.yml
+++ b/src/Jackett.Common/Definitions/hdme.yml
@@ -5,6 +5,8 @@ description: "HDME is a Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: windows-1252
+certificates:
+  - 07872b2e93e50d8abeea094e5621b4c637c61652 # self signed
 links:
  - https://hdme.eu/

--- a/src/Jackett.Common/Definitions/hdolimpo-api.yml
+++ b/src/Jackett.Common/Definitions/hdolimpo-api.yml
@@ -0,0 +1,181 @@
+---
+id: hdolimpo-api
+name: HD-Olimpo (API)
+description: "HD-Olimpo is a SPANISH site for HD content"
+language: es-ES
+type: private
+encoding: UTF-8
+links:
+  - https://hd-olimpo.club/
+legacylinks:
+  - https://hdolimpo.co/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Películas"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 3, cat: Audio, desc: "Música"}
+    - {id: 4, cat: TV/Documentary, desc: "Documentales"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your account <i>My configuration / Mi configuración => Secutiy / Seguridad</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title:
+      selector: name
+      filters:
+        - name: re_replace
+          args: ["\\[", " "]
+        - name: re_replace
+          args: ["\\]", " "]
+        - name: re_replace
+          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
+        - name: replace
+          args: ["HDOlimpo", ""] # Delete HDOlimpo
+        - name: replace
+          args: ["HD-Olimpo", ""] # Delete HD-Olimpo
+        - name: replace
+          args: ["E-AC-3", "EAC3"]
+        - name: re_replace
+          args: ["[ -](?i)español[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)spa[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)esp[ -]", " SPANiSH "]
+        - name: re_replace
+          args: [" ES ", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)ingl[eé]s[ -]", " English "]
+        - name: re_replace
+          args: ["[ -](?i)[ei]ng[ -]", " English "]
+        - name: re_replace
+          args: ["[ -](?i)cat[ -]", " Catalan "]
+        - name: re_replace
+          args: ["[ -](?i)vas[ -]", " Basque "]
+        - name: re_replace
+          args: ["[ -](?i)fr[ae][ -]", " French "]
+        - name: re_replace
+          args: ["[ -](?i)jap[ -]", " Japanese "]
+        - name: re_replace
+          args: ["[ -](?i)ita[ -]", " Italian "]
+        - name: re_replace
+          args: ["[ -](?i)rus[ -]", " Russian "]
+        - name: re_replace
+          args: ["[ -](?i)ger[ -]", " German "]
+        - name: re_replace
+          args: ["(?i)(triaudio)", "MULTi SPANiSH English"]
+        - name: re_replace
+          args: ["(?i)(dual)", " MULTi SPANiSH "]
+        - name: re_replace
+          args: ["(?i)(es-en)", " MULTi SPANiSH "]
+        - name: re_replace
+          args: ["(?i)(en-es)", " MULTi SPANiSH "]
+        - name: re_replace
+          args: ["\\.+", "."] # More than 1 dot -> .
+        - name: re_replace
+          args: ["^\\.", ""] # Delete first dot
+        - name: re_replace
+          args: ["\\s+", " "] # More than 1 space to 1 space
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# json UNIT3D ???
--- a/src/Jackett.Common/Definitions/hdolimpo.yml
+++ b/src/Jackett.Common/Definitions/hdolimpo.yml
@@ -1,244 +0,0 @@
---
-id: hdolimpo
-name: HD-Olimpo
-description: "HD-Olimpo is a SPANISH site for HD content"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://hd-olimpo.club/
-legacylinks:
-  - https://hdolimpo.co/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: TV/Documentary, desc: "Documentaries"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-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: created_at
-    options:
-      created_at: 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: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents/filter
-  inputs:
-    $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 }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-
-    title:
-      selector: a.view-torrent
-      filters:
-        - name: re_replace
-          args: ["\\[", " "]
-        - name: re_replace
-          args: ["\\]", " "]
-        - name: re_replace
-          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
-        - name: replace
-          args: ["HDOlimpo", ""] # Delete HDOlimpo
-        - name: replace
-          args: ["HD-Olimpo", ""] # Delete HD-Olimpo
-        - name: replace
-          args: ["E-AC-3", "EAC3"]
-        - name: re_replace
-          args: ["[ -](?i)español[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)spa[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)esp[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)ingl[eé]s[ -]", " English "]
-        - name: re_replace
-          args: ["[ -](?i)[ei]ng[ -]", " English "]
-        - name: re_replace
-          args: ["[ -](?i)cat[ -]", " Catalan "]
-        - name: re_replace
-          args: ["[ -](?i)vas[ -]", " Basque "]
-        - name: re_replace
-          args: ["[ -](?i)fr[ae][ -]", " French "]
-        - name: re_replace
-          args: ["[ -](?i)jap[ -]", " Japanese "]
-        - name: re_replace
-          args: ["[ -](?i)ita[ -]", " Italian "]
-        - name: re_replace
-          args: ["[ -](?i)rus[ -]", " Russian "]
-        - name: re_replace
-          args: ["[ -](?i)ger[ -]", " German "]
-        - name: re_replace
-          args: ["(?i)(triaudio)", "MULTi/SPANiSH/English"]
-        - name: re_replace
-          args: ["(?i)(dual)", " MULTi/SPANiSH "]
-        - name: re_replace
-          args: ["\\.+", "."] # More than 1 dot -> .
-        - name: re_replace
-          args: ["^\\.", ""] # Delete first dot
-        - name: re_replace
-          args: ["\\s+", " "] # More than 1 space to 1 space
-
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    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", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    date:
-      selector: time
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fas fa-star text-gold"]: 0 # Freeleech
-        i[class*="fal fa-star text-gold"]: 0.5 # 50% Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# UNIT3D 2.4.0
--- a/src/Jackett.Common/Definitions/hdspain.yml
+++ b/src/Jackett.Common/Definitions/hdspain.yml
@@ -23,7 +23,7 @@ caps:

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

--- a/src/Jackett.Common/Definitions/hellastz.yml
+++ b/src/Jackett.Common/Definitions/hellastz.yml
@@ -15,25 +15,27 @@ caps:
  categorymappings:
    - {id: 11, cat: Movies, desc: "Movies Αποκλειστικά του HTz (HTz only)"}
    - {id: 54, cat: Movies/BluRay, desc: "Movies Blu-Ray 720p-1080p"}
-    - {id: 232, cat: Movies/UHD, desc: "Movies Full-HD - 4K"}
-    - {id: 234, cat: Movies/HD, desc: "Movies BDRip-BRRip-HDRip"}
-    - {id: 233, cat: Movies/DVD, desc: "Movies DvdRip Full"}
    - {id: 213, cat: Movies, desc: "Movies Ελληνικές Ταινιίες (Greek)"}
-    - {id: 236, cat: Movies/SD, desc: "Movies Cam - HDcam-HDts"}
+    - {id: 232, cat: Movies/UHD, desc: "Movies Full-HD - 4K"}
+    - {id: 233, cat: Movies/DVD, desc: "Movies DvdRip Full"}
+    - {id: 234, cat: Movies/HD, desc: "Movies BDRip-BRRip-HDRip"}
    - {id: 235, cat: Movies/WEB-DL, desc: "Movies WEB-720-1080p -HDrip"}
+    - {id: 236, cat: Movies/SD, desc: "Movies Cam - HDcam-HDts"}
+    - {id: 242, cat: Movies, desc: "Movies Ταινίες No Subs"}
+    - {id: 243, cat: Movies/DVD, desc: "Movies Φιλμογραφίες"}
    - {id: 90, cat: TV, desc: "TV Ελληνικές Σειρές (Greek)"}
    - {id: 96, cat: TV, desc: "TV Ξένες Σειρές (Foreign)"}
    - {id: 219, cat: Audio, desc: "Music Ξένη μουσική (Foreign)"}
    - {id: 220, cat: Audio, desc: "Music Ελληνική Μουσική (Greek)"}
-    - {id: 240, cat: PC/Mobile-Other, desc: "Android - Linux"}
+    - {id: 221, cat: Console, desc: "Παιχνίδια (Games)"}
+    - {id: 223, cat: Books/EBook, desc: "Βιβλία (Books)"}
+    - {id: 100, cat: Books/Comics, desc: "Comics & Περιοδικά"}
+    - {id: 225, cat: TV/Documentary, desc: "Ντοκιμαντερ (Documentaries)"}
+    - {id: 227, cat: PC, desc: "Pc Software"}
+    - {id: 228, cat: TV/Anime, desc: "Animation"}
    - {id: 230, cat: TV/Anime, desc: "Παιδικα μεταγλωτισμε (Children)"}
    - {id: 231, cat: TV/Anime, desc: "Παιδικα υποτιτλους (Children w/ subs)"}
-    - {id: 221, cat: Console, desc: "Παιχνίδια (Games)"}
-    - {id: 228, cat: TV/Anime, desc: "Animation"}
-    - {id: 223, cat: Books/EBook, desc: "Βιβλία (Books)"}
-    - {id: 100, cat: Books/Comics, desc: "Comics &Περιοδικά"}
-    - {id: 227, cat: PC, desc: "Pc Software"}
-    - {id: 225, cat: TV/Documentary, desc: "Ντοκιμαντερ (Documentaries)"}
+    - {id: 240, cat: PC/Mobile-Other, desc: "Android - Linux"}
    - {id: 241, cat: Audio/Audiobook, desc: "Audio Books"}

  modes:
--- a/src/Jackett.Common/Definitions/insanetracker.yml
+++ b/src/Jackett.Common/Definitions/insanetracker.yml
@@ -12,32 +12,34 @@ caps:
  categorymappings:
    - {id: 8, cat: TV/SD, desc: "Sorozat/Hun"}
    - {id: 40, cat: TV/HD, desc: "Sorozat/Hun/HD"}
-    - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
-    - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
-    - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
-    - {id: 44, cat: Movies/UHD, desc: "Film/Hun/UHD"}
-    - {id: 2, cat: Books, desc: "eBook/Hun"}
+    - {id: 47, cat: TV/UHD, desc: "Sorozat/Hun/UHD"}
    - {id: 7, cat: TV/SD, desc: "Sorozat/Eng"}
    - {id: 39, cat: TV/HD, desc: "Sorozat/Eng/HD"}
+    - {id: 46, cat: TV/UHD, desc: "Sorozat/Eng/UHD"}
+    - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
+    - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
+    - {id: 44, cat: Movies/UHD, desc: "Film/Hun/UHD"}
+    - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
    - {id: 42, cat: Movies/SD, desc: "Film/Eng/SD"}
-    - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
    - {id: 25, cat: Movies/HD, desc: "Film/Eng/HD"}
    - {id: 45, cat: Movies/UHD, desc: "Film/Eng/UHD"}
+    - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
+    - {id: 2, cat: Books, desc: "eBook/Hun"}
    - {id: 1, cat: Books, desc: "eBook/Eng"}
    - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 21, cat: XXX, desc: "XXX"}
-    - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
    - {id: 19, cat: Audio/MP3, desc: "Zene/Hun"}
    - {id: 37, cat: Audio/Lossless, desc: "Lossless/Hun"}
-    - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 43, cat: Console, desc: "Játék/Konzol"}
-    - {id: 29, cat: Other, desc: "Képek"}
-    - {id: 28, cat: XXX/ImageSet, desc: "XXX Képek"}
-    - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
    - {id: 18, cat: Audio/MP3, desc: "Zene/Eng"}
    - {id: 26, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
    - {id: 11, cat: PC/Games, desc: "Játék/Rip"}
+    - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 43, cat: Console, desc: "Játék/Konzol"}
    - {id: 13, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 21, cat: XXX, desc: "XXX"}
+    - {id: 28, cat: XXX/ImageSet, desc: "XXX Képek"}
+    - {id: 29, cat: Other, desc: "Képek"}


  modes:
--- a/src/Jackett.Common/Definitions/internetarchive.yml
+++ b/src/Jackett.Common/Definitions/internetarchive.yml
@@ -60,6 +60,7 @@ search:
    - path: advancedsearch.php
      response:
        type: json
+
  inputs:
    q: "{{ if and .Config.titleOnly .Keywords }}title:({{ else }}{{ end }}{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}{{ if and .Config.titleOnly .Keywords }}){{ else }}{{ end }}{{ if .Keywords }} AND {{ else }}{{ end }}format:(\"Archive BitTorrent\"){{ if .Categories }} AND mediatype:({{ join .Categories \" OR \" }}){{ else }}{{ end }}"
    fl[]: "identifier,title,mediatype,item_size,downloads,btih,publicdate"
@@ -95,6 +96,7 @@ search:
      selector: item_size
    grabs:
      selector: downloads
+      optional: true
    seeders:
      text: 1
    leechers:
--- a/src/Jackett.Common/Definitions/iv-torrents.yml
+++ b/src/Jackett.Common/Definitions/iv-torrents.yml
@@ -39,7 +39,7 @@ caps:
    - {id: 124, cat: Movies, desc: " |- Зарубежные фильмы"}
    - {id: 123, cat: Movies, desc: " |- Отечественные фильмы (Новинки)"}
    - {id: 122, cat: Movies, desc: " |- Отечественные фильмы"}
-    - {id: 689, cat: Movies/WEB-DL, desc: " |- Фильмы WEB-DLRip, HDTVRip "}
+    - {id: 689, cat: Movies/WEB-DL, desc: " |- Фильмы WEB-DLRip, HDTVRip"}
    - {id: 121, cat: Movies, desc: " |- Классика зарубежного кино (фильмы вышедшие до 1980 года)"}
    - {id: 120, cat: Movies, desc: " |- Классика отечественного кино (фильмы вышедшие до ..."}
    - {id: 126, cat: Movies, desc: " |- Антологии"}
@@ -48,7 +48,7 @@ caps:
    - {id: 117, cat: Movies, desc: " |- Зарубежные фильмы (новинки)"}
    - {id: 116, cat: Movies, desc: " |- Отечественные фильмы (новинки)"}
    - {id: 415, cat: Movies, desc: " |- Разное"}
-    - {id: 19, cat: Movies/HD, desc: "HD "}
+    - {id: 19, cat: Movies/HD, desc: "HD"}
    - {id: 48, cat: Movies/HD, desc: " |- Новые релизы"}
    - {id: 735, cat: Movies/HD, desc: " |- 60fps"}
    - {id: 50, cat: Movies/HD, desc: " |- Зарубежные фильмы HD (Новинки)"}
@@ -63,13 +63,13 @@ caps:
    - {id: 681, cat: Movies/HD, desc: " |- Классика зарубежного кино (фильмы вышедшие до 1980 года)"}
    - {id: 682, cat: Movies/HD, desc: " |- Классика отечественного кино (фильмы вышедшие до ..."}
    - {id: 683, cat: Movies/HD, desc: " |- Временные HD фильмы"}
-    - {id: 20, cat: Movies/DVD, desc: "DVD "}
+    - {id: 20, cat: Movies/DVD, desc: "DVD"}
    - {id: 49, cat: Movies/DVD, desc: " |- Новые релизы"}
-    - {id: 56, cat: Movies/DVD, desc: " |- Зарубежные фильмы DVD "}
-    - {id: 57, cat: Movies/DVD, desc: " |- Наши фильмы DVD "}
-    - {id: 58, cat: Movies/DVD, desc: " |- Зарубежные мультфильмы DVD "}
-    - {id: 59, cat: Movies/DVD, desc: " |- Наши мультфильмы DVD "}
-    - {id: 338, cat: Movies/3D, desc: "3D "}
+    - {id: 56, cat: Movies/DVD, desc: " |- Зарубежные фильмы DVD"}
+    - {id: 57, cat: Movies/DVD, desc: " |- Наши фильмы DVD"}
+    - {id: 58, cat: Movies/DVD, desc: " |- Зарубежные мультфильмы DVD"}
+    - {id: 59, cat: Movies/DVD, desc: " |- Наши мультфильмы DVD"}
+    - {id: 338, cat: Movies/3D, desc: "3D"}
    - {id: 346, cat: Movies/3D, desc: " |- F.A.Q."}
    - {id: 339, cat: Movies/3D, desc: " |- Новые релизы"}
    - {id: 340, cat: Movies/3D, desc: " |- 3D Зарубежные фильмы"}
@@ -80,7 +80,7 @@ caps:
    - {id: 345, cat: Movies/3D, desc: " |- 3D Спорт"}
    - {id: 400, cat: TV/Documentary, desc: "Документальные фильмы, Научно-познавательные фильмы"}
    - {id: 401, cat: TV/Documentary, desc: " |- Новые релизы"}
-    - {id: 405, cat: TV/Documentary, desc: " |- BBC / Discovery / National Geographic "}
+    - {id: 405, cat: TV/Documentary, desc: " |- BBC / Discovery / National Geographic"}
    - {id: 410, cat: TV/Documentary, desc: " |- О рыбалке и охоте"}
    - {id: 408, cat: TV/Documentary, desc: " |- Криминальные документальные фильмы"}
    - {id: 402, cat: TV/Documentary, desc: " |- Документальные научно-познавательные"}
@@ -105,7 +105,7 @@ caps:
    - {id: 563, cat: XXX, desc: " |- Pron (DVDRip & others)"}
    - {id: 564, cat: XXX, desc: " |- Pron DVD (DVD5/DVD9)"}
    - {id: 565, cat: XXX, desc: " |- Pron HD (720p/1080p/1080i)"}
-    - {id: 566, cat: XXX, desc: " |- Паки Pron "}
+    - {id: 566, cat: XXX, desc: " |- Паки Pron"}
    - {id: 567, cat: XXX, desc: " |- Эротика"}
    - {id: 568, cat: XXX, desc: " |- Эротика HD (720p/1080p/1080i)"}
    - {id: 569, cat: XXX, desc: " |- Мульты"}
@@ -145,15 +145,15 @@ caps:
    - {id: 474, cat: Other, desc: " |- Компьютерные сети и безопасность"}
    # Игры Games
    - {id: 97, cat: Console, desc: " |- Новые релизы"}
-    - {id: 287, cat: Console, desc: " |- MMORPG "}
+    - {id: 287, cat: Console, desc: " |- MMORPG"}
    - {id: 286, cat: Console, desc: " |- Online / Онлайн Игры"}
    - {id: 111, cat: Console, desc: " |- Аркады"}
    - {id: 96, cat: Console, desc: " |- Горячие новинки"}
    - {id: 90, cat: Console, desc: " |- Гонки"}
-    - {id: 95, cat: Console, desc: " |- Action / Shooter / FPS "}
-    - {id: 94, cat: Console, desc: " |- Action / Shooter / TPS "}
+    - {id: 95, cat: Console, desc: " |- Action / Shooter / FPS"}
+    - {id: 94, cat: Console, desc: " |- Action / Shooter / TPS"}
    - {id: 285, cat: Console, desc: " |- Детские игры"}
-    - {id: 93, cat: Console, desc: " |- RPG "}
+    - {id: 93, cat: Console, desc: " |- RPG"}
    - {id: 92, cat: Console, desc: " |- RTS (стратегии в реальном времени)"}
    - {id: 91, cat: Console, desc: " |- TBS (пошаговые стратегии)"}
    - {id: 88, cat: Console, desc: " |- Многопользовательские игры"}
@@ -164,11 +164,11 @@ caps:
    - {id: 553, cat: Console, desc: " |- Эротические игры"}
    - {id: 12, cat: PC/Games, desc: "Игры для PC (Repack)"}
    - {id: 109, cat: PC/Games, desc: " |- Новые релизы"}
-    - {id: 107, cat: PC/Games, desc: " |- Action / Shooter / FPS "}
+    - {id: 107, cat: PC/Games, desc: " |- Action / Shooter / FPS"}
    - {id: 463, cat: PC/Games, desc: " |- Горячие новинки"}
    - {id: 102, cat: PC/Games, desc: " |- Аркады"}
-    - {id: 106, cat: PC/Games, desc: " |- Action / Shooter / TPS "}
-    - {id: 105, cat: PC/Games, desc: " |- RPG "}
+    - {id: 106, cat: PC/Games, desc: " |- Action / Shooter / TPS"}
+    - {id: 105, cat: PC/Games, desc: " |- RPG"}
    - {id: 104, cat: PC/Games, desc: " |- RTS (стратегии в реальном времени)"}
    - {id: 103, cat: PC/Games, desc: " |- TBS (пошаговые стратегии)"}
    - {id: 530, cat: PC/Games, desc: " |- Детские игры"}
@@ -180,22 +180,22 @@ caps:
    - {id: 554, cat: PC/Games, desc: " |- Эротические игры"}
    - {id: 14, cat: Console, desc: "Игры для Консолей"}
    - {id: 115, cat: Console, desc: " |- Новые релизы"}
-    - {id: 114, cat: Console/XBox 360, desc: " |- XBox360 "}
-    - {id: 674, cat: Console/XBox 360, desc: " |- XBox360 | Kinect "}
-    - {id: 113, cat: Console/NDS, desc: " |- NDS "}
-    - {id: 288, cat: Console/PS3, desc: " |- Playstation 2 "}
-    - {id: 290, cat: Console/PS3, desc: " |- Playstation 3 "}
+    - {id: 114, cat: Console/XBox 360, desc: " |- XBox360"}
+    - {id: 674, cat: Console/XBox 360, desc: " |- XBox360 | Kinect"}
+    - {id: 113, cat: Console/NDS, desc: " |- NDS"}
+    - {id: 288, cat: Console/PS3, desc: " |- Playstation 2"}
+    - {id: 290, cat: Console/PS3, desc: " |- Playstation 3"}
    - {id: 531, cat: Console, desc: "Программы / Прошивки"}
    - {id: 532, cat: Console, desc: " |- Новые релизы"}
-    - {id: 533, cat: Console/PS3, desc: " |- Playstation 3 "}
-    - {id: 535, cat: Console/XBox 360, desc: " |- XBox360 "}
-    - {id: 534, cat: Console/PSP, desc: " |- PSP "}
+    - {id: 533, cat: Console/PS3, desc: " |- Playstation 3"}
+    - {id: 535, cat: Console/XBox 360, desc: " |- XBox360"}
+    - {id: 534, cat: Console/PSP, desc: " |- PSP"}
    - {id: 277, cat: Console, desc: "Всё для игр"}
    - {id: 291, cat: Console, desc: " |- Новые релизы"}
    - {id: 284, cat: Console, desc: " |- Трейлеры/Геймплей видео"}
    - {id: 283, cat: Console, desc: " |- Различные моды и дополнения к играм"}
    - {id: 281, cat: Console, desc: " |- Софт для игр"}
-    - {id: 280, cat: Console, desc: " |- NoCD/NoDVD "}
+    - {id: 280, cat: Console, desc: " |- NoCD/NoDVD"}
    - {id: 279, cat: Console, desc: " |- Патчи"}
    - {id: 278, cat: Console, desc: " |- Русификаторы"}
    # Мультипликация TV
@@ -215,10 +215,10 @@ caps:
    - {id: 159, cat: TV, desc: " |- Сборники отечественных мультфильмов и сиквелы"}
    - {id: 23, cat: TV, desc: "Зарубежные мультсериалы"}
    - {id: 158, cat: TV, desc: " |- Новые релизы"}
-    - {id: 157, cat: TV, desc: " |- Disney "}
+    - {id: 157, cat: TV, desc: " |- Disney"}
    - {id: 156, cat: TV, desc: " |- Гриффины"}
    - {id: 155, cat: TV, desc: " |- Симпсоны"}
-    - {id: 154, cat: TV, desc: " |- Южный Парк / South Park "}
+    - {id: 154, cat: TV, desc: " |- Южный Парк / South Park"}
    - {id: 153, cat: TV, desc: " |- Звездные войны"}
    - {id: 152, cat: TV, desc: " |- Том и Джерри"}
    - {id: 151, cat: TV, desc: " |- Футурама"}
@@ -240,7 +240,7 @@ caps:
    - {id: 250, cat: TV, desc: " |- Воронины / Папины дочки"}
    - {id: 245, cat: TV, desc: " |- Детективы"}
    - {id: 550, cat: TV, desc: " |- Деффчонки"}
-    - {id: 242, cat: TV, desc: " |- Зайцев +1 "}
+    - {id: 242, cat: TV, desc: " |- Зайцев +1"}
    - {id: 546, cat: TV, desc: " |- Закрытая школа"}
    - {id: 249, cat: TV, desc: " |- Ментовские войны"}
    - {id: 247, cat: TV, desc: " |- Кадетство / Кремлёвские курсанты"}
@@ -259,19 +259,19 @@ caps:
    - {id: 238, cat: TV, desc: " |- Другие российские сериалы"}
    - {id: 26, cat: TV, desc: "Зарубежные сериалы"}
    - {id: 237, cat: TV, desc: " |- Новые релизы"}
-    - {id: 544, cat: TV, desc: " |- Анатомия страсти / Grey's anatomy "}
+    - {id: 544, cat: TV, desc: " |- Анатомия страсти / Grey's anatomy"}
    - {id: 236, cat: TV, desc: " |- Доктор Хаус / House M.D."}
-    - {id: 545, cat: TV, desc: " |- Друзья / Friends "}
-    - {id: 537, cat: TV, desc: " |- Звёздные врата / Stargate "}
-    - {id: 536, cat: TV, desc: " |- Игра престолов / Game of Thrones "}
-    - {id: 235, cat: TV, desc: " |- Остаться в живых / Lost "}
-    - {id: 234, cat: TV, desc: " |- Сверхъестественное / Supernatural "}
-    - {id: 538, cat: TV, desc: " |- Секретные материалы / The X-Files "}
-    - {id: 539, cat: TV, desc: " |- Спартак / Spartacus "}
-    - {id: 540, cat: TV, desc: " |- Тайны Смолвиля / Smallville "}
-    - {id: 541, cat: TV, desc: " |- Теория Большого Взрыва / The Big Bang Theory "}
-    - {id: 542, cat: TV, desc: " |- Холм одного дерева / One tree hill "}
-    - {id: 543, cat: TV, desc: " |- Ходячие мертвецы / The Walking Dead "}
+    - {id: 545, cat: TV, desc: " |- Друзья / Friends"}
+    - {id: 537, cat: TV, desc: " |- Звёздные врата / Stargate"}
+    - {id: 536, cat: TV, desc: " |- Игра престолов / Game of Thrones"}
+    - {id: 235, cat: TV, desc: " |- Остаться в живых / Lost"}
+    - {id: 234, cat: TV, desc: " |- Сверхъестественное / Supernatural"}
+    - {id: 538, cat: TV, desc: " |- Секретные материалы / The X-Files"}
+    - {id: 539, cat: TV, desc: " |- Спартак / Spartacus"}
+    - {id: 540, cat: TV, desc: " |- Тайны Смолвиля / Smallville"}
+    - {id: 541, cat: TV, desc: " |- Теория Большого Взрыва / The Big Bang Theory"}
+    - {id: 542, cat: TV, desc: " |- Холм одного дерева / One tree hill"}
+    - {id: 543, cat: TV, desc: " |- Ходячие мертвецы / The Walking Dead"}
    - {id: 233, cat: TV, desc: " |- Другие зарубежные сериалы"}
    # Мир Аниме Anime
    - {id: 32, cat: TV/Anime, desc: "Аниме (общение)"}
@@ -301,18 +301,19 @@ caps:
    # Программное обеспечение Software
    - {id: 185, cat: PC, desc: " |- Новые релизы"}
    - {id: 184, cat: PC, desc: " |- Настольные OS, выпущенные до 2001 года (Microsoft Windows..."}
-    - {id: 183, cat: PC, desc: " |- Windows XP "}
-    - {id: 182, cat: PC, desc: " |- Windows Vista "}
-    - {id: 181, cat: PC, desc: " |- Windows 7 "}
-    - {id: 180, cat: PC, desc: " |- Windows 8, 8.1 "}
-    - {id: 702, cat: PC, desc: " |- Windows 10 "}
-    - {id: 708, cat: PC, desc: " |- Мультисборки Windows OS "}
+    - {id: 183, cat: PC, desc: " |- Windows XP"}
+    - {id: 182, cat: PC, desc: " |- Windows Vista"}
+    - {id: 181, cat: PC, desc: " |- Windows 7"}
+    - {id: 180, cat: PC, desc: " |- Windows 8, 8.1"}
+    - {id: 702, cat: PC, desc: " |- Windows 10"}
+    - {id: 770, cat: PC, desc: " |- Windows 11"}
+    - {id: 708, cat: PC, desc: " |- Мультисборки Windows OS"}
    - {id: 179, cat: PC, desc: " |- Серверные (Microsoft Windows OS)"}
    - {id: 34, cat: PC, desc: "Mac OS. Программное обеспечение под них"}
    - {id: 189, cat: PC, desc: " |- Новые релизы"}
    - {id: 188, cat: PC/Mac, desc: " |- Mac OS (для Apple Macintosh)"}
    - {id: 187, cat: PC/Mac, desc: " |- Mac OS (для РС-Hackintosh)"}
-    - {id: 186, cat: PC/Mac, desc: " |- Системные программы для Mac OS "}
+    - {id: 186, cat: PC/Mac, desc: " |- Системные программы для Mac OS"}
    - {id: 35, cat: PC, desc: "Linux, Unix и другие ОС"}
    - {id: 194, cat: PC, desc: " |- Новые релизы"}
    - {id: 193, cat: PC, desc: " |- ОС (Linux, Unix)"}
@@ -331,7 +332,7 @@ caps:
    - {id: 211, cat: PC, desc: " |- Работа с носителями информации"}
    - {id: 210, cat: PC, desc: " |- Резервное копирование и программы для защиты информации"}
    - {id: 209, cat: PC, desc: " |- Разное"}
-    - {id: 37, cat: PC, desc: "Программы для работы с мультимедиа и 3D "}
+    - {id: 37, cat: PC, desc: "Программы для работы с мультимедиа и 3D"}
    - {id: 731, cat: PC, desc: " |- 3D моделирование, рендеринг и плагины для них"}
    - {id: 208, cat: PC, desc: " |- Новые релизы"}
    - {id: 207, cat: PC, desc: " |- Графические редакторы"}
@@ -353,7 +354,7 @@ caps:
    - {id: 230, cat: PC, desc: " |- Новые релизы"}
    - {id: 228, cat: PC, desc: " |- Системы для офиса, бизнеса и научной работы"}
    - {id: 227, cat: PC, desc: " |- Распознавание текста, звука и синтез речи"}
-    - {id: 226, cat: PC, desc: " |- Работа с PDF и DjVu "}
+    - {id: 226, cat: PC, desc: " |- Работа с PDF и DjVu"}
    - {id: 225, cat: PC, desc: " |- Словари, переводчики"}
    - {id: 695, cat: PC, desc: " |- Текстовые редакторы"}
    - {id: 223, cat: PC, desc: " |- САПР"}
@@ -373,10 +374,10 @@ caps:
    - {id: 765, cat: Audio, desc: " |- Отечественная поп-музыка (lossless)"}
    - {id: 764, cat: Audio, desc: " |- Отечественная поп-музыка (сборники) (lossy)"}
    - {id: 272, cat: Audio, desc: " |- Электронная музыка"}
-    - {id: 271, cat: Audio, desc: " |- Рэп, Хип - Хоп, R'n'B "}
+    - {id: 271, cat: Audio, desc: " |- Рэп, Хип - Хоп, R'n'B"}
    - {id: 270, cat: Audio, desc: " |- Поп музыка"}
    - {id: 269, cat: Audio, desc: " |- Рок"}
-    - {id: 268, cat: Audio, desc: " |- Metal "}
+    - {id: 268, cat: Audio, desc: " |- Metal"}
    - {id: 267, cat: Audio, desc: " |- Шансон"}
    - {id: 678, cat: Audio, desc: " |- Джаз / блюз"}
    - {id: 266, cat: Audio, desc: " |- Классика и Инструментал"}
@@ -384,22 +385,22 @@ caps:
    - {id: 40, cat: Audio, desc: "Зарубежная музыка"}
    - {id: 265, cat: Audio, desc: " |- Новые релизы"}
    - {id: 264, cat: Audio, desc: " |- Электронная музыка"}
-    - {id: 505, cat: Audio, desc: " |- Trance "}
-    - {id: 263, cat: Audio, desc: " |- Рэп, Хип - Хоп, R'n'B "}
-    - {id: 501, cat: Audio, desc: " |- Drum & Bass "}
-    - {id: 503, cat: Audio, desc: " |- House "}
-    - {id: 504, cat: Audio, desc: " |- Dubstep "}
-    - {id: 412, cat: Audio, desc: " |- Soundtrack / OST "}
-    - {id: 502, cat: Audio, desc: " |- Hardcore, Hardstyle, Jumpstyle "}
+    - {id: 505, cat: Audio, desc: " |- Trance"}
+    - {id: 263, cat: Audio, desc: " |- Рэп, Хип - Хоп, R'n'B"}
+    - {id: 501, cat: Audio, desc: " |- Drum & Bass"}
+    - {id: 503, cat: Audio, desc: " |- House"}
+    - {id: 504, cat: Audio, desc: " |- Dubstep"}
+    - {id: 412, cat: Audio, desc: " |- Soundtrack / OST"}
+    - {id: 502, cat: Audio, desc: " |- Hardcore, Hardstyle, Jumpstyle"}
    - {id: 262, cat: Audio, desc: " |- Поп музыка"}
    - {id: 261, cat: Audio, desc: " |- Рок"}
-    - {id: 260, cat: Audio, desc: " |- Metal "}
+    - {id: 260, cat: Audio, desc: " |- Metal"}
    - {id: 259, cat: Audio, desc: " |- Шансон"}
    - {id: 679, cat: Audio, desc: " |- Джаз / блюз"}
    - {id: 42, cat: Audio/Video, desc: "Музыкальное видео"}
    - {id: 256, cat: Audio/Video, desc: " |- Новые релизы"}
-    - {id: 255, cat: Audio/Video, desc: " |- Музыкальные DVD "}
-    - {id: 254, cat: Audio/Video, desc: " |- Музыкальные HD "}
+    - {id: 255, cat: Audio/Video, desc: " |- Музыкальные DVD"}
+    - {id: 254, cat: Audio/Video, desc: " |- Музыкальные HD"}
    - {id: 253, cat: Audio/Video, desc: " |- Клипы (видео)"}
    - {id: 252, cat: Audio/Video, desc: " |- Концерты (видео)"}
    # Спорт Sport
@@ -412,7 +413,7 @@ caps:
    - {id: 691, cat: TV/Sport, desc: " |- Рестлинг"}
    - {id: 513, cat: TV/Sport, desc: " |- Теннис"}
    - {id: 507, cat: TV/Sport, desc: " |- Хоккей"}
-    - {id: 690, cat: TV/Sport, desc: " |- Формула 1 "}
+    - {id: 690, cat: TV/Sport, desc: " |- Формула 1"}
    - {id: 506, cat: TV/Sport, desc: " |- Футбол"}
    - {id: 514, cat: TV/Sport, desc: " |- Другие виды спорта"}
    # Все по авто и мото Other
@@ -462,27 +463,27 @@ caps:
    # Мобильные устройства Mobile
    - {id: 433, cat: PC/Mobile-Other, desc: "Приложения для мобильных телефонов и КПК, КМК"}
    - {id: 436, cat: PC/Mobile-Other, desc: " |- Новые релизы"}
-    - {id: 437, cat: PC/Mobile-Android, desc: " |- Android OS "}
-    - {id: 435, cat: PC/Mobile-Other, desc: " |- Windows Mobile "}
-    - {id: 439, cat: PC/Mobile-Other, desc: " |- Symbian "}
-    - {id: 438, cat: PC/Mobile-iOS, desc: " |- iOS "}
-    - {id: 440, cat: PC/Mobile-Other, desc: " |- Java "}
+    - {id: 437, cat: PC/Mobile-Android, desc: " |- Android OS"}
+    - {id: 435, cat: PC/Mobile-Other, desc: " |- Windows Mobile"}
+    - {id: 439, cat: PC/Mobile-Other, desc: " |- Symbian"}
+    - {id: 438, cat: PC/Mobile-iOS, desc: " |- iOS"}
+    - {id: 440, cat: PC/Mobile-Other, desc: " |- Java"}
    - {id: 434, cat: PC/Mobile-Other, desc: "Игры"}
    - {id: 441, cat: PC/Mobile-Other, desc: " |- Новые релизы"}
-    - {id: 442, cat: PC/Mobile-Android, desc: " |- Android OS "}
-    - {id: 443, cat: PC/Mobile-Other, desc: " |- Symbian "}
-    - {id: 444, cat: PC/Mobile-iOS, desc: " |- iOS "}
-    - {id: 446, cat: PC/Mobile-Other, desc: " |- Java "}
-    - {id: 445, cat: PC/Mobile-Other, desc: " |- Windows Mobile "}
-    - {id: 575, cat: PC/Mobile-Other, desc: " |- Игры для Windows Phone 7,8 "}
+    - {id: 442, cat: PC/Mobile-Android, desc: " |- Android OS"}
+    - {id: 443, cat: PC/Mobile-Other, desc: " |- Symbian"}
+    - {id: 444, cat: PC/Mobile-iOS, desc: " |- iOS"}
+    - {id: 446, cat: PC/Mobile-Other, desc: " |- Java"}
+    - {id: 445, cat: PC/Mobile-Other, desc: " |- Windows Mobile"}
+    - {id: 575, cat: PC/Mobile-Other, desc: " |- Игры для Windows Phone 7,8"}
    - {id: 447, cat: PC/Mobile-Other, desc: "Софт для работы с телефоном"}
    - {id: 448, cat: PC/Mobile-Other, desc: "Прошивки"}
    - {id: 449, cat: PC/Mobile-Other, desc: " |- Новые релизы"}
-    - {id: 450, cat: PC/Mobile-Android, desc: " |- Android OS "}
-    - {id: 451, cat: PC/Mobile-Other, desc: " |- Windows Mobile "}
-    - {id: 452, cat: PC/Mobile-Other, desc: " |- Symbian "}
-    - {id: 454, cat: PC/Mobile-iOS, desc: " |- iOS "}
-    - {id: 455, cat: PC/Mobile-Other, desc: " |- Java "}
+    - {id: 450, cat: PC/Mobile-Android, desc: " |- Android OS"}
+    - {id: 451, cat: PC/Mobile-Other, desc: " |- Windows Mobile"}
+    - {id: 452, cat: PC/Mobile-Other, desc: " |- Symbian"}
+    - {id: 454, cat: PC/Mobile-iOS, desc: " |- iOS"}
+    - {id: 455, cat: PC/Mobile-Other, desc: " |- Java"}
    # Книги и журналы Books
    - {id: 610, cat: Books, desc: " |- Новые релизы"}
    - {id: 611, cat: Books, desc: " |- Кино, театр, ТВ, мультипликация"}
--- a/src/Jackett.Common/Definitions/jav-torrent.yml
+++ b/src/Jackett.Common/Definitions/jav-torrent.yml
@@ -0,0 +1,58 @@
+---
+id: jav-torrent
+name: JAV-Torrent
+description: "JAV-Torrent is a Public tracker for Asian 3X (JAV)"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://jav-torrent.org/
+
+caps:
+  categories:
+    XXX: XXX
+
+  modes:
+    search: [q]
+
+settings: []
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search?keyword={{ .Keywords }}{{ else }}new{{ end }}"
+
+  rows:
+    selector: div.card
+
+  fields:
+    category:
+      text: XXX
+    title:
+      selector: h5 a
+    details:
+      selector: h5 a
+      attribute: href
+    download:
+      selector: a.button
+      attribute: href
+    poster:
+      selector: img
+      attribute: data-src
+    date:
+      selector: p.is-6 a
+      filters:
+        - name: append
+          args: " -07:00" # PDT
+        - name: dateparse
+          args: "Jan. 02, 2006 -07:00"
+    size:
+      selector: span.is-size-6
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/korsar.yml
+++ b/src/Jackett.Common/Definitions/korsar.yml
@@ -0,0 +1,604 @@
+---
+id: korsar
+name: Korsar
+description: "Korsar is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: ru-ru
+type: private
+encoding: UTF-8
+links:
+  - http://filbi1976.org/
+legacylinks:
+  - https://korsar.tv/
+  - http://korsar.info/
+  - https://korsar.info/
+  - http://korsar.tv/
+  - http://korsar.rest/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Все Кинофильмы"}
+    - {id: 153, cat: Movies, desc: "Кинофильмы - Кино времён СССР"}
+    - {id: 656, cat: Movies, desc: "Кинофильмы - Детские фильмы времён СССР"}
+    - {id: 186, cat: Movies/HD, desc: "Кинофильмы - Кино времён СССР (HD Video)"}
+    - {id: 657, cat: Movies/HD, desc: "Кинофильмы - Детские фильмы времён СССР (HD Video)"}
+    - {id: 49, cat: Movies, desc: "Кинофильмы - Наше современное кино"}
+    - {id: 203, cat: Movies/HD, desc: "Кинофильмы - Наше современное кино (HD Video)"}
+    - {id: 268, cat: Movies, desc: "Кинофильмы - Зарубежное кино"}
+    - {id: 654, cat: Movies, desc: "Кинофильмы - Классика зарубежного кино (фильмы до 1980 года)"}
+    - {id: 658, cat: Movies, desc: "Кинофильмы - Зарубежное кино (1981-1990)"}
+    - {id: 659, cat: Movies, desc: "Кинофильмы - Зарубежное кино (1991-2000)"}
+    - {id: 660, cat: Movies, desc: "Кинофильмы - Зарубежное кино (2001-2010)"}
+    - {id: 661, cat: Movies, desc: "Кинофильмы - Зарубежное кино (2011-2022)"}
+    - {id: 676, cat: Movies, desc: "Кинофильмы - Зарубежное кино (Сборники фильмов)"}
+    - {id: 913, cat: Movies, desc: "Кинофильмы - Зарубежное кино (КПК Video)"}
+    - {id: 205, cat: Movies/HD, desc: "Кинофильмы - Зарубежное кино (HD Video)"}
+    - {id: 655, cat: Movies/HD, desc: "Кинофильмы - Классика зарубежного кино (фильмы до 1980 года / HD Video)"}
+    - {id: 662, cat: Movies/HD, desc: "Кинофильмы - Зарубежное кино (1981-1990 / HD Video)"}
+    - {id: 663, cat: Movies/HD, desc: "Кинофильмы - Зарубежное кино (1991-2000 / HD Video)"}
+    - {id: 664, cat: Movies/HD, desc: "Кинофильмы - Зарубежное кино (2001-2010 / HD Video)"}
+    - {id: 665, cat: Movies/HD, desc: "Кинофильмы - Зарубежное кино (2011-2022 / HD Video)"}
+    - {id: 666, cat: Movies/HD, desc: "Кинофильмы - Зарубежное кино (Сборники фильмов / HD Video)"}
+    - {id: 922, cat: Movies, desc: "Кинофильмы - Фильмы Ближнего Зарубежья"}
+    - {id: 923, cat: Movies/HD, desc: "Кинофильмы - Фильмы Ближнего Зарубежья (HD Video)"}
+    - {id: 838, cat: Movies/UHD, desc: "Кинофильмы - Фильмы 4К (UHD 4K)"}
+    - {id: 848, cat: Movies, desc: "Кинофильмы - Фильмы HEVC (HEVC Video)"}
+    - {id: 837, cat: Movies/3D, desc: "Кинофильмы - Фильмы 3D (3D Video)"}
+
+    - {id: 33, cat: Movies, desc: "Все Сериалы"}
+    - {id: 35, cat: TV, desc: "Сериалы - Отечественные сериалы"}
+    - {id: 266, cat: TV/HD, desc: "Сериалы - Отечественные сериалы (HD Video)"}
+    - {id: 34, cat: TV, desc: "Сериалы - Зарубежные сериалы"}
+    - {id: 267, cat: TV/HD, desc: "Сериалы - Зарубежные сериалы (HD Video)"}
+    - {id: 916, cat: TV, desc: "Сериалы - ближнего зарубежья"}
+    - {id: 917, cat: TV/HD, desc: "Сериалы ближнего зарубежья (HD Video)"}
+    - {id: 800, cat: TV, desc: "Сериалы - Зарубежные сериалы (Сборники сезонов)"}
+    - {id: 801, cat: TV/HD, desc: "Сериалы - Зарубежные сериалы (Сборники сезонов / HD Video)"}
+    - {id: 906, cat: TV/UHD, desc: "Сериалы - Зарубежные сериалы (4K)"}
+    - {id: 910, cat: TV, desc: "Сериалы - Зарубежные сериалы (HEVC Video)"}
+
+    - {id: 46, cat: TV/Documentary, desc: "Все Документалистика"}
+    - {id: 77, cat: TV/Documentary, desc: "Документалистика - Документальные фильмы и телепередачи"}
+    - {id: 84, cat: TV/Documentary, desc: "Документалистика - Биографии. Личности и кумиры"}
+    - {id: 92, cat: TV/Documentary, desc: "Документалистика - Космос"}
+    - {id: 86, cat: TV/Documentary, desc: "Документалистика - Флора и фауна"}
+    - {id: 85, cat: TV/Documentary, desc: "Документалистика - Научно-популярные фильмы"}
+    - {id: 148, cat: TV/Documentary, desc: "Документалистика - Познавательные фильмы"}
+    - {id: 187, cat: TV/Documentary, desc: "Документалистика - Путешествия и туризм"}
+    - {id: 88, cat: TV/Documentary, desc: "Документалистика - BBC, Discovery, National Geographic"}
+    - {id: 692, cat: TV/Documentary, desc: "Документалистика - Военное дело"}
+    - {id: 91, cat: TV/Documentary, desc: "Документалистика - История: Древний мир / Античность / Средневековье"}
+    - {id: 693, cat: TV/Documentary, desc: "Документалистика - КВН, Ток-Шоу, ТВ-Шоу"}
+    - {id: 694, cat: TV/Documentary, desc: "Документалистика - Интеллектуальные игры и викторины"}
+    - {id: 696, cat: TV/Documentary, desc: "Документалистика - Сатирики, юмористы, приколы и юмор"}
+    - {id: 700, cat: TV/Documentary, desc: "Документалистика - Естествознание, наука и техника"}
+    - {id: 698, cat: TV/Documentary, desc: "Документалистика - Аудио и видео ролики (Приколы и юмор)"}
+    - {id: 47, cat: TV/Documentary, desc: "Документалистика - Документальные фильмы и телепередачи (HD Video)"}
+    - {id: 283, cat: TV/Documentary, desc: "Документалистика - Биографии. Личности и кумиры (HD Video)"}
+    - {id: 290, cat: TV/Documentary, desc: "Документалистика - Военное дело (HD Video)"}
+    - {id: 291, cat: TV/Documentary, desc: "Документалистика - Естествознание, наука и техника (HD Video)"}
+    - {id: 288, cat: TV/Documentary, desc: "Документалистика - Путешествия и туризм (HD Video)"}
+    - {id: 285, cat: TV/Documentary, desc: "Документалистика - Флора и фауна (HD Video)"}
+    - {id: 284, cat: TV/Documentary, desc: "Документалистика - Космос (HD Video)"}
+    - {id: 573, cat: TV/Documentary, desc: "Документалистика - Познавательные фильмы (HD Video)"}
+    - {id: 286, cat: TV/Documentary, desc: "Документалистика - Научно-популярные фильмы (HD Video)"}
+    - {id: 289, cat: TV/Documentary, desc: "Документалистика - BBC, Discovery, National Geographic (HD Video)"}
+    - {id: 690, cat: TV/Documentary, desc: "Документалистика - КВН, ТВ-Шоу, Ток-Шоу (HD Video)"}
+    - {id: 695, cat: TV/Documentary, desc: "Документалистика - Интеллектуальные игры и викторины (HD Video)"}
+    - {id: 697, cat: TV/Documentary, desc: "Документалистика - Сатирики, юмористы, приколы и юмор (HD Video)"}
+    - {id: 701, cat: TV/Documentary, desc: "Документалистика - История: Древний мир / Античность / Средневековье (HD Video)"}
+    - {id: 699, cat: TV/Documentary, desc: "Документалистика - Аудио и видео ролики (Приколы и юмор / HD Video)"}
+    - {id: 689, cat: TV/Documentary, desc: "Документалистика - Документальные (3D Video)"}
+    - {id: 893, cat: TV/Documentary, desc: "Документалистика - Документальные (4К)"}
+    - {id: 79, cat: TV/Documentary, desc: "Документалистика - Вера и религия"}
+    - {id: 98, cat: TV/Documentary, desc: "Документалистика - Христианство"}
+    - {id: 99, cat: TV/Documentary, desc: "Документалистика - Ислам"}
+    - {id: 100, cat: TV/Documentary, desc: "Документалистика - Религии Индии, Тибета и Восточной Азии"}
+
+    - {id: 73, cat: TV/Anime, desc: "Все Мультипликация"}
+    - {id: 74, cat: TV/Anime, desc: "Мультипликация - Мультфильмы"}
+    - {id: 292, cat: TV/Anime, desc: "Мультипликация - Зарубежные мультфильмы (HD Video)"}
+    - {id: 874, cat: TV/Anime, desc: "Мультипликация - Отечественные мультфильмы (HD Video)"}
+    - {id: 299, cat: TV/Anime, desc: "Мультипликация - Зарубежные мультфильмы"}
+    - {id: 297, cat: TV/Anime, desc: "Мультипликация - Отечественные мультфильмы"}
+    - {id: 301, cat: TV/Anime, desc: "Мультипликация - Сборники зарубежных мультфильмов (HD Video)"}
+    - {id: 876, cat: TV/Anime, desc: "Мультипликация - Сборники зарубежных мультфильмов"}
+    - {id: 877, cat: TV/Anime, desc: "Мультипликация - Сборники отечественных мультфильмов (HD Video)"}
+    - {id: 875, cat: TV/Anime, desc: "Мультипликация - Сборники отечественных мультфильмов<"}
+    - {id: 294, cat: TV/Anime, desc: "Мультипликация - Отечественные (DVD)"}
+    - {id: 295, cat: TV/Anime, desc: "Мультипликация - Иностранные (DVD)"}
+    - {id: 688, cat: TV/Anime, desc: "Мультипликация - Мультфильмы (3D Video)"}
+    - {id: 807, cat: TV/Anime, desc: "Мультипликация - Мультфильмы (60 FPS)"}
+    - {id: 841, cat: TV/Anime, desc: "Мультипликация - Мультфильмы (UHD 4K)"}
+    - {id: 867, cat: TV/Anime, desc: "Мультипликация - Мультфильмы (HEVC Video)"}
+    - {id: 75, cat: TV/Anime, desc: "Мультипликация - Мультсериалы"}
+    - {id: 872, cat: TV/Anime, desc: "Мультипликация - Зарубежные мультсериалы (HD Video)"}
+    - {id: 878, cat: TV/Anime, desc: "Мультипликация - Зарубежные мультсериалы"}
+    - {id: 879, cat: TV/Anime, desc: "Мультипликация - Отечественные мультсериалы (HD Video)"}
+    - {id: 880, cat: TV/Anime, desc: "Мультипликация - Отечественные мультсериалы"}
+    - {id: 76, cat: TV/Anime, desc: "Мультипликация - Аниме"}
+    - {id: 302, cat: TV/Anime, desc: "Мультипликация - Аниме"}
+    - {id: 303, cat: TV/Anime, desc: "Мультипликация - Аниме (DVD)"}
+    - {id: 304, cat: TV/Anime, desc: "Мультипликация - Аниме (HD Video)"}
+
+    - {id: 108, cat: TV, desc: "Все Театр"}
+    - {id: 109, cat: TV, desc: "Бенефис. Мастера искусств отечественного Театра и Кино"}
+    - {id: 130, cat: TV, desc: "Театр - Фильмы-спектакли, театральные постановки"}
+
+    - {id: 319, cat: TV/Sport, desc: "Все Спорт"}
+    - {id: 320, cat: TV/Sport, desc: "Спорт - Спортивные турниры, фильмы и передачи"}
+    - {id: 321, cat: TV/Sport, desc: "Спорт - Автоспорт"}
+    - {id: 322, cat: TV/Sport, desc: "Спорт - Мотоспорт"}
+    - {id: 323, cat: TV/Sport, desc: "Спорт - Формула 1 "}
+    - {id: 324, cat: TV/Sport, desc: "Спорт - Велоспорт"}
+    - {id: 325, cat: TV/Sport, desc: "Спорт - Волейбол/Гандбол"}
+    - {id: 326, cat: TV/Sport, desc: "Спорт - Бокс"}
+    - {id: 327, cat: TV/Sport, desc: "Спорт - Единоборства"}
+    - {id: 328, cat: TV/Sport, desc: "Спорт - Американский футбол"}
+    - {id: 329, cat: TV/Sport, desc: "Спорт - Регби"}
+    - {id: 330, cat: TV/Sport, desc: "Спорт - Бейсбол"}
+    - {id: 331, cat: TV/Sport, desc: "Спорт - Теннис"}
+    - {id: 332, cat: TV/Sport, desc: "Спорт - Биатлон"}
+    - {id: 333, cat: TV/Sport, desc: "Спорт - Фигурное катание"}
+    - {id: 334, cat: TV/Sport, desc: "Спорт - Экстрим"}
+    - {id: 335, cat: TV/Sport, desc: "Спорт - Спорт (видео)"}
+    - {id: 338, cat: TV/Sport, desc: "Спорт - Футбол"}
+    - {id: 680, cat: TV/Sport, desc: "Спорт - Чемпионаты футбольных держав (Англия, Германия, Испания, Италия, Франция)"}
+    - {id: 681, cat: TV/Sport, desc: "Спорт - Еврокубки"}
+    - {id: 682, cat: TV/Sport, desc: "Спорт - Чемпионаты Европы"}
+    - {id: 683, cat: TV/Sport, desc: "Спорт - Чемпионаты мира"}
+    - {id: 684, cat: TV/Sport, desc: "Спорт - Международные турниры"}
+    - {id: 685, cat: TV/Sport, desc: "Спорт - Обзорные и аналитические передачи"}
+    - {id: 686, cat: TV/Sport, desc: "Спорт - Россия"}
+    - {id: 339, cat: TV/Sport, desc: "Спорт - Баскетбол"}
+    - {id: 340, cat: TV/Sport, desc: "Спорт - Хоккей"}
+
+    - {id: 32, cat: Audio, desc: "Все Музыка"}
+    - {id: 134, cat: Audio/Video, desc: "Музыка - Музыка (SD Video)"}
+    - {id: 544, cat: Audio/Video, desc: "Музыка - Концерты"}
+    - {id: 545, cat: Audio/Video, desc: "Музыка - Видеоклипы"}
+    - {id: 36, cat: Audio/Video, desc: "Музыка - Музыка (HD Video)"}
+    - {id: 542, cat: Audio/Video, desc: "Музыка - Концерты (HD Video)"}
+    - {id: 543, cat: Audio/Video, desc: "Музыка - Видеоклипы (HD Video)"}
+    - {id: 483, cat: Audio, desc: "Музыка - Популярная музыка"}
+    - {id: 490, cat: Audio, desc: "Музыка - Зарубежная поп-музыка (Lossless)"}
+    - {id: 546, cat: Audio/MP3, desc: "Музыка - Зарубежная поп-музыка (Lossy)"}
+    - {id: 620, cat: Audio/Lossless, desc: "Музыка - Eurodance, Euro-House, Technopop, Disco, Italo-Disco (Lossless)"}
+    - {id: 621, cat: Audio/MP3, desc: "Музыка - Eurodance, Euro-House, Technopop, Disco, Italo-Disco (Lossy)"}
+    - {id: 484, cat: Audio/Lossless, desc: "Музыка - Отечественная поп-музыка (Lossless)"}
+    - {id: 547, cat: Audio/MP3, desc: "Музыка - Отечественная поп-музыка (Lossy)"}
+    - {id: 523, cat: Audio/Lossless, desc: "Музыка - Зарубежные сборники (Lossless)"}
+    - {id: 548, cat: Audio/MP3, desc: "Музыка - Зарубежные сборники (Lossy)"}
+    - {id: 522, cat: Audio/Lossless, desc: "Музыка - Отечественные сборники (Lossless)"}
+    - {id: 498, cat: Audio/MP3, desc: "Музыка - Отечественные сборники (Lossy)"}
+    - {id: 788, cat: Audio, desc: "Музыка - Популярная музыка"}
+    - {id: 787, cat: Audio/MP3, desc: "Музыка - Сборники 50х50 (Lossy)"}
+    - {id: 505, cat: Audio, desc: "Музыка - Рок-музыка"}
+    - {id: 506, cat: Audio/Lossless, desc: "Музыка - Зарубежный Rock (Lossless)"}
+    - {id: 537, cat: Audio/MP3, desc: "Музыка - Зарубежный Rock (Lossy)"}
+    - {id: 507, cat: Audio/Lossless, desc: "Музыка - Зарубежный Metal (Lossless)"}
+    - {id: 538, cat: Audio/MP3, desc: "Музыка - Зарубежный Metal (Lossy)"}
+    - {id: 588, cat: Audio/Lossless, desc: "Музыка - Зарубежные Alternative, Punk, Independent (Lossless)"}
+    - {id: 589, cat: Audio/MP3, desc: "Музыка - Зарубежные Alternative, Punk, Independent (Lossy)"}
+    - {id: 539, cat: Audio/MP3, desc: "Музыка - Отечественный Рок (Lossy)"}
+    - {id: 541, cat: Audio/MP3, desc: "Музыка - Сборники (Lossy)"}
+    - {id: 524, cat: Audio, desc: "Музыка - Блюзовая и Джазовая музыка"}
+    - {id: 527, cat: Audio/Lossless, desc: "Музыка - Зарубежный блюз (Lossless)"}
+    - {id: 528, cat: Audio/MP3, desc: "Музыка - Зарубежный блюз (Lossy)"}
+    - {id: 642, cat: Audio/Lossless, desc: "Музыка - Зарубежный джаз (Lossless)"}
+    - {id: 643, cat: Audio/MP3, desc: "Музыка - Зарубежный джаз (Lossy)"}
+    - {id: 529, cat: Audio/Lossless, desc: "Музыка - Сборники (Lossless)"}
+    - {id: 530, cat: Audio/MP3, desc: "Музыка - Сборники (Lossy)"}
+    - {id: 531, cat: Audio, desc: "Музыка - New Country"}
+    - {id: 532, cat: Audio/Lossless, desc: "Музыка - Зарубежное New Country (Lossless)"}
+    - {id: 533, cat: Audio/MP3, desc: "Музыка - Зарубежное New Country (Lossy)"}
+    - {id: 534, cat: Audio/Lossless, desc: "Музыка - Сборники (Lossless)"}
+    - {id: 535, cat: Audio/MP3, desc: "Музыка - Сборники (Lossy)"}
+    - {id: 551, cat: Audio, desc: "Музыка - Электронная музыка"}
+    - {id: 552, cat: Audio/Lossless, desc: "Музыка - Chillout, Lounge, Downtempo, Trip-Hop (Lossless) "}
+    - {id: 553, cat: Audio/MP3, desc: "Музыка -  Chillout, Lounge, Downtempo, Trip-Hop (Lossy)"}
+    - {id: 624, cat: Audio/Lossless, desc: "Музыка -  Drum & ass, Jungle, Breakbeat, Dubstep, IDM, Trap (Lossless)"}
+    - {id: 623, cat: Audio/MP3, desc: "Музыка -  Drum & ass, Jungle, Breakbeat, Dubstep, IDM, Trap (Lossy)"}
+    - {id: 785, cat: Audio/Lossless, desc: "Музыка -  Trance, Goa Trance, Psy-Trance, PsyChill, Ambient, Full On, Dub (Lossless)"}
+    - {id: 786, cat: Audio/MP3, desc: "Музыка -  Trance, Goa Trance, Psy-Trance, PsyChill, Ambient, Full On, Dub (Lossy)"}
+    - {id: 571, cat: Audio/Lossless, desc: "Музыка -  Progressive Trance, Progressive House, Tech-House, Deep-House, Electro, Electro-House, House (Lossless)"}
+    - {id: 572, cat: Audio/MP3, desc: "Музыка -  Progressive Trance, Progressive House, Tech-House, Deep-House, Electro, Electro-House, House (Lossy)"}
+    - {id: 843, cat: Audio/Lossless, desc: "Музыка -  Dj-миксы и радиошоу,  Dance, Club, Hands Up (Lossless)"}
+    - {id: 844, cat: Audio/MP3, desc: "Музыка -  Dj-миксы и радиошоу, Dance, Club, Hands Up (Lossy)"}
+    - {id: 846, cat: Audio/Lossless, desc: "Музыка -  Darkwave, Dark Electro, Aggrotech, Industrial (Lossless)"}
+    - {id: 845, cat: Audio/MP3, desc: "Музыка -  Darkwave, Dark Electro, Aggrotech, Industrial (Lossy)"}
+    - {id: 644, cat: Audio/Lossless, desc: "Музыка -  Сборники (Lossless)"}
+    - {id: 645, cat: Audio/MP3, desc: "Музыка -  Сборники (Lossy)"}
+    - {id: 771, cat: Audio, desc: "Музыка - Psychedelic Trance"}
+    - {id: 772, cat: Audio/Lossless, desc: "Музыка - Psychedelic Trance (Lossless)"}
+    - {id: 773, cat: Audio/MP3, desc: "Музыка - Psychedelic Trance (Lossy)"}
+    - {id: 344, cat: Audio, desc: "Музыка - Рэп, Хип-Хоп, R'n'B"}
+    - {id: 556, cat: Audio/Lossless, desc: "Музыка - Зарубежный (Lossless)"}
+    - {id: 348, cat: Audio/MP3, desc: "Музыка - Зарубежный (Lossy)"}
+    - {id: 557, cat: Audio/Lossless, desc: "Музыка - Отечественный (Lossless)"}
+    - {id: 345, cat: Audio/MP3, desc: "Музыка - Отечественный (Lossy)"}
+    - {id: 633, cat: Audio/Lossless, desc: "Музыка - Сборники (Lossless)"}
+    - {id: 634, cat: Audio/MP3, desc: "Музыка - Сборники (Lossy)"}
+    - {id: 622, cat: Audio, desc: "Музыка - Reggae, Ska, Dub"}
+    - {id: 629, cat: Audio/Lossless, desc: "Музыка - Зарубежный (Lossless)"}
+    - {id: 630, cat: Audio/MP3, desc: "Музыка - Зарубежный (Lossy)"}
+    - {id: 635, cat: Audio/Lossless, desc: "Музыка - Отечественный (Lossless)"}
+    - {id: 636, cat: Audio/MP3, desc: "Музыка - Отечественный (Lossy)"}
+    - {id: 631, cat: Audio/Lossless, desc: "Музыка - Сборники (Lossless)"}
+    - {id: 632, cat: Audio/MP3, desc: "Музыка - Сборники (Lossy)"}
+    - {id: 387, cat: Audio, desc: "Музыка - Музыка других жанров"}
+    - {id: 560, cat: Audio/Lossless, desc: "Музыка - Зарубежная музыка других жанров (Lossless)"}
+    - {id: 561, cat: Audio/MP3, desc: "Музыка - Зарубежная музыка других жанров (Lossy)"}
+    - {id: 570, cat: Audio/Lossless, desc: "Музыка - Сборники смешанных жанров (lossless)"}
+    - {id: 569, cat: Audio/MP3, desc: "Музыка - Сборники смешанных жанров (lossy)"}
+    - {id: 889, cat: Audio/Lossless, desc: "Музыка - Сборники песен для детей (Lossless)"}
+    - {id: 562, cat: Audio/MP3, desc: "Музыка - Сборники песен для детей (Lossy)"}
+    - {id: 362, cat: Audio, desc: "Музыка - Саундтреки"}
+    - {id: 555, cat: Audio/Lossless, desc: "Музыка - Саундтреки к зарубежным фильмам (Lossless)"}
+    - {id: 368, cat: Audio/MP3, desc: "Музыка - Саундтреки к зарубежным фильмам (Lossy)"}
+    - {id: 554, cat: Audio/Lossless, desc: "Музыка - Саундтреки к отечественным фильмам (Lossless)"}
+    - {id: 366, cat: Audio/MP3, desc: "Музыка - Саундтреки к отечественным фильмам (Lossy)"}
+    - {id: 376, cat: Audio, desc: "Музыка - Шансон, Авторская и Военная песня"}
+    - {id: 558, cat: Audio/Lossless, desc: "Музыка - Отечественный шансон (Lossless)"}
+    - {id: 378, cat: Audio/MP3, desc: "Музыка - Отечественный шансон (Lossy)"}
+    - {id: 379, cat: Audio/Lossless, desc: "Музыка - Сборники отечественного шансона (Lossless)"}
+    - {id: 559, cat: Audio/MP3, desc: "Музыка - Сборники отечественного шансона (Lossy)"}
+    - {id: 564, cat: Audio/Lossless, desc: "Музыка - Военная песня (Lossless)"}
+    - {id: 380, cat: Audio/MP3, desc: "Музыка - Военная песня (Lossy)"}
+    - {id: 565, cat: Audio/Lossless, desc: "Музыка - Авторская песня (Lossless)"}
+    - {id: 383, cat: Audio/MP3, desc: "Музыка - Авторская песня (Lossy)"}
+    - {id: 779, cat: Audio, desc: "Музыка - New Age, Relax, Meditative & Flamenсо"}
+    - {id: 780, cat: Audio/Lossless, desc: "Музыка - Фламенко и акустическая гитара (lossless)"}
+    - {id: 781, cat: Audio/MP3, desc: "Музыка - Фламенко и акустическая гитара (lossy)"}
+    - {id: 341, cat: Audio, desc: "Музыка - Классическая и современная академическая музыка"}
+    - {id: 549, cat: Audio/Lossless, desc: "Музыка - Классическая и современная академическая музыка  (lossless)"}
+    - {id: 550, cat: Audio/MP3, desc: "Музыка - Классическая и современная академическая музыка (lossy)"}
+    - {id: 536, cat: Audio, desc: "Музыка - Многоканальная музыка, Hi-Res форматы, оцифровки"}
+    - {id: 653, cat: Audio, desc: "Музыка - Музыка (HD Audio)"}
+
+    - {id: 45, cat: Audio/Audiobook, desc: "Все Аудиокниги"}
+    - {id: 141, cat: Audio/Audiobook, desc: "Аудиокниги - Радиоспектакли, история, мемуары"}
+    - {id: 389, cat: Audio/Audiobook, desc: "Аудиокниги - Радиоспектакли и литературные чтения"}
+    - {id: 388, cat: Audio/Audiobook, desc: "Аудиокниги - Жизнь замечательных людей"}
+    - {id: 390, cat: Audio/Audiobook, desc: "Аудиокниги - Историческая книга"}
+    - {id: 48, cat: Audio/Audiobook, desc: "Аудиокниги - Фантастика, фэнтези, мистика, ужасы, фанфики"}
+    - {id: 391, cat: Audio/Audiobook, desc: "Аудиокниги - Зарубежная фантастика, фэнтези, мистика, ужасы, фанфики"}
+    - {id: 392, cat: Audio/Audiobook, desc: "Аудиокниги - Российская фантастика, фэнтези, мистика, ужасы, фанфики"}
+    - {id: 126, cat: Audio/Audiobook, desc: "Аудиокниги - Художественная литература"}
+    - {id: 394, cat: Audio/Audiobook, desc: "Аудиокниги - Поэзия"}
+    - {id: 395, cat: Audio/Audiobook, desc: "Аудиокниги - Зарубежная литература"}
+    - {id: 396, cat: Audio/Audiobook, desc: "Аудиокниги - Русская литература"}
+    - {id: 397, cat: Audio/Audiobook, desc: "Аудиокниги - Детская литература"}
+    - {id: 398, cat: Audio/Audiobook, desc: "Аудиокниги - Детективы, приключения, триллеры, боевики"}
+    - {id: 399, cat: Audio/Audiobook, desc: "Аудиокниги - Религии"}
+    - {id: 400, cat: Audio/Audiobook, desc: "Аудиокниги - Православие"}
+    - {id: 401, cat: Audio/Audiobook, desc: "Аудиокниги - Ислам"}
+    - {id: 402, cat: Audio/Audiobook, desc: "Аудиокниги - Другие традиционные религии"}
+    - {id: 404, cat: Audio/Audiobook, desc: "Аудиокниги - Прочая литература"}
+    - {id: 405, cat: Audio/Audiobook, desc: "Аудиокниги - Учебная и научно-популярная литература"}
+    - {id: 406, cat: Audio/Audiobook, desc: "Аудиокниги - Аудиокниги в lossless-форматах"}
+    - {id: 407, cat: Audio/Audiobook, desc: "Аудиокниги - Бизнес"}
+    - {id: 408, cat: Audio/Audiobook, desc: "Аудиокниги - Разное"}
+
+    - {id: 37, cat: Books, desc: "Все Книги и журналы"}
+    - {id: 471, cat: Books, desc: "Книги и журналы - Книги"}
+    - {id: 472, cat: Books, desc: "Книги и журналы - Кино, театр, ТВ, мультипликация"}
+    - {id: 473, cat: Books, desc: "Книги и журналы - Рисунок, графический дизайн"}
+    - {id: 474, cat: Books, desc: "Книги и журналы - Фото и видеосъемка"}
+    - {id: 475, cat: Books, desc: "Книги и журналы - Журналы и газеты (общий раздел)"}
+    - {id: 479, cat: Books, desc: "Книги и журналы - Мода. Стиль. Этикет"}
+    - {id: 678, cat: Books, desc: "Книги и журналы - Православие"}
+    - {id: 420, cat: Books, desc: "Книги и журналы - Для детей, родителей и учителей"}
+    - {id: 421, cat: Books, desc: "Книги и журналы - Учебная литература для детского сада и начальной школы (до 4 класса)"}
+    - {id: 422, cat: Books, desc: "Книги и журналы - Учебная литература для старших классов (5-11 класс)"}
+    - {id: 423, cat: Books, desc: "Книги и журналы - Учителям и педагогам"}
+    - {id: 424, cat: Books, desc: "Книги и журналы - Научно-популярная и познавательная литература (для детей)"}
+    - {id: 425, cat: Books, desc: "Книги и журналы - Досуг и творчество"}
+    - {id: 426, cat: Books, desc: "Книги и журналы - Воспитание и развитие"}
+    - {id: 427, cat: Books, desc: "Книги и журналы - Худ. лит-ра для дошкольников и младших классов"}
+    - {id: 428, cat: Books, desc: "Книги и журналы - Худ. лит-ра для средних и старших классов"}
+    - {id: 429, cat: Books, desc: "Книги и журналы - Спорт, физическая культура, боевые искусства"}
+    - {id: 430, cat: Books, desc: "Книги и журналы - Футбол"}
+    - {id: 431, cat: Books, desc: "Книги и журналы - Хоккей"}
+    - {id: 432, cat: Books, desc: "Книги и журналы - Игровые виды спорта"}
+    - {id: 433, cat: Books, desc: "Книги и журналы - Легкая атлетика. Плавание. Гимнастика. Тяжелая атлетика. Гребля"}
+    - {id: 434, cat: Books, desc: "Книги и журналы - Автоспорт. Мотоспорт. Велоспорт"}
+    - {id: 435, cat: Books, desc: "Книги и журналы - Шахматы. Шашки"}
+    - {id: 436, cat: Books, desc: "Книги и журналы - Боевые искусства, единоборства"}
+    - {id: 437, cat: Books, desc: "Книги и журналы - Экстрим"}
+    - {id: 438, cat: Books, desc: "Книги и журналы - Физкультура, фитнес, бодибилдинг"}
+    - {id: 439, cat: Books, desc: "Книги и журналы - Спортивная пресса"}
+    - {id: 440, cat: Books, desc: "Книги и журналы - Гуманитарные науки"}
+    - {id: 441, cat: Books, desc: "Книги и журналы - Искусствоведение. Культурология"}
+    - {id: 443, cat: Books, desc: "Книги и журналы - Литературоведение"}
+    - {id: 444, cat: Books, desc: "Книги и журналы - Лингвистика"}
+    - {id: 445, cat: Books, desc: "Книги и журналы - Философия"}
+    - {id: 446, cat: Books, desc: "Книги и журналы - Политология"}
+    - {id: 447, cat: Books, desc: "Книги и журналы - Социология"}
+    - {id: 448, cat: Books, desc: "Книги и журналы - Бизнес, менеджмент"}
+    - {id: 451, cat: Books, desc: "Книги и журналы - Экономика"}
+    - {id: 311, cat: Books, desc: "Книги и журналы - Военное дело"}
+    - {id: 312, cat: Books, desc: "Книги и журналы - Милитария"}
+    - {id: 313, cat: Books, desc: "Книги и журналы - Военная история"}
+    - {id: 314, cat: Books, desc: "Книги и журналы - История Второй мировой войны"}
+    - {id: 315, cat: Books, desc: "Книги и журналы - Военная техника"}
+    - {id: 316, cat: Books, desc: "Книги и журналы - Стрелковое оружие"}
+    - {id: 317, cat: Books, desc: "Книги и журналы - Учебно-методическая литература"}
+    - {id: 318, cat: Books, desc: "Книги и журналы - Спецслужбы мира"}
+    - {id: 39, cat: Books, desc: "Книги и журналы - Художественная литература"}
+    - {id: 104, cat: Books, desc: "Книги и журналы - Русская литература"}
+    - {id: 105, cat: Books, desc: "Книги и журналы - Зарубежная литература"}
+    - {id: 106, cat: Books, desc: "Книги и журналы - Литературные журналы"}
+    - {id: 107, cat: Books, desc: "Книги и журналы - Художественная литература"}
+    - {id: 679, cat: Books, desc: "Книги и журналы - Отечественная фантастика / фэнтези / мистика"}
+    - {id: 102, cat: Books, desc: "Книги и журналы - Компьютерная литература"}
+    - {id: 103, cat: Books, desc: "Книги и журналы - Компьютерные журналы и приложения к ним"}
+    - {id: 415, cat: Books, desc: "Книги и журналы - Дисковые приложения к игровым журналам"}
+    - {id: 409, cat: Books, desc: "Книги и журналы - Программы от Microsoft"}
+    - {id: 416, cat: Books, desc: "Книги и журналы - Другие программы"}
+    - {id: 410, cat: Books, desc: "Книги и журналы - Веб-дизайн и программирование"}
+    - {id: 411, cat: Books, desc: "Книги и журналы - Программирование"}
+    - {id: 419, cat: Books, desc: "Книги и журналы - Mac OS; Linux, FreeBSD и прочие *NIX"}
+    - {id: 412, cat: Books, desc: "Книги и журналы - Графика, обработка видео"}
+    - {id: 414, cat: Books, desc: "Книги и журналы - Инженерные и научные программы"}
+    - {id: 413, cat: Books, desc: "Книги и журналы - Сети / VoIP"}
+    - {id: 417, cat: Books, desc: "Книги и журналы - Железо (книги о ПК)"}
+    - {id: 418, cat: Books, desc: "Книги и журналы - СУБД"}
+    - {id: 464, cat: Books, desc: "Книги и журналы - Комиксы"}
+    - {id: 465, cat: Books, desc: "Книги и журналы - Комиксы на русском языке"}
+    - {id: 466, cat: Books, desc: "Книги и журналы - Комиксы издательства Marvel"}
+    - {id: 467, cat: Books, desc: "Книги и журналы - Комиксы издательства DC"}
+    - {id: 468, cat: Books, desc: "Книги и журналы - Комиксы других издательств"}
+    - {id: 470, cat: Books, desc: "Книги и журналы - Манга (на иностранных языках)"}
+    - {id: 454, cat: Books, desc: "Книги и журналы - Коллекции книг и библиотеки"}
+    - {id: 455, cat: Books, desc: "Книги и журналы - Библиотеки (зеркала сетевых библиотек/коллекций)"}
+    - {id: 456, cat: Books, desc: "Книги и журналы - Тематические коллекции (подборки)"}
+    - {id: 457, cat: Books, desc: "Книги и журналы - Многопредметные коллекции (подборки)"}
+    - {id: 458, cat: Books, desc: "Книги и журналы - Мультимедийные и интерактивные издания"}
+    - {id: 459, cat: Books, desc: "Книги и журналы - Мультимедийные энциклопедии"}
+    - {id: 460, cat: Books, desc: "Книги и журналы - >Интерактивные обучающие и развивающие материалы"}
+    - {id: 461, cat: Books, desc: "Книги и журналы - Обучающие издания для детей"}
+    - {id: 462, cat: Books, desc: "Книги и журналы - Кулинария. Цветоводство. Домоводство"}
+    - {id: 463, cat: Books, desc: "Книги и журналы - Культура. Искусство. История"}
+    - {id: 677, cat: Books, desc: "Книги и журналы - Детективы, приключения"}
+    - {id: 128, cat: Books, desc: "Книги и журналы - Разное"}
+
+    - {id: 774, cat: Other, desc: "Все Графика, Арт, Разное"}
+    - {id: 775, cat: Other, desc: "Живопись, Графика, Скульптура, Digital Art"}
+    - {id: 776, cat: Other, desc: "Рисунки, графический дизайн"}
+    - {id: 778, cat: Other, desc: "Обои, аватары, иконки и прочее"}
+    - {id: 777, cat: Other, desc: "3D-графика"}
+
+    - {id: 38, cat: PC, desc: "Программное обеспечение"}
+    - {id: 40, cat: PC, desc: "Программное обеспечение - Операционные системы"}
+    - {id: 41, cat: PC, desc: "Программное обеспечение - Windows"}
+    - {id: 42, cat: PC, desc: "Программное обеспечение - Mac"}
+    - {id: 43, cat: PC, desc: "Программное обеспечение - Linux (Unix)"}
+    - {id: 112, cat: PC, desc: "Программное обеспечение - Софт"}
+    - {id: 113, cat: PC, desc: "Программное обеспечение - Сборники программ"}
+    - {id: 273, cat: PC, desc: "Программное обеспечение - Безопасность"}
+    - {id: 278, cat: PC, desc: "Программное обеспечение - Информация и диагностика"}
+    - {id: 275, cat: PC, desc: "Программное обеспечение - Программы для интернет и сетей"}
+    - {id: 276, cat: PC, desc: "Программное обеспечение - Программы для настройки и оптимизации ОС"}
+    - {id: 116, cat: PC, desc: "Программное обеспечение - Аудио и видео редакторы и конвертеры"}
+    - {id: 115, cat: PC, desc: "Программное обеспечение - Графические редакторы"}
+    - {id: 518, cat: PC, desc: "Программное обеспечение - Каталогизаторы и просмотрщики графики"}
+    - {id: 117, cat: PC, desc: "Программное обеспечение - Аудио и видео-проигрыватели и каталогизаторы"}
+    - {id: 282, cat: PC, desc: "Программное обеспечение - Виртуальные студии, секвенсоры"}
+    - {id: 517, cat: PC, desc: "Программное обеспечение - Словари, переводчики"}
+    - {id: 667, cat: PC, desc: "Программное обеспечение - Офисное ПО"}
+    - {id: 668, cat: PC, desc: "Программное обеспечение - Работа с жёстким диском"}
+    - {id: 669, cat: PC, desc: "Программное обеспечение - Сервисное обслуживание компьютера"}
+    - {id: 670, cat: PC, desc: "Программное обеспечение - Архиваторы и файловые менеджеры"}
+    - {id: 114, cat: PC, desc: "Программное обеспечение - Плагины и программы компании Adobe"}
+    - {id: 274, cat: PC, desc: "Программное обеспечение - Видеокурсы"}
+    - {id: 675, cat: PC, desc: "Программное обеспечение - Разное (Системные программы для Windows)"}
+    - {id: 671, cat: PC, desc: "Программное обеспечение - Игры и программы для iOS"}
+    - {id: 672, cat: PC, desc: "Программное обеспечение - Игры и программы для Android"}
+    - {id: 673, cat: PC, desc: "Программное обеспечение - Текстовые редакторы"}
+    - {id: 674, cat: PC, desc: "Программное обеспечение - Работа с носителями информации"}
+    - {id: 113, cat: PC, desc: "Сборники программ"}
+    - {id: 273, cat: PC, desc: "Безопасность"}
+    - {id: 278, cat: PC, desc: "Сериалы - Информация и диагностика"}
+    - {id: 275, cat: PC, desc: "Программы для интернет и сетей"}
+    - {id: 276, cat: PC, desc: "Программы для настройки и оптимизации ОС"}
+    - {id: 116, cat: PC, desc: "Аудио и видео редакторы и конвертеры"}
+    - {id: 115, cat: PC, desc: "Графические редакторы"}
+    - {id: 518, cat: PC, desc: "Каталогизаторы и просмотрщики графики"}
+    - {id: 117, cat: PC, desc: "Аудио и видео-проигрыватели и каталогизаторы"}
+    - {id: 282, cat: PC, desc: "Виртуальные студии, секвенсоры"}
+    - {id: 517, cat: PC, desc: "Словари, переводчики"}
+    - {id: 667, cat: PC, desc: "Офисное ПО"}
+    - {id: 668, cat: PC, desc: "Работа с жёстким диском"}
+    - {id: 669, cat: PC, desc: "Сервисное обслуживание компьютера"}
+    - {id: 670, cat: PC, desc: "Архиваторы и файловые менеджеры"}
+    - {id: 114, cat: PC, desc: "Плагины и программы компании Adobe"}
+    - {id: 274, cat: PC, desc: "Видеокурсы"}
+    - {id: 675, cat: PC, desc: "Разное (Системные программы для Windows)"}
+    - {id: 671, cat: PC, desc: "Игры и программы для iOS"}
+    - {id: 672, cat: PC, desc: "Игры и программы для Android"}
+    - {id: 673, cat: PC, desc: "Текстовые редакторы"}
+    - {id: 674, cat: PC, desc: "Работа с носителями информации"}
+
+    - {id: 30, cat: Console, desc: "Все Игры"}
+    - {id: 80, cat: Console, desc: "Игры - Игры для Windows"}
+    - {id: 81, cat: Console, desc: "Игры - Игры и приложения для Android"}
+    - {id: 44, cat: Console, desc: "Игры - Игры для PSP"}
+
+  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><a href=\"http://filbi1976.org/ucp.php?mode=login\" target =_blank>Login</a> 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: sort
+    type: select
+    label: Sort requested from site
+    default: t
+    options:
+      nt: created
+      ts: seeders
+      sz: size
+      i: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: d
+    options:
+      d: desc
+      a: asc
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+
+search:
+  paths:
+  # http://filbi1976.org/search.php?t=0&cs=1&cs_post=1&sc=1&keywords=&cs_where=title&cs_forb=&submit=Hand+Search&fid%5B%5D=0&cs_format=0&cs_year=0&cs_filter=0&sk=nt&sd=d&cs_private=0
+    - path: search.php
+  inputs:
+    t: 0
+    cs: 1
+    cs_post: 1
+    sc: 1
+    keywords: "{{ .Keywords }}"
+    # title, persona, genre, producer, author, korsar
+    cs_where: title
+    cs_forb: ""
+    submit: "Hand+Search"
+    $raw: "{{ if .Categories }}{{ range .Categories }}&fid[]={{.}}{{end}}{{ else }}&fid[]=0{{ end }}"
+    cs_format: 0
+    cs_year: 0
+    cs_filter: 0
+    sk: "{{ .Config.sort }}"
+    sd: "{{ .Config.type }}"
+    cs_private: 0
+
+  rows:
+    selector: li.row:has(a.topictitle)
+
+  fields:
+    category:
+      selector: a[href*="/viewtopic.php?f="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: f
+    title:
+      selector: a.topictitle
+    details:
+      selector: a.topictitle
+      attribute: href
+    download:
+      selector: a[href^="./download/file.php?id="][title="Скачать торрент"]
+      attribute: href
+    size:
+      selector: dt
+      filters:
+        - name: regexp
+          args: "Размер: (.+?),"
+        - name: replace
+          args: ["ТБ", "TB"]
+        - name: replace
+          args: ["ГБ", "GB"]
+        - name: replace
+          args: ["МБ", "MB"]
+        - name: replace
+          args: ["КБ", "KB"]
+    seeders:
+      selector: span.seed
+    leechers:
+      selector: span.leech
+    grabs:
+      selector: span.complet
+    date:
+      # Сегодня, 15:10 (today)
+      # Вчера, 23:28 (yesterday)
+      selector: dd:last-of-type:contains("Сегодня,"), dd:last-of-type:contains("Вчера,")
+      remove: a
+      optional: true
+      filters:
+        - name: replace
+          args: ["»", ""]
+        - name: replace
+          args: ["Вчера,", "Today"]
+        - name: replace
+          args: ["Сегодня,", "Yesterday"]
+        - name: fuzzytime
+    date:
+      # 4 минуты назад (4 minutes ago)
+      # 11 минут назад (11 minutes ago)
+      # 4 часа назад (4 hours ago)
+      # 11 часов назад (11 hours ago)
+      selector: dd:last-of-type:contains("назад")
+      remove: a
+      optional: true
+      filters:
+        - name: replace
+          args: ["»", ""]
+        - name: replace
+          args: ["назад", "ago"]
+        - name: replace
+          args: ["минуты", "minutes"]
+        - name: replace
+          args: ["минут", "minutes"]
+        - name: replace
+          args: ["часа", "hours"]
+        - name: replace
+          args: ["часов", "hours"]
+        - name: timeago
+    date:
+      # 12 янв 2019, 11:26
+      # 25 май 2017, 18:41
+      selector: dd:last-of-type:not(:contains("назад")):not(:contains("Сегодня,")):not(:contains("Вчера,"))
+      remove: a
+      optional: true
+      filters:
+        - name: replace
+          args: ["»", ""]
+        - name: regexp
+          args: "(\\d{2} \\D{3} \\d{4}, \\d{2}:\\d{2})"
+        - name: replace
+          args: ["янв", "Jan"]
+        - name: replace
+          args: ["фев", "Feb"]
+        - name: replace
+          args: ["мар", "Mar"]
+        - name: replace
+          args: ["апр", "Apr"]
+        - name: replace
+          args: ["май", "May"]
+        - name: replace
+          args: ["июн", "Jun"]
+        - name: replace
+          args: ["июл", "Jul"]
+        - name: replace
+          args: ["авг", "Aug"]
+        - name: replace
+          args: ["сен", "Sep"]
+        - name: replace
+          args: ["окт", "Oct"]
+        - name: replace
+          args: ["ноя", "Nov"]
+        - name: replace
+          args: ["дек", "Dec"]
+        - name: append
+          args: " +03:00" # MSK
+        - name: dateparse
+          args: "02 Jan 2006, 15:04 -07:00"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# phpBB
--- a/src/Jackett.Common/Definitions/krazyzone.yml
+++ b/src/Jackett.Common/Definitions/krazyzone.yml
@@ -64,16 +64,17 @@ caps:
    - {id: 50, cat: PC/Mobile-Android, desc: "Applications Android"}
    - {id: 51, cat: PC/Mac, desc: "Applications Misc , Linux , Mac "}
    - {id: 52, cat: PC/0day, desc: "Applications Windows"}
-    - {id: 22, cat: Books, desc: "Ebooks/Mags"}
+    - {id: 22, cat: Books, desc: "Ebooks/Mags/Comics"}
    - {id: 48, cat: Audio/Audiobook, desc: "Ebooks Audiobooks"}
-    - {id: 49, cat: Books/EBook, desc: "Ebooks Ebooks / Mags"}
+    - {id: 117, cat: Books/Comics, desc: "Ebooks Comics"}
+    - {id: 49, cat: Books/EBook, desc: "Ebooks Mags"}
    - {id: 23, cat: PC/Games, desc: "Games"}
    - {id: 45, cat: PC/Games, desc: "Games PC / ISO"}
    - {id: 105, cat: Console/PS4, desc: "Games PS2 / PS3 / PS4 "}
    - {id: 46, cat: Console/NDS, desc: "Games Wii+ Nds"}
    - {id: 47, cat: Console/XBox 360, desc: "Games Xbox360"}
    - {id: 20, cat: Movies, desc: "Movies"}
-    - {id: 113, cat: Movies, desc: "Movies 2021 Movies"}
+    - {id: 113, cat: Movies, desc: "Movies 2022 Movies"}
    - {id: 116, cat: Movies/UHD, desc: "Movies 4K Movies"}
    - {id: 53, cat: Movies, desc: "Movies Anime / Kids"}
    - {id: 54, cat: Movies/BluRay, desc: "Movies Bluray,HDRip,BDRip,Webrip,HEVC"}
@@ -82,6 +83,7 @@ caps:
    - {id: 57, cat: Movies/DVD, desc: "Movies DVDR ,NTSCPAL ,ISO"}
    - {id: 58, cat: Movies/WEB-DL, desc: "Movies DVDRip,AVI,XVID,BRRip"}
    - {id: 59, cat: Movies/Foreign, desc: "Movies Foreign"}
+    - {id: 118, cat: Movies, desc: "Movies iPad"}
    - {id: 107, cat: Movies/HD, desc: "Movies Mp4  Movies"}
    - {id: 60, cat: Movies, desc: "Movies Netflix"}
    - {id: 61, cat: Movies/3D, desc: "Movies Remux , 3D"}
@@ -91,8 +93,8 @@ caps:
    - {id: 42, cat: TV/Anime, desc: "TV Kids / Anime"}
    - {id: 43, cat: TV/Sport, desc: "TV Sport"}
    - {id: 44, cat: TV/Sport, desc: "TV Sport Packs"}
-    - {id: 26, cat: Books/Comics, desc: "Comics"}
-    - {id: 37, cat: Books/Comics, desc: "Comics Comics"}
+    - {id: 26, cat: Audio, desc: "Request Seed DMC/Mastermix"}
+    - {id: 37, cat: Audio, desc: "Request Seed DMC/Mastermix"}
    - {id: 25, cat: TV, desc: "TV Packs/Full Seasons"}
    - {id: 38, cat: TV, desc: "TV Packs Full Seasons"}
    - {id: 40, cat: TV, desc: "TV Packs Kids / Anime Full Seasons"}
@@ -102,9 +104,9 @@ caps:
    - {id: 1, cat: Other/Misc, desc: "Unsorted"}
    - {id: 2, cat: Other/Misc, desc: "Unsorted To Be Edited"}
    - {id: 30, cat: Other, desc: "Exclusive VIP"}
-    - {id: 33, cat: Other, desc: "Exclusive VIP Exclusive VIP Not To Be Uploaded Anywhere"}
+    - {id: 33, cat: Other, desc: "Exclusive VIP Not To Be Uploaded Anywhere"}
    - {id: 31, cat: Other, desc: "VIP"}
-    - {id: 32, cat: Other, desc: "VIP VIP Not To Be Uploaded Anywhere"}
+    - {id: 32, cat: Other, desc: "VIP Not To Be Uploaded Anywhere"}
    - {id: 99, cat: Other, desc: "Christmas Albums"}
    - {id: 101, cat: Other, desc: "Christmas Albums Packs"}
    - {id: 103, cat: Other, desc: "All Christmas Movies and Packs"}
--- a/src/Jackett.Common/Definitions/lastfiles.yml
+++ b/src/Jackett.Common/Definitions/lastfiles.yml
@@ -138,16 +138,18 @@ search:
        - name: querystring
          args: cat
    title:
-      selector: a[href^="details.php?id="]
+      selector: a[onmouseover]
    details:
-      selector: a[href^="details.php?id="]
+      selector: a[onmouseover]
      attribute: href
    poster:
-      selector: a[href^="details.php?id="]
+      selector: a[onmouseover]
      attribute: onmouseover
      filters:
        - name: regexp
          args: src=\\'(.+?)\\'
+        - name: replace
+          args: ["./pic/noposter.png", ""]
    download:
      selector: a[href^="download.php"]
      attribute: href
--- a/src/Jackett.Common/Definitions/lat-team-api.yml
+++ b/src/Jackett.Common/Definitions/lat-team-api.yml
@@ -0,0 +1,169 @@
+---
+id: lat-team-api
+name: Lat-Team (API)
+description: "Lat-Team is a SPANISH Private Torrent Tracker for MOVIES / TV"
+language: es-ES
+type: private
+encoding: UTF-8
+links:
+  - https://lat-team.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Peliculas"}
+    - {id: 2, cat: TV, desc: "TV Series"}
+    - {id: 3, cat: Audio, desc: "Musica"}
+    - {id: 4, cat: Console, desc: "Juegos"}
+    - {id: 5, cat: TV/Anime, desc: "Anime"}
+    - {id: 6, cat: Movies/Other, desc: "Retro Pelicula"}
+    - {id: 7, cat: TV/Other, desc: "Retro Serie TV"}
+    - {id: 8, cat: TV/Foreign, desc: "Telenovelas y Teleseries"}
+    - {id: 9, cat: Audio/Video, desc: "Conciertos"}
+    - {id: 10, cat: TV/Documentary, desc: "Documentales"}
+    - {id: 11, cat: Other, desc: "Videotutoriales y Educativo"}
+    - {id: 12, cat: XXX, desc: "XXX"}
+    - {id: 16, cat: TV/Sport, desc: "Deportes"}
+    - {id: 17, cat: PC, desc: "Sistemas Operativos"}
+    - {id: 18, cat: Books, desc: "E-Books"}
+    - {id: 19, cat: Audio/Audiobook, desc: "Audiolibros"}
+    - {id: 20, cat: Movies/Other, desc: "Películas Oscars"}
+    - {id: 21, cat: Audio/Video, desc: "VideoMixes"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://lat-team.com/\" target =_blank>Lat-Team</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+  keywordsfilters:
+    - name: re_replace
+      args: ["(?i)\\bS(\\d+)", "T$1"]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title_vose:
+      selector: name:contains(VOSE)
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
+        - name: re_replace
+          args: ["(?i)\\bT(\\d+)", "S$1"]
+        - name: re_replace
+          args: ["UHDRip", "BDRip"] # Fix for Radarr
+        - name: append
+          args: " ENGLiSH"
+    title_notvose:
+      selector: name:not(:contains(VOSE))
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
+        - name: re_replace
+          args: ["(?i)\\bT(\\d+)", "S$1"]
+        - name: re_replace
+          args: ["UHDRip", "BDRip"] # Fix for Radarr
+        - name: append
+          args: " SPANiSH"
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# json UNIT3D 5.3.0
--- a/src/Jackett.Common/Definitions/lat-team.yml
+++ b/src/Jackett.Common/Definitions/lat-team.yml
@@ -1,219 +0,0 @@
---
-id: lat-team
-name: Lat-Team
-description: "Lat-Team is a SPANISH Private Torrent Tracker for MOVIES / TV"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://lat-team.com/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 6, cat: Movies/Other, desc: "Retro Pelicula"}
-    - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 2, cat: TV, desc: "TV Series"}
-    - {id: 7, cat: TV/Other, desc: "Retro Serie TV"}
-    - {id: 8, cat: TV/Foreign, desc: "Telenovelas y Teleseries"}
-    - {id: 3, cat: Audio, desc: "Musica"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    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: created_at
-    options:
-      created_at: 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: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)\\bS(\\d+)", "T$1"]
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title_vose:
-      selector: a.view-torrent:contains("VOSE")
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
-        - name: re_replace
-          args: ["(?i)\\bT(\\d+)", "S$1"]
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
-        - name: append
-          args: " ENGLiSH"
-    title_notvose:
-      selector: a.view-torrent:not(:contains("VOSE"))
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
-        - name: re_replace
-          args: ["(?i)\\bT(\\d+)", "S$1"]
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
-        - name: append
-          args: " SPANiSH"
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# UNIT3D 5.3.0
--- a/src/Jackett.Common/Definitions/leech24.yml
+++ b/src/Jackett.Common/Definitions/leech24.yml
@@ -5,51 +5,52 @@ description: "leech24 is a Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - 15a5285012463f22155b077ddfbad9feb9b4b8ee # issued to DNS Name=vds50211.inrr.ru
 links:
  - https://leech24.net/

 caps:
  categorymappings:
    - {id: 28, cat: TV/Anime, desc: "Anime: All"}
-    - {id: 18, cat: PC/0day, desc: "Apps: PC"}
-    - {id: 19, cat: PC/Mac, desc: "Apps: Mac"}
    - {id: 20, cat: PC, desc: "Apps: Linux"}
+    - {id: 19, cat: PC/Mac, desc: "Apps: Mac"}
    - {id: 21, cat: PC/Mobile-Other, desc: "Apps: Other"}
+    - {id: 18, cat: PC/0day, desc: "Apps: PC"}
    - {id: 9, cat: TV/Documentary, desc: "Documentaries: All"}
-    - {id: 10, cat: PC/Games, desc: "Games: PC"}
-    - {id: 11, cat: Console/PSP, desc: "Games: PS2"}
-    - {id: 43, cat: Console/PS3, desc: "Games: PS3"}
-    - {id: 12, cat: Console/PSP, desc: "Games: PSP"}
-    - {id: 13, cat: Console/XBox, desc: "Games: Xbox"}
-    - {id: 14, cat: Console/XBox 360, desc: "Games: Xbox360"}
-    - {id: 15, cat: Console/PSP, desc: "Games: PS1"}
-    - {id: 16, cat: Console/Other, desc: "Games: Dreamcast"}
-    - {id: 44, cat: Console/Wii, desc: "Games: Wii"}
    - {id: 45, cat: Console/NDS, desc: "Games: DS"}
+    - {id: 16, cat: Console/Other, desc: "Games: Dreamcast"}
    - {id: 46, cat: Console/Other, desc: "Games: GameCube"}
    - {id: 17, cat: Console/Other, desc: "Games: Other"}
+    - {id: 10, cat: PC/Games, desc: "Games: PC"}
+    - {id: 15, cat: Console/PSP, desc: "Games: PS"}
+    - {id: 12, cat: Console/PSP, desc: "Games: PSP"}
+    - {id: 44, cat: Console/Wii, desc: "Games: Wii"}
+    - {id: 13, cat: Console/XBox, desc: "Games: Xbox"}
+    - {id: 14, cat: Console/XBox 360, desc: "Games: Xbox360"}
+    - {id: 3, cat: Movies/UHD, desc: "Movies: 4K"}
    - {id: 1, cat: Movies/DVD, desc: "Movies: DVD"}
    - {id: 2, cat: Movies/SD, desc: "Movies: Divx/Xvid"}
-    - {id: 3, cat: Movies/UHD, desc: "Movies: 4K"}
    - {id: 42, cat: Movies/HD, desc: "Movies: HD"}
    - {id: 4, cat: Movies/Other, desc: "Movies: Other"}
-    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Music: Lossless"}
+    - {id: 48, cat: Movies, desc: "Movies: Packs"}
    - {id: 24, cat: Audio/Video, desc: "Music: DVD"}
-    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
-    - {id: 26, cat: Audio/Other, desc: "Music: Radio"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: Lossless"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
    - {id: 27, cat: Audio/Other, desc: "Music: Other"}
-    - {id: 33, cat: PC, desc: "Other: Emulation"}
-    - {id: 34, cat: PC/Mobile-Other, desc: "Other: PPC/PDA"}
-    - {id: 35, cat: Audio, desc: "Other: Sounds"}
+    - {id: 26, cat: Audio/Other, desc: "Music: Radio"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
    - {id: 36, cat: Books/EBook, desc: "Other: E-Books"}
+    - {id: 33, cat: PC, desc: "Other: Emulation"}
+    - {id: 39, cat: Other, desc: "Other: Extra Pars/Fills"}
    - {id: 37, cat: Other, desc: "Other: Images"}
    - {id: 38, cat: PC/Mobile-Other, desc: "Other: Mobile Phone"}
-    - {id: 39, cat: Other, desc: "Other: Extra Pars/Fills"}
    - {id: 40, cat: Other, desc: "Other: Other"}
+    - {id: 34, cat: PC/Mobile-Other, desc: "Other: PPC/PDA"}
+    - {id: 35, cat: Audio, desc: "Other: Sounds"}
    - {id: 5, cat: TV/SD, desc: "TV: DVD"}
-    - {id: 41, cat: TV/HD, desc: "TV: HD"}
    - {id: 6, cat: TV/SD, desc: "TV: Divx/Xvid"}
+    - {id: 41, cat: TV/HD, desc: "TV: HD"}
    - {id: 7, cat: TV/Other, desc: "TV: pack"}
    - {id: 47, cat: XXX, desc: "xxx: xxx"}

--- a/src/Jackett.Common/Definitions/lesaloon.yml
+++ b/src/Jackett.Common/Definitions/lesaloon.yml
@@ -96,6 +96,10 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: vfq
+    type: checkbox
+    label: Replace VFQ with FRENCH in release name
+    default: false
  - name: multilang
    type: checkbox
    label: Replace MULTI by another language in release name
@@ -157,24 +161,34 @@ search:
      filters:
        - name: querystring
          args: category
-    title_phase1:
+    title_original:
      selector: td a[href^="index.php?page=torrent-details"]
+      filters:
+        - name: replace
+          args: [".", " "]
+    title_vfq:
+      text: "{{ .Result.title_original }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\sVFQ\\s)", " FRENCH "]
+    title_step2:
+      text: "{{ if .Config.vfq }}{{ .Result.title_vfq }}{{ else }}{{ .Result.title_original }}{{ end }}"
    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
+      text: "{{ .Result.title_step2 }}"
      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_step3:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_step2 }}{{ end }}"
    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
+      text: "{{ .Result.title_step3 }}"
      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 }}"
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_step3 }}{{ end }}"
    details:
      selector: td a[href^="index.php?page=torrent-details"]
      attribute: href
--- a/src/Jackett.Common/Definitions/limetorrents.yml
+++ b/src/Jackett.Common/Definitions/limetorrents.yml
@@ -9,7 +9,7 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
  - https://www.limetorrents.pro/
-  - https://limetorrents.unblockit.how/
+  - https://limetorrents.unblockit.day/
  - https://limetorrents.unblockninja.com/
  - https://limetorrents.nocensor.biz/
 legacylinks:
@@ -17,8 +17,6 @@ legacylinks:
  - https://www.limetorrents.cc/
  - https://www.limetorrents.me/
  - https://www.limetorrents.zone/ # redirects to .info
-  - https://limetorrents.unblockit.club/
-  - https://limetorrents.unblockit.onl/
  - https://www.limetorrents.info/
  - https://www.limetorrents.asia/
  - https://www.limetorrents.co/
@@ -33,6 +31,8 @@ legacylinks:
  - https://limetorrents.unblockit.kim/
  - https://limetorrents.unblockit.bz/
  - https://limetorrents.unblockit.tv/
+  - https://limetorrents.unblockit.how/
+  - https://limetorrents.unblockit.cam/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/linkomanija.yml
+++ b/src/Jackett.Common/Definitions/linkomanija.yml
@@ -10,24 +10,24 @@ links:

 caps:
  categorymappings:
-    - {id: 29, cat: Movies/SD, desc: "movies"}
-    - {id: 52, cat: Movies/HD, desc: "movies HD"}
+    - {id: 29, cat: Movies/SD, desc: "Movies"}
+    - {id: 52, cat: Movies/HD, desc: "Movies HD"}
    - {id: 30, cat: TV/SD, desc: "TV"}
-    - {id: 60, cat: TV/HD, desc: "HD TV"}
+    - {id: 60, cat: TV/HD, desc: "TV HD"}
    - {id: 45, cat: PC/Games, desc: "PC Games"}
    - {id: 37, cat: Audio, desc: "Music"}
    - {id: 56, cat: Books, desc: "Books"}
-    - {id: 40, cat: Other/Misc, desc: "misc"}
-    - {id: 53, cat: Movies/SD, desc: "movies E"}
-    - {id: 61, cat: Movies/HD, desc: "E HD Movies"}
-    - {id: 28, cat: TV/SD, desc: "TV E"}
-    - {id: 62, cat: TV/HD, desc: "E HD TV"}
+    - {id: 40, cat: Other/Misc, desc: "Misc"}
+    - {id: 53, cat: Movies/SD, desc: "Movies LT"}
+    - {id: 61, cat: Movies/HD, desc: "Movies LT HD"}
+    - {id: 28, cat: TV/SD, desc: "TV LT"}
+    - {id: 62, cat: TV/HD, desc: "TV LT HD"}
    - {id: 63, cat: PC/Games, desc: "PC Games Misc"}
-    - {id: 33, cat: Audio, desc: "Music E"}
-    - {id: 57, cat: Books, desc: "Books E"}
-    - {id: 43, cat: Other/Misc, desc: "misc E"}
-    - {id: 51, cat: Movies/SD, desc: "movies RU"}
-    - {id: 64, cat: Movies/HD, desc: "RU Movies HD"}
+    - {id: 33, cat: Audio, desc: "Music LT"}
+    - {id: 57, cat: Books, desc: "Books LT"}
+    - {id: 43, cat: Other/Misc, desc: "Misc LT"}
+    - {id: 51, cat: Movies/SD, desc: "Movies RU"}
+    - {id: 64, cat: Movies/HD, desc: "Movies RU HD"}
    - {id: 65, cat: TV, desc: "TV RU"}
    - {id: 25, cat: Movies/DVD, desc: "DVD"}
    - {id: 42, cat: Console/XBox, desc: "XBOX"}
@@ -37,7 +37,7 @@ caps:
    - {id: 46, cat: TV/Sport, desc: "Sports"}
    - {id: 58, cat: TV/Documentary, desc: "Documentaries"}
    - {id: 38, cat: TV/Anime, desc: "Anime"}
-    - {id: 26, cat: Movies/DVD, desc: "DVD E"}
+    - {id: 26, cat: Movies/DVD, desc: "DVD LT"}
    - {id: 44, cat: Console/Other, desc: "Consoles"}
    - {id: 31, cat: Audio/Video, desc: "Music Videos"}
    - {id: 32, cat: PC/0day, desc: "Appz"}
@@ -49,6 +49,25 @@ caps:
    music-search: [q]
    book-search: [q]

+settings:
+  - name: username
+    type: text
+    label: Username
+
+  - name: password
+    type: password
+    label: Password
+
+#  - name: andmatch
+#    type: checkbox
+#    label: Accept non english characters in torrent names (get more results)
+#    default: true
+
+  - name: searchindesc
+    type: checkbox
+    label: Search in torrent description (get more results)
+    default: true
+
 login:
  path: takelogin.php
  method: post
@@ -67,11 +86,12 @@ search:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    incldead: 1
+    searchindesc: "{{ .Config.searchindesc }}"

  rows:
    selector: table> tbody > tr:has(a[href^="details?"])
-    filters:
-      - name: andmatch
+#    filters:
+#      - name: "{{ if .Config.andmatch }}andmatch{{ else }}{{ end }}" Currently, -name must be simple string, not a variable

  fields:
    category:
--- a/src/Jackett.Common/Definitions/marinetracker.yml
+++ b/src/Jackett.Common/Definitions/marinetracker.yml
@@ -41,7 +41,7 @@ caps:
    - {id: 36, cat: Books, desc: "Deckofficer's Library-Technical equipment of navigation"}
    - {id: 95, cat: Books, desc: "Deckofficer's Library-Hydrometeorology"}
    - {id: 100, cat: Books, desc: "Deckofficer's Library-Ship Theory"}
-    - {id: 110, cat: Books, desc: "Deckofficer's Library-Astronomy"}
+    - {id: 110, cat: Books, desc: "Deckofficer's Library-Nautical Astronomy"}
    - {id: 94, cat: Books, desc: "Deckofficer's Library-Nautical charts, tables, sailing directions"}
    - {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"}
@@ -122,7 +122,7 @@ caps:
    - {id: 253, cat: Books, desc: "Yachting, sailing, boating-Seamanship practice"}
    - {id: 254, cat: Books, desc: "Yachting, sailing, boating-Repair and Restoration"}
    - {id: 255, cat: Books, desc: "Yachting, sailing, boating-Sailing Alone"}
-    - {id: 256, cat: Books, desc: "Yachting, sailing, boating-Rigging, knots"}
+    - {id: 256, cat: Books, desc: "Yachting, sailing, boating-Rigging, sails, knots"}
    - {id: 252, cat: Books, desc: "Yachting, sailing, boating-Projects, design, construction"}
    - {id: 251, cat: Books, desc: "Diving"}
    - {id: 177, cat: Books, desc: "Shipmodeling"}
@@ -147,6 +147,7 @@ caps:
    - {id: 275, cat: Books, desc: "Marine History-Accidents and disasters at sea"}
    - {id: 264, cat: Books, desc: "Marine History-Marine cartography"}
    - {id: 274, cat: Books, desc: "Marine History-Pirates"}
+    - {id: 323, cat: Books, desc: "Marine History-Submarines"}
    - {id: 218, cat: Books, desc: "Maritime Fiction"}
    - {id: 198, cat: Books, desc: "Navy"}
    - {id: 272, cat: Books, desc: "Navy-Naval magazines"}
@@ -162,9 +163,12 @@ caps:
    - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
    - {id: 187, cat: Books, desc: "Others (not maritime)"}
    - {id: 162, cat: Books, desc: "Archive"}
-    - {id: 315, cat: Books, desc: "Archive-Unformed"}
+    - {id: 322, cat: Books, desc: "Archive-No seeds"}
+    - {id: 321, cat: Books, desc: "Archive-Outdated software"}
    - {id: 38, cat: Books, desc: "Archive-Uncategorized"}
-    - {id: 295, cat: Books, desc: "Archive-Unregistered releases"}
+    - {id: 295, cat: Books, desc: "Archive-Unregistered"}
+    - {id: 324, cat: Other, desc: "Posters, placards, signs"}
+#    - {id: 325, cat: Other, desc: "Corrupt torrents (hash errors)"} # we filter these out in the rows selector

  modes:
    search: [q]
@@ -243,7 +247,7 @@ search:
    submit: "%C2%A0%C2%A0Search%C2%A0%C2%A0"

  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
+    selector: tr[id^="tor_"]:has(a[href^="./download.php?id="]):not(:has(a[href="tracker.php?f=325"]))

  fields:
    title:
--- a/src/Jackett.Common/Definitions/megamixtracker.yml
+++ b/src/Jackett.Common/Definitions/megamixtracker.yml
@@ -183,6 +183,6 @@ search:
    minimumratio:
      text: 1.0
    minimumseedtime:
-      # 14 days (as seconds = 14 x 24 x 60 x 60)
-      text: 1209600
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # TBDEV custom v2.0
--- a/src/Jackett.Common/Definitions/muziekfabriek.yml
+++ b/src/Jackett.Common/Definitions/muziekfabriek.yml
@@ -40,18 +40,27 @@ caps:
    music-search: [q, artist]

 settings:
-  - name: cookie
+  - name: username
    type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
    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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.

 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
  inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
  test:
    path: /
    selector: :has(a[href="logout.php"])
--- a/src/Jackett.Common/Definitions/newpct-me.yml
+++ b/src/Jackett.Common/Definitions/newpct-me.yml
@@ -6,8 +6,10 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://www.newpct.me/
+  - https://www.newpct.net/
  - https://newpct.nocensor.biz/
+legacylinks:
+  - https://www.newpct.me/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/opencd.yml
+++ b/src/Jackett.Common/Definitions/opencd.yml
@@ -23,6 +23,9 @@ caps:
    - {id: 16, cat: Audio, desc: "独立(Indie)"}
    - {id: 17, cat: Audio, desc: "嘻哈(Hip Hop)"}
    - {id: 18, cat: Audio, desc: "音乐剧(Musical)"}
+    - {id: 19, cat: Audio, desc: "乡村(Country)"}
+    - {id: 20, cat: Audio, desc: "另类(Alternative)"}
+    - {id: 21, cat: Audio, desc: "世界音樂(World))"}
    - {id: 9, cat: Audio, desc: "其它类型(Others)"}

  modes:
@@ -30,12 +33,13 @@ caps:
    music-search: [q, artist]

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    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
@@ -62,23 +66,9 @@ settings:
      asc: asc

 login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[alt="CAPTCHA"]
-    input: imagestring
+  method: cookie
  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!"))
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
    selector: a[href="logout.php"]
@@ -122,17 +112,22 @@ search:
        td[title="独立"]: 16
        td[title="嘻哈"]: 17
        td[title="音乐剧"]: 18
+        td[title="乡村(Country)"]: 19
+        td[title="另类(Alternative)"]: 20
+        td[title="世界音樂(World)"]: 21
        td[title="其它类型"]: 9
+        # Some torrents have no title set on td
+        td:not([title]): 9
    title_default:
-      selector: a[href^="plugin_details.php?id="]
+      selector: a[href*="details.php?id="]
    title_optional:
      optional: true
-      selector: a[title][href^="plugin_details.php?id="]
+      selector: a[title][href*="details.php?id="]
      attribute: title
    title:
      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    details:
-      selector: a[href^="plugin_details.php?id="]
+      selector: a[href*="details.php?id="]
      attribute: href
    download:
      selector: a[href^="download.php?id="]
--- a/src/Jackett.Common/Definitions/oxtorrent.yml
+++ b/src/Jackett.Common/Definitions/oxtorrent.yml
@@ -7,8 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.be/
-  - https://oxtorrent.unblockit.how/
+  - https://www.oxtorrent.re/
+  - https://oxtorrent.unblockit.day/
  - https://oxtorrent.nocensor.biz/
 legacylinks:
  - https://www.oxtorrent.bz/
@@ -17,10 +17,7 @@ legacylinks:
  - https://www.oxtorrent.ph/
  - https://www.oxtorrent.pe/
  - https://www.oxtorrent.co/
-  - https://oxtorrent.unblockit.uno/
  - https://www.oxtorrent.io/
-  - https://oxtorrent.unblockit.ch/
-  - https://oxtorrent.nocensor.space/
  - https://www.oxtorrent.cx/
  - https://oxtorrent.unblockit.ws/
  - https://www.oxtorrent.nz/
@@ -31,6 +28,9 @@ legacylinks:
  - https://oxtorrent.unblockit.bz/
  - https://www.oxtorrent.vc/
  - https://oxtorrent.unblockit.tv/
+  - https://oxtorrent.unblockit.how/
+  - https://www.oxtorrent.be/
+  - https://oxtorrent.unblockit.cam/

 caps:
  categorymappings:
@@ -73,6 +73,8 @@ settings:

 download:
  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
    - selector: script:contains("magnet:?")
      filters:
        - name: regexp
--- a/src/Jackett.Common/Definitions/p2pelite.yml
+++ b/src/Jackett.Common/Definitions/p2pelite.yml
@@ -5,6 +5,8 @@ description: "P2PElite is a Private Torrent Tracker for EBOOKS / AUDIOBOOKS"
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - 62c2e785a370398cf1397ffa05423044f654c057 # expired ‎3 ‎Feb ‎2022
 links:
  - https://p2pelite.com/

--- a/src/Jackett.Common/Definitions/pier720.yml
+++ b/src/Jackett.Common/Definitions/pier720.yml
@@ -160,9 +160,9 @@ search:
      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}1 GB{{ end }}"
    seeders_optional:
      selector: dd.posts span.my_tt.seed
+      optional: true
    seeders:
      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-      optional: true
    leechers_optional:
      selector: dd.posts span.my_tt.leech
      optional: true
--- a/src/Jackett.Common/Definitions/piratbit.yml
+++ b/src/Jackett.Common/Definitions/piratbit.yml
@@ -28,6 +28,8 @@ caps:
    - {id: 1700, cat: Movies, desc: "Оформление раздач (Кино, Видео и ТВ)"}
    - {id: 3, cat: Movies, desc: "арубежные Фильмы (DVDrip, WEB-DLRip, HDrip)"}
    - {id: 1845, cat: Movies, desc: " |- Фильмы (мультфильмы) cо спонсором показа (Новинки AVI/MKV)"}
+    - {id: 1863, cat: Movies, desc: " |- Фильмы 2022 (Звук TS, Cam, VO, DVO)"}
+    - {id: 1864, cat: Movies, desc: " |- Фильмы 2022 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
    - {id: 1860, cat: Movies, desc: " |- Фильмы 2021 (Звук TS, Cam, VO, DVO)"}
    - {id: 1859, cat: Movies, desc: " |- Фильмы 2021 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
    - {id: 1856, cat: Movies, desc: " |- Фильмы 2019-2020 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
@@ -690,7 +692,7 @@ search:
    submit: "Поиск"

  rows:
-    selector: tr[id^="tor_"]
+    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"]))
    filters:
      - name: andmatch

@@ -721,27 +723,9 @@ search:
      attribute: href
    size:
      selector: td > u
-      # 2 date flavours for 3 languages
-    date_day:
-      # 15:04
-      optional: true
-      selector: td[title="Добавлен"] p:first-of-type:not(:contains("-")), td[title="Доданий"] p:first-of-type:not(:contains("-")), td[title="Added"] p:first-of-type:not(:contains("-"))
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "15:04 -07:00"
-    date_year:
-      # 15:04 24-02-19
-      optional: true
-      selector: td[title="Добавлен"] p:first-of-type:contains("-"), td[title="Доданий"] p:first-of-type:contains("-"), td[title="Added"] p:first-of-type:contains("-")
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "15:04 2-01-06 -07:00"
    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      # unix
+      selector: td[title="Добавлен"] > u
    # Russian and Ukranian and English languages are supported
    grabs:
      selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"]
--- a/src/Jackett.Common/Definitions/piratbitl.yml
+++ b/src/Jackett.Common/Definitions/piratbitl.yml
@@ -28,6 +28,8 @@ caps:
    - {id: 1700, cat: Movies, desc: "Оформление раздач (Кино, Видео и ТВ)"}
    - {id: 3, cat: Movies, desc: "арубежные Фильмы (DVDrip, WEB-DLRip, HDrip)"}
    - {id: 1845, cat: Movies, desc: " |- Фильмы (мультфильмы) cо спонсором показа (Новинки AVI/MKV)"}
+    - {id: 1863, cat: Movies, desc: " |- Фильмы 2022 (Звук TS, Cam, VO, DVO)"}
+    - {id: 1864, cat: Movies, desc: " |- Фильмы 2022 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
    - {id: 1860, cat: Movies, desc: " |- Фильмы 2021 (Звук TS, Cam, VO, DVO)"}
    - {id: 1859, cat: Movies, desc: " |- Фильмы 2021 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
    - {id: 1856, cat: Movies, desc: " |- Фильмы 2019-2020 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
@@ -704,7 +706,7 @@ search:
    submit: "Поиск"

  rows:
-    selector: tr[id^="tor_"]
+    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"]))
    filters:
      - name: andmatch

@@ -736,26 +738,9 @@ search:
    size:
      selector: td > u
      # 2 date flavours for 3 languages
-    date_day:
-      # 15:04
-      optional: true
-      selector: td[title="Добавлен"] p:first-of-type:not(:contains("-")), td[title="Доданий"] p:first-of-type:not(:contains("-")), td[title="Added"] p:first-of-type:not(:contains("-"))
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "15:04 -07:00"
-    date_year:
-      # 15:04 24-02-19
-      optional: true
-      selector: td[title="Добавлен"] p:first-of-type:contains("-"), td[title="Доданий"] p:first-of-type:contains("-"), td[title="Added"] p:first-of-type:contains("-")
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "15:04 2-01-06 -07:00"
    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      # unix
+      selector: td[title="Добавлен"] > u
    # Russian and Ukranian and English languages are supported
    grabs:
      selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"]
--- a/src/Jackett.Common/Definitions/pirateiro.yml
+++ b/src/Jackett.Common/Definitions/pirateiro.yml
@@ -1,121 +0,0 @@
---
-id: pirateiro
-name: Pirateiro
-description: "Pirateiro is a Public site for MOVIES / TV / GENERAL"
-language: en-US
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://pirateiro.com/
-  - https://pirateiro.eu/
-  - https://pirateiro.unblockit.how/
-legacylinks:
-  - http://pirateiro.com/
-  - https://pirateiro.unblockit.pw/
-  - https://pirateiro.unblockit.id/
-  - https://pirateiro.unblockit.win/
-  - https://pirateiro.unblockit.top/
-  - https://pirateiro.unblockit.lat/
-  - https://pirateiro.unblockit.app/
-  - https://pirateiro.unblockit.dev/
-  - https://pirateiro.unblockit.ltd/
-  - https://pirateiro.unblockit.link/
-  - https://pirateiro.unblockit.buzz/
-  - https://pirateiro.unblockit.club/
-  - https://pirateiro.unblockit.onl/
-  - https://pirateiro.unblockit.li/
-  - https://pirateiro.unblockit.uno/
-  - https://pirateiro.unblockit.ch/
-  - https://pirateiro.unblockit.ws/
-  - https://pirateiro.unblockit.kim/
-  - https://pirateiro.unblockit.bz/
-  - https://pirateiro.unblockit.tv/
-
-caps:
-  categorymappings:
-    - {id: cat100, cat: TV/Anime, desc: Anime}
-    - {id: cat200, cat: PC, desc: Software}
-    - {id: cat300, cat: Movies, desc: Movies}
-    - {id: cat400, cat: Console, desc: Games}
-    - {id: cat500, cat: Audio, desc: Music}
-    - {id: cat600, cat: Other, desc: Other}
-    - {id: cat700, cat: TV, desc: TV}
-    - {id: cat800, cat: XXX, desc: Adult}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: enviado
-    options:
-      enviado: created
-      seeders: seeders
-      tamanho: size
-  - 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:
-    - path: torrents/
-  inputs:
-    search: "{{ .Keywords }}"
-    orderby: "{{ .Config.sort }}"
-
-  rows:
-    selector: table.torrenttable tbody tr:has(a[href^="magnet:?xt="])
-
-  fields:
-    category:
-      selector: td:nth-child(1) a
-      attribute: class
-      filters:
-        # extract the first class
-        - name: split
-          args: [" ", 0]
-    title:
-      selector: td:nth-child(1) a:nth-child(2)
-    details:
-      selector: td:nth-child(1) a:nth-child(2)
-      attribute: href
-    download:
-      # .torrent urls can be missing
-      optional: true
-      selector: a[href$="/download"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: td:nth-child(3) span
-      attribute: title
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 15:04:05 -07:00"
-    size:
-      selector: td:nth-child(4)
-    seeders:
-      selector: td:nth-child(5)
-      filters:
-        - name: replace
-          args: [" ", ""]
-    leechers:
-      selector: td:nth-child(6)
-      filters:
-        - name: replace
-          args: [" ", ""]
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/puurhollands.yml
+++ b/src/Jackett.Common/Definitions/puurhollands.yml
@@ -23,13 +23,16 @@ caps:
    music-search: [q, artist]

 settings:
-  - name: cookie
+  - name: username
    type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
    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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
  - name: thankyou
    type: text
    label: Thank You Comment
@@ -39,9 +42,15 @@ settings:
    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.

 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
  inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
  test:
    path: index.php
    selector: a[href="logout.php"]
--- a/src/Jackett.Common/Definitions/racing4everyone-api.yml
+++ b/src/Jackett.Common/Definitions/racing4everyone-api.yml
@@ -0,0 +1,172 @@
+---
+id: racing4everyone-api
+name: Racing4Everyone (API)
+description: "Racing4Everyone (R4E) is a Private Torrent Tracker for RACING"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://racing4everyone.eu/
+legacylinks:
+  - https://racing4everyone.jp/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Sport, desc: "BTCC"}
+    - {id: 2, cat: TV/Sport, desc: "TV-Documentaries"}
+    - {id: 3, cat: TV/Sport, desc: "DTM"}
+    - {id: 22, cat: TV/Sport, desc: "Formula 2"}
+    - {id: 23, cat: TV/Sport, desc: "Formula E"}
+    - {id: 24, cat: TV/Sport, desc: "Misc"}
+    - {id: 25, cat: TV/Sport, desc: "Other Bikes"}
+    - {id: 26, cat: TV/Sport, desc: "MotoGP-2-3-E"}
+    - {id: 31, cat: TV/Sport, desc: "Nascar"}
+    - {id: 32, cat: TV/Sport, desc: "Stock Car Brazil"}
+    - {id: 50, cat: TV/Sport, desc: "WRC"}
+    - {id: 55, cat: TV/Sport, desc: "Season Reviews"}
+    - {id: 56, cat: TV/Sport, desc: "WRX"}
+    - {id: 57, cat: TV/Sport, desc: "WEC"}
+    - {id: 58, cat: TV/Sport, desc: "W Series"}
+    - {id: 60, cat: TV/Sport, desc: "Drag Racing"}
+    - {id: 61, cat: TV/Sport, desc: "ERC"}
+    - {id: 62, cat: TV/Sport, desc: "Indycar Series"}
+    - {id: 63, cat: TV/Sport, desc: "Supercars"}
+    - {id: 66, cat: TV/Sport, desc: "Documentaries"}
+    - {id: 67, cat: TV/Sport, desc: "Formula 1"}
+    - {id: 68, cat: TV/Sport, desc: "Formula 3"}
+    - {id: 69, cat: TV/Sport, desc: "Other Cars"}
+    - {id: 70, cat: TV/Sport, desc: "Motorsport Movies"}
+    - {id: 71, cat: TV/Sport, desc: "WSBK"}
+    - {id: 72, cat: TV/Sport, desc: "AMA Pro Motocross"}
+    - {id: 73, cat: TV/Sport, desc: "AMA Supercross"}
+    - {id: 74, cat: TV/Sport, desc: "WTCR"}
+    - {id: 76, cat: TV/Sport, desc: "ARCA"}
+    - {id: 77, cat: TV/Sport, desc: "Blancpain GT"}
+    - {id: 78, cat: TV/Sport, desc: "Porsche Supercup"}
+    - {id: 79, cat: TV/Sport, desc: "TV Series"}
+    - {id: 80, cat: TV/Sport, desc: "Touring Cars"}
+    - {id: 81, cat: TV/Sport, desc: "Extreme E"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://racing4everyone.eu/\" target =_blank>Racing4Everyone</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.0
+# json UNIT3D 6.0.0
--- a/src/Jackett.Common/Definitions/racing4everyone.yml
+++ b/src/Jackett.Common/Definitions/racing4everyone.yml
@@ -1,206 +0,0 @@
---
-id: racing4everyone
-name: Racing4Everyone (R4E)
-description: "Racing4Everyone (R4E) is a Private Torrent Tracker for RACING"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://racing4everyone.eu/
-legacylinks:
-  - https://racing4everyone.jp/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV/Sport, desc: "BTCC"}
-    - {id: 2, cat: TV/Sport, desc: "Documentaries TV"}
-    - {id: 3, cat: TV/Sport, desc: "DTM"}
-    - {id: 22, cat: TV/Sport, desc: "Formula 2"}
-    - {id: 23, cat: TV/Sport, desc: "Formula E"}
-    - {id: 24, cat: TV/Sport, desc: "Misc"}
-    - {id: 25, cat: TV/Sport, desc: "Other Bikes"}
-    - {id: 26, cat: TV/Sport, desc: "MotoGP 2-3-E"}
-    - {id: 31, cat: TV/Sport, desc: "Nascar"}
-    - {id: 32, cat: TV/Sport, desc: "Stock Car Brazil"}
-    - {id: 50, cat: TV/Sport, desc: "WRC"}
-    - {id: 55, cat: TV/Sport, desc: "Season Reviews"}
-    - {id: 56, cat: TV/Sport, desc: "WRX"}
-    - {id: 57, cat: TV/Sport, desc: "WEC"}
-    - {id: 58, cat: TV/Sport, desc: "W Series"}
-    - {id: 60, cat: TV/Sport, desc: "Drag Racing"}
-    - {id: 61, cat: TV/Sport, desc: "ERC"}
-    - {id: 62, cat: TV/Sport, desc: "Indycar Series"}
-    - {id: 63, cat: TV/Sport, desc: "Supercars"}
-    - {id: 66, cat: TV/Sport, desc: "Documentaries"}
-    - {id: 67, cat: TV/Sport, desc: "Formula 1"}
-    - {id: 68, cat: TV/Sport, desc: "Formula 3"}
-    - {id: 69, cat: TV/Sport, desc: "Other Cars"}
-    - {id: 70, cat: TV/Sport, desc: "Motorsport Movies"}
-    - {id: 71, cat: TV/Sport, desc: "WSBK"}
-    - {id: 72, cat: TV/Sport, desc: "AMA Pro Motocross"}
-    - {id: 73, cat: TV/Sport, desc: "AMA Supercross"}
-    - {id: 74, cat: TV/Sport, desc: "WTCR"}
-    - {id: 76, cat: TV/Sport, desc: "ARCA"}
-    - {id: 77, cat: TV/Sport, desc: "Blancpain GT"}
-    - {id: 78, cat: TV/Sport, desc: "Porsche Supercup"}
-    - {id: 79, cat: TV/Sport, desc: "TV Series"}
-    - {id: 80, cat: TV/Sport, desc: "Touring Cars"}
-    - {id: 81, cat: TV/Sport, desc: "Extreme E"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-
-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: created_at
-    options:
-      created_at: 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: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents/filter
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: time
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-# UNIT3D 2.2.7
--- a/src/Jackett.Common/Definitions/redbits-api.yml
+++ b/src/Jackett.Common/Definitions/redbits-api.yml
@@ -0,0 +1,172 @@
+---
+id: redbits-api
+name: RedBits (API)
+description: "RedBits is a SPANISH site for classic content"
+language: es-ES
+type: private
+encoding: UTF-8
+links:
+  - https://red-bits.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Películas"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 6, cat: TV/Documentary, desc: "Documentales"}
+    - {id: 7, cat: TV/Sport, desc: "Deportes"}
+    - {id: 8, cat: Movies, desc: "Hagbard"}
+    - {id: 9, cat: Movies, desc: "Studio Ghibli"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://red-bits.com/\" target =_blank>RedBits</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title_vose:
+      selector: name:contains(VOSE)
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
+        - name: re_replace
+          args: ["(?i)RedBits", ""] # Delete RedBits
+        - name: append
+          args: " English" # Add english to fix Sonarr/Radarr language
+        - name: re_replace
+          args: ["\\[|\\]", " "]
+        - name: re_replace
+          args: ["  ", " "]
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+    title_notvose:
+      selector: name:not(:contains(VOSE))
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
+        - name: re_replace
+          args: ["(?i)RedBits", ""] # Delete RedBits
+        - name: append
+          args: " Spanish" # Add spanish to fix Sonarr/Radarr language
+        - name: re_replace
+          args: ["\\[|\\]", " "]
+        - name: re_replace
+          args: ["  ", " "]
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# json UNIT3D 6.0.0
--- a/src/Jackett.Common/Definitions/redbits.yml
+++ b/src/Jackett.Common/Definitions/redbits.yml
@@ -1,226 +0,0 @@
---
-id: redbits
-name: RedBits
-description: "RedBits is a SPANISH site for classic content"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://red-bits.com/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 2, cat: TV, desc: "Series"}
-    - {id: 6, cat: TV/Documentary, desc: "Documentales"}
-    - {id: 7, cat: TV/Sport, desc: "Deportes"}
-    - {id: 8, cat: Movies, desc: "Hagbard"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-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: created_at
-    options:
-      created_at: 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: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents/filter
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)\\bS0*(\\d+)\\b", "T$1"]
-  inputs:
-    $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 }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title_vose:
-      selector: a.view-torrent:contains("VOSE")
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
-        - name: re_replace
-          args: ["(?i)RedBits", ""] # Delete RedBits
-        - name: append
-          args: " English" # Add english to fix Sonarr/Radarr language
-        - name: re_replace
-          args: ["\\[|\\]", " "]
-        - name: re_replace
-          args: ["  ", " "]
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-    title_notvose:
-      selector: a.view-torrent:not(:contains("VOSE"))
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
-        - name: re_replace
-          args: ["(?i)RedBits", ""] # Delete RedBits
-        - name: append
-          args: " Spanish" # Add spanish to fix Sonarr/Radarr language
-        - name: re_replace
-          args: ["\\[|\\]", " "]
-        - name: re_replace
-          args: ["  ", " "]
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    date:
-      selector: time
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# UNIT3D 5.1.0
--- a/src/Jackett.Common/Definitions/reelflix-api.yml
+++ b/src/Jackett.Common/Definitions/reelflix-api.yml
@@ -11,9 +11,8 @@ legacylinks:
  - https://legacyhd.org/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}

  modes:
    search: [q]
@@ -51,25 +50,47 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        Movie: 1
    title:
      selector: name
    details:
@@ -78,13 +99,11 @@ search:
      selector: download_link
    poster:
      selector: poster
-    imdbid:
-      selector: imdb_id
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
+    imdbid:
+      selector: imdb_id
    tmdbid:
      selector: tmdb_id
    tvdbid:
@@ -103,11 +122,15 @@ search:
    size:
      selector: size
    downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
    uploadvolumefactor:
      # api returns 0=false, 1=true
      selector: double_upload
@@ -119,4 +142,4 @@ search:
    minimumseedtime:
      # 5 days (as seconds = 5 x 24 x 60 x 60)
      text: 432000
-# json UNIT3D 5.3.0
+# json UNIT3D 6.0.1
--- a/src/Jackett.Common/Definitions/rintornet.yml
+++ b/src/Jackett.Common/Definitions/rintornet.yml
@@ -9,7 +9,6 @@ links:
  - https://www.rintor.net/

 caps:
-  # dont forget to update the search fields category case block
  categorymappings:
    - {id: 27, cat: XXX, desc: "Фильмы 2160 4K | Movies 2160p 4K"}
    - {id: 20, cat: XXX, desc: "Сайтрипы 2160 4K | Porn Video 2160p 4K"}
@@ -20,8 +19,8 @@ caps:
    - {id: 24, cat: XXX, desc: "Инцест (Инсценировка) | Incest (Simulation)"}
    - {id: 22, cat: XXX, desc: "Лесбиянки | Lesbians"}
    - {id: 26, cat: XXX, desc: "Порно Кастинг | Porno Casting"}
-    - {id: 29, cat: XXX, desc: "Японское Порно | Japanese Porn (Uncen)"}
-    - {id: 23, cat: XXX, desc: "Ретро Порно, Классика | Classic Porn, Retro"}
+    - {id: 29, cat: XXX, desc: "Японское (Без Цензуры) | Japanese Porn (Uncen)"}
+    - {id: 23, cat: XXX, desc: "Ретро Порно, Классика | Retro Porn, Classic"}
    - {id: 21, cat: XXX, desc: "Женское Доминирование, Страпон | Femdom, StrapOn"}
    - {id: 17, cat: XXX, desc: "БДСМ, Фистинг, Дилдо | BDSM, Fisting, Dildo"}
    - {id: 19, cat: XXX, desc: "Беременные | Pregnant"}
@@ -60,30 +59,8 @@ search:
    selector: div.entry:has(div.entry__title)

  fields:
-    category:
-      selector: div.entry__info
-      case:
-        "a:last-of-type:contains(\"Movies 2160p\")": 27
-        "a:last-of-type:contains(\"Video 2160p\")": 20
-        "a:last-of-type:contains(\"Movies HD\")": 1
-        "a:last-of-type:contains(\"SiteRips\")": 9
-        "a:last-of-type:contains(\"WEBRip\")": 12
-        "a:last-of-type:contains(\"Amateur\")": 10
-        "a:last-of-type:contains(\"Incest\")": 24
-        "a:last-of-type:contains(\"Lesbians\")": 22
-        "a:last-of-type:contains(\"Casting\")": 26
-        "a:last-of-type:contains(\"Japanese\")": 29
-        "a:last-of-type:contains(\"Classic\")": 23
-        "a:last-of-type:contains(\"Femdom\")": 21
-        "a:last-of-type:contains(\"BDSM\")": 17
-        "a:last-of-type:contains(\"Pregnant\")": 19
-        "a:last-of-type:contains(\"Bukkake\")": 28
-        "a:last-of-type:contains(\"Peeing\")": 25
-        "a:last-of-type:contains(\"Shemale\")": 16
-        "a:last-of-type:contains(\"Picture\")": 11
-        "a:last-of-type:contains(\"Cartoons\")": 14
-        "a:last-of-type:contains(\"Games\")": 13
-        "a:last-of-type:contains(\"Gay\")": 15
+    categorydesc:
+      selector: div.entry__info > span > a
    title:
      selector: div.entry__title > h3 > a
    details:
--- a/src/Jackett.Common/Definitions/rutracker-ru.yml
+++ b/src/Jackett.Common/Definitions/rutracker-ru.yml
@@ -11,6 +11,12 @@ links:
 caps:
  categorymappings:
    # Кинематограф movies
+    - {id: 1677, cat: Movies, desc: "Кинематограф Зарубежные новинки (2022)"}
+    - {id: 1676, cat: Movies, desc: "Кинематограф Российские новинки (2022)"}
+    - {id: 1675, cat: Movies/HD, desc: "Кинематограф Зарубежные новинки в 720p (2022)"}
+    - {id: 1674, cat: Movies/HD, desc: "Кинематограф Российские новинки в 720p (2022)"}
+    - {id: 1673, cat: Movies/HD, desc: "Кинематограф Зарубежные новинки в 1080p (2022)"}
+    - {id: 1672, cat: Movies/HD, desc: "Кинематограф Российские новинки в 1080р (2022)"}
    - {id: 1656, cat: Movies, desc: "Новинки (2021)"}
    - {id: 1662, cat: Movies, desc: " |- Зарубежные новинки (2021)"}
    - {id: 1661, cat: Movies, desc: " |- Российские новинки (2021)"}
--- a/src/Jackett.Common/Definitions/shareisland-api.yml
+++ b/src/Jackett.Common/Definitions/shareisland-api.yml
@@ -12,7 +12,6 @@ legacylinks:
  - http://www.shareisland.org/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movie"}
    - {id: 2, cat: TV, desc: "Serie TV"}
@@ -59,14 +58,33 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1

  keywordsfilters:
    - name: diacritics
@@ -78,21 +96,13 @@ search:

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        "Movie": 1
-        "Serie TV": 2
-        "Ebook": 15
-        "Riviste e Giornali": 17
-        "XXX": 19
-        "Music": 3
-        "Games": 7
-        "Software": 23
    title:
      selector: name
      filters:
@@ -128,8 +138,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
@@ -150,11 +158,15 @@ search:
    size:
      selector: size
    downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
    uploadvolumefactor:
      # api returns 0=false, 1=true
      selector: double_upload
@@ -167,4 +179,4 @@ search:
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 5.3.0
+# json UNIT3D 6.0.0
--- a/src/Jackett.Common/Definitions/showrss.yml
+++ b/src/Jackett.Common/Definitions/showrss.yml
@@ -0,0 +1,59 @@
+---
+id: showrss
+name: showRSS
+description: "showRSS is a service that allows you to keep track of your favorite TV shows"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://showrss.info/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/SD}
+    - {id: 2, cat: TV/HD}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+settings: []
+
+search:
+  paths:
+    - path: /other/all.rss
+      response:
+        type: xml
+
+  rows:
+    selector: rss > channel > item
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: raw_title
+      filters:
+      case:
+        ":contains(\"720p\")": 2
+        ":contains(\"1080p\")": 2
+        "*": 1
+    title:
+      selector: raw_title
+    details:
+      text: "{{ .Config.sitelink }}"
+    date:
+      selector: pubDate
+    download:
+      selector: link
+    size:
+      text: "512 MB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/skipthecommercials-api.yml
+++ b/src/Jackett.Common/Definitions/skipthecommercials-api.yml
@@ -9,7 +9,6 @@ links:
  - https://skipthecommericals.xyz/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 2, cat: TV, desc: "TV Show"}

@@ -25,7 +24,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://datascene.xyz/\" target =_blank>DataScene</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://skipthecommericals.xyz/\" target =_blank>SkipTheCommercials</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -47,14 +46,33 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1

  keywordsfilters:
    - name: re_replace
@@ -62,14 +80,13 @@ search:

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        "TV Show": 2
    title:
      selector: name
    details:
@@ -81,8 +98,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
@@ -103,15 +118,22 @@ search:
    size:
      selector: size
    downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
    uploadvolumefactor:
      # api returns 0=false, 1=true
      selector: double_upload
      case:
        0: 1 # normal
        1: 2 # double
-# json UNIT3D 5.3.0
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 6.0.0
--- a/src/Jackett.Common/Definitions/slosoul.yml
+++ b/src/Jackett.Common/Definitions/slosoul.yml
@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 testlinktorrent: false
+certificates:
+  - 86140a5aa0b0646ad79fe2f2bcd75ea5f9cedbda # Expired ‎27 ‎Jan ‎2022
 links:
  - https://slosoul.net/
 legacylinks:
--- a/src/Jackett.Common/Definitions/solidtorrents.yml
+++ b/src/Jackett.Common/Definitions/solidtorrents.yml
@@ -6,6 +6,8 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
+  - https://solidtorrents.to/
+legacylinks:
  - https://solidtorrents.net/

 caps:
@@ -72,7 +74,7 @@ search:
    order: "{{ .Config.type }}"

  rows:
-    selector: div.search-result
+    selector: li.search-result:has(a[class="dl-torrent"])

  fields:
    category:
--- a/src/Jackett.Common/Definitions/spidertk.yml
+++ b/src/Jackett.Common/Definitions/spidertk.yml
@@ -25,8 +25,10 @@ caps:
    - {id: 421, cat: Movies/SD, desc: "Films / XviD"}
    - {id: 422, cat: Movies/HD, desc: "Films / HDTV / 1080p"}
    - {id: 440, cat: Movies/HD, desc: "Films / HDTV / 720p"}
+    - {id: 463, cat: Movies/WEB-DL, desc: "Films / WEB / 2160p"}
    - {id: 423, cat: Movies/WEB-DL, desc: "Films / WEB / 1080p"}
    - {id: 458, cat: Movies/WEB-DL, desc: "Films / WEB / 720p"}
+    - {id: 462, cat: Movies/WEB-DL, desc: "Films / WEB / SD"}
    - {id: 424, cat: TV/Documentary, desc: "Films / Documentaire"}
    - {id: 425, cat: TV/Sport, desc: "Films / Sport"}
    - {id: 426, cat: Movies, desc: "Films / Animation"}
@@ -44,6 +46,7 @@ caps:
    - {id: 437, cat: TV/Anime, desc: "Séries / Pack Animé"}
    - {id: 438, cat: TV/Anime, desc: "Séries / Animé VF"}
    - {id: 439, cat: TV/Anime, desc: "Séries / Animé VOSTFR"}
+    - {id: 461, cat: TV, desc: "Séries / VO"}
    - {id: 441, cat: TV/Documentary, desc: "Séries / Documentaire"}
    - {id: 442, cat: TV/Sport, desc: "Séries / Sport"}
    - {id: 443, cat: TV, desc: "Séries / Émission TV"}
@@ -71,13 +74,19 @@ caps:
    book-search: [q]

 settings:
-  - name: cookie
+  - name: username
    type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
    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>"
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the SpiderTK Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -104,9 +113,26 @@ settings:
      asc: asc

 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
  inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: ""
+  error:
+    - selector: td.embedded:has(h2:contains("Echoué")) # invalid captcha
+    - selector: td.embedded:has(h2:contains("Échec")) # invalid uid or pwd
+      message:
+        selector: td.text
  test:
    path: index.php
    selector: a[href="logout.php"]
--- a/src/Jackett.Common/Definitions/swarmazon.yml
+++ b/src/Jackett.Common/Definitions/swarmazon.yml
@@ -9,7 +9,6 @@ links:
  - https://swarmazon.club/

 caps:
-  # dont forget to update the search fields category case block
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "Television"}
@@ -56,7 +55,7 @@ login:

 search:
  paths:
-    - path: "{{ if .Keywords }}en/search/search.php?category=all&query={{ .Keywords }}&limit=50{{ else }}index.php?date_range=14{{ end }}"
+    - path: "{{ if .Keywords }}en/search/search.php?category=all&query={{ .Keywords }}{{ else }}latest.php?date_range=14{{ end }}"

  rows:
    selector: table.table-striped > tbody > tr
@@ -64,19 +63,14 @@ search:
      - name: andmatch

  fields: # some users (rank specific?) have an extra column (td:nth-child(4)) with bookmark features
-    category:
-      selector: td.Name
-      case:
-        "small:contains(\"in Movies\")": 1
-        "small:contains(\"in Television\")": 2
-        "small:contains(\"in Video Courses\")": 3
-        "small:contains(\"in Music\")": 4
-        "small:contains(\"in Games\")": 5
-        "small:contains(\"in Software\")": 6
-        "small:contains(\"in Anime\")": 7
-        "small:contains(\"in E-Books\")": 8
-        "small:contains(\"in Audio Books\")": 9
-        "small:contains(\"in Comics\")": 10
+    categorydesc:
+      selector: td.Name small
+      filters:
+        - name: re_replace
+          args: ["(.+?)in\\s(.+?)", "$2"]
+        - name: replace
+          args: ["Freeleech", ""]
+        - name: trim
    title:
      selector: a[href*="/view/torrent.php?hash="]
    details:
--- a/src/Jackett.Common/Definitions/tasmanit.yml
+++ b/src/Jackett.Common/Definitions/tasmanit.yml
@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
  - https://tasmanit.es/
+certificates:
+  - 23C30AC9655A8A7351A549538062B8C6B0D01A78 # expired 24 Jan 2022

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/tellytorrent-api.yml
+++ b/src/Jackett.Common/Definitions/tellytorrent-api.yml
@@ -13,7 +13,6 @@ legacylinks:
  - https://telly.to/

 caps:
-  # dont forget to update the case block in the search fields category
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movie"}
    - {id: 2, cat: TV, desc: "TV"}
@@ -59,32 +58,47 @@ settings:
      desc: desc
      asc: asc

+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
 search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]

  rows:
    selector: data
+    attribute: attributes
    count:
      selector: meta.total

  fields:
-    category:
+    categorydesc:
      selector: category
-      case:
-        "Movie": 1
-        "TV": 2
-        "Music": 3
-        "Web Originals": 4
-        "Games": 5
-        "Application": 6
-        "Mobile App": 7
-        "Movies": 8
    title:
      selector: name
    details:
@@ -96,8 +110,6 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
    imdbid:
      selector: imdb_id
    tmdbid:
@@ -118,11 +130,15 @@ search:
    size:
      selector: size
    downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
    uploadvolumefactor:
      # api returns 0=false, 1=true
      selector: double_upload
@@ -135,4 +151,4 @@ search:
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 5.3.0
+# json UNIT3D 6.0.0
--- a/src/Jackett.Common/Definitions/teracod.yml
+++ b/src/Jackett.Common/Definitions/teracod.yml
@@ -4,7 +4,7 @@ name: teracod
 description: "teracod (Movie Zone) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
 language: hu-HU
 type: private
-encoding: iso-8859-2
+encoding: UTF-8
 links:
  - https://teracod.net/
 legacylinks:
--- a/src/Jackett.Common/Definitions/the-devils-lounge.yml
+++ b/src/Jackett.Common/Definitions/the-devils-lounge.yml
@@ -1,194 +0,0 @@
---
-id: the-devils-lounge
-name: The-Devils-Lounge
-description: "The-Devils-Lounge is a Private torrent site for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://the-devils-lounge.xyz/
-
-caps:
-  categorymappings:
-    - {id: 39, cat: Audio/Audiobook, desc: "Abook: Abook"}
-    - {id: 1, cat: PC/0day, desc: "Application: 0-Day"}
-    - {id: 2, cat: PC, desc: "Application: Pc"}
-    - {id: 3, cat: PC/Mac, desc: "Application: Mac"}
-    - {id: 38, cat: Books/EBook, desc: "Ebooks: Ebook"}
-    - {id: 32, cat: TV/Anime, desc: "Episodes: Anime"}
-    - {id: 33, cat: TV, desc: "Episodes: Classic"}
-    - {id: 34, cat: TV/Foreign, desc: "Episodes: Foreign"}
-    - {id: 35, cat: TV/HD, desc: "Episodes: TvHD"}
-    - {id: 36, cat: TV/SD, desc: "Episodes: TvSD"}
-    - {id: 37, cat: TV/Sport, desc: "Episodes: TVsports"}
-    - {id: 22, cat: PC/Games, desc: "Games: Pc"}
-    - {id: 23, cat: Console/PS4, desc: "Games: Ps4"}
-    - {id: 24, cat: Console/PS3, desc: "Games: Ps3"}
-    - {id: 25, cat: Console/PSP, desc: "Games: Ps1"}
-    - {id: 26, cat: Console/PSP, desc: "Games: Ps2"}
-    - {id: 27, cat: Console/PSP, desc: "Games: PsP"}
-    - {id: 28, cat: Console/XBox, desc: "Games: xbox"}
-    - {id: 29, cat: Console/Wii, desc: "Games: Wii"}
-    - {id: 30, cat: Console/NDS, desc: "Games: Nintendo"}
-    - {id: 31, cat: Console/Other, desc: "Games: Dreamcast"}
-    - {id: 4, cat: Movies/HD, desc: "Movies: 1080P"}
-    - {id: 5, cat: TV/Anime, desc: "Movies: Anime"}
-    - {id: 6, cat: Movies/DVD, desc: "Movies: DvdR"}
-    - {id: 7, cat: Movies/SD, desc: "Movies: Camer"}
-    - {id: 8, cat: Movies/3D, desc: "Movies: 3D"}
-    - {id: 9, cat: Movies/WEB-DL, desc: "Movies: WEBRip"}
-    - {id: 10, cat: XXX, desc: "Movies: XxX"}
-    - {id: 11, cat: Movies/UHD, desc: "Movies: Real-4K"}
-    - {id: 12, cat: Movies, desc: "Movies: Classic"}
-    - {id: 13, cat: Movies/Foreign, desc: "Movies: Foreign"}
-    - {id: 14, cat: Movies, desc: "Movies: Remux"}
-    - {id: 15, cat: Movies/HD, desc: "Movies: HD"}
-    - {id: 16, cat: Movies/SD, desc: "Movies: SD"}
-    - {id: 17, cat: Movies, desc: "Movies: Packs"}
-    - {id: 18, cat: Movies, desc: "Movies: Animation"}
-    - {id: 19, cat: Audio, desc: "Music: Audio"}
-    - {id: 20, cat: Audio, desc: "Music: Packs"}
-    - {id: 21, cat: Audio/Video, desc: "Music: Video"}
-
-  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: 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 }}"
-    returnto: /
-  error:
-    - selector: div.myFrame:contains("Access Denied")
-  test:
-    path: /
-    selector: a[href="account-logout.php"]
-
-download:
-  before:
-    path: thanks.php
-    method: post
-    inputs:
-      torrent: "{{ .DownloadUri.Query.id }}"
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  # https://the-devils-lounge.xyz/torrents.php?search=&cat=0&incldead=0&freeleech=0&inclexternal=0&lang=0
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    cat: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 both, 1 local, 2 external
-    inclexternal: 0
-    # 0 all, 1 English, 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  # does not support imdbid searching or display imdbid links.
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: tr.t-row
-
-  fields:
-    category:
-      selector: td a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td a[href^="torrents-details.php?id="]
-    details:
-      selector: td a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: td a[href^="torrents-details.php?id="]
-      attribute: href
-    poster:
-      selector: td a[href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "img\\ssrc=\\\\'(http.+?)\\\\'"
-    date:
-      selector: td a[href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Date\\sAdded\\s:(\\d{2}-\\d{2}-\\d{4})"
-        - name: dateparse
-          args: "02-01-2006"
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7) font:first-of-type
-      filters:
-        - name: replace
-          args: [",", ""]
-    leechers:
-      selector: td:nth-child(7) font:last-of-type
-      filters:
-        - name: replace
-          args: [",", ""]
-    description:
-      selector: td:last-of-type img
-      attribute: title
-    downloadvolumefactor:
-      case:
-        img[src$="/images/free.gif"]: 0
-        td:last-of-type img[title="Extern"]: 0 # all external torrents are free
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# FMEDition 3 (TorrentTrader)
--- a/src/Jackett.Common/Definitions/thehorrorcharnel.yml
+++ b/src/Jackett.Common/Definitions/thehorrorcharnel.yml
@@ -5,6 +5,8 @@ description: "The Horror Charnel (THC) is a Private Torrent Tracker for HORROR /
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - ffcfcef31cc501c935dedfeae5be2aff9ebcd19f # expired ‎‎23 ‎Jan ‎2022
 links:
  - https://horrorcharnel.org/

--- a/Show More
+++ b/Show More