jme-reunit3d: moved to API. resolves #13043

dark-shadow: changed cat
marinetracker: add new cat
2025-09-14 16:04:11 +02:00 · 2022-04-10 17:05:22 +12:00 · 2022-04-10 16:30:20 +12:00 · 2022-04-10 16:22:18 +12:00 · 2022-04-10 16:16:54 +12:00 · 2022-04-10 16:12:04 +12:00
182 changed files with 8366 additions and 5676 deletions
--- 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,6 +52,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ConCen
 * cpasbien
 * cpasbienClone
+ * CrackingPatching
 * Demonoid
 * DivxTotal
 * dmhy
@@ -68,11 +68,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * FireBit
 * freshMeat
 * Frozen Layer
+ * FTUApps
 * GamesTorrents
 * GkTorrent
 * GloDLS
 * GTorrent.pro
- * HDhouse (HDReactor)
 * IBit
 * Idope
 * Il CorSaRo Blu
@@ -80,9 +80,9 @@ 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
 * Legit Torrents
 * LePorno.info
 * LimeTorrents
@@ -92,11 +92,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * MegaPeer
 * MejorTorrent
 * Mikan
+ * MioBT
 * MixTapeTorrent
 * MoviesDVDR
 * MovieTorrent
 * MyPornClub
- * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
 * NewPCT.me
 * Newstudio
 * Nipponsei
@@ -127,7 +127,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * RuTor
 * RuTracker.RU
 * seleZen
- * Sexxi
 * Sexy-Pics
 * ShizaProject
 * ShowRSS
@@ -139,7 +138,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Tokyo Tosho
 * Torlock
 * Torlook
- * TOROS
 * Torrent Downloads (TD)
 * Torrent Oyun indir
 * torrent.by
@@ -151,7 +149,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentGalaxy (TGx)
 * TorrentKitty
 * TorrentMafya
- * TorrentMax (토렌트맥스)
 * TorrentParadise
 * TorrentProject2
 * TorrentQQ (토렌트큐큐)
@@ -166,6 +163,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * UnionDHT
 * VSTHouse
 * VST Torrents
+ * xBiT
 * xxxAdultTorrent
 * xxxtor
 * xxxtorrents
@@ -182,7 +180,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Anime-Free
 * AnimeLayer
 * ArenaBG
- * BaibaKo
 * BookTracker
 * BootyTape
 * Catorrent
@@ -193,6 +190,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * EniaHD
 * ExKinoRay
 * ExtremlymTorrents
+ * Fenyarnyek-Tracker
 * Fou-Du-Cinema
 * Gay-Torrents.net
 * Genesis-Movement
@@ -217,6 +215,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * RGFootball
 * RiperAM
 * RockBox
+ * RUDUB (ex-BaibaKoTV)
 * RuTracker
 * Rustorka
 * Sharewood
@@ -255,6 +254,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * AmigosShareClub
 * anasch.cc
 * AnimeBytes (AB)
+ * AnimeItalia
 * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
 * AnimeWorld [![(invite needed)][inviteneeded]](#)
 * Anthelion
@@ -274,7 +274,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Bit-Bázis
 * Bit-City Reloaded
 * BIT-HDTV
- * BiT-TiTAN
 * BitBR
 * Bitded
 * Bithorlo (BHO)
@@ -301,7 +300,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Carp-Hunter
 * Carpathians
 * CartoonChaos (CC)
- * CasaTorrent [![(invite needed)][inviteneeded]](#)
 * Cathode-Ray.Tube (CRT)
 * CCFBits [![(invite needed)][inviteneeded]](#)
 * CeskeForum
@@ -323,7 +321,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * DANISH BYTES
 * Darius Tracker
 * Dark-Shadow
- * Dark Tracker
 * DataScene (DS)
 * DataTalli
 * DesiTorrents
@@ -344,7 +341,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Falkon Vision Team
 * FANO.IN [![(invite needed)][inviteneeded]](#)
 * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
- * Fantastiko [![(invite needed)][inviteneeded]](#)
+ * Fantastiko
 * Femdomcult
 * FileList (FL)
 * Film-Paleis
@@ -356,7 +353,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]](#)
@@ -396,6 +393,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HDZone
 * Hebits
 * HellasTZ
+ * Hidden-Palace
+ * House of Devil
 * HQSource (HQS)
 * Il Corsaro Verde
 * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -404,10 +403,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Immortuos [![(invite needed)][inviteneeded]](#)
 * Insane Tracker
 * IPTorrents (IPT)
+ * JME-REUNIT3D
 * JPopsuki [![(invite needed)][inviteneeded]](#)
 * JPTV
 * Karagarga
 * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * Korsar
 * KrazyZone
 * LastFiles
 * Lat-Team [![(invite needed)][inviteneeded]](#)
@@ -500,13 +501,14 @@ 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
 * Shazbat [![(invite needed)][inviteneeded]](#)
 * SiamBIT
 * SkipTheCommercials
+ * SkipTheTrailers
 * slosoul
 * SnowPT (SSPT)
 * SoulVoice
@@ -524,11 +526,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Swarmazon
 * Tapochek
 * Tasmanit [![(invite needed)][inviteneeded]](#)
+ * Team CT Game (TCTG)
 * TeamHD
 * TeamOS
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * TellyTorrent
 * teracod (Movie Zone)
+ * The-Crazy-Ones
+ * The-New-Fun
 * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
 * The Geeks
 * The Horror Charnel (THC)
@@ -571,6 +576,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
@@ -578,7 +584,6 @@ 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
 * UnionGang [![(invite needed)][inviteneeded]](#)
 * UnlimitZ
 * Vizuk
@@ -664,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/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -8,17 +8,13 @@ encoding: UTF-8
 followredirect: true
 links:
  - https://1337x.to/
-  - https://1337x.gd/
  - https://1337x.st/
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337x.unblockit.how/
-  - https://1337x.nocensor.biz/
+  - https://1337x.unblockit.day/
+  - https://1337x.nocensor.sbs/
 legacylinks:
-  - https://1337x.unblockit.app/
-  - https://1337.root.yt/
-  - https://1337x.unblocked.rest/
  - https://1337x.unblockit.dev/
  - https://1337x.unblockit.ltd/
  - https://1337x.unblockit.link/
@@ -36,6 +32,10 @@ legacylinks:
  - https://1337x.unblockit.kim/
  - https://1337x.unblockit.bz/
  - https://1337x.unblockit.tv/
+  - https://1337x.unblockit.how/
+  - https://1337x.unblockit.cam/
+  - https://1337x.nocensor.biz/
+  - https://1337x.gd/

 caps:
  categorymappings:
@@ -128,6 +128,10 @@ caps:
    book-search: [q]

 settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
  - name: downloadlink
    type: select
    label: Download link
--- a/src/Jackett.Common/Definitions/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -115,7 +115,7 @@ search:
      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td.rowfollow:nth-last-of-type(7) > span[title]
+      selector: td.rowfollow:nth-last-of-type(6) > span[title]
      attribute: title
      optional: true
      filters:
@@ -125,7 +125,7 @@ search:
          args: "2006-01-02 15:04:05 -07:00"
    date_added:
      # time added
-      selector: td.rowfollow:nth-last-of-type(7):not(:has(span))
+      selector: td.rowfollow:nth-last-of-type(6):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -135,13 +135,13 @@ search:
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
-      selector: td.rowfollow:nth-last-of-type(6)
-    seeders:
      selector: td.rowfollow:nth-last-of-type(5)
-    leechers:
+    seeders:
      selector: td.rowfollow:nth-last-of-type(4)
-    grabs:
+    leechers:
      selector: td.rowfollow:nth-last-of-type(3)
+    grabs:
+      selector: td.rowfollow:nth-last-of-type(2)
    downloadvolumefactor:
      case:
        img.pro_free: 0
--- 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
@@ -71,13 +71,27 @@ 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

@@ -115,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.5
--- 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/animeitalia.yml
+++ b/src/Jackett.Common/Definitions/animeitalia.yml
@@ -0,0 +1,155 @@
+---
+id: animeitalia
+name: AnimeItalia
+description: "AnimeItalia is an ITALIAN Private Torrent Tracker for ANIME"
+language: it-IT
+type: private
+encoding: UTF-8
+links:
+  - https://animeitalia.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Film ITA"}
+    - {id: 2, cat: TV, desc: "Serie TV"}
+    - {id: 3, cat: Audio, desc: "Musica"}
+    - {id: 4, cat: Console, desc: "Giochi"}
+    - {id: 5, cat: PC, desc: "Programmi"}
+    - {id: 6, cat: TV/Anime, desc: "Anime SUB-ITA"}
+    - {id: 7, cat: TV/Anime, desc: "Anime ITA"}
+    - {id: 8, cat: Movies/Other, desc: "Film Anime SUB-ITA"}
+    - {id: 9, cat: Movies/Other, desc: "Film Anime ITA"}
+    - {id: 10, cat: Books/Comics, desc: "Manga ITA"}
+    - {id: 11, cat: Books/Comics, desc: "Manga ENG"}
+    - {id: 12, cat: Audio, desc: "Anime Music"}
+    - {id: 13, cat: Other, desc: "Foto Anime"}
+    - {id: 14, cat: XXX/Other, desc: "Hentai SUB-ITA"}
+    - {id: 15, cat: XXX/Other, desc: "Hentai ITA"}
+    - {id: 16, cat: XXX/ImageSet, desc: "Foto Hentai"}
+
+  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://animeitalia.org/\" target =_blank>AnimeItalia</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.4
--- a/src/Jackett.Common/Definitions/animeworld-api.yml
+++ b/src/Jackett.Common/Definitions/animeworld-api.yml
@@ -76,13 +76,23 @@ 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

@@ -120,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
@@ -134,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/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -47,6 +47,7 @@ caps:
    - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
    - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
    - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
+    - {id: 111, cat: TV, desc: "2022 رمضان (2022 Ramadan)"}
    # المرئيات الاجنبية Foreign Movies
    - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
    - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -9,10 +9,9 @@ links:
  - 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/
@@ -30,6 +29,8 @@ legacylinks:
  - 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/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -7,9 +7,10 @@ type: public
 encoding: UTF-8
 links:
  - https://badasstorrents.com/
-  - https://badasstorrents.nocensor.biz/
+  - https://badasstorrents.nocensor.sbs/
 legacylinks:
  - https://badasstorrents.nocensor.work/
+  - https://badasstorrents.nocensor.biz/

 caps:
  categories:
--- 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
@@ -1,184 +0,0 @@
---
-id: bit-titan
-name: BiT-TiTAN
-description: "BiT-TiTAN is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://bit-titan.net/
-
-caps:
-  categorymappings:
-    - {id: 1010, cat: Movies/UHD, desc: "Movies 2160p"}
-    - {id: 1020, cat: Movies/HD, desc: "Movies 1080p"}
-    - {id: 1030, cat: Movies/HD, desc: "Movies 720p"}
-    - {id: 1040, cat: Movies/HD, desc: "Movies x264"}
-    - {id: 1050, cat: Movies/HD, desc: "Movies x265"}
-    - {id: 1060, cat: Movies/SD, desc: "Movies XviD"}
-    - {id: 1070, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 1080, cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: 1090, cat: Movies/BluRay, desc: "Movies BluRay"}
-    - {id: 1100, cat: Movies/DVD, desc: "Movies HD2DVD"}
-    - {id: 1110, cat: Movies/Foreign, desc: "Movies International"}
-    - {id: 1120, cat: Movies/HD, desc: "Movies HD Packs"}
-    - {id: 1130, cat: Movies/SD, desc: "Movies SD Packs"}
-    - {id: 2010, cat: TV/UHD, desc: "TV 2160p"}
-    - {id: 2020, cat: TV/HD, desc: "TV 1080p"}
-    - {id: 2030, cat: TV/HD, desc: "TV 720p"}
-    - {id: 2040, cat: TV/HD, desc: "TV x264"}
-    - {id: 2050, cat: TV/HD, desc: "TV x265"}
-    - {id: 2060, cat: TV/SD, desc: "TV XviD"}
-    - {id: 2070, cat: TV/HD, desc: "TV HD Packs"}
-    - {id: 2080, cat: TV/SD, desc: "TV SD Packs"}
-    - {id: 2090, cat: TV/Foreign, desc: "TV International"}
-    - {id: 3010, cat: TV/Documentary, desc: "Docu 2160p"}
-    - {id: 3020, cat: TV/Documentary, desc: "Docu 1080p"}
-    - {id: 3030, cat: TV/Documentary, desc: "Docu 720p"}
-    - {id: 3040, cat: TV/Documentary, desc: "Docu x264"}
-    - {id: 3050, cat: TV/Documentary, desc: "Docu x265"}
-    - {id: 3060, cat: TV/Documentary, desc: "Docu XviD"}
-    - {id: 3070, cat: TV/Documentary, desc: "Docu HD Packs"}
-    - {id: 3080, cat: TV/Documentary, desc: "Docu SD Packs"}
-    - {id: 3090, cat: TV/Documentary, desc: "Docu International"}
-    - {id: 4010, cat: TV/Sport, desc: "Sport 2160p"}
-    - {id: 4020, cat: TV/Sport, desc: "Sport 1080p"}
-    - {id: 4030, cat: TV/Sport, desc: "Sport 720p"}
-    - {id: 4040, cat: TV/Sport, desc: "Sport SD Sport"}
-    - {id: 4050, cat: TV/Sport, desc: "Sport HD Packs"}
-    - {id: 4060, cat: TV/Sport, desc: "Sport SD Packs"}
-    - {id: 5010, cat: XXX, desc: "XXX 2160p"}
-    - {id: 5020, cat: XXX, desc: "XXX 1080p"}
-    - {id: 5030, cat: XXX, desc: "XXX 720p"}
-    - {id: 5040, cat: XXX, desc: "XXX x264"}
-    - {id: 5050, cat: XXX, desc: "XXX x265"}
-    - {id: 5060, cat: XXX, desc: "XXX XviD"}
-    - {id: 5070, cat: XXX, desc: "XXX HD Packs"}
-    - {id: 5080, cat: XXX, desc: "XXX SD Packs"}
-    - {id: 5090, cat: XXX, desc: "XXX Sonstiges"}
-    - {id: 6010, cat: PC/Games, desc: "Games Windows"}
-    - {id: 6020, cat: Console, desc: "Games Linux"}
-    - {id: 6030, cat: PC/Mac, desc: "Games MacOS"}
-    - {id: 6040, cat: PC/Mobile-Android, desc: "Games Android"}
-    - {id: 6050, cat: Console/XBox, desc: "Games Xbox"}
-    - {id: 6060, cat: Console/PSP, desc: "Games PlayStation"}
-    - {id: 6070, cat: Console/NDS, desc: "Games Nintendo"}
-    - {id: 6080, cat: Console, desc: "Games Sonstige"}
-    - {id: 7010, cat: PC/0day, desc: "Software Windows"}
-    - {id: 7020, cat: PC, desc: "Software Linux"}
-    - {id: 7030, cat: PC/Mac, desc: "Software MacOS"}
-    - {id: 7040, cat: PC/Mobile-Android, desc: "Software Android"}
-    - {id: 8010, cat: Audio/MP3, desc: "Music MP3-Album"}
-    - {id: 8020, cat: Audio/MP3, desc: "Music MP3-Charts"}
-    - {id: 8030, cat: Audio/MP3, desc: "Music MP3-Sampler"}
-    - {id: 8040, cat: Audio/MP3, desc: "Music MP3-Single"}
-    - {id: 8050, cat: Audio/Lossless, desc: "Music FLAC-Album"}
-    - {id: 8060, cat: Audio/Lossless, desc: "Music FLAC-Charts"}
-    - {id: 8070, cat: Audio/Lossless, desc: "Music FLAC-Sampler"}
-    - {id: 8080, cat: Audio/Lossless, desc: "Music FLAC-Single"}
-    - {id: 8090, cat: Audio/Video, desc: "Music Video"}
-    - {id: 9010, cat: Audio/Audiobook, desc: "Books A-Book"}
-    - {id: 9020, cat: Books/EBook, desc: "Books E-Book"}
-    - {id: 9030, cat: Books, desc: "Books E-Paper"}
-    - {id: 9040, cat: Books, desc: "Books E-Learning"}
-    - {id: 9060, cat: TV/Anime, desc: "Anime HD"}
-    - {id: 9070, cat: TV/Anime, desc: "Anime SD"}
-    - {id: 9080, cat: TV/Anime, desc: "Anime Pack"}
-    - {id: 9999, cat: Other, desc: "unsort"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    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 key <a href=\"https://bit-titan.net/api_cp.php\" target =_blank>here</a>."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      2: seeders
-      5: size
-      9: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-search:
-  paths:
-    - path: api.php
-      response:
-        type: json
-
-  inputs:
-    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: "{{ 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
-    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
-    orderBy: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-
-  rows:
-    selector: results
-    count:
-      selector: filesFound
-
-  fields:
-    id:
-      selector: id
-    category:
-      selector: category
-    title:
-      selector: name
-    details:
-      text: "details.php?id={{ .Result.id }}"
-    download:
-      selector: download
-    poster:
-      selector: poster
-    seeders:
-      selector: seeds
-    leechers:
-      selector: leechers
-    grabs:
-      selector: snatchers
-    date:
-      # unix
-      selector: added
-    size:
-      selector: size
-    downloadvolumefactor:
-      selector: downloadFactor
-    uploadvolumefactor:
-      selector: uploadFactor
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# json engine v.2.011.021
--- a/src/Jackett.Common/Definitions/bitbazis.yml
+++ b/src/Jackett.Common/Definitions/bitbazis.yml
@@ -4,7 +4,6 @@ name: Bit-Bázis
 description: "Bit-Bázis is a HUNGARIAN Private Tracker for MOVIES / TV"
 language: hu-HU
 type: private
-# encoding: ISO-8859-2
 encoding: UTF-8
 links:
  - https://bitbazis.net/
@@ -19,9 +18,10 @@ caps:
    - {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: 94, cat: Movies/HD, desc: "Film/FHD/Hun"}
+    - {id: 95, cat: Movies/HD, desc: "Film/FHD/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: 58, cat: TV, desc: "Sorozat/Eng"}
    - {id: 69, cat: TV/Anime, desc: "Mese/SD"}
@@ -36,12 +36,13 @@ caps:
    - {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: 64, cat: Movies, desc: "Film/Pack"}
    - {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: 67, cat: PC/Mobile-Android, desc: "Program/Android"}
    - {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"}
@@ -129,28 +130,19 @@ search:
    size:
      selector: td:nth-child(6)
    date:
-      # 2021-11-09 16:51:24
+      # 2022<br>03/15.
      selector: td:nth-child(7)
      filters:
        - name: append
          args: " +01:00" # CET
        - name: dateparse
-          args: "06/01/02 -07:00"
+          args: "200601/02. -07:00"
    grabs:
      selector: td:nth-child(5)
-      filters:
-        - name: regexp
-          args: "D:(\\d+)"
    seeders:
      selector: td:nth-child(3)
-      filters:
-        - name: regexp
-          args: "S:(\\d+)"
    leechers:
      selector: td:nth-child(4)
-      filters:
-        - name: regexp
-          args: "L:(\\d+)"
    downloadvolumefactor:
      case:
        "i:contains(\"(Free)\")": 0
--- a/src/Jackett.Common/Definitions/bitbr.yml
+++ b/src/Jackett.Common/Definitions/bitbr.yml
@@ -18,9 +18,12 @@ caps:
    - {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: 412, cat: Other, desc: "Scripts PHP"}
+    - {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"}
--- a/src/Jackett.Common/Definitions/bitcityreloaded.yml
+++ b/src/Jackett.Common/Definitions/bitcityreloaded.yml
@@ -136,7 +136,7 @@ search:
        - name: dateparse
          args: "02.01.2006 15:04:05 -07:00"
    size:
-      selector: table tbody tr:nth-of-type(2) td b
+      selector: table tbody tr:nth-of-type(2) > td > b
    files:
      selector: td:has(a[href*="&filelist=1"])> b:nth-child(2)
    grabs:
--- a/src/Jackett.Common/Definitions/bitsearch.yml
+++ b/src/Jackett.Common/Definitions/bitsearch.yml
@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
  - https://bitsearch.to/
+  - https://bitsearch.nocensor.sbs/
+legacylinks:
  - https://bitsearch.nocensor.biz/

 caps:
@@ -72,8 +74,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 +90,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/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -66,7 +66,7 @@ search:
    - 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 }}"
@@ -83,12 +83,13 @@ search:

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

  fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
    title:
      selector: name
    details:
@@ -141,4 +142,4 @@ search:
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 6.0.0 beta
+# json UNIT3D 6.0.6 beta
--- a/src/Jackett.Common/Definitions/brsociety-api.yml
+++ b/src/Jackett.Common/Definitions/brsociety-api.yml
@@ -15,6 +15,7 @@ caps:
    - {id: 5, cat: Books/Mags, desc: "Revistas"}
    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
    - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
+    - {id: 6, cat: Other, desc: "Graduação"}

  modes:
    search: [q]
@@ -67,10 +68,10 @@ 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

@@ -93,6 +94,8 @@ 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/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -100,7 +100,7 @@ search:
    by: "{{ .Config.type }}"

  rows:
-    selector: "table.lista tr td table.lista tr:has(a[href^=\"index.php?page=torrent-details\"]){{ if .Config.freeleech }}:has(img[src=\"gold/gold.gif\"]){{ else }}{{ end }}"
+    selector: "table.lista tr td table.lista tr:has(a[href^=\"index.php?page=torrent-details\"]):not(:has(a[href=\"index.php?page=torrents&category=0\"])){{ if .Config.freeleech }}:has(img[src=\"gold/gold.gif\"]){{ else }}{{ end }}"

  fields:
    category:
--- a/src/Jackett.Common/Definitions/casatorrent.yml
+++ b/src/Jackett.Common/Definitions/casatorrent.yml
@@ -1,213 +0,0 @@
---
-id: casatorrent
-name: Casa-Torrent
-description: "Casa-Torrent is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://tctg.in/
-legacylinks:
-  - https://teamctgame.co/
-  - http://teamctgame.xyz/
-  - https://teamctgame.xyz/
-
-caps:
-  categorymappings:
-    - {id: 65, cat: Movies/HD, desc: "BD: BD"}
-    - {id: 68, cat: Books/Mags, desc: "Ebooks:  Presse"}
-    - {id: 90, cat: Audio/Audiobook, desc: "Ebooks: Audio books"}
-    - {id: 56, cat: Books/EBook, desc: "Ebooks: Ebooks"}
-    - {id: 95, cat: Books/Comics, desc: "Ebooks: Mangas"}
-    - {id: 84, cat: XXX, desc: "Ebooks: XXX"}
-    - {id: 54, cat: Movies/3D, desc: "Films: 3D"}
-    - {id: 53, cat: Movies/HD, desc: "Films: 4K"}
-    - {id: 77, cat: Movies/UHD, desc: "Films: 4K-HDR"}
-    - {id: 82, cat: Movies/UHD, desc: "Films: 4K-light"}
-    - {id: 50, cat: Movies/UHD, desc: "Films: 4K-Remux"}
-    - {id: 61, cat: Movies, desc: "Films: Animation"}
-    - {id: 48, cat: Movies/BluRay, desc: "Films: BDRip / BRRip"}
-    - {id: 78, cat: Movies/DVD, desc: "Films: DVD-R"}
-    - {id: 47, cat: Movies/DVD, desc: "Films: DVDRip"}
-    - {id: 71, cat: Movies/BluRay, desc: "Films: Full Bluray"}
-    - {id: 63, cat: Movies/HD, desc: "Films: HD TV"}
-    - {id: 52, cat: Movies/HD, desc: "Films: HD.1080p"}
-    - {id: 51, cat: Movies/HD, desc: "Films: HD.720p"}
-    - {id: 80, cat: Movies/HD, desc: "Films: HDLiGHT / M-HD"}
-    - {id: 87, cat: Movies/HD, desc: "Films: HDRiP"}
-    - {id: 60, cat: Movies, desc: "Films: Pack"}
-    - {id: 96, cat: Movies, desc: "Films: Remux"}
-    - {id: 75, cat: TV, desc: "Films: TVRiP"}
-    - {id: 98, cat: Movies, desc: "Films: VFSTFR"}
-    - {id: 89, cat: Movies, desc: "Films: VO"}
-    - {id: 55, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 58, cat: Movies/WEB-DL, desc: "Films: Web - DL"}
-    - {id: 57, cat: Movies/WEB-DL, desc: "Films: WebRip"}
-    - {id: 72, cat: Movies/HD, desc: "Films: x265"}
-    - {id: 1, cat: XXX, desc: "Films: XXX"}
-    - {id: 97, cat: Console, desc: "Jeux : Android"}
-    - {id: 81, cat: Console, desc: "Jeux : Consoles"}
-    - {id: 66, cat: PC/Games, desc: "Jeux: PC"}
-    - {id: 62, cat: PC/0day, desc: "Logiciels:  Windows"}
-    - {id: 99, cat: Other, desc: "Logiciels: Graph / Wallpaper"}
-    - {id: 94, cat: TV/HD, desc: "Series: 4K HDR"}
-    - {id: 93, cat: TV/Anime, desc: "Series: Animés"}
-    - {id: 86, cat: TV/HD, desc: "Series: Episode HD"}
-    - {id: 101, cat: TV/HD, desc: "Series: Episode HD Vostfr"}
-    - {id: 85, cat: TV/SD, desc: "Series: Episode SD"}
-    - {id: 102, cat: TV/SD, desc: "Series: Episode SD Vostfr"}
-    - {id: 100, cat: TV/HD, desc: "Series: Tv - Pack HD"}
-    - {id: 103, cat: TV/HD, desc: "Series: Tv - Pack HD Vostfr"}
-    - {id: 59, cat: TV/SD, desc: "Series: Tv - Pack SD"}
-    - {id: 104, cat: TV/SD, desc: "Series: Tv - Pack SD Vostfr"}
-    - {id: 88, cat: TV, desc: "Spectacles: Tous"}
-    - {id: 83, cat: TV, desc: "TV:  Emissions"}
-    - {id: 73, cat: TV/Documentary, desc: "TV: Documentaires"}
-    - {id: 74, cat: TV/Sport, desc: "TV: Sports"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: p#msgError
-  test:
-    path: torrents-search.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr.t-row
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_phase1:
-      selector: a[href^="torrents-details.php?id="] b
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/uploads/images/"]
-      attribute: src
-    grabs:
-      selector: a[onmouseover][href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Snatched: </b>(\\d+)<br"
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    date:
-      selector: a[onmouseover][href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "le: </b>(.*?)<br"
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02-01-2006 -07:00"
-    downloadvolumefactor:
-      case:
-        img[src="images/free.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- 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/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/crazyspirits.yml
+++ b/src/Jackett.Common/Definitions/crazyspirits.yml
@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
  - https://www.crazyspirits.com/
+certificates:
+  - cb68471b631304b3b4cec6315cfbad5a6780eb84 # self-signed 13 Mar 2022

 caps:
  categorymappings:
--- 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.96
--- 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: 128, cat: Movies/HD, desc: "Internal Film HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
    - {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(\"Film HD\"))": 128
+        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serie 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(\"Serien SD\"))": 131
        ":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/darktracker.yml
+++ b/src/Jackett.Common/Definitions/darktracker.yml
@@ -1,800 +0,0 @@
---
-id: darktracker
-name: Dark Tracker
-description: "Dark Tracker is a RUSSIAN Semi-Private Torrent Tracker for 0DAY / GENERAL"
-language: ru-RU
-type: semi-private
-encoding: UTF-8
-links:
-  - https://darkos.club/
-  - https://dark-os.com/
-
-caps:
-  categorymappings:
-    - {id: 511, cat: Movies/HD, desc: "Форум HD Video/RIP"}
-    # 3D
-    - {id: 801, cat: Movies/3D, desc: " | Фильмы в формате 3D"}
-    - {id: 802, cat: Movies/3D, desc: " | Мультфильмы в формате 3D"}
-    - {id: 803, cat: Movies/3D, desc: " | Музыкальные клипы и концерты в формате 3D"}
-    - {id: 800, cat: Movies/3D, desc: "Релизы Blu-ray disc 3D (iso)"}
-    - {id: 815, cat: Movies/3D, desc: " | Фильмы в формате 3D (iso)"}
-    - {id: 814, cat: Movies/3D, desc: " | Мультфильмы в формате 3D (iso)"}
-    - {id: 813, cat: Movies/3D, desc: " | Музыкальные клипы и концерты в формате 3D (iso)"}
-    - {id: 1046, cat: Movies/3D, desc: "Архив"}
-    # Кино, Видео и ТВ
-    # Cinema, Video and TV
-    - {id: 1055, cat: Movies, desc: "Новинки проката"}
-    - {id: 1058, cat: Movies, desc: " | Портал для новинок"}
-    - {id: 1056, cat: Movies/SD, desc: " | Новинки (CamRip|TS)"}
-    - {id: 1057, cat: Movies/WEB-DL, desc: " | Новинки (HD|DVD|BD|WEB|TV|SAT|PDTV|-Rip)"}
-    - {id: 1059, cat: Movies, desc: " | Новинки (BD|HDTV|DVD)"}
-    - {id: 57, cat: Movies, desc: "Зарубежные фильмы"}
-    - {id: 1021, cat: Movies, desc: " | Фильмы 2011-2020"}
-    - {id: 63, cat: Movies, desc: " | Фильмы 2001-2010"}
-    - {id: 60, cat: Movies, desc: " | Фильмы до 2000 года"}
-    - {id: 1114, cat: Movies/HD, desc: " | Зарубежное кино (HD Video)"}
-    - {id: 65, cat: Movies, desc: " | Антология зарубежного кино"}
-    - {id: 515, cat: Movies, desc: " | Зарубежные Фильмы для детей"}
-    - {id: 85, cat: Movies, desc: "Отечественные фильмы"}
-    - {id: 90, cat: Movies, desc: " | Фильмы 2011-2020"}
-    - {id: 89, cat: Movies, desc: " | Фильмы 2001-2010"}
-    - {id: 88, cat: Movies, desc: " | Фильмы до 2000 года"}
-    - {id: 1115, cat: Movies/HD, desc: " | Отечественное кино (HD Video)"}
-    - {id: 516, cat: Movies, desc: " | Отечественные Фильмы для детей"}
-    - {id: 378, cat: TV, desc: "Сериалы"}
-    - {id: 281, cat: TV, desc: " | Отечественные cериалы"}
-    - {id: 277, cat: TV, desc: " | Зарубежные сериалы"}
-    - {id: 377, cat: TV, desc: "Мультфильмы"}
-    - {id: 106, cat: TV, desc: " | Отечественные мультфильмы"}
-    - {id: 108, cat: TV, desc: " | Иностранные мультфильмы"}
-    - {id: 280, cat: TV, desc: " | Мультсериалы"}
-    - {id: 92, cat: TV, desc: "DVD и HD Video"}
-    - {id: 99, cat: Movies, desc: " | Зарубежное кино"}
-    - {id: 97, cat: Movies, desc: " | Наше кино"}
-    - {id: 100, cat: TV, desc: " | Мультфильмы"}
-    - {id: 98, cat: Audio/Video, desc: " | Музыкальные клипы и концерты"}
-    - {id: 95, cat: TV, desc: " | Антология"}
-    - {id: 788, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"}
-    - {id: 1024, cat: TV/Documentary, desc: " | National Geographic"}
-    - {id: 1023, cat: TV/Documentary, desc: " | Discovery"}
-    - {id: 1022, cat: TV/Documentary, desc: " | Animal Planet"}
-    - {id: 790, cat: TV/Documentary, desc: " | BBC"}
-    - {id: 789, cat: TV/Documentary, desc: " | Среда Обитания"}
-    - {id: 70, cat: TV, desc: "Развлекательные телепередачи, юмор"}
-    - {id: 742, cat: TV, desc: " | Развлекательные телепередачи и шоу, приколы и юмор"}
-    - {id: 475, cat: TV/Anime, desc: "Аниме"}
-    - {id: 485, cat: TV/Anime, desc: " | Правила и FAQ"}
-    - {id: 484, cat: TV/Anime, desc: " | Аниме основной подраздел"}
-    - {id: 477, cat: TV/Anime, desc: " | Dorama и live-action"}
-    - {id: 483, cat: TV/Anime, desc: " | OST"}
-    - {id: 482, cat: TV/Anime, desc: " | Манга"}
-    - {id: 481, cat: TV/Anime, desc: " | Клипы"}
-    - {id: 480, cat: TV/Anime, desc: " | Фэндом"}
-    - {id: 478, cat: TV/Anime, desc: " | Полнометражные"}
-    - {id: 479, cat: TV/Anime, desc: " | Онгоинги"}
-    - {id: 827, cat: Other, desc: "Обучающее видео"}
-    - {id: 456, cat: Other, desc: "Мобильное видео"}
-    - {id: 101, cat: Other, desc: "Дополнительные материалы к фильмам"}
-    - {id: 1017, cat: Other, desc: " | Трейлеры"}
-    - {id: 270, cat: Other, desc: "Архив"}
-    # Игры для PC
-    # PC Games
-    - {id: 25, cat: PC/Games, desc: "Горячие новинки"}
-    - {id: 829, cat: PC/Games, desc: " | Пиратки"}
-    - {id: 707, cat: PC/Games, desc: " | Лицензии"}
-    - {id: 706, cat: PC/Games, desc: " | RePack"}
-    - {id: 708, cat: PC/Games, desc: "Demo/Beta версии Игр"}
-    - {id: 709, cat: PC/Games, desc: "Аркады"}
-    - {id: 711, cat: PC/Games, desc: " | Аркады (разное)"}
-    - {id: 710, cat: PC/Games, desc: " | Настольные и карточные аркады"}
-    - {id: 712, cat: PC/Games, desc: "Приключения и квесты"}
-    - {id: 713, cat: PC/Games, desc: "Стратегии"}
-    - {id: 716, cat: PC/Games, desc: " | TBS (пошаговые стратегии)"}
-    - {id: 715, cat: PC/Games, desc: " | RTS (стратегии в реальном времени)"}
-    - {id: 714, cat: PC/Games, desc: " | Экономические стратегии"}
-    - {id: 717, cat: PC/Games, desc: "Симуляторы"}
-    - {id: 721, cat: PC/Games, desc: " | Спортивные симуляторы"}
-    - {id: 720, cat: PC/Games, desc: " | Космические и Авиа симуляторы"}
-    - {id: 719, cat: PC/Games, desc: " | Гоночные симуляторы"}
-    - {id: 718, cat: PC/Games, desc: " | Прочие симуляторы"}
-    - {id: 722, cat: PC/Games, desc: "Action"}
-    - {id: 724, cat: PC/Games, desc: " | FPS (1st Person)"}
-    - {id: 723, cat: PC/Games, desc: " | TPS (3rd Person)"}
-    - {id: 725, cat: PC/Games, desc: "RPG"}
-    - {id: 726, cat: PC/Games, desc: "Эротические игры"}
-    - {id: 727, cat: PC/Games, desc: "Многопользовательские игры"}
-    - {id: 728, cat: PC/Games, desc: " | MMORPG"}
-    - {id: 729, cat: PC/Games, desc: "Для самых маленьких"}
-    - {id: 793, cat: PC/Games, desc: "Аниме-игры"}
-    - {id: 730, cat: PC/Games, desc: "Старые игры для PC"}
-    - {id: 458, cat: PC/Games, desc: "Игры для Apple"}
-    - {id: 508, cat: PC/Games, desc: "Игры для Linux"}
-    - {id: 731, cat: PC/Games, desc: "Прочее"}
-    - {id: 830, cat: PC/Games, desc: " | Дополнения"}
-    - {id: 737, cat: PC/Games, desc: " | Таблетки"}
-    - {id: 736, cat: PC/Games, desc: " | Моды"}
-    - {id: 735, cat: PC/Games, desc: " | Русификаторы"}
-    - {id: 734, cat: PC/Games, desc: " | Патчи"}
-    - {id: 733, cat: PC/Games, desc: " | Бонусные диски / Комплекты предзаказов"}
-    - {id: 738, cat: PC/Games, desc: "Игровое видео"}
-    - {id: 740, cat: PC/Games, desc: " | Трейлеры/Геймплей видео"}
-    - {id: 739, cat: PC/Games, desc: " | Видео прохождения игр"}
-    - {id: 269, cat: PC/Games, desc: "Архив"}
-    # Консоли
-    # Console
-    - {id: 679, cat: Console/XBox, desc: "XBox"}
-    - {id: 684, cat: Console/XBox, desc: " | XBox360 | Игры"}
-    - {id: 683, cat: Console/XBox, desc: " | XBox360 | Демоверсии"}
-    - {id: 682, cat: Console/XBox, desc: " | Xbox360 | Live"}
-    - {id: 681, cat: Console/XBox, desc: " | XBox360 | Программы / Прошивки"}
-    - {id: 680, cat: Console/XBox, desc: " | XBox | Игры"}
-    - {id: 685, cat: Console/PS3, desc: "PlayStation"}
-    - {id: 694, cat: Console/PS3, desc: " | Playstation 3 | Игры"}
-    - {id: 693, cat: Console/PS3, desc: " | Playstation 3 | PSN Игры"}
-    - {id: 692, cat: Console/PS3, desc: " | Playstation 3 | Разное"}
-    - {id: 691, cat: Console/PS3, desc: " | PlayStation 2 | Игры"}
-    - {id: 690, cat: Console/PS3, desc: " | PlayStation 2 | Разное"}
-    - {id: 689, cat: Console/PS3, desc: " | PlayStation 1 | Игры"}
-    - {id: 688, cat: Console/PSP, desc: " | PSP | Игры"}
-    - {id: 687, cat: Console/PSP, desc: " | PSP | Программы / Прошивки"}
-    - {id: 686, cat: Console/PSP, desc: " | PSX-PSP"}
-    - {id: 695, cat: Console/NDS, desc: "Nintendo"}
-    - {id: 699, cat: Console/NDS, desc: " | Nintendo DS | Игры"}
-    - {id: 698, cat: Console, desc: " | GameCube | Игры"}
-    - {id: 697, cat: Console/Wii, desc: " | Wii | Игры"}
-    - {id: 696, cat: Console, desc: " | Nintendo | Разное"}
-    - {id: 700, cat: Console, desc: "Sega"}
-    - {id: 792, cat: Console, desc: "Архив"}
-    # Музыка
-    # Music
-    - {id: 537, cat: Audio/MP3, desc: "Russian (MP3)"}
-    - {id: 538, cat: Audio/MP3, desc: " | Pop"}
-    - {id: 539, cat: Audio/MP3, desc: " | Rock"}
-    - {id: 540, cat: Audio/MP3, desc: " | Metal"}
-    - {id: 545, cat: Audio/MP3, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 544, cat: Audio/MP3, desc: " | Electronic"}
-    - {id: 543, cat: Audio/MP3, desc: " | Шансон"}
-    - {id: 542, cat: Audio/MP3, desc: " | Авторская песня"}
-    - {id: 541, cat: Audio/MP3, desc: " | Музыка других жанров"}
-    - {id: 546, cat: Audio/MP3, desc: "World Pop (MP3)"}
-    - {id: 547, cat: Audio/MP3, desc: " | World Pop"}
-    - {id: 551, cat: Audio/MP3, desc: " | Latin Pop"}
-    - {id: 550, cat: Audio/MP3, desc: " | Dance"}
-    - {id: 549, cat: Audio/MP3, desc: " | Asian Pop"}
-    - {id: 548, cat: Audio/MP3, desc: " | 50 / 50"}
-    - {id: 552, cat: Audio/MP3, desc: "Rock (MP3)"}
-    - {id: 557, cat: Audio/MP3, desc: " | Rock"}
-    - {id: 556, cat: Audio/MP3, desc: " | Metal"}
-    - {id: 555, cat: Audio/MP3, desc: " | Alternative"}
-    - {id: 554, cat: Audio/MP3, desc: " | Punk Rock"}
-    - {id: 553, cat: Audio/MP3, desc: " | Rock 'n' Rol"}
-    - {id: 558, cat: Audio/MP3, desc: "Hip-Hop (MP3)"}
-    - {id: 561, cat: Audio/MP3, desc: " | Rap"}
-    - {id: 560, cat: Audio/MP3, desc: " | R&B"}
-    - {id: 559, cat: Audio/MP3, desc: " | Funk, Soul"}
-    - {id: 562, cat: Audio/MP3, desc: "Electronic (MP3)"}
-    - {id: 570, cat: Audio/MP3, desc: " | Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub"}
-    - {id: 569, cat: Audio/MP3, desc: " | Drum & Bass, Jungle, Breakbeat, Dubstep, IDM"}
-    - {id: 568, cat: Audio/MP3, desc: " | House, Techno/MP3, Hardcore, Hardstyle, Jumpstyle"}
-    - {id: 567, cat: Audio/MP3, desc: " | Lo-Fi, Chillout, Lounge, Downtempo/MP3, Trip-Hop, Nu Jazz"}
-    - {id: 566, cat: Audio/MP3, desc: " | Radioshows, Podcasts, Live Sets, Mixes"}
-    - {id: 565, cat: Audio/MP3, desc: " | Traditional Electronic, Ambient, Experimental"}
-    - {id: 564, cat: Audio/MP3, desc: " | Industrial, Noise, EBM, Dark Electro/MP3, New Wave,..."}
-    - {id: 563, cat: Audio/MP3, desc: " | Newage, Relax"}
-    - {id: 571, cat: Audio/MP3, desc: "Classical (MP3)"}
-    - {id: 574, cat: Audio/MP3, desc: " | Instrumental"}
-    - {id: 573, cat: Audio/MP3, desc: " | Orchestral"}
-    - {id: 572, cat: Audio/MP3, desc: " | Vocal"}
-    - {id: 575, cat: Audio/MP3, desc: "Jazz & Blues & Country (MP3)"}
-    - {id: 577, cat: Audio/MP3, desc: " | Blues"}
-    - {id: 578, cat: Audio/MP3, desc: " | Jazz"}
-    - {id: 579, cat: Audio/MP3, desc: " | Swing"}
-    - {id: 580, cat: Audio/MP3, desc: "Reggae, Latin, Ethnik (MP3)"}
-    - {id: 581, cat: Audio/MP3, desc: " | Reggae"}
-    - {id: 576, cat: Audio/MP3, desc: " | Country"}
-    - {id: 582, cat: Audio/MP3, desc: " | Latin"}
-    - {id: 583, cat: Audio/MP3, desc: " | Ethnic"}
-    - {id: 584, cat: Audio/MP3, desc: "Soundtracks (MP3)"}
-    - {id: 587, cat: Audio/MP3, desc: " | Games"}
-    - {id: 586, cat: Audio/MP3, desc: " | Anime"}
-    - {id: 585, cat: Audio/MP3, desc: " | Movies"}
-    - {id: 588, cat: Audio/MP3, desc: "Discographies (MP3)"}
-    - {id: 598, cat: Audio/MP3, desc: " | Russian Pop"}
-    - {id: 597, cat: Audio/MP3, desc: " | World Pop"}
-    - {id: 596, cat: Audio/MP3, desc: " | Rock"}
-    - {id: 595, cat: Audio/MP3, desc: " | Russian Rock"}
-    - {id: 594, cat: Audio/MP3, desc: " | Russian Metal"}
-    - {id: 593, cat: Audio/MP3, desc: " | Metal"}
-    - {id: 591, cat: Audio/MP3, desc: " | Electronic"}
-    - {id: 592, cat: Audio/MP3, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 590, cat: Audio/MP3, desc: " | World Music from other genres"}
-    - {id: 589, cat: Audio/MP3, desc: " | Музыка других жанров"}
-    - {id: 599, cat: Audio/Lossless, desc: "Russian (LOSSLESS)"}
-    - {id: 607, cat: Audio/Lossless, desc: " | Pop"}
-    - {id: 606, cat: Audio/Lossless, desc: " | Rock"}
-    - {id: 605, cat: Audio/Lossless, desc: " | Metal"}
-    - {id: 604, cat: Audio/Lossless, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 603, cat: Audio/Lossless, desc: " | Electronic"}
-    - {id: 602, cat: Audio/Lossless, desc: " | Шансон"}
-    - {id: 601, cat: Audio/Lossless, desc: " | Авторская песня"}
-    - {id: 600, cat: Audio/Lossless, desc: " | Музыка других жанров"}
-    - {id: 608, cat: Audio/Lossless, desc: "World Pop (LOSSLESS)"}
-    - {id: 613, cat: Audio/Lossless, desc: " | World Pop"}
-    - {id: 612, cat: Audio/Lossless, desc: " | Latin Pop"}
-    - {id: 611, cat: Audio/Lossless, desc: " | Dance"}
-    - {id: 610, cat: Audio/Lossless, desc: " | Asian Pop"}
-    - {id: 609, cat: Audio/Lossless, desc: " | 50 / 50"}
-    - {id: 614, cat: Audio/Lossless, desc: "Rock (LOSSLESS)"}
-    - {id: 619, cat: Audio/Lossless, desc: " | Rock"}
-    - {id: 618, cat: Audio/Lossless, desc: " | Metal"}
-    - {id: 617, cat: Audio/Lossless, desc: " | Alternative"}
-    - {id: 616, cat: Audio/Lossless, desc: " | Punk Rock"}
-    - {id: 615, cat: Audio/Lossless, desc: " | Rock 'n' Rol"}
-    - {id: 620, cat: Audio/Lossless, desc: "Hip-Hop (LOSSLESS)"}
-    - {id: 623, cat: Audio/Lossless, desc: " | Rap"}
-    - {id: 622, cat: Audio/Lossless, desc: " | R&B"}
-    - {id: 621, cat: Audio/Lossless, desc: " | Funk, Soul"}
-    - {id: 624, cat: Audio/Lossless, desc: "Electronic (LOSSLESS)"}
-    - {id: 632, cat: Audio/Lossless, desc: " | Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub"}
-    - {id: 631, cat: Audio/Lossless, desc: " | Drum & Bass, Jungle, Breakbeat, Dubstep, IDM"}
-    - {id: 630, cat: Audio/Lossless, desc: " | House, Techno/Lossless, Hardcore, Hardstyle, Jumpstyle"}
-    - {id: 629, cat: Audio/Lossless, desc: " | Lo-Fi, Chillout, Lounge, Downtempo/Lossless, Trip-Hop, Nu Jazz"}
-    - {id: 628, cat: Audio/Lossless, desc: " | Radioshows, Podcasts, Live Sets, Mixes"}
-    - {id: 627, cat: Audio/Lossless, desc: " | Traditional Electronic, Ambient, Experimental"}
-    - {id: 626, cat: Audio/Lossless, desc: " | Industrial, Noise, EBM, Dark Electro/Lossless, Aggrotech,..."}
-    - {id: 625, cat: Audio/Lossless, desc: " | Newage, Relax"}
-    - {id: 633, cat: Audio/Lossless, desc: "Classical (LOSSLESS)"}
-    - {id: 636, cat: Audio/Lossless, desc: " | Instrumental"}
-    - {id: 635, cat: Audio/Lossless, desc: " | Orchestral"}
-    - {id: 634, cat: Audio/Lossless, desc: " | Vocal"}
-    - {id: 637, cat: Audio/Lossless, desc: "Jazz & Blues & Country (LOSSLESS)"}
-    - {id: 641, cat: Audio/Lossless, desc: " | Swing"}
-    - {id: 640, cat: Audio/Lossless, desc: " | Jazz"}
-    - {id: 639, cat: Audio/Lossless, desc: " | Blues"}
-    - {id: 638, cat: Audio/Lossless, desc: " | Country"}
-    - {id: 642, cat: Audio/Lossless, desc: "Reggae, Latin, Ethnik (LOSSLESS)"}
-    - {id: 645, cat: Audio/Lossless, desc: " | Ethnic"}
-    - {id: 644, cat: Audio/Lossless, desc: " | Latin"}
-    - {id: 643, cat: Audio/Lossless, desc: " | Reggae"}
-    - {id: 646, cat: Audio/Lossless, desc: "Soundtracks (LOSSLESS)"}
-    - {id: 649, cat: Audio/Lossless, desc: " | Games"}
-    - {id: 648, cat: Audio/Lossless, desc: " | Anime"}
-    - {id: 647, cat: Audio/Lossless, desc: " | Movies"}
-    - {id: 650, cat: Audio/Lossless, desc: "Discographies (LOSSLESS)"}
-    - {id: 660, cat: Audio/Lossless, desc: " | Russian Pop"}
-    - {id: 659, cat: Audio/Lossless, desc: " | World Pop"}
-    - {id: 658, cat: Audio/Lossless, desc: " | Rock"}
-    - {id: 656, cat: Audio/Lossless, desc: " | Russian Metal"}
-    - {id: 655, cat: Audio/Lossless, desc: " | Metal"}
-    - {id: 657, cat: Audio/Lossless, desc: " | Russian Rock"}
-    - {id: 654, cat: Audio/Lossless, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 653, cat: Audio/Lossless, desc: " | Electronic"}
-    - {id: 652, cat: Audio/Lossless, desc: " | World Music from other genres"}
-    - {id: 651, cat: Audio/Lossless, desc: " | Музыка других жанров"}
-    - {id: 826, cat: Audio/Lossless, desc: "Music from other genres (LOSSLESS)"}
-    - {id: 447, cat: Audio/Lossless, desc: "Multichannel Music"}
-    - {id: 663, cat: Audio, desc: " | DVD-Audio, SACD, Audio-DVD"}
-    - {id: 662, cat: Audio, desc: " | DTS"}
-    - {id: 661, cat: Audio, desc: " | Vinyl-Rip и Hand-Made"}
-    - {id: 449, cat: Audio, desc: " | Зарубежная"}
-    - {id: 448, cat: Audio, desc: " | Отечественная"}
-    - {id: 445, cat: Audio, desc: "Concert Recording & Musical films (Documentary)"}
-    - {id: 674, cat: Audio, desc: " | New Concert Recording"}
-    - {id: 673, cat: Audio, desc: " | Rock"}
-    - {id: 672, cat: Audio, desc: " | Metal"}
-    - {id: 671, cat: Audio, desc: " | World Pop"}
-    - {id: 670, cat: Audio, desc: " | Музыка других жанров"}
-    - {id: 664, cat: Audio/Video, desc: "Clips"}
-    - {id: 669, cat: Audio/Video, desc: " | New Clips"}
-    - {id: 668, cat: Audio/Video, desc: " | Rock"}
-    - {id: 667, cat: Audio/Video, desc: " | Metal"}
-    - {id: 666, cat: Audio/Video, desc: " | World Pop"}
-    - {id: 665, cat: Audio/Video, desc: " | Музыка других жанров"}
-    - {id: 455, cat: Audio, desc: "Apple Lossless"}
-    - {id: 446, cat: Audio, desc: "Karaoke"}
-    - {id: 272, cat: Audio, desc: "Архив"}
-    # Спорт
-    # Sport
-    - {id: 495, cat: TV/Sport, desc: "Футбол"}
-    - {id: 755, cat: TV/Sport, desc: " | Чемпионат России"}
-    - {id: 754, cat: TV/Sport, desc: " | Чемпионат Украины"}
-    - {id: 753, cat: TV/Sport, desc: " | Чемпионат Испании"}
-    - {id: 752, cat: TV/Sport, desc: " | Чемпионат Англии"}
-    - {id: 751, cat: TV/Sport, desc: " | Чемпионат Италии"}
-    - {id: 750, cat: TV/Sport, desc: " | Чемпионат Германии"}
-    - {id: 749, cat: TV/Sport, desc: " | Чемпионат Франции"}
-    - {id: 748, cat: TV/Sport, desc: " | Другие чемпионаты"}
-    - {id: 505, cat: TV/Sport, desc: " | Лига Чемпионов"}
-    - {id: 747, cat: TV/Sport, desc: " | Лига Европы"}
-    - {id: 497, cat: TV/Sport, desc: " | Чемпионат мира"}
-    - {id: 498, cat: TV/Sport, desc: " | Чемпионат Европы"}
-    - {id: 496, cat: TV/Sport, desc: " | Международные матчи"}
-    - {id: 513, cat: TV/Sport, desc: " | Товарищеские матчи"}
-    - {id: 746, cat: TV/Sport, desc: " | Пляжный футбол"}
-    - {id: 745, cat: TV/Sport, desc: " | Мини-футбол"}
-    - {id: 499, cat: TV/Sport, desc: " | Обзорные и аналитические передачи"}
-    - {id: 744, cat: TV/Sport, desc: " | Футбольное видео, прочее о футболе"}
-    - {id: 500, cat: TV/Sport, desc: "Хоккей"}
-    - {id: 760, cat: TV/Sport, desc: " | КХЛ"}
-    - {id: 759, cat: TV/Sport, desc: " | NHL"}
-    - {id: 758, cat: TV/Sport, desc: " | Европейские клубные чемпионаты"}
-    - {id: 757, cat: TV/Sport, desc: " | Чемпионат Мира"}
-    - {id: 756, cat: TV/Sport, desc: " | Международные турниры"}
-    - {id: 501, cat: TV/Sport, desc: "Баскетбол"}
-    - {id: 763, cat: TV/Sport, desc: " | NBA"}
-    - {id: 762, cat: TV/Sport, desc: " | Европейский клубный баскетбол"}
-    - {id: 761, cat: TV/Sport, desc: " | Международные турниры"}
-    - {id: 502, cat: TV/Sport, desc: "Теннис"}
-    - {id: 768, cat: TV/Sport, desc: " | ATP World Tour"}
-    - {id: 767, cat: TV/Sport, desc: " | WTA Tour"}
-    - {id: 766, cat: TV/Sport, desc: " | ATP World Tour Masters 1000"}
-    - {id: 765, cat: TV/Sport, desc: " | Grand Slam tournaments"}
-    - {id: 764, cat: TV/Sport, desc: " | Team"}
-    - {id: 503, cat: TV/Sport, desc: "Авто и мото спорт"}
-    - {id: 769, cat: TV/Sport, desc: "Боевые единоборства"}
-    - {id: 773, cat: TV/Sport, desc: " | Бокс"}
-    - {id: 772, cat: TV/Sport, desc: " | Рестлинг"}
-    - {id: 771, cat: TV/Sport, desc: " | Ultimate Fighting Championship"}
-    - {id: 770, cat: TV/Sport, desc: " | Mixed Martial Arts"}
-    - {id: 504, cat: TV/Sport, desc: "Другие виды спорта"}
-    - {id: 786, cat: TV/Sport, desc: " | Биатлон"}
-    - {id: 785, cat: TV/Sport, desc: " | Волейбол"}
-    - {id: 784, cat: TV/Sport, desc: " | Гандбол"}
-    - {id: 783, cat: TV/Sport, desc: " | Бильярд"}
-    - {id: 782, cat: TV/Sport, desc: " | Бейсбол"}
-    - {id: 781, cat: TV/Sport, desc: " | Американский футбол"}
-    - {id: 780, cat: TV/Sport, desc: " | Покер"}
-    - {id: 779, cat: TV/Sport, desc: " | Легкая атлетика"}
-    - {id: 778, cat: TV/Sport, desc: " | Тяжелая атлетика"}
-    - {id: 777, cat: TV/Sport, desc: " | Велоспорт"}
-    - {id: 776, cat: TV/Sport, desc: " | Гимнастика"}
-    - {id: 775, cat: TV/Sport, desc: " | Летние виды спорта"}
-    - {id: 774, cat: TV/Sport, desc: " | Зимние виды спорта"}
-    - {id: 787, cat: TV/Sport, desc: "Архив"}
-    # Аудиокниги
-    # Audiobooks
-    - {id: 942, cat: Audio/Audiobook, desc: "Произведения отечественных авторов"}
-    - {id: 943, cat: Audio/Audiobook, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 944, cat: Audio/Audiobook, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 945, cat: Audio/Audiobook, desc: " | Художественная литература"}
-    - {id: 947, cat: Audio/Audiobook, desc: " | Современная проза, классика, поэзия"}
-    - {id: 946, cat: Audio/Audiobook, desc: " | Историческая литература"}
-    - {id: 949, cat: Audio/Audiobook, desc: " | Книги для IPhone, IPod, Apple"}
-    - {id: 951, cat: Audio/Audiobook, desc: " | Детская литература"}
-    - {id: 952, cat: Audio/Audiobook, desc: " | Сатира, Юмор"}
-    - {id: 955, cat: Audio/Audiobook, desc: "Произведения зарубежных авторов"}
-    - {id: 967, cat: Audio/Audiobook, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 966, cat: Audio/Audiobook, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 965, cat: Audio/Audiobook, desc: " | Художественная литература"}
-    - {id: 962, cat: Audio/Audiobook, desc: " | Современная проза, классика, поэзия"}
-    - {id: 963, cat: Audio/Audiobook, desc: " | Историческая литература"}
-    - {id: 960, cat: Audio/Audiobook, desc: " | Книги для IPhone, IPod, Apple"}
-    - {id: 959, cat: Audio/Audiobook, desc: " | Детская литература"}
-    - {id: 958, cat: Audio/Audiobook, desc: " | Сатира, Юмор"}
-    - {id: 968, cat: Audio/Audiobook, desc: "Прочая литература"}
-    - {id: 1025, cat: Audio/Audiobook, desc: " | Аудиоспектакли и литературные чтения"}
-    - {id: 1026, cat: Audio/Audiobook, desc: " | ЖЗЛ, мемуары, биографии"}
-    - {id: 1089, cat: Audio/Audiobook, desc: " | Для детей, родителей и учителей"}
-    - {id: 1019, cat: Audio/Audiobook, desc: " | Разножанровые, многоавторские сборники"}
-    - {id: 970, cat: Audio/Audiobook, desc: " | Обучающая и научно-популярная литература"}
-    - {id: 971, cat: Audio/Audiobook, desc: " | Аудиокниги на иностранных языках"}
-    - {id: 972, cat: Audio/Audiobook, desc: " | Психология, Тренинг, Саморазвитие"}
-    - {id: 973, cat: Audio/Audiobook, desc: " | Философия и религия"}
-    - {id: 969, cat: Audio/Audiobook, desc: " | Разное"}
-    - {id: 1047, cat: Audio/Audiobook, desc: "Архив"}
-    # Книги и журналы
-    # Books and Magazines
-    - {id: 336, cat: Books, desc: "Книги отечественных авторов"}
-    - {id: 341, cat: Books, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 974, cat: Books, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 975, cat: Books, desc: " | Художественная литература"}
-    - {id: 976, cat: Books, desc: " | Историческая литература"}
-    - {id: 977, cat: Books, desc: " | Современная проза, классика, поэзия"}
-    - {id: 979, cat: Books, desc: " | Детская литература"}
-    - {id: 980, cat: Books, desc: " | Сатира, Юмор"}
-    - {id: 982, cat: Books, desc: "Книги зарубежных авторов"}
-    - {id: 991, cat: Books, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 990, cat: Books, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 989, cat: Books, desc: " | Художественная литература"}
-    - {id: 988, cat: Books, desc: " | Историческая литература"}
-    - {id: 987, cat: Books, desc: " | Современная проза, классика, поэзия"}
-    - {id: 986, cat: Books, desc: " | Детская литература"}
-    - {id: 985, cat: Books, desc: " | Сатира, Юмор"}
-    - {id: 992, cat: Books, desc: "Прочая литература"}
-    - {id: 1028, cat: Books, desc: " | ЖЗЛ. Биографии. Мемуары. Историография."}
-    - {id: 1004, cat: Books, desc: " | Философия, Религия, Эзотерика"}
-    - {id: 1050, cat: Books, desc: " | Публицистика, Социология и Политология"}
-    - {id: 1005, cat: Books, desc: " | Художественная литература на ин языках"}
-    - {id: 1018, cat: Books, desc: " | Для детей, родителей и учителей"}
-    - {id: 1003, cat: Books, desc: " | Психология, Тренинг, Саморазвитие"}
-    - {id: 1002, cat: Books, desc: " | Техническая и научно-популярная литература"}
-    - {id: 1001, cat: Books, desc: " | Строительство, Дизайн и Ремонт"}
-    - {id: 1067, cat: Books, desc: " | Домоводство, Сад, Огород, Хобби"}
-    - {id: 1000, cat: Books, desc: " | Кулинария"}
-    - {id: 999, cat: Books, desc: " | Медицина и Здоровье"}
-    - {id: 998, cat: Books, desc: " | Бизнес, Право, Экономика, Финансы"}
-    - {id: 997, cat: Books, desc: " | Разножанровые коллекции книг и библиотеки"}
-    - {id: 996, cat: Books, desc: " | Компьютерная литература"}
-    - {id: 1094, cat: Books, desc: " | Компьютерная литература на иностранных языках"}
-    - {id: 995, cat: Books, desc: " | Справочники, энциклопедии и словари"}
-    - {id: 1090, cat: Books, desc: " | Обучающая и развивающая литература, учебники"}
-    - {id: 994, cat: Books, desc: " | Разное"}
-    - {id: 292, cat: Books, desc: "Журналы"}
-    - {id: 1015, cat: Books, desc: " | Мужские"}
-    - {id: 1014, cat: Books, desc: " | Женские (мода, шитьё)"}
-    - {id: 1068, cat: Books, desc: " | Кулинария"}
-    - {id: 1013, cat: Books, desc: " | Игровые и Компьютерные журналы"}
-    - {id: 1012, cat: Books, desc: " | Мультимедийные приложения"}
-    - {id: 1011, cat: Books, desc: " | Научно-популярные, техника, авто"}
-    - {id: 1101, cat: Books, desc: " | Журналы по электротехнике и радиоэлектронике"}
-    - {id: 1010, cat: Books, desc: " | Домоводство, Хобби, Бизнес"}
-    - {id: 1091, cat: Books, desc: " | Строительство, Дизайн и Ремонт"}
-    - {id: 464, cat: Books, desc: " | Комиксы, Графика, Wallpapers, Арт"}
-    - {id: 1008, cat: Books, desc: " | Подшивки журналов и газет"}
-    - {id: 1016, cat: Books, desc: " | Журналы и газеты (общий раздел)"}
-    - {id: 1093, cat: Books, desc: " | Журналы и газеты на иностранных языках"}
-    - {id: 295, cat: Books, desc: "Книги и журналы для самых маленьких и их родителей"}
-    - {id: 468, cat: Books, desc: "Архив"}
-    # Операционные системы и программное обеспечение
-    # Software
-    - {id: 834, cat: PC/0day, desc: "Операционные системы от Microsoft"}
-    - {id: 844, cat: PC/0day, desc: " | Оригинальные образы восстановления ОС ноутбуков (нетбуков)"}
-    - {id: 1116, cat: PC/0day, desc: " | Windows 11 (оригинальные образы)"}
-    - {id: 1083, cat: PC/0day, desc: " | Windows 10 (оригинальные образы)"}
-    - {id: 1084, cat: PC/0day, desc: " | Windows 8 / 8.1 (оригинальные образы)"}
-    - {id: 1085, cat: PC/0day, desc: " | Windows 7 (оригинальные образы)"}
-    - {id: 1086, cat: PC/0day, desc: " | Windows Vista (оригинальные образы)"}
-    - {id: 1087, cat: PC/0day, desc: " | Windows XP (оригинальные образы)"}
-    - {id: 1088, cat: PC/0day, desc: " | Windows OS, выпущенные до 2001 года (оригинальные образы)"}
-    - {id: 1117, cat: PC/0day, desc: " | Сборки Windows 11"}
-    - {id: 1035, cat: PC/0day, desc: " | Сборки Windows 10"}
-    - {id: 843, cat: PC/0day, desc: " | Сборки Windows 8 / 8.1"}
-    - {id: 842, cat: PC/0day, desc: " | Сборки Windows 7"}
-    - {id: 841, cat: PC/0day, desc: " | Сборки Windows Vista"}
-    - {id: 840, cat: PC/0day, desc: " | Сборки Windows XP"}
-    - {id: 1051, cat: PC/0day, desc: " | Сборки Windows - &quot;все в одном&quot;"}
-    - {id: 839, cat: PC/0day, desc: " | Серверные ОС"}
-    - {id: 838, cat: PC/0day, desc: " | Патчи, RC, Beta, Service Packs и дополнения для ОС от..."}
-    - {id: 837, cat: PC/0day, desc: " | Изменение интерфейса"}
-    - {id: 1096, cat: PC/0day, desc: " | Обои и Скринсейверы"}
-    - {id: 836, cat: PC/0day, desc: " | Разное (Windows)"}
-    - {id: 1029, cat: PC/0day, desc: " | Активация ОС Windows и ПО Microsoft"}
-    - {id: 1071, cat: PC/0day, desc: " | Архив"}
-    - {id: 845, cat: PC/Mac, desc: "Операционные системы и ПО для Apple Macintosh"}
-    - {id: 852, cat: PC/Mac, desc: " | Mac OS"}
-    - {id: 851, cat: PC/Mac, desc: " | Mac OS (для РС-Хакинтош)"}
-    - {id: 850, cat: PC/Mac, desc: " | Системные программы для Mac OS"}
-    - {id: 849, cat: PC/Mac, desc: " | Программы для просмотра и обработки видео"}
-    - {id: 848, cat: PC/Mac, desc: " | Mac OS Программы для просмотра и обработки графики"}
-    - {id: 847, cat: PC/Mac, desc: " | Mac OS Аудио редакторы и конверторы для Mac OS"}
-    - {id: 846, cat: PC/Mac, desc: " | Другие программы для Mac OS"}
-    - {id: 1072, cat: PC/Mac, desc: " | Архив"}
-    - {id: 853, cat: PC, desc: "Операционные системы и ПО для Linux, Unix и других ОС"}
-    - {id: 856, cat: PC, desc: " | Операционные системы"}
-    - {id: 855, cat: PC, desc: " | Программное обеспечение"}
-    - {id: 854, cat: PC, desc: " | Разное"}
-    - {id: 1073, cat: PC, desc: " | Архив"}
-    - {id: 857, cat: PC, desc: "Веб-разработка и Программирование"}
-    - {id: 864, cat: PC, desc: " | Среды программирования, компиляторы и вспомогател..."}
-    - {id: 863, cat: PC, desc: " | Компоненты для сред программирования"}
-    - {id: 862, cat: PC, desc: " | Системы управления базами данных"}
-    - {id: 861, cat: PC, desc: " | Текстовые редакторы"}
-    - {id: 860, cat: PC, desc: " | Скрипты и шаблоны"}
-    - {id: 859, cat: PC, desc: " | Веб-разработка"}
-    - {id: 858, cat: PC, desc: " | Разное"}
-    - {id: 1074, cat: PC, desc: " | Архив"}
-    - {id: 865, cat: PC, desc: "Системные программы"}
-    - {id: 918, cat: PC, desc: " | Live /PE/ Boot CD (DVD, USB)"}
-    - {id: 875, cat: PC, desc: " | Настройка и оптимизация ОС (software)"}
-    - {id: 874, cat: PC, desc: " | Резервное копирование и восстановление данных"}
-    - {id: 1092, cat: PC, desc: " | Архиваторы и файловые менеджеры"}
-    - {id: 873, cat: PC, desc: " | Диагностика и обслуживание (hardware)"}
-    - {id: 872, cat: PC, desc: " | Сборники программ"}
-    - {id: 871, cat: PC, desc: " | Работа с носителями информации (SSD, HDD, USB, DVD, CD)"}
-    - {id: 1098, cat: PC, desc: " | Программы для работы с ПК со смартфонами (планшетами) н..."}
-    - {id: 870, cat: PC, desc: " | Программы для интернет и сетей"}
-    - {id: 869, cat: PC, desc: " | Безопасность"}
-    - {id: 868, cat: PC, desc: " | Серверное ПО"}
-    - {id: 867, cat: PC, desc: " | Драйверы"}
-    - {id: 866, cat: PC, desc: " | Разное"}
-    - {id: 1075, cat: PC, desc: " | Архив"}
-    - {id: 876, cat: PC, desc: "Системы для бизнеса, офиса, научной и проектной работы"}
-    - {id: 884, cat: PC, desc: " | Офисные системы"}
-    - {id: 1102, cat: PC, desc: " | Дополнения (надстройки и т.д.) для офисных систем"}
-    - {id: 4, cat: PC, desc: " | Системы для бизнеса"}
-    - {id: 881, cat: PC, desc: " | Системы для научной работы"}
-    - {id: 892, cat: PC, desc: " | Программы для архитекторов и дизайнеров интерьеров"}
-    - {id: 889, cat: PC, desc: " | Программы для верстки, сканирования, печати и работы ..."}
-    - {id: 890, cat: PC, desc: " | Работа с PDF и DjVu"}
-    - {id: 882, cat: PC, desc: " | Медицинский софт"}
-    - {id: 879, cat: PC, desc: " | Софт для специалистов"}
-    - {id: 880, cat: PC, desc: " | Словари, переводчики"}
-    - {id: 878, cat: PC, desc: " | САПР"}
-    - {id: 877, cat: PC, desc: " | Разное"}
-    - {id: 1077, cat: PC, desc: " | Архив"}
-    - {id: 913, cat: PC, desc: "Справочно-правовые системы"}
-    - {id: 917, cat: PC, desc: " | Консультант Плюс"}
-    - {id: 1070, cat: PC, desc: " | КонсультантБухгалтер: Версия Проф"}
-    - {id: 1036, cat: PC, desc: " | Архив Консультант Плюс"}
-    - {id: 916, cat: PC, desc: " | Другие справочно-правовые системы"}
-    - {id: 914, cat: PC, desc: " | Справочные системы"}
-    - {id: 915, cat: PC, desc: " | Общий архив раздела &quot;Справочно-правовые системы&quot;"}
-    - {id: 908, cat: PC, desc: "Системы навигации и карты, ГИС"}
-    - {id: 1107, cat: PC/Mobile-iOS, desc: " | iOS"}
-    - {id: 1106, cat: PC/Mobile-Android, desc: " | Android"}
-    - {id: 1105, cat: PC, desc: " | Garmin"}
-    - {id: 1104, cat: PC/0day, desc: " | Windows XP/Vista/7/8/8.1/10"}
-    - {id: 1103, cat: PC/0day, desc: " | Windows CE"}
-    - {id: 1108, cat: PC, desc: " | Разное (Системы навигации и карты, ГИС)"}
-    - {id: 1097, cat: PC, desc: " | Архив (Системы навигации и карты, ГИС)"}
-    - {id: 885, cat: PC, desc: "Программы для работы с мультимедиа и 3D"}
-    - {id: 896, cat: PC, desc: " | 3D моделирование, рендеринг и плагины для них"}
-    - {id: 895, cat: PC, desc: " | Анимация"}
-    - {id: 894, cat: PC, desc: " | Аудио, видео  конвертеры"}
-    - {id: 893, cat: PC, desc: " | Редакторы и конвертеры графики"}
-    - {id: 891, cat: PC, desc: " | Работа со звуком, Редакторы видео"}
-    - {id: 888, cat: PC, desc: " | Аудио и видео  плееры, рекордеры и кодеки"}
-    - {id: 887, cat: PC, desc: " | Каталогизаторы и просмотр графики"}
-    - {id: 886, cat: PC, desc: " | Разное"}
-    - {id: 1076, cat: PC, desc: " | Архив"}
-    - {id: 897, cat: PC, desc: "Материалы для мультимедиа и дизайна"}
-    - {id: 907, cat: PC, desc: " | Текстуры, материалы и проекты"}
-    - {id: 906, cat: PC, desc: " | 3D модели и сцены Photostoсks"}
-    - {id: 905, cat: PC, desc: " | Заготовки, виньетки, костюмы, шаблоны и рамки"}
-    - {id: 904, cat: PC, desc: " | Стили, кисти, формы и узоры"}
-    - {id: 903, cat: PC, desc: " | Футажи"}
-    - {id: 902, cat: PC, desc: " | Шрифты"}
-    - {id: 901, cat: PC, desc: " | Библиотеки сэмплов и Звуковые эффекты"}
-    - {id: 900, cat: PC, desc: " | Векторные клипарты"}
-    - {id: 899, cat: PC, desc: " | Растровые клипарты"}
-    - {id: 898, cat: PC, desc: " | Разное"}
-    - {id: 1078, cat: PC, desc: " | Архив"}
-    - {id: 909, cat: PC, desc: "Разное"}
-    # Смартфоны и Планшеты
-    # mobiles
-    - {id: 921, cat: PC/Mobile-Other, desc: "Windows Phone 7"}
-    - {id: 936, cat: PC/Mobile-Other, desc: " | Прошивки"}
-    - {id: 935, cat: PC/Mobile-Other, desc: " | Игры"}
-    - {id: 934, cat: PC/Mobile-Other, desc: " | Программы"}
-    - {id: 1079, cat: PC/Mobile-Other, desc: " | Архив"}
-    - {id: 922, cat: PC/Mobile-Other, desc: "Windows Mobile 5.x - 6.x"}
-    - {id: 927, cat: PC/Mobile-Other, desc: " | Прошивки"}
-    - {id: 926, cat: PC/Mobile-Other, desc: " | Игры"}
-    - {id: 925, cat: PC/Mobile-Other, desc: " | Программы"}
-    - {id: 1080, cat: PC/Mobile-Other, desc: " | Архив"}
-    - {id: 923, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 930, cat: PC/Mobile-Android, desc: " | Игры"}
-    - {id: 929, cat: PC/Mobile-Android, desc: " | Программы"}
-    - {id: 928, cat: PC/Mobile-Android, desc: " | Прошивки"}
-    - {id: 1081, cat: PC/Mobile-Android, desc: " | Архив"}
-    - {id: 924, cat: PC/Mobile-Other, desc: "Symbian"}
-    - {id: 933, cat: PC/Mobile-Other, desc: " | Игры"}
-    - {id: 932, cat: PC/Mobile-Other, desc: " | Программы"}
-    - {id: 931, cat: PC/Mobile-Other, desc: " | Прошивки"}
-    - {id: 1082, cat: PC/Mobile-Other, desc: " | Архив"}
-    - {id: 1048, cat: PC/Mobile-Other, desc: "Архив"}
-    # Авто и Мото
-    # Auto and Bikes
-    - {id: 1095, cat: TV/Sport, desc: "Книги по ремонту/обслуживанию/эксплуатации ТС"}
-    - {id: 1110, cat: TV/Sport, desc: "Программы для прошивки и диагностики авто, прошивки"}
-    - {id: 1111, cat: TV/Sport, desc: "Мото техника"}
-    - {id: 1112, cat: TV/Sport, desc: "Водный транспорт"}
-    - {id: 1113, cat: TV/Sport, desc: "Видео по ремонту и тюнингу ТС"}
-    # Песочница
-    # sandbox
-    - {id: 507, cat: Other, desc: "Песочница"}
-    # Pron
-    # xxx
-    - {id: 1037, cat: XXX, desc: "Русское порно"}
-    - {id: 1038, cat: XXX, desc: " | Фильмы"}
-    - {id: 1039, cat: XXX, desc: " | Ролики, сайт рипы"}
-    - {id: 1040, cat: XXX, desc: " | Любительское видео"}
-    - {id: 368, cat: XXX, desc: "Зарубежное порно"}
-    - {id: 1062, cat: XXX, desc: " | Фильмы 2020 года"}
-    - {id: 1061, cat: XXX, desc: " | Фильмы 2001-2019 года"}
-    - {id: 1043, cat: XXX, desc: " | Фильмы до 2000 года"}
-    - {id: 1042, cat: XXX, desc: " | Зарубежные фильмы с переводом"}
-    - {id: 1069, cat: XXX, desc: " | Порно Пародии"}
-    - {id: 1065, cat: XXX, desc: " | Нетрадиционное порно"}
-    - {id: 821, cat: XXX, desc: " | Ролики, сайт рипы"}
-    - {id: 1041, cat: XXX, desc: " | Японское порно без цензуры"}
-    - {id: 820, cat: XXX, desc: " | Мульты"}
-    - {id: 819, cat: XXX, desc: " | Фото"}
-    - {id: 818, cat: XXX, desc: " | Разное"}
-    - {id: 816, cat: XXX, desc: "3D Pron"}
-    - {id: 825, cat: XXX, desc: " | Фильмы"}
-    - {id: 824, cat: XXX, desc: " | Ролики, сайт рипы"}
-    - {id: 823, cat: XXX, desc: " | Мульты"}
-    - {id: 822, cat: XXX, desc: " | Разное"}
-    - {id: 271, cat: XXX, desc: "Архив"}
-
-  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: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-login:
-  path: login.php
-  method: form
-  form: form[action="./login.php"]
-  inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    redirect: /
-    autologin: 1
-  error:
-    - selector: table.error
-  test:
-    path: index.php
-    selector: a[href="./login.php?logout=1"]
-
-search:
-  paths:
-    - path: tracker.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
-    - name: re_replace # S01E01 to сезон 1 серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    prev_allw: 1
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    prev_tor_type: 0
-    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
-    o: "{{ .Config.sort }}"
-    # 1=asc, 2=desc
-    s: "{{ .Config.type }}"
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # search by partial word
-    allw: 0
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="viewforum.php?f="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    descr_cat:
-      selector: a[href^="viewforum.php?f="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    description:
-      selector: a[href^="viewforum.php?f="]
-      filters:
-        - name: prepend
-          args: "cat={{ .Result.descr_cat }} "
-    title:
-      selector: a[href^="viewtopic.php?t="]
-      filters:
-        # hell no, i'm not unravelling this pile of spaghetti. Someone else can spend their life sorting this mess out.
-        # Stand Up (16.02.2020) WEB-DLRip (сезон 7, выпуск 13)
-        # Прощаться не будем (2018) WEBDL [H.264/1080p-LQ] (серии 1-4 из 4) [Расширенная версия]
-        # Поцелуй Сократа (2011) WEBDL (сезон 1, серии 1-12 из 12)
-        # Барри / Barry (2018-2019) WEB-DLRip (сезон 1-2, серии 1-16 из 16) Amedia
-        # 	Стрела / Arrow / Сезон: 8 / Серии: 1-10 из 10 (Дэвид Баррет, Дэвид Наттер) [2019, фантастика, боевик, драма, детектив, приключения, WEB-DLRip] [MVO] [LostFilm]
-        # Викинги / Vikings / 6 сезон / 1-10 из 20 / (Стив Сэйнт Лигер) [2019, боевик, драма, мелодрама, военный, история, WEB-DLRip] [MVO] [AlexFilm]
-        # Рикошет (Денис Карышев, Вячеслав Кириллов) (16 серий из 16) [2019/2020, боевик, WEBDL, HDTV] 50%DL
-        # to show but a few variations!
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["[\\,\\:\\-\\/\\|\\[\\]–]", " "]
-#          - name: re_replace
-#            args: ["[\\.\\,\\:\\-\\/\\|\\[\\]\\(\\)–]", " "]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*(\\d+)\\s*(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)(.*)", "$1 S$2 rus $3"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]]ери[ия]\\s*(\\d+)(.*)", "$1 E$2 rus $3"]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEBRip", "WEBDL"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-    details:
-      selector: a[href^="viewtopic.php?t="]
-      attribute: href
-    download:
-      selector: a[href^="./download.php?id="]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    size:
-      selector: td:nth-child(6) > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(9)
-    date:
-      # unix
-      selector: td:last-child > u
-    downloadvolumefactor:
-      case:
-        img[src="images/tor_gold.gif"]: 0
-        img[src="images/tor_silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# TorrentPier II
--- a/src/Jackett.Common/Definitions/datascene-api.yml
+++ b/src/Jackett.Common/Definitions/datascene-api.yml
@@ -75,10 +75,10 @@ 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

--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -11,13 +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/
+  - https://demonoid.nocensor.sbs/
 legacylinks:
-  - https://demonoid.unblockit.id/
-  - https://demonoid.unblockit.win/
-  - https://demonoid.unblockit.top/
  - https://demonoid.unblockit.lat/
  - https://demonoid.unblockit.app/
  - https://demonoid.unblockit.dev/
@@ -35,6 +32,9 @@ legacylinks:
  - https://demonoid.unblockit.kim/
  - https://demonoid.unblockit.bz/
  - https://demonoid.unblockit.tv/
+  - https://demonoid.unblockit.how/
+  - https://demonoid.unblockit.cam/
+  - https://demonoid.nocensor.biz/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/desitorrents-api.yml
+++ b/src/Jackett.Common/Definitions/desitorrents-api.yml
@@ -67,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
@@ -75,6 +74,7 @@ search:

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

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

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/extratorrent-st.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-st.yml
@@ -7,13 +7,16 @@ type: public
 encoding: UTF-8
 links:
  - https://extratorrent.st/
-  - https://extratorrent.unblockit.how/
-  - https://extratorrent.nocensor.biz/
+  - https://extratorrent.unblockit.day/
+  - https://extratorrent.nocensor.sbs/
 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/
+  - https://extratorrent.nocensor.biz/

 caps:
  categorymappings:
@@ -36,6 +39,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,16 +12,13 @@ links:
  - https://eztv.tf/
  - https://eztv.yt/
  - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.how/
-  - https://eztv.nocensor.biz/
+  - https://eztv.unblockit.day/
+  - https://eztv.nocensor.sbs/
 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/
  - https://eztv.unblockit.club/
@@ -35,6 +32,9 @@ legacylinks:
  - https://eztv.unblockit.kim/
  - https://eztv.unblockit.bz/
  - https://eztv.unblockit.tv/
+  - https://eztv.unblockit.how/
+  - https://eztv.unblockit.cam/
+  - https://eztv.nocensor.biz/

 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/fenyarnyek-tracker.yml
+++ b/src/Jackett.Common/Definitions/fenyarnyek-tracker.yml
@@ -0,0 +1,181 @@
+---
+id: fenyarnyek-tracker
+name: Fenyarnyek-Tracker
+description: "Fenyarnyek-Tracker is a HUNGARIAN semi private site for TV / MOVIES / GENERAL"
+language: hu-HU
+type: semi-private
+encoding: UTF-8
+links:
+  - http://tracker.fenyarnyek.com/
+legacylinks:
+  - https://tracker.fenyarnyek.com/  # site is forcing http
+
+caps:
+  categorymappings:
+    - {id: 13, cat: PC/ISO, desc: "Program/Iso"}
+    - {id: 14, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 15, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 16, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 17, cat: Audio, desc: "Zene/Eng"}
+    - {id: 18, cat: Audio, desc: "Zene/Hun"}
+    - {id: 19, cat: PC/Games, desc: "Game/Rip"}
+    - {id: 20, cat: PC/Games, desc: "Game/Iso"}
+    - {id: 21, cat: Movies/SD, desc: "Xvid/Eng"}
+    - {id: 22, cat: Movies/SD, desc: "Xvid/hun"}
+    - {id: 23, cat: Other, desc: "Képek"}
+    - {id: 24, cat: Movies/SD, desc: "Cam/Hun"}
+    - {id: 25, cat: Movies/SD, desc: "Cam/Eng"}
+    - {id: 26, cat: TV/Anime, desc: "Animació"}
+    - {id: 27, cat: Books, desc: "E-book/Hun"}
+    - {id: 28, cat: Books, desc: "E-book/Eng"}
+    - {id: 29, cat: Movies/DVD, desc: "DVD/Hun"}
+    - {id: 31, cat: Movies/DVD, desc: "DVD/Eng"}
+    - {id: 32, cat: Movies/HD, desc: "Hd/Hun"}
+    - {id: 33, cat: Movies/HD, desc: "Hd/Eng"}
+    - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 35, cat: XXX, desc: "XXX/Film"}
+    - {id: 36, cat: XXX/ImageSet, desc: "XXX/Kep"}
+    - {id: 38, cat: Movies/SD, desc: "SD/Eng"}
+    - {id: 39, cat: Movies/SD, desc: "SD/Hun"}
+    - {id: 37, cat: Other, desc: "Egyéb"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+  - name: info
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  method: post
+  path: index.php?page=login
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: td.lista span[style="color:#FF0000;"]
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+download:
+  before:
+    path: thanks.php
+    method: post
+    inputs:
+      infohash: "'{{ .DownloadUri.Query.id }}'"
+      thanks: 1
+      rndval: "1487013827343"
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    # http://tracker.fenyarnyek.com/index.php?page=torrents&search=&category=0&uploader=0&options=0&active=0&gold=0
+    - path: index.php
+  inputs:
+    page: torrents
+    search: "{{ .Keywords }}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
+    uploader: 0
+    # 0 filename, 1 file & desc, 2 description
+    options: 0
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    # 0 all, 1 classic, 2 silver, 3 gold, 4 silver & gold
+    gold: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: td#mcol table.lista > tbody > tr:has(a[href*=bookmark])
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: a[href^="index.php?page=torrent-details"]
+    details:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: href
+    poster:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) "
+    date:
+      selector: td:nth-last-child(11)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02/01/2006 -07:00"
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(9)
+    leechers:
+      selector: td:nth-last-child(8)
+    downloadvolumefactor:
+      case:
+        img[src$="freeleech.gif"]: 0
+        img[src$="gold.gif"]: 0
+        img[src$="silver.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="2x.gif"]: 2
+        img[src$="3x.gif"]: 3
+        img[src$="4x.gif"]: 4
+        img[src$="5x.gif"]: 5
+        img[src$="6x.gif"]: 6
+        img[src$="7x.gif"]: 7
+        img[src$="8x.gif"]: 8
+        img[src$="9x.gif"]: 9
+        img[src$="10x.gif"]: 10
+        "*": 1
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# xbtit
--- a/src/Jackett.Common/Definitions/filelisting.yml
+++ b/src/Jackett.Common/Definitions/filelisting.yml
@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
  - https://filelisting.com/
+  - https://filelisting.nocensor.sbs/
+legacylinks:
  - https://filelisting.nocensor.biz/

 caps:
--- a/src/Jackett.Common/Definitions/fouducinema.yml
+++ b/src/Jackett.Common/Definitions/fouducinema.yml
@@ -1,9 +1,9 @@
 ---
 id: fouducinema
 name: Fou-Du-Cinema
-description: "Fou-Du-Cinema (FdC) is a FRENCH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "Fou-Du-Cinema (FdC) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: fr-FR
-type: semi-private
+type: private
 encoding: UTF-8
 links:
  - https://fou-du-cinema.net/
--- 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/gamestorrents.yml
+++ b/src/Jackett.Common/Definitions/gamestorrents.yml
@@ -7,13 +7,14 @@ type: public
 encoding: UTF-8
 links:
  - https://www.gamestorrents.fm/
-  - https://gamestorrents.nocensor.biz/
+  - https://gamestorrents.nocensor.sbs/
 legacylinks:
  - https://www.gamestorrents.com/
  - https://www.gamestorrents.tv/
  - https://www.gamestorrents.nu/
  - https://gamestorrents.nocensor.space/
  - https://gamestorrents.nocensor.work/
+  - https://gamestorrents.nocensor.biz/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/gaytorrentru.yml
+++ b/src/Jackett.Common/Definitions/gaytorrentru.yml
@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://www.gaytor.rent/
+legacylinks:
  - https://www.gaytorrent.ru/

 settings:
--- a/src/Jackett.Common/Definitions/generationfree-api.yml
+++ b/src/Jackett.Common/Definitions/generationfree-api.yml
@@ -0,0 +1,187 @@
+---
+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"
+      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_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
+    magnet:
+      selector: magnet_link
+      optional: true
+    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:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.0.5
--- 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,17 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.gktorrents.net/
-  - https://gktorrent.nocensor.biz/
+  - https://www.gktorrents.org/
+  - https://gktorrent.nocensor.sbs/
 legacylinks:
-  - https://www.gktorrent.com/
-  - http://www.gktorrent.com/
-  - http://ww1.gktorrent.com/
-  - http://ww2.gktorrent.com/
-  - https://ww2.gktorrent.com/
-  - https://ww3.gktorrent.com/
-  - http://www.gktorrent.net/
-  - https://ww4.gktorrent.com/
  - http://www.gktorrent.co/
  - https://www.gktorrent.co/
  - https://www.gktorrent.ws/
@@ -36,6 +28,8 @@ legacylinks:
  - https://gktorrent.nocensor.space/
  - https://www.gktorrents.com/
  - https://gktorrent.nocensor.work/
+  - https://www.gktorrents.net/
+  - https://gktorrent.nocensor.biz/

 caps:
  categorymappings:
@@ -78,6 +72,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
@@ -8,15 +8,13 @@ encoding: UTF-8
 followredirect: true
 links:
  - https://glodls.to/
+  - https://gtdb.cc/
  - https://www.gtdb.to/
-  - https://glotorrents.unblockit.how/
-  - https://glotorrents.nocensor.biz/
+  - https://glotorrents.unblockit.day/
+  - https://glotorrents.nocensor.sbs/
 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/
  - https://glotorrents.unblockit.buzz/
@@ -32,6 +30,9 @@ legacylinks:
  - https://glotorrents.unblockit.kim/
  - https://glotorrents.unblockit.bz/
  - https://glotorrents.unblockit.tv/
+  - https://glotorrents.unblockit.how/
+  - https://glotorrents.unblockit.cam/
+  - https://glotorrents.nocensor.biz/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/hawke-uno.yml
+++ b/src/Jackett.Common/Definitions/hawke-uno.yml
@@ -64,10 +64,10 @@ 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

--- a/src/Jackett.Common/Definitions/hdcity.yml
+++ b/src/Jackett.Common/Definitions/hdcity.yml
@@ -5,6 +5,8 @@ description: "HDCity is a SPANISH site for HD content"
 language: es-ES
 type: private
 encoding: ISO-8859-1
+certificates:
+  - a10f2f7a863cd3fba9663185b0943cde01698451 # expired  ‎25 ‎October ‎2021
 links:
  - https://hdcity.li/

--- a/src/Jackett.Common/Definitions/hdhouse.yml
+++ b/src/Jackett.Common/Definitions/hdhouse.yml
@@ -1,156 +0,0 @@
---
-id: hdhouse
-name: HDhouse
-description: "HDhouse (HDReactor) is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
-language: ru-RU
-type: public
-encoding: windows-1251
-links:
-  - https://hdreactor.club/
-  - https://hdreactor.net/
-legacylinks:
-  - https://hdreactor.guru/
-  - https://hdreactor.su/
-  - https://hdhouse.club/
-
-caps:
-  categorymappings:
-    - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
-    - {id: 5006, cat: Movies/UHD, desc: "Кино UHD"}
-    - {id: 2007, cat: TV/Anime, desc: "Мультфильмы"}
-    - {id: 2006, cat: TV/HD, desc: "Сериалы HD"}
-    - {id: 2004, cat: Audio/Lossless, desc: "Музыка A"}
-    - {id: 5007, cat: Audio/Video, desc: "Музыка V"}
-    - {id: 2003, cat: XXX, desc: "18+ HD"}
-    - {id: 2005, cat: PC/Games, desc: "Игры"}
-    - {id: 5005, cat: TV/Sport, desc: "Спорт HD"} # not shown in list
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: date
-    options:
-      date: created
-      title: 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:
-  # https://hdreactor.net/index.php?do=search&subaction=search&showposts=1&story=2020&catlist[]=2001&catlist[]=2006
-  paths:
-    - path: index.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to Сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", " Сезон $1"]
-    - name: re_replace # S01E01 to Сезон 1 Серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", " Сезон $1  Серии $2"]
-  inputs:
-    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
-    do: search
-    subaction: search
-    showposts: 1
-    # 0 in article, 1 in comments ,2 in static pages, 3 in article titles
-    titleonly: 3
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    sortby: "{{ .Config.sort }}"
-    resorder: "{{ .Config.type }}"
-
-  headers:
-    # site presents hcaptcha challenge for Jackett's User-Agent, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
-    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
-
-  rows:
-    selector: div.movie-item
-
-  fields:
-    category:
-      selector: div.movie-item__meta > span > a
-      case:
-        a[href$="/1/"]: 2001
-        a[href$="/4k_uhd/"]: 5006
-        a[href$="/7/"]: 2007
-        a[href$="/6/"]: 2006
-        a[href$="/4/"]: 2004
-        a[href$="/9/"]: 5007
-        a[href$="/3/"]: 2003
-        a[href$="/5/"]: 2005
-        a[href$="/sport-hd/"]: 5005 # not shown in list
-    title:
-      selector: span.movie-item__title
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["[\\.\\,\\:\\-\\/\\|\\[\\]]", " "]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*(.*)", "$1 S$2E$3-$4 rus $5"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)(.*)", "$1 S$2 rus $3"]
-        - name: re_replace
-          args: ["(.*)[CСcс]]ери[ия]\\s*(\\d+)(.*)", "$1 E$2 rus $3"]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEBRip", "WEBDL"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-    details:
-      selector: div.movie-item__desc > a
-      attribute: href
-    download:
-      selector: div.movie-item__desc > a
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    date:
-      selector: div.movie-item__meta > span:nth-child(2)
-      filters:
-        # 5-03-2021, 21:59
-        - name: replace
-          args: [",", ""]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2-01-2006 15:04 -07:00"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# DataLife
--- a/src/Jackett.Common/Definitions/hdmonkey.yml
+++ b/src/Jackett.Common/Definitions/hdmonkey.yml
@@ -132,13 +132,13 @@ search:
    size:
      selector: td:nth-child(4)
    date:
-      # 19.Jul<br>2021<br>06:57
+      # 15.11.21<br>07:47
      selector: td:nth-child(5)
      filters:
        - name: append
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
-          args: "2.Jan200615:04 -07:00"
+          args: "2.01.0615:04 -07:00"
    grabs:
      selector: td:nth-child(7)
    seeders:
--- a/src/Jackett.Common/Definitions/hdolimpo-api.yml
+++ b/src/Jackett.Common/Definitions/hdolimpo-api.yml
@@ -68,10 +68,10 @@ 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

--- a/src/Jackett.Common/Definitions/hdonly.yml
+++ b/src/Jackett.Common/Definitions/hdonly.yml
@@ -16,7 +16,7 @@ caps:
    - {id: 5, cat: TV, desc: "Série"}
    - {id: 6, cat: TV/Anime, desc: "Série anim"}
    - {id: 7, cat: Movies/Other, desc: "Film d'animation"}
-    - {id: 7, cat: Audio/Video, desc: "Concert"}
+    - {id: 9, cat: Audio/Video, desc: "Concert"}
    - {id: 11, cat: TV/Documentary, desc: "Documentaire"}
    - {id: 13, cat: Movies/Other, desc: "Court-métrage"}
    - {id: 14, cat: Movies/Other, desc: "Clip"}
--- 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]

@@ -79,6 +79,12 @@ search:
          args: "["
        - name: append
          args: "]"
+        - name: re_replace
+          args: ["(?i)(MEGAPACK)", "REPACK"]
+        - name: re_replace
+          args: ["(?i)(AUDIOEDITADO)", "PROPER"]
+        - name: re_replace
+          args: ["(?i)(VERSIÓN MEJORADA)", "PROPER"]
    title_vose:
      selector: td.titulo a[id]:contains("VOSE")
      optional: true
--- 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/hidden-palace.yml
+++ b/src/Jackett.Common/Definitions/hidden-palace.yml
@@ -0,0 +1,144 @@
+---
+id: hidden-palace
+name: Hidden-Palace
+description: "Hidden-Palace is a Private torrent site for MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://hidden-palace.net/
+legacylinks:
+  - https://hidden-palace.xyz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 2, cat: TV, desc: "TV"}
+
+  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://hidden-palace.net/\" target =_blank>Hidden-Palace</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
+    minimumseedtime:
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+# json UNIT3D 6.0.5
--- a/src/Jackett.Common/Definitions/houseofdevil.yml
+++ b/src/Jackett.Common/Definitions/houseofdevil.yml
@@ -0,0 +1,176 @@
+---
+id: houseofdevil
+name: House of Devil
+description: "House of Devil is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://h-o-d.org/
+
+caps:
+  categorymappings:
+    - {id: 117, cat: TV, desc: "Allgemein - Serien"}
+    - {id: 119, cat: Other, desc: "Bilder"}
+    - {id: 120, cat: Books, desc: "EBook"}
+    - {id: 138, cat: Movies/3D, desc: "Filme - 3D"}
+    - {id: 101, cat: TV/Anime, desc: "Filme - Animie"}
+    - {id: 102, cat: Movies/BluRay, desc: "Filme - Bluray"}
+    - {id: 131, cat: Movies/Other, desc: "Filme - Bollywood"}
+    - {id: 103, cat: Movies/DVD, desc: "Filme - DVD"}
+    - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
+    - {id: 135, cat: Movies/HD, desc: "Filme - HD"}
+    - {id: 132, cat: Movies/DVD, desc: "Filme - HD2DVD"}
+    - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 134, cat: Movies/SD, desc: "Filme - SD"}
+    - {id: 136, cat: Movies/UHD, desc: "Filme - UHD"}
+    - {id: 105, cat: Movies/HD, desc: "Filme - x264"}
+    - {id: 106, cat: Movies/SD, desc: "Filme - XviD / DivX"}
+    - {id: 127, cat: Movies, desc: "Fuer Unsere Kleinsten"}
+    - {id: 121, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
+    - {id: 124, cat: Audio, desc: "Musik - Alben"}
+    - {id: 140, cat: Audio, desc: "Musik - Diskografie"}
+    - {id: 122, cat: Audio/Audiobook, desc: "Musik - Hoerbuch"}
+    - {id: 123, cat: Audio, desc: "Musik - Mixe"}
+    - {id: 133, cat: Audio/MP3, desc: "Musik - MP3"}
+    - {id: 125, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 113, cat: PC, desc: "Programme - Linux"}
+    - {id: 114, cat: PC/Mac, desc: "Programme - Mac"}
+    - {id: 115, cat: PC/0day, desc: "Programme - Windows"}
+    - {id: 116, cat: TV/Documentary, desc: "Serien - Dokus"}
+    - {id: 118, cat: TV/Sport, desc: "Serien - Sport"}
+    - {id: 129, cat: Other, desc: "Sonstiges"}
+    - {id: 109, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
+    - {id: 112, cat: Console, desc: "Spiele - Konsolen"}
+    - {id: 111, cat: PC/Games, desc: "Spiele - Mac / Linux"}
+    - {id: 110, cat: PC/Games, desc: "Spiele - PC"}
+    - {id: 137, cat: Console/Other, desc: "Wimmelspiele"}
+    - {id: 69, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: pin
+    type: text
+    label: Pin
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at H-O-D
+    default: <li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
+  - 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>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
+  error:
+    - selector: .tablea:contains("Fehler")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  # https://h-o-d.org/browse.php?showsearch=1&c117=1&c116=1&c118=1&search=&incldead=1&orderby=added&sort=desc
+  path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 dead
+    incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid search from the browse.php page or return imdb links in results
+
+  rows:
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"]:not(:has(a[href=\"index.php\"])) > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.onlyupload }}:has(img[src=\"/pic/free.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php"]
+    details:
+      selector: a[href^="details.php"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: a[href^="details.php"]
+      attribute: onMouseOver
+      filters:
+        - name: regexp
+          args: "src=(.*?) width"
+    size:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
+    seeders:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
+    leechers:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
+    date:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    downloadvolumefactor:
+      case:
+        img[src="/pic/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.8
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# engine n/a
--- a/src/Jackett.Common/Definitions/ilcorsaronero.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml
@@ -11,7 +11,7 @@ links:
  - https://ilcorsaronero.fun/
  - https://ilcorsaronero.pro/
  - https://ilcorsaronero.torrentbay.to/
-  - https://ilcorsaronero.nocensor.biz/
+  - https://ilcorsaronero.nocensor.sbs/
 legacylinks:
  - https://ilcorsaronero.live/
  - https://ilcorsaronero.vip/
@@ -27,6 +27,7 @@ legacylinks:
  - https://ilcorsaronero.unblockit.pw/
  - https://ilcorsaronero.nocensor.space/
  - https://ilcorsaronero.nocensor.work/
+  - https://ilcorsaronero.nocensor.biz/

 caps:
  categorymappings:
--- 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/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/jme-reunit3d-api.yml
+++ b/src/Jackett.Common/Definitions/jme-reunit3d-api.yml
@@ -0,0 +1,150 @@
+---
+id: jme-reunit3d-api
+name: JME-REUNIT3D (API)
+description: "JME-REUNIT3D is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://jme-reunit3d.de/
+legacylinks:
+  - https://jme-reunit3d.eu/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 6, cat: XXX, desc: "XXX"}
+    - {id: 7, cat: TV/Sport, desc: "Sport"}
+    - {id: 3, cat: Audio, desc: "Music-Audio"}
+    - {id: 5, cat: PC, desc: "Application"}
+    - {id: 4, cat: Console, desc: "Game"}
+    - {id: 8, cat: Books, desc: "E-Books"}
+
+  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://jme-reunit3d.de/\" target =_blank>JME-REUNIT3D</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
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.0.4
--- a/src/Jackett.Common/Definitions/kinorun.yml
+++ b/src/Jackett.Common/Definitions/kinorun.yml
@@ -116,6 +116,9 @@ search:

  fields:
    category:
+      text: 24
+    category|noappend:
+      optional: true
      selector: a[href^="browse.php?cat="]
      attribute: href
      filters:
--- 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/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,22 +9,19 @@ 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/
+  - https://limetorrents.nocensor.sbs/
 legacylinks:
  - https://www.limetorrents.io/
  - 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/
  - https://limetor.com/
  - https://www.limetor.pro/
-  - https://limetorrents.unblockit.li/
  - https://limetorrents.unblockit.uno/
  - https://limetorrents.unblockit.ch/
  - https://limetorrents.nocensor.space/
@@ -33,6 +30,9 @@ legacylinks:
  - https://limetorrents.unblockit.kim/
  - https://limetorrents.unblockit.bz/
  - https://limetorrents.unblockit.tv/
+  - https://limetorrents.unblockit.how/
+  - https://limetorrents.unblockit.cam/
+  - https://limetorrents.nocensor.biz/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/magico.yml
+++ b/src/Jackett.Common/Definitions/magico.yml
@@ -6,13 +6,14 @@ language: el-GR
 type: private
 encoding: UTF-8
 links:
-  - https://trelas.club/
+  - https://trellas.net/
 legacylinks:
  - https://magico.info/
  - https://magico.one/
  - https://magico.club/
  - https://magico.fun/
  - https://trellas.info/
+  - https://trelas.club/

 caps:
  categorymappings:
--- 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"}
@@ -72,6 +72,9 @@ caps:
    - {id: 16, cat: Books, desc: Marine Engineer's Library-MAN B&W"}
    - {id: 17, cat: Books, desc: Marine Engineer's Library-Wärtsilä & Sulzer"}
    - {id: 7, cat: Books, desc: "Technical Books (Not maritime)"}
+    - {id: 328, cat: Books, desc: "Technical Books (Not maritime)-Hydraulics"}
+    - {id: 327, cat: Books, desc: "Technical Books (Not maritime)-Mechanics"}
+    - {id: 326, cat: Books, desc: "Technical Books (Not maritime)-Electricity"}
    - {id: 10, cat: Books, desc: "English for seamen"}
    - {id: 266, cat: Books, desc: "English for seamen-English for Deck Officers"}
    - {id: 267, cat: Books, desc: "English for seamen-English for Marine Engineers"}
@@ -94,6 +97,7 @@ caps:
    - {id: 285, cat: Books, desc: "Section for cadets-Encyclopedias and atlases"}
    - {id: 265, cat: Books, desc: "Section for cadets-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
    - {id: 191, cat: Books, desc: "Maritime Law"}
+    - {id: 329, cat: Books, desc: "Maritime Law-Lloyd's, ABS, BV, DNV-GL, TÜV, NKK, RMRS and other approvals"}
    - {id: 240, cat: Books, desc: "Maritime Law-IMO Resolutions"}
    - {id: 212, cat: Books, desc: "Ship's documentation"}
    - {id: 190, cat: Books, desc: "Catalogs"}
@@ -122,7 +126,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"}
@@ -133,6 +137,7 @@ caps:
    - {id: 289, cat: Books, desc: "Shipmodeling-Ships in Bottles"}
    - {id: 197, cat: Books, desc: "Marine bulletins"}
    - {id: 219, cat: Books, desc: "Marine History"}
+    - {id: 323, cat: Books, desc: "Marine History-History of Submarines"}
    - {id: 282, cat: Books, desc: "Marine History-Fleets history"}
    - {id: 281, cat: Books, desc: "Marine History-History of Merchant Marine"}
    - {id: 280, cat: Books, desc: "Marine History-Historic ships"}
@@ -160,11 +165,14 @@ caps:
    - {id: 245, cat: Books, desc: "Rarity-1800 - 1900"}
    - {id: 246, cat: Books, desc: "Rarity-1700 - 1800"}
    - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
+    - {id: 324, cat: Other, desc: "Posters, placards, signs"}
    - {id: 187, cat: Books, desc: "Others (not maritime)"}
    - {id: 162, cat: Books, desc: "Archive"}
-    - {id: 315, cat: Books, desc: "Archive-Unformed"}
+#    - {id: 325, cat: Other, desc: "Corrupt torrents (hash errors)"} # we filter these out in the rows selector
+    - {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"}

  modes:
    search: [q]
@@ -243,7 +251,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/kisssub.yml
+++ b/src/Jackett.Common/Definitions/kisssub.yml
@@ -1,11 +1,12 @@
 ---
-id: kisssub
-name: KissSub
-description: "KissSub is a CHINESE Public torrent index"
+id: miobt
+name: MioBT
+description: "MioBT is a CHINESE Public torrent index"
 language: zh-CN
 type: public
 encoding: UTF-8
 links:
+  - https://miobt.com/
  - https://kisssub.org/

 caps:
@@ -28,7 +29,7 @@ settings: []

 search:
  paths:
-    # https://kisssub.org/search.php?keyword=moon+720p
+    # https://miobt.com/search.php?keyword=moon+720p
    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}{{ end }}"

  rows:
@@ -51,20 +52,20 @@ search:
    date_today:
       # 今天 00:35	 (Today)
      optional: true
-      selector: td:nth-child(1):contains("昨天")
+      selector: td:nth-child(1):contains("今天")
      filters:
        - name: replace
-          args: ["昨天", "Today"]
+          args: ["今天", "Today"]
        - name: append
          args: " +08:00" # CST
        - name: fuzzytime
    date_yday:
      # 昨天 22:50	 (Yesterday)
      optional: true
-      selector: td:nth-child(1):contains("今天")
+      selector: td:nth-child(1):contains("昨天")
      filters:
        - name: replace
-          args: ["今天", "Yesterday"]
+          args: ["昨天", "Yesterday"]
        - name: append
          args: " +08:00" # CST
        - name: fuzzytime
--- a/src/Jackett.Common/Definitions/mnv.yml
+++ b/src/Jackett.Common/Definitions/mnv.yml
@@ -51,7 +51,7 @@ settings:
  - name: info_free
    type: info
    label: About Freeleech and OnlyUpload at MNV
-    default: <li>FreeLeech are torrents where neither the download or upload is counted.</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for buiding your Ratio up.</li><li>Do not set both FreeLeech and OnlyUpload check boxes, there are no torrents with both these flags so you will get a no-results error.</li>
+    default: <li>FreeLeech are torrents where neither the download or upload is counted.</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up.</li><li>Do not set both FreeLeech and OnlyUpload check boxes, there are no torrents with both these flags so you will get a no-results error.</li>
  - name: sort
    type: select
    label: Sort requested from site
--- a/src/Jackett.Common/Definitions/newpct-me.yml
+++ b/src/Jackett.Common/Definitions/newpct-me.yml
@@ -6,6 +6,9 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
+  - https://www.newpct.net/
+  - https://newpct.nocensor.sbs/
+legacylinks:
  - https://www.newpct.me/
  - https://newpct.nocensor.biz/

--- a/src/Jackett.Common/Definitions/nyaasi.yml
+++ b/src/Jackett.Common/Definitions/nyaasi.yml
@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
  - https://nyaa.si/
+  - https://nyaa.iss.ink/
 legacylinks:
  - https://nyaa.black-mirror.xyz/
  - https://nyaa.unblocked.casa/
--- 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:
@@ -109,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/opensharing.yml
+++ b/src/Jackett.Common/Definitions/opensharing.yml
@@ -37,12 +37,14 @@ caps:
    - {id: 275, cat: XXX, desc: "Movies XXX: Taboo"}
    - {id: 280, cat: XXX, desc: "Movies XXX: Lesbians"}
    - {id: 285, cat: XXX, desc: "Movies XXX: Lesbian Strap-On"}
+    - {id: 290, cat: XXX, desc: "Movies XXX: Midgets"}
    - {id: 295, cat: XXX, desc: "Movies XXX: Skinny & Petite"}
    - {id: 300, cat: XXX, desc: "Movies XXX: Young"}
    - {id: 320, cat: XXX, desc: "Movies XXX: MILF & Mature"}
    - {id: 325, cat: XXX, desc: "Movies XXX: Granny"}
    - {id: 340, cat: XXX, desc: "Movies XXX: Oral & Blowjob"}
    - {id: 360, cat: XXX, desc: "Movies XXX: Parody"}
+    - {id: 370, cat: XXX, desc: "Movies XXX: Pregnants"}
    - {id: 380, cat: XXX, desc: "Movies XXX: Public & Car, Outdoors"}
    - {id: 385, cat: XXX, desc: "Movies XXX: Rape Roleplay"}
    - {id: 400, cat: XXX, desc: "Movies XXX: Russian"}
--- a/src/Jackett.Common/Definitions/oxtorrent.yml
+++ b/src/Jackett.Common/Definitions/oxtorrent.yml
@@ -7,9 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.be/
-  - https://oxtorrent.unblockit.how/
-  - https://oxtorrent.nocensor.biz/
+  - https://www.oxtorrent.re/
+  - https://oxtorrent.unblockit.day/
+  - https://oxtorrent.nocensor.sbs/
 legacylinks:
  - https://www.oxtorrent.bz/
  - https://www.oxtorrent.ws/
@@ -17,12 +17,8 @@ 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/
  - https://oxtorrent.nocensor.work/
  - https://oxtorrent.unblockit.kim/
@@ -31,6 +27,10 @@ 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/
+  - https://oxtorrent.nocensor.biz/

 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/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
@@ -692,7 +692,7 @@ search:
    submit: "Поиск"

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

@@ -723,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
@@ -706,7 +706,7 @@ search:
    submit: "Поиск"

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

@@ -738,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/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.4
--- 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: "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: 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,227 +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"}
-    - {id: 9, cat: Movies, desc: "Studio Ghibli"}
-
-  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
@@ -64,13 +64,27 @@ 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

@@ -108,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
@@ -120,8 +138,5 @@ search:
        0: 1 # normal
        1: 2 # double
    minimumratio:
-      text: 0.4
-    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 5.3.0
+      text: 1.0
+# json UNIT3D 6.0.5
--- a/src/Jackett.Common/Definitions/rintor.yml
+++ b/src/Jackett.Common/Definitions/rintor.yml
@@ -149,7 +149,7 @@ search:
      args: ["(\\w+)", " +$1"] # prepend + to each word

  rows:
-    selector: tr[id^="tor_"]
+    selector: tr[id^="tor_"]:has(span.tor-approved) # only approved tors have .torrent and magnets.
    filters:
      - name: andmatch

--- a/src/Jackett.Common/Definitions/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -1,15 +1,16 @@
 ---
-id: baibako
-name: BaibaKo
-description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
+id: rudub
+name: RUDUB
+description: "RUDUB (ex-BaibaKoTV) is a RUSSIAN Semi-Private Torrent Tracker for TV"
 language: ru-RU
 type: semi-private
 encoding: windows-1251
 links:
-  - http://bko.baibako.tv/ # https is unsupported ERR_CONNECTION_REFUSED
+  - http://rudub.tv/ # https is unsupported ERR_CONNECTION_REFUSED
 legacylinks:
  - http://baibako.tv/
  - https://baibako.tv/
+  - http://bko.baibako.tv/

 caps:
  categorymappings:
@@ -65,6 +66,7 @@ login:

 search:
  paths:
+    # http://rudub.tv/browse.php?search=&incldead=1&sort=4&type=desc
    - path: browse.php
  inputs:
    search: "{{.Keywords }}"
@@ -77,7 +79,7 @@ search:
      args: ["[s|S](\\d+)[e|E][\\d]+", "/s$1"]

  rows:
-    selector: table > tbody > tr:has(a[href^="details.php?id="])
+    selector: div.card__torlist__browse_2

  fields:
    category:
@@ -88,7 +90,9 @@ search:
        - name: re_replace
          args: ["[\\/]+", ""]
        - name: replace
-          args: [" (Золото)", ""]
+          args: [" (Золото)", ""] # remove gold tag
+        - name: re_replace
+          args: ["[()]", " "] # remove the brackets around the English title and attributes
        - name: replace
          args: ["-Rip", "Rip"]
        - name: replace
@@ -109,66 +113,37 @@ search:
          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
        - name: append
          args: " - rus"
+        - name: trim # clean up any leading and trailing spaces left over from above editing
    details:
      selector: a[href^="details.php?id="]
      attribute: href
-    poster:
-      selector: img[src^="/posters/"]
-      attribute: src
    download:
      selector: a[href^="download.php?id="]
      attribute: href
    date:
-      selector: small
+      # 2022-03-28 01:28:07
+      selector: li[title="Дата"]
      filters:
-        - name: replace
-          args: ["Загружена: ", ""]
-        - name: replace
-          args: [" в ", " "]
-        - name: replace
-          args: ["января", "January"]
-        - name: replace
-          args: ["февраля", "February"]
-        - name: replace
-          args: ["марта", "March"]
-        - name: replace
-          args: ["апреля", "April"]
-        - name: replace
-          args: ["мая", "May"]
-        - name: replace
-          args: ["июня", "June"]
-        - name: replace
-          args: ["июля", "July"]
-        - name: replace
-          args: ["августа", "August"]
-        - name: replace
-          args: ["сентября", "September"]
-        - name: replace
-          args: ["октября", "October"]
-        - name: replace
-          args: ["ноября", "November"]
-        - name: replace
-          args: ["декабря", "December"]
        - name: append
          args: " +03:00" # MSK
        - name: dateparse
-          args: "2 January 2006 15:04:05 -07:00"
+          args: "2006-01-02 15:04:05 -07:00"
    files:
-      selector: td:nth-last-child(5)
+      selector: li[title="Файлов"]
    size:
-      selector: td:nth-last-child(3)
+      selector: li[title="Размер"]
    seeders:
-      selector: td:nth-last-child(2)
+      selector: li[title="Активность"]
      filters:
-        - name: split
-          args: ["|", 0]
+        - name: regexp
+          args: (\d+)\s+\d+
    leechers:
-      selector: td:nth-last-child(2)
+      selector: li[title="Активность"]
      filters:
-        - name: split
-          args: ["|", 1]
+        - name: regexp
+          args: \d+\s+(\d+)
    grabs:
-      selector: td:nth-last-child(1)
+      selector: li[title="Завершено"]
    downloadvolumefactor:
      case:
        "a[href^=\"details.php?id=\"]:contains(\"(Золото)\")": 0
--- a/src/Jackett.Common/Definitions/rutor.yml
+++ b/src/Jackett.Common/Definitions/rutor.yml
@@ -8,6 +8,7 @@ encoding: UTF-8
 links:
  - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
  - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
+  - http://6tor.org/
 legacylinks:
  - http://live-rutor.org/ # domain expired 9 Feb 2020
  - http://new-rutor.org/ # ERR_NAME_NOT_RESOLVED
--- a/src/Jackett.Common/Definitions/sexxi.yml
+++ b/src/Jackett.Common/Definitions/sexxi.yml
@@ -1,170 +0,0 @@
---
-id: sexxi
-name: Sexxi
-description: "Sexxi is a RUSSIAN Public Torrent Tracker for 3X"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - https://sexxi.club/
-
-caps:
-  # don't forget to update the search fields category case block
-  categorymappings:
-    - {id: 1, cat: XXX, desc: "Любительское"}
-    - {id: 20, cat: XXX, desc: "Орал"}
-    - {id: 13, cat: XXX, desc: "Минет"}
-    - {id: 2, cat: XXX, desc: "Анал"}
-    - {id: 31, cat: XXX, desc: "Куннилингус"}
-    - {id: 32, cat: XXX, desc: "Большие сиськи"}
-    - {id: 27, cat: XXX, desc: "HD-видео"}
-    - {id: 10, cat: XXX, desc: "Хардкор"}
-    - {id: 35, cat: XXX, desc: "Втроем"}
-    - {id: 19, cat: XXX, desc: "Мастурбация"}
-    - {id: 34, cat: XXX, desc: "Русские"}
-    - {id: 7, cat: XXX, desc: "Молодые"}
-    - {id: 17, cat: XXX, desc: "Зрелые"}
-    - {id: 5, cat: XXX, desc: "Блондинки"}
-    - {id: 6, cat: XXX, desc: "Брюнетки"}
-    - {id: 3, cat: XXX, desc: "Азиатки"}
-    - {id: 15, cat: XXX, desc: "Лесбиянки"}
-    - {id: 12, cat: XXX, desc: "Межрасовый"}
-    - {id: 30, cat: XXX, desc: "Групповое"}
-    - {id: 36, cat: XXX, desc: "От первого лица"}
-    - {id: 22, cat: XXX, desc: "ПорноЗвезды"}
-    - {id: 11, cat: XXX, desc: "Кастинг"}
-    - {id: 33, cat: XXX, desc: "Ролевая игра"}
-    - {id: 14, cat: XXX, desc: "Фетиш"}
-    - {id: 25, cat: XXX, desc: "Униформа"}
-    - {id: 18, cat: XXX, desc: "Пьяные"}
-    - {id: 21, cat: XXX, desc: "Колготки"}
-    - {id: 28, cat: XXX, desc: "Волосатые"}
-    - {id: 23, cat: XXX, desc: "Рыжая"}
-    - {id: 24, cat: XXX, desc: "Ретро"}
-    - {id: 29, cat: XXX, desc: "Нудизм"}
-    - {id: 4, cat: XXX, desc: "БДСМ"}
-    - {id: 8, cat: XXX, desc: "Эротика"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: date
-    options:
-      date: created
-      title: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-
-download:
-  selectors:
-    - selector: a[href*="index.php?do=download&id="]
-      attribute: href
-
-search:
-  headers:
-    Referer: ["{{ .Config.sitelink }}"]
-  paths:
-    - path: index.php
-  inputs:
-    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
-    do: search
-    subaction: search
-    search_start: 0
-    full_search: 1
-    result_from: 1
-    all_word_seach: 0
-    showposts: 0
-    # 0 in article 1 in comments 2 in static pages 3 in article titles
-    titleonly: 3
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    sortby: "{{ .Config.sort }}"
-    resorder: "{{ .Config.type }}"
-
-  rows:
-    selector: div.short-item
-
-  fields:
-    category:
-      selector: p a:last-child
-      case:
-        a[href$="/amateur/"]: 1
-        a[href$="/pornstars/"]: 22
-        a[href$="/hdvideo/"]: 27
-        a[href$="/blonde/"]: 5
-        a[href$="/hairy/"]: 28
-        a[href$="/brunette/"]: 6
-        a[href$="/russians/"]: 34
-        a[href$="/asian/"]: 3
-        a[href$="/redhead/"]: 23
-        a[href$="/anal/"]: 2
-        a[href$="/oral/"]: 20
-        a[href$="/bdsm/"]: 4
-        a[href$="/erotic/"]: 8
-        a[href$="/hardcore/"]: 10
-        a[href$="/uniforms/"]: 25
-        a[href$="/masturbation/"]: 19
-        a[href$="/big_boobs/"]: 32
-        a[href$="/role-playing-game/"]: 33
-        a[href$="/interracial/"]: 12
-        a[href$="/lesbians/"]: 15
-        a[href$="/young/"]: 7
-        a[href$="/threesome/"]: 35
-        a[href$="/kasting/"]: 11
-        a[href$="/blowjob/"]: 13
-        a[href$="/retro/"]: 24
-        a[href$="/fetish/"]: 14
-        a[href$="/mature/"]: 17
-        a[href$="/drunk/"]: 18
-        a[href$="/nudism/"]: 29
-        a[href$="/pantyhose/"]: 21
-        a[href$="/group/"]: 30
-        a[href$="/cunnilingus/"]: 31
-        a[href$="/first_person/"]: 36
-        "*": 27
-    title:
-      selector: a.short-title
-    details:
-      selector: a.short-title
-      attribute: href
-    download:
-      selector: a.short-title
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    cat_tags:
-      selector: p.argcat
-    description:
-      selector: ul.short-list
-      filters:
-        - name: append
-          args: "</br>{{ .Result.cat_tags }}"
-    date:
-      selector: div.short-meta-item:has(span.fa-calendar-alt)
-      filters:
-        # 28.10.2021
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "02.01.2006 -07:00"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# DataLife
--- a/src/Jackett.Common/Definitions/shareisland-api.yml
+++ b/src/Jackett.Common/Definitions/shareisland-api.yml
@@ -72,10 +72,19 @@ 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
@@ -87,12 +96,13 @@ search:

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

  fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
    title:
      selector: name
      filters:
@@ -148,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
@@ -165,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.6
--- a/src/Jackett.Common/Definitions/skipthecommercials-api.yml
+++ b/src/Jackett.Common/Definitions/skipthecommercials-api.yml
@@ -60,10 +60,19 @@ 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
@@ -71,12 +80,13 @@ search:

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

  fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
    title:
      selector: name
    details:
@@ -108,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.6
--- a/src/Jackett.Common/Definitions/skipthetrailers.yml
+++ b/src/Jackett.Common/Definitions/skipthetrailers.yml
@@ -0,0 +1,143 @@
+---
+id: skipthetrailers
+name: SkipTheTrailers
+description: "SkipTheTrailers (STT) is a Private Torrent Tracker for MOVIES"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://skipthetrailers.xyz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+
+  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://skipthetrailers.xyz/\" target =_blank>SkipTheTrailers</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
+    minimumseedtime:
+      # 7 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.0.5
--- 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/sosulki.yml
+++ b/src/Jackett.Common/Definitions/sosulki.yml
@@ -41,7 +41,7 @@ download:

 search:
  paths:
-    - path: "{{ if .Keywords }}?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story={{ .Keywords }}&titleonly=3catlist[]=0&searchdate=0&resorder=desc{{ else }}lastnews/{{ end }}"
+    - path: "{{ if .Keywords }}?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story={{ .Keywords }}&titleonly=3&catlist[]=0&searchdate=0&resorder=desc{{ else }}lastnews/{{ end }}"

  rows:
    selector: tr.fr_viewn_in:has(td.frs:contains("B"))
--- a/src/Jackett.Common/Definitions/tasmanit.yml
+++ b/src/Jackett.Common/Definitions/tasmanit.yml
@@ -7,6 +7,9 @@ type: private
 encoding: UTF-8
 links:
  - https://tasmanit.es/
+certificates:
+  - 23C30AC9655A8A7351A549538062B8C6B0D01A78 # expired 24 Jan 2022
+  - 4325e8f1f13f6074f2bed6a6186fe183791ab32d # expired 1 March 2022

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/teamctgame.yml
+++ b/src/Jackett.Common/Definitions/teamctgame.yml
@@ -0,0 +1,243 @@
+---
+id: teamctgame
+name: Team CT Game
+description: "Team CT Game (TCTG) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://tctg.pm/
+legacylinks:
+  - https://teamctgame.co/
+  - http://teamctgame.xyz/
+  - https://teamctgame.xyz/
+  - https://tctg.in/
+
+caps:
+  categorymappings:
+    - {id: 409, cat: Books/Comics, desc: "BD"}
+    - {id: 410, cat: Books/Mags, desc: "Ebooks - Presse"}
+    - {id: 411, cat: Audio/Audiobook, desc: "Ebooks - Audiobooks"}
+    - {id: 412, cat: Books/EBook, desc: "Ebooks - Ebooks"}
+    - {id: 413, cat: Movies/3D, desc: "Films - 3D"}
+    - {id: 414, cat: Movies/HD, desc: "Films - 4K"}
+    - {id: 415, cat: Movies/UHD, desc: "Films - 4K HDR"}
+    - {id: 416, cat: Movies/UHD, desc: "Films - 4K Light"}
+    - {id: 417, cat: Movies/UHD, desc: "Films - 4K Remux"}
+    - {id: 418, cat: Movies, desc: "Films - Animation"}
+    - {id: 419, cat: Movies/BluRay, desc: "Films - BDRip / BRRip"}
+    - {id: 420, cat: Movies/DVD, desc: "Films - DVD-R"}
+    - {id: 421, cat: Movies/DVD, desc: "Films - DVDRip"}
+    - {id: 422, cat: Movies/BluRay, desc: "Films - Full Bluray"}
+    - {id: 423, cat: Movies/HD, desc: "Films - HDTV"}
+    - {id: 424, cat: Movies/HD, desc: "Films - HD 1080p"}
+    - {id: 425, cat: Movies/HD, desc: "Films - HD 720p"}
+    - {id: 426, cat: Movies/HD, desc: "Films - HDLiGHT / M-HD"}
+    - {id: 427, cat: Movies/HD, desc: "Films - HDRiP"}
+    - {id: 428, cat: Movies, desc: "Films - Pack"}
+    - {id: 429, cat: Movies, desc: "Films - Remux"}
+    - {id: 430, cat: TV, desc: "Films - TVRip"}
+    - {id: 431, cat: Movies, desc: "Films - VO"}
+    - {id: 432, cat: Movies, desc: "Films - VOSTFR"}
+    - {id: 433, cat: Movies/WEB-DL, desc: "Films - Web"}
+    - {id: 434, cat: Movies/HD, desc: "Films - x265"}
+    - {id: 436, cat: Console, desc: "Jeux - Consoles"}
+    - {id: 437, cat: PC/Games, desc: "Jeux - PC"}
+    - {id: 438, cat: PC/0day, desc: "Logiciels -  Windows"}
+    - {id: 439, cat: Other, desc: "Logiciels - Graph / Wallpaper"}
+    - {id: 440, cat: TV/HD, desc: "Series - 4K HDR"}
+    - {id: 441, cat: TV/HD, desc: "Series TV - Pack HD"}
+    - {id: 442, cat: TV/HD, desc: "Series TV - Episode HD"}
+    - {id: 443, cat: TV/HD, desc: "Series TV - Pack HD VOSTFR"}
+    - {id: 444, cat: TV/HD, desc: "Series TV - Episode HD VOSTFR"}
+    - {id: 445, cat: TV/SD, desc: "Series TV - Pack SD"}
+    - {id: 446, cat: TV/SD, desc: "Series TV - Episode SD"}
+    - {id: 447, cat: TV/SD, desc: "Series TV - Pack SD VOSTFR"}
+    - {id: 448, cat: TV/SD, desc: "Series TV - Episode SD VOSTFR"}
+    - {id: 449, cat: TV/Anime, desc: "Series - Animés"}
+    - {id: 450, cat: TV, desc: "Spectacles - Tous"}
+    - {id: 451, cat: TV, desc: "TV - Emissions"}
+    - {id: 452, cat: TV/Documentary, desc: "TV - Documentaires"}
+    - {id: 453, cat: TV/Sport, desc: "TV - Sports"}
+    - {id: 435, cat: XXX, desc: "Films - XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    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: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+  error:
+    - selector: td.embedded:has(h2:contains("Erreur")) # 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"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: ["!", 435]
+    - path: special.php
+      categories: [435]
+  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 }}"
+    inclbookmarked: 0
+    # 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 }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_phase1:
+      selector: a[href^="details.php?id="] b
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+        - name: re_replace
+          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    details:
+      selector: a[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: " +01:00" # CET
+        - 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: " +01:00" # CET
+        - 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: 1.0
+# NexusPHP Standard v1.6 Beta 12
--- a/src/Jackett.Common/Definitions/tellytorrent-api.yml
+++ b/src/Jackett.Common/Definitions/tellytorrent-api.yml
@@ -72,13 +72,27 @@ 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

@@ -116,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
@@ -133,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.2
--- a/src/Jackett.Common/Definitions/the-crazy-ones.yml
+++ b/src/Jackett.Common/Definitions/the-crazy-ones.yml
@@ -0,0 +1,178 @@
+---
+id: the-crazy-ones
+name: The-Crazy-Ones
+description: "The-Crazy-Ones (T-C-O) is a Private GERMAN tracker for MOVIES / TV / MUSIC"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://thecrazyones.hopto.org/
+
+caps:
+  categorymappings:
+    - {id: 62, cat: Books, desc: "EBook"}
+    - {id: 30, cat: TV/Anime, desc: "Filme - Animie"}
+    - {id: 28, cat: Movies/BluRay, desc: "Filme - Bluray"}
+    - {id: 31, cat: Movies/Other, desc: "Filme - Bollywood"}
+    - {id: 32, cat: Movies/DVD, desc: "Filme - DVD"}
+    - {id: 33, cat: Movies/HD, desc: "Filme - HD"}
+    - {id: 34, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 35, cat: Movies, desc: "Filme - Pack"}
+    - {id: 36, cat: Movies/SD, desc: "Filme - SD"}
+    - {id: 37, cat: Movies/UHD, desc: "Filme - UHD"}
+    - {id: 38, cat: Movies/HD, desc: "Filme - x264"}
+    - {id: 63, cat: Movies, desc: "Fuer Unsere Kleinsten"}
+    - {id: 64, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
+    - {id: 39, cat: Audio, desc: "Musik - Alben"}
+    - {id: 40, cat: Audio, desc: "Musik - Diskografie"}
+    - {id: 41, cat: Audio/Audiobook, desc: "Musik - Hoerbuch"}
+    - {id: 42, cat: Audio, desc: "Musik - Mixe"}
+    - {id: 43, cat: Audio/MP3, desc: "Musik - MP3"}
+    - {id: 66, cat: Audio, desc: "Musik - Pack"}
+    - {id: 44, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 45, cat: PC, desc: "Programme - Linux"}
+    - {id: 48, cat: PC/Mac, desc: "Programme - Mac"}
+    - {id: 49, cat: PC/0day, desc: "Programme - Windows"}
+    - {id: 65, cat: TV, desc: "Serien - Allgemein"}
+    - {id: 50, cat: TV/Documentary, desc: "Serien - Dokus"}
+    - {id: 51, cat: TV, desc: "Serien - Klassiker"}
+    - {id: 52, cat: TV, desc: "Serien - Pack"}
+    - {id: 53, cat: TV/Sport, desc: "Serien - Sport"}
+    - {id: 60, cat: Other, desc: "Sonstiges"}
+    - {id: 54, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
+    - {id: 55, cat: Console, desc: "Spiele - Konsolen"}
+    - {id: 57, cat: PC/Games, desc: "Spiele - Mac / Linux / PC"}
+    - {id: 58, cat: Console/Other, desc: "Spiele - Wimmel"}
+    - {id: 59, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: pin
+    type: text
+    label: Pin
+  - name: freeleech
+    type: checkbox
+    label: Filter FreeLeech only
+    default: false
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech and OnlyUpload at T-C-O
+    default: <li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
+  - 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>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    secure_pin: "{{ .Config.pin }}"
+  error:
+    - selector: .tablea:contains("Fehler")
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  # https://thecrazyones.hopto.org/browse.php?showsearch=1&c65=1&c51=1&c52=1&search=&incldead=1&orderby=added&sort=desc
+  path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 dead
+    incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid search from the browse.php page or return imdb links in results
+
+  rows:
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"] > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php"]
+    details:
+      selector: a[href^="details.php"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
+    seeders:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
+    leechers:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
+    date:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    downloadvolumefactor:
+      case:
+        img[src="pic/oupic.gif"]: 0
+        img[src="pic/freeleech.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src="pic/freeleech.gif"]: 0
+        "*": 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/thenewfun.yml
+++ b/src/Jackett.Common/Definitions/thenewfun.yml
@@ -0,0 +1,168 @@
+---
+id: thenewfun
+name: The-New-Fun
+description: "The-New-Fun is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://the-new-fun.spdns.eu/
+
+caps:
+  categorymappings:
+    - {id: 119, cat: Other, desc: "Bilder"}
+    - {id: 139, cat: TV/Documentary, desc: "Doku - HD"}
+    - {id: 141, cat: TV/Documentary, desc: "Doku - Pack"}
+    - {id: 140, cat: TV/Documentary, desc: "Doku - SD"}
+    - {id: 142, cat: TV/Documentary, desc: "Doku - Sonstige"}
+    - {id: 120, cat: Books, desc: "Ebook"}
+    - {id: 131, cat: TV/Anime, desc: "Filme - Animie"}
+    - {id: 101, cat: Movies/BluRay, desc: "Filme - Blue Ray"}
+    - {id: 102, cat: Movies/Other, desc: "Filme - Bollywood"}
+    - {id: 103, cat: Movies/DVD, desc: "Filme - DVD"}
+    - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
+    - {id: 135, cat: Movies/HD, desc: "Filme - HD"}
+    - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 134, cat: Movies/SD, desc: "Filme - SD"}
+    - {id: 136, cat: Movies/UHD, desc: "Filme - UHD"}
+    - {id: 105, cat: Movies/HD, desc: "Filme - x264/x265"}
+    - {id: 106, cat: Movies/SD, desc: "Filme - XviD / DivX"}
+    - {id: 127, cat: Movies, desc: "Für Unsere kleinsten"}
+    - {id: 121, cat: PC/Mobile-Other, desc: "Handy Stuff"}
+    - {id: 124, cat: Audio, desc: "Musik - Alben"}
+    - {id: 123, cat: Audio, desc: "Musik - Discography"}
+    - {id: 122, cat: Audio/Audiobook, desc: "Musik - Hörbuch"}
+    - {id: 133, cat: Audio/MP3, desc: "Musik - MP3/Mp4"}
+    - {id: 146, cat: Audio, desc: "Musik - Pack"}
+    - {id: 125, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 113, cat: PC, desc: "Programme - Linux"}
+    - {id: 114, cat: PC/Mac, desc: "Programme - Mac"}
+    - {id: 115, cat: PC/0day, desc: "Programme - Windows"}
+    - {id: 137, cat: TV/HD, desc: "Serien - HD"}
+    - {id: 116, cat: TV, desc: "Serien - Pack"}
+    - {id: 138, cat: TV/SD, desc: "Serien - SD"}
+    - {id: 143, cat: TV/Other, desc: "Serien - Sonstige"}
+    - {id: 144, cat: TV/UHD, desc: "Serien - UHD"}
+    - {id: 129, cat: Other, desc: "Sonstiges"}
+    - {id: 109, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
+    - {id: 112, cat: Console, desc: "Spiele - Konsolen"}
+    - {id: 111, cat: PC/Games, desc: "Spiele - Mac / Linux"}
+    - {id: 110, cat: PC/Games, desc: "Spiele - PC"}
+    - {id: 118, cat: TV/Sport, desc: "WWE - Sport"}
+    - {id: 69, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at T-N-F
+    default: <li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
+  - 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>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.tabletitle:contains("fehlgeschlagen")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  # https://the-new-fun.spdns.eu/browse.php?showsearch=1&c140=1&c142=1&search=2022+1080p&incldead=1&orderby=added&sort=desc
+  path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 dead
+    incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid search from the browse.php page or return imdb links in results
+
+  rows:
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"]:not(:has(a[href=\"index.php\"])) > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php"]
+    details:
+      selector: a[href^="details.php"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: img[id="img-1"]
+      attribute: src
+    size:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
+    seeders:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
+    leechers:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
+    date:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    downloadvolumefactor:
+      case:
+        img[src="pic/oupic.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/thepiratebay.yml
+++ b/src/Jackett.Common/Definitions/thepiratebay.yml
@@ -127,6 +127,7 @@ search:
    - path: "https://apibay.org/{{ if .Keywords }}q.php?q={{ .Keywords }}&cat={{ join .Categories \",\" }}{{ else }}precompiled/data_top100_recent.json{{ end }}"
      response:
        type: json
+
  keywordsfilters:
    # remove it's #8829
    - name: re_replace
--- a/src/Jackett.Common/Definitions/thesceneplace.yml
+++ b/src/Jackett.Common/Definitions/thesceneplace.yml
@@ -102,6 +102,10 @@ search:
    by: "{{ .Config.type }}"
    # does not support imdbid search and does not return imdb link in results

+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
  rows:
    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]):has(td[width=\"30\"]){{ if .Config.freeleech }}:has(img[src=\"images/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.freeleech }}, table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]):has(td[width=\"30\"]):has(img[src=\"images/gold.gif\"]){{ else }}{{ end }}"

@@ -128,24 +132,24 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    superuser:
+    uploader:
      selector: a[href^="index.php?page=userdetails"]
      optional: true
    date:
-      selector: "{{ if .Result.superuser }}td:nth-last-child(10){{ else }}td:nth-last-child(8){{ end }}"
+      selector: td:has(a[href^="download.php?id="]) ~ td
      filters:
        - name: append
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "02/01/2006 -07:00"
    seeders:
-      selector: "{{ if .Result.superuser }}td:nth-last-child(9){{ else }}td:nth-last-child(7){{ end }}"
+      selector: td:has(a[href^="download.php?id="]) ~ td ~ td
    leechers:
-      selector: "{{ if .Result.superuser }}td:nth-last-child(8){{ else }}td:nth-last-child(6){{ end }}"
+      selector: td:has(a[href^="download.php?id="]) ~ td ~ td ~ td
    grabs:
-      selector: "{{ if .Result.superuser }}td:nth-last-child(7){{ else }}td:nth-last-child(5){{ end }}"
+      selector: td:has(a[href^="download.php?id="]) ~ td ~ td ~ td ~ td
    size:
-      selector: "{{ if .Result.superuser }}td:nth-last-child(5){{ else }}td:nth-last-child(4){{ end }}"
+      selector: "td:has(a[href^=\"download.php?id=\"]) ~ td ~ td ~ td ~ td ~ td{{ if .Result.uploader }} ~ td{{ else }}{{ end }}"
    downloadvolumefactor:
      case:
        img[src="images/freeleech.gif"]: 0
@@ -168,6 +172,6 @@ search:
    minimumratio:
      text: 1.0
    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 #  xbtitFM v3.1.00
--- a/Show More
+++ b/Show More