greekdiamond: removed. resolves #9407

comicat, miobt: -> semi
switching to semi so we can save the cookie to pass the visitors test
2025-12-15 19:46:12 +01:00 · 2024-09-02 08:23:21 +12:00 · 2024-09-02 06:54:10 +12:00 · 2024-09-02 06:01:16 +12:00 · 2024-09-02 06:01:05 +12:00 · 2024-09-02 05:13:01 +12:00
200 changed files with 3287 additions and 4282 deletions
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux)
 * macOS 12.0+ (Monterey) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos)

+#### Supported Trackers
 <details> <summary> <b> Supported Public Trackers </b> </summary>

 * ØMagnet
@@ -31,7 +32,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ACG.RIP
 * Anidex
 * AniLibria
- * Anime Time
 * Anime Tosho
 * AniRena
 * AniSource
@@ -42,11 +42,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BitRu
 * BitSearch
 * BT.etree
+ * BTdirectory (BT目录)
 * BTMET
 * BTSOW
 * Byrutor
 * Cinecalidad
- * comicat
 * cpasbien
 * cpasbienClone
 * CrackingPatching
@@ -55,6 +55,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * DonTorrent
 * E-Hentai
 * EBook Bay (EBB)
+ * Elitetorrent.wf
 * EpubLibre
 * EXT Torrents
 * ExtraTorrent.st
@@ -74,17 +75,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * kickasstorrents.ws
 * Knaben
 * LePorno.info
+ * Libronube
 * LimeTorrents
 * LinuxTracker
 * Mac Torrents Download
 * MegaPeer
 * MejorTorrent
 * Mikan
- * MioBT
 * MixTapeTorrent
 * MoviesDVDR
 * MyPornClub
- * NextJAV
 * Newstudio
 * Nipponsei
 * NNTT
@@ -96,6 +96,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ParnuXi
 * PC-torrent
 * PornoTorrent
+ * PornRips
 * Postman
 * ProPorn
 * Rapidzona
@@ -153,12 +154,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * AniDUB
 * AnimeLayer
 * ArenaBG
+ * Best-Torrents [PAY2DL]
 * BitMagnet (Local DHT) [[site](https://github.com/bitmagnet-io/bitmagnet)]
 * BookTracker
 * BootyTape
 * Catorrent
+ * comicat
 * Deildu
- * Demonoid
 * Devil-Torrents
 * DreamingTree
 * DXP (Deaf Experts)
@@ -171,6 +173,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * File-Tracker
 * Gay-Torrents.net
 * Genesis-Movement
+ * GOOD tracker
 * HD-CzTorrent
 * HDGalaKtik
 * HellTorrents
@@ -185,6 +188,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Masters-TB
 * Mazepa
 * Metal Tracker
+ * MioBT
 * MIRcrew
 * MuseBootlegs (MB)
 * MVGroup Forum
@@ -213,6 +217,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TribalMixes
 * Union Fansub
 * UniOtaku
+ * ViDEOTEKA
 * xTorrenty
 * ZOMB
 * Ztracker
@@ -230,7 +235,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * 720pier
 * Abnormal
 * ABtorrents (ABT + RNS)
- * Acid Lounge (A-L)
 * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
 * Aftershock
 * AGSVPT (Artic Global Seed Vault)
@@ -239,6 +243,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * AlphaRatio (AR)
 * AmigosShareClub
 * AnimeBytes (AB)
+ * AnimeLovers
 * AnimeTorrents (AnT)
 * AnimeTorrents.ro (Anime Torrents Romania)
 * AnimeWorld
@@ -273,6 +278,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BlueBird
 * BlurayTracker
 * Blutopia (BLU)
+ * Bolly (Telly)
 * Borgzelle [![(invite needed)][inviteneeded]](#)
 * Boxing Torrents
 * Brasil Tracker
@@ -289,7 +295,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * CarPT
 * Cathode-Ray.Tube (CRT)
 * CD File
- * Central Torrent
 * CeskeForum
 * CGPeers [![(invite needed)][inviteneeded]](#)
 * CHDBits [![(invite needed)][inviteneeded]](#)
@@ -337,7 +342,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Fappaizuri
 * FearNoPeer
 * Femdomcult
- * File-Shack
 * FileList (FL)
 * FinElite (FE)
 * FinVip
@@ -356,8 +360,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * GimmePeers (formerly ILT)
 * GiroTorrent
 * GreatPosterWall (GPW)
- * GreekDiamond
- * H-P2P
 * HaiDan
 * Hǎitáng (海棠PT)
 * HappyFappy
@@ -377,26 +379,22 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HDBits [![(invite needed)][inviteneeded]](#)
 * HDCiTY (HDC) [![(invite needed)][inviteneeded]](#)
 * HDFans
- * HDFun (HDZone)
 * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
 * HDKylin (麒麟)
- * HDMaYi (小蚂蚁PT站)
 * HDPT (明教) [![(invite needed)][inviteneeded]](#)
 * HDRoute [![(invite needed)][inviteneeded]](#)
 * HDSky [![(invite needed)][inviteneeded]](#)
 * HDT-LaFenice
 * HDtime
- * HDTorrents.it [![(invite needed)][inviteneeded]](#)
+ * HDTorrents.it [PAY2DL]
 * HDTurk
 * HDU
- * hdvbits
 * HDVIDEO
 * Hebits
 * HellasHut
 * HHanClub
 * HomePornTorrents (HPT)
 * House of Devil
- * HQMusic
 * HUDBT (蝴蝶) [![(invite needed)][inviteneeded]](#)
 * iAnon
 * ICC2022 (冰淇淋)
@@ -404,6 +402,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ImmortalSeed (iS)
 * Immortuos
 * Indietorrents [![(invite needed)][inviteneeded]](#)
+ * INFINITY
 * Infire
 * Insane Tracker
 * IPTorrents (IPT)
@@ -435,7 +434,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Lesbians4u
 * Libble
 * LibraNet (LN)
- * LilleSky.org
 * LinkoManija
 * Locadora
 * LosslessClub [![(invite needed)][inviteneeded]](#)
@@ -460,6 +458,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * MySpleen [![(invite needed)][inviteneeded]](#)
 * NCore [![(invite needed)][inviteneeded]](#)
 * Nebulance (NBL) (TransmiTheNet)
+ * NewHeaven (TorrentHeavenResurrection) [![(invite needed)][inviteneeded]](#)
 * NicePT
 * NorBits
 * NORDiCHD
@@ -496,6 +495,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PTCafe (咖啡)
 * PTChina (铂金学院)
 * PTerClub (PT之友俱乐部)
+ * PTFans
 * PTFiles (PTF)
 * PThome [![(invite needed)][inviteneeded]](#)
 * PTSBAO (烧包) [![(invite needed)][inviteneeded]](#)
@@ -518,31 +518,27 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Resurrect The Net [![(invite needed)][inviteneeded]](#)
 * RetroFlix
 * RevolutionTT [![(invite needed)][inviteneeded]](#)
- * RocketHD
 * Romanian Metal Torrents (RMT)
 * RoTorrent
 * Rousi
 * RPTScene (RPTorrents)
 * SATClubbing
 * SceneHD [![(invite needed)][inviteneeded]](#)
- * SceneLinks (SL)
 * SceneRush
 * SceneTime
 * Secret Cinema
 * SeedFile
+ * seedpool
 * SFP (Share Friends Projekt)
- * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
 * Shareisland
 * Shazbat
 * SiamBIT
 * SkipTheCommercials
- * slosoul
 * SnowPT (SSPT)
 * SoulVoice (聆音Club)
 * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
 * SpeedCD
 * Speedmaster HD [![(invite needed)][inviteneeded]](#)
- * SpeedTorrent Reloaded
 * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
 * SportsCult
 * SpringSunday [![(invite needed)][inviteneeded]](#)
@@ -592,7 +588,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentDay (TD)
 * TorrentDD
 * Torrenteros (TTR)
- * TorrentHeaven (German) [![(invite needed)][inviteneeded]](#)
 * TorrentHR [![(invite needed)][inviteneeded]](#)
 * Torrenting (TT)
 * Torrentland
@@ -616,8 +611,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * UnionGang
 * UnlimitZ
 * upload.cx
+ * Upscale Vault
 * UTOPIA
- * ViSiON HD
 * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
 * White Angel
 * WinterSakura
@@ -631,7 +626,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * XtremeBytes
 * XWT-Classics
 * XWTorrents (XWT)
- * YDYPT (伊甸园PT)
 * YggTorrent (YGG)
 * YOiNKED
 * Zamunda.net
@@ -746,7 +740,7 @@ On most operating systems all the required dependencies will already be present.
 ### Install as service
 A) Command to download and install the latest package and run the Jackett service:

-`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && sudo wget -Nc https://github.com/Jackett/Jackett/releases/latest/download/"$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"`
+`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && sudo wget -Nc https://github.com/Jackett/Jackett/releases/latest/download/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo chown $(whoami):$(id -g) -R "/opt/Jackett" && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`

 B) Or manually:

--- a/src/DateTimeRoutines/DateTimeRoutines.csproj
+++ b/src/DateTimeRoutines/DateTimeRoutines.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <LangVersion>9</LangVersion>
    <NoWarn />
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    <WarningsAsErrors />
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -8,6 +8,8 @@

    <!-- Set the Product and Version info for our own projects -->
    <PropertyGroup Condition="'$(JackettProject)'=='true'">
+        <Version>0.0.0</Version>
+
        <PathMap>$(MSBuildProjectDirectory)=./$(MSBuildProjectName)/</PathMap>
    </PropertyGroup>

--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -481,7 +481,9 @@
                                    <td class="fit">{{jacketTimespan PublishDate}}</td>
                                    <td class="fit">{{jacketTimespan FirstSeen}}</td>
                                    <td class="fit">{{Tracker}}</td>
-                                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
+                                    <td class="Title" style="word-break: break-all">
+                                        {{#if Details}}<a href="{{Details}}" target="_blank">{{Title}}</a>{{else}}{{Title}}{{/if}} <span class="release-labels"></span>
+                                    </td>
                                    <td class="fit">{{Size}}</td>
                                    <td class="fit">{{jacketSize Size}}</td>
                                    <td class="fit">{{Files}}</td>
@@ -629,7 +631,9 @@
                    <td class="text-center">{{PublishDate}}</td>
                    <td class="text-center" title="{{dateFormat PublishDate format="YYYY-MM-DD HH:mm:ss Z"}}">{{jacketTimespan PublishDate}}</td>
                    <td class="text-center">{{Tracker}}</td>
-                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
+                    <td class="Title" style="word-break: break-all">
+                        {{#if Details}}<a href="{{Details}}" target="_blank">{{Title}}</a>{{else}}{{Title}}{{/if}} <span class="release-labels"></span>
+                    </td>
                    <td class="text-right">{{Size}}</td>
                    <td class="text-right fit">{{jacketSize Size}}</td>
                    <td class="text-center">{{Files}}</td>
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -14,7 +14,7 @@ links:
  - https://x1337x.eu/
  - https://x1337x.se/
  - https://x1337x.cc/
-  - https://1337x.unblockit.black/
+  - https://1337x.unblockit.download/
  - https://1337x.unblockninja.com/
  - https://1337x.ninjaproxy1.com/
  - https://1337x.proxyninja.org/
@@ -24,9 +24,6 @@ links:
 legacylinks:
  - https://1337x.is/
  - https://1337x.gd/
-  - https://1337x.mrunblock.life/
-  - https://1337x.unblockit.asia/
-  - https://1337x.unblockit.mov/
  - https://1337x.unblockit.rsvp/
  - https://1337x.unblockit.vegas/
  - https://1337x.unblockit.esq/
@@ -42,6 +39,8 @@ legacylinks:
  - https://1337x.unblockit.ong/ # 502
  - https://1337x.abcproxy.org/
  - https://1337x.so/
+  - https://1337x.unblockit.black/
+  - https://1337x.unblockit.meme/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -195,4 +195,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.12 2024-05-20
+# NexusPHP v1.8.13 2024-07-23
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/src/Jackett.Common/Definitions/acidlounge.yml
@@ -1,188 +0,0 @@
---
-id: acidlounge
-name: Acid-Lounge
-description: "Acid Lounge (A-L) is a Private Torrent Tracker for 0DAY / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.acid-lounge.org.uk/
-
-caps:
-  categorymappings:
-    - {id: 79, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 61, cat: TV/Anime, desc: "Anime"}
-    - {id: 55, cat: PC/0day, desc: "Appz/0-Day"}
-    - {id: 59, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 22, cat: PC, desc: "Appz/Misc"}
-    - {id: 32, cat: PC, desc: "Appz/PC"}
-    - {id: 48, cat: Audio/Audiobook, desc: "Audio/Books"}
-    - {id: 84, cat: Other, desc: "Damaged Torrent"}
-    - {id: 14, cat: Books/EBook, desc: "eBooks"}
-    - {id: 82, cat: Books/Comics, desc: "eBooks/Comics"}
-    - {id: 81, cat: Books/Mags, desc: "eBooks/Mags"}
-    - {id: 60, cat: PC/Mac, desc: "Games/Mac"}
-    - {id: 54, cat: Console/NDS, desc: "Games/NDS"}
-    - {id: 4, cat: PC/Games, desc: "Games/PC"}
-    - {id: 42, cat: Console/PS3, desc: "Games/PS3"}
-    - {id: 56, cat: Console/Wii, desc: "Games/Wii"}
-    - {id: 36, cat: Console/XBox 360, desc: "Games/xbox360"}
-    - {id: 69, cat: Other, desc: "Halloween"}
-    - {id: 80, cat: PC/Mobile-iOS, desc: "iPhone / iPad"}
-    - {id: 46, cat: Other, desc: "Kids"}
-    - {id: 63, cat: PC, desc: "Linux"}
-    - {id: 49, cat: Other, desc: "Misc"}
-    - {id: 77, cat: Movies/3D, desc: "Movies/3D BLURAY"}
-    - {id: 73, cat: Movies/HD, desc: "Movies/Boxsets HD"}
-    - {id: 74, cat: Movies/SD, desc: "Movies/Boxsets SD"}
-    - {id: 25, cat: Movies/DVD, desc: "Movies/DVD-R"}
-    - {id: 51, cat: Movies/HD, desc: "Movies/HD"}
-    - {id: 26, cat: Movies, desc: "Movies/Retro"}
-    - {id: 29, cat: Movies/SD, desc: "Movies/SD"}
-    - {id: 52, cat: Movies/SD, desc: "Movies/WMV"}
-    - {id: 85, cat: Movies/HD, desc: "Movies/X265"}
-    - {id: 66, cat: Audio/Lossless, desc: "Music/Flac"}
-    - {id: 35, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 31, cat: Audio/Video, desc: "Music/Videos"}
-    - {id: 72, cat: Movies, desc: "Sci-Fi"}
-    - {id: 83, cat: Movies, desc: "Tribute Packs"}
-    - {id: 30, cat: TV, desc: "TV"}
-    - {id: 50, cat: TV/HD, desc: "TV-HD/X264"}
-    - {id: 71, cat: TV/SD, desc: "TV-SD/X264"}
-    - {id: 75, cat: TV/HD, desc: "TV/Boxsets HD"}
-    - {id: 76, cat: TV/SD, desc: "TV/Boxsets SD"}
-    - {id: 37, cat: XXX, desc: "XXX"}
-    - {id: 68, cat: XXX, desc: "XXX/0-Day"}
-    - {id: 78, cat: XXX, desc: "XXX/3D"}
-    - {id: 67, cat: XXX/ImageSet, desc: "XXX/Imagesets"}
-
-  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: dateAdded
-    options:
-      dateAdded: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Accounts with nothing uploaded/ downloaded will be disabled after 4 weeks."
-
-login:
-  path: Main/?act=Login
-  method: form
-  form: form#login
-  captcha:
-    type: image
-    selector: img[alt="Security code"]
-    input: code
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.errorWrap
-  test:
-    path: index.php
-    selector: a[href$="logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
-    search: "{{ .Keywords }}"
-    # alive, aliveanddead, nobot, dead, free, nuked
-    status: "{{ if .Config.freeleech }}free{{ else }}aliveanddead{{ end }}"
-    # title, desc, both
-    search_type: title
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-
-  rows:
-    selector: table#browse_torrents_table > tbody > tr[id^="torrent_row_"]
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat[]="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat[]
-    title:
-      selector: a.torrent_name
-      attribute: title
-    details:
-      selector: a.torrent_name
-      attribute: href
-    download:
-      selector: a[href^="download.php?"]
-      attribute: href
-    description:
-      selector: span.torrent_small_desc
-    genre:
-      selector: span.torrent_small_desc
-      filters:
-        - name: regexp
-          args: "\\[.+?\\] \\[(.+?)\\]"
-        - name: replace
-          args: [" ", "_"]
-    files:
-      selector: td.torrent_table_files
-    date:
-      selector: td.torrent_table_dateAdded
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: td.torrent_table_size
-    grabs:
-      selector: td.torrent_table_snatched
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: td.torrent_table_seeders
-    leechers:
-      selector: td.torrent_table_leechers
-    downloadvolumefactor:
-      case:
-        ":root div#notice_ratioBoostingMadness": 0
-        img[src$="images/freedownload.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 5 day (as seconds = 5 x 24 x 60 x 60)
-      text: 432000 # 3 days for torrents under 20GB
-# engine n/a
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -66,6 +66,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -156,7 +157,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -166,16 +172,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
      # 5 days (as seconds = 5 x 24 x 60 x 60)
      text: 432000
-# json UNIT3D 8.1.3
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/animelovers-api.yml
+++ b/src/Jackett.Common/Definitions/animelovers-api.yml
@@ -1,39 +1,23 @@
 ---
-id: scenelinks
-name: SceneLinks
-description: "SceneLinks (SL) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ro-RO
+id: animelovers-api
+name: AnimeLovers (API)
+description: "AnimeLovers is a Private tracker for ANIME / MANGA / DOUNGUA / MANHWA"
+language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://scenelinks.me/
-legacylinks:
-  - https://scenelinks.io/
-  - https://www.scenelinks.io/
+  - https://animelovers.club/

 caps:
  categorymappings:
-    - {id: 1, cat: Movies/HD, desc: "Movies: HD"}
-    - {id: 2, cat: TV, desc: "TV Episodes"}
-    - {id: 6, cat: TV, desc: "RO TV"}
-    - {id: 7, cat: Movies, desc: "Ro Movies"}
-    - {id: 8, cat: TV, desc: "TV Episodes-RO"}
-    - {id: 9, cat: Movies/HD, desc: "Movies: HD-Ro"}
-    - {id: 11, cat: Movies/BluRay, desc: "Movies: BluRay"}
-    - {id: 12, cat: Movies/BluRay, desc: "Movies: BluRay-RO"}
-    - {id: 13, cat: Movies/UHD, desc: "Movies: 4K"}
-    - {id: 14, cat: Movies/UHD, desc: "Movies: 4K-RO"}
-    - {id: 15, cat: TV, desc: "TV Packs RO"}
-    - {id: 20, cat: Movies/DVD, desc: "Movies: DVD"}
-    - {id: 21, cat: Movies/DVD, desc: "Movies: DVD-Ro"}
-    - {id: 19, cat: TV/Documentary, desc: "Docs"}
-    - {id: 18, cat: Other, desc: "Images"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 16, cat: Console, desc: "Games: Console"}
-    - {id: 4, cat: PC/Games, desc: "Games PC"}
-    - {id: 5, cat: PC, desc: "Application"}
-    - {id: 22, cat: TV/Sport, desc: "Sport"}
-    - {id: 10, cat: XXX, desc: "XXX"}
+    - {id: 1, cat: Movies/Other, desc: "Anime Movies"}
+    - {id: 2, cat: TV/Anime, desc: "Anime Series"}
+    - {id: 3, cat: TV/Anime, desc: "Anime OVA"}
+    - {id: 9, cat: XXX, desc: "Doujinshi"}
+    - {id: 4, cat: Books/Comics, desc: "Manhua/Manhwa"}
+    - {id: 8, cat: Books/Comics, desc: "Manga"}
+    - {id: 7, cat: XXX, desc: "Hentai"}
+    - {id: 10, cat: Audio/Lossless, desc: "Lossless Music"}

  modes:
    search: [q]
@@ -49,11 +33,15 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://www.scenelinks.me/\" target=\"_blank\">SceneLinks</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animelovers.club/\" target=\"_blank\">AnimeLovers</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -73,7 +61,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Account will be disabled due to inactivity for more than 90 days."
+    default: "In order to not be disabled, you are required to login to AnimeLovers at least once every 90 days."

 login:
  path: /api/torrents
@@ -82,6 +70,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -119,8 +108,15 @@ search:
  fields:
    category:
      selector: category_id
-    title:
+    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -141,8 +137,6 @@ search:
    genre:
      selector: meta.genres
      filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
        - name: re_replace
          args: ["(?i)(Science Fiction)", "Science_Fiction"]
        - name: re_replace
@@ -151,8 +145,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -169,7 +161,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -179,16 +176,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
-# global MR is 0.4 but torrents must be seeded for 1 day regardless of ratio
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# json UNIT3D 7.0.3
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/animetime.yml
+++ b/src/Jackett.Common/Definitions/animetime.yml
@@ -1,81 +0,0 @@
---
-id: animetime
-name: Anime Time
-description: "Anime Time is a PUBLIC torrent tracker for ANIME"
-language: en-US
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://animetime.cc/
-
-caps:
-  categories:
-    anime: TV/Anime
-    books: Books
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    book-search: [q]
-
-settings: []
-
-search:
-  paths:
-    # https://animetime.cc/search?query=
-    - path: "{{ if .Keywords }}search{{ else }}{{ end }}"
-
-  inputs:
-    query: "{{ .Keywords }}"
-
-  keywordsfilters:
-    - name: trim
-    - name: re_replace
-      args: ["\\W+", "%"]
-
-  rows:
-    selector: div.flow-root > div.divide-y > div.p-2.space-y-2
-
-  fields:
-    category:
-      selector: span.badge.badge-primary
-    title:
-      selector: a[href*="/view/"]
-    details:
-      selector: a[href*="/view/"]
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: span[data-tip]
-      attribute: data-tip
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: span.badge.badge-ghost
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    genre:
-      selector: span.badge.badge-secondary
-      filters:
-        - name: replace
-          args: ["non english", "non_english"]
-        - name: replace
-          args: ["music video", "music_video"]
-        - name: replace
-          args: ["Anime Time", "Anime_Time"]
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/animetorrentsro.yml
+++ b/src/Jackett.Common/Definitions/animetorrentsro.yml
@@ -65,14 +65,17 @@ settings:
    default: "Inactive accounts under VIP and without parked are automatically deleted after about a year."

 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    x: 0
-    y: 0
    referer: /
+  selectorinputs:
+    csrf_token:
+      selector: input[name="csrf_token"]
+      attribute: value
  error:
    - selector: table.main:contains("esuat")
  test:
--- a/src/Jackett.Common/Definitions/animeworld-api.yml
+++ b/src/Jackett.Common/Definitions/animeworld-api.yml
@@ -77,6 +77,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -165,7 +166,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -175,16 +181,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 1.0 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 1.0
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.0.0
+# json UNIT3D 8.1.3
--- a/src/Jackett.Common/Definitions/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -32,6 +32,8 @@ caps:
    book-search: [q]

 settings:
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: downloadlink
    type: select
    label: Download link
--- a/src/Jackett.Common/Definitions/best-torrents.yml
+++ b/src/Jackett.Common/Definitions/best-torrents.yml
@@ -0,0 +1,120 @@
+---
+id: best-torrents
+name: Best-Torrents
+description: "Best-Torrents is a POLISH Semi-Private PAY2DL Torrent Tracker for MOVIES / TV / GENERAL"
+language: pl-PL
+type: semi-private
+encoding: UTF-8
+links:
+  - https://best-torrents.com/
+
+caps:
+  categorymappings:
+    - {id: 774, cat: Movies, desc: Filmy Polskie}
+    - {id: 642, cat: Movies, desc: Filmy/Bajki}
+    - {id: 1, cat: Movies/SD, desc: Filmy XviD/DivX}
+    - {id: 20, cat: Movies/DVD, desc: Filmy DVD}
+    - {id: 23, cat: Movies/HD, desc: Filmy x264}
+    - {id: 573, cat: Movies/UHD, desc: Filmy 4K UHD}
+    - {id: 17, cat: Movies/HD, desc: Filmy HD}
+    - {id: 265, cat: Movies/HD, desc: Filmy x265 HEVC}
+    - {id: 12, cat: Movies/3D, desc: Filmy 3D}
+    - {id: 530, cat: Movies/SD, desc: Filmy TS/CAM}
+    - {id: 9, cat: PC, desc: Programy}
+    - {id: 7, cat: Console, desc: Konsole}
+    - {id: 6, cat: PC/Games, desc: Gry}
+    - {id: 5, cat: Audio, desc: Muzyka}
+    - {id: 305, cat: Audio/Video, desc: Teledyski}
+    - {id: 22, cat: TV, desc: TV}
+    - {id: 228, cat: XXX, desc: Erotyka}
+    - {id: 25, cat: Books/EBook, desc: Książki}
+    - {id: 739, cat: Audio/Audiobook, desc: AudioBooki}
+    - {id: 26, cat: Books/Comics, desc: Komiksy}
+    - {id: 27, cat: PC/Mac, desc: Linux/Mac}
+    - {id: 28, cat: TV/Sport, desc: Sport}
+    - {id: 29, cat: TV/Anime, desc: Anime}
+    - {id: 31, cat: PC/Mobile-Other, desc: GSM/PDA}
+    - {id: 32, cat: Other, desc: Inne}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.komunikaty:contains("Nazwa użytkownika bądź hasło jest nieprawidłowe")
+  test:
+    path: /
+    selector: a[href$="/logout.php"]
+
+search:
+  # https://best-torrents.com/szukaj.php?search=%25&cat=774&full_name=no
+  paths:
+    - path: szukaj.php
+  inputs:
+    # does not appear to support multi category searches
+    cat: 0
+    # no, 0 Standard mode, 1 Initial mode, 2 Full Phrase mode, 3 Final mode
+    full_name: no
+    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%{{ end }}"
+
+  rows:
+    selector: div#torrents_browse-standard-all
+
+  fields:
+    categorydesc:
+      selector: div#torrents_browse-standard-category a
+      attribute: href
+      filters:
+        - name: regexp
+          args: kategorii/(.+?)/gatunku
+    title:
+      selector: div#torrents_browse-standard-torrent-name a
+    details:
+      selector: div#torrents_browse-standard-torrent-name a
+      attribute: href
+    download:
+      selector: div#torrents_browse-standard-download a
+      attribute: href
+    poster:
+      selector: div#torrents_browse-standard-poster img
+      attribute: src
+    date:
+      selector: div#torrents_browse-standard-time
+      remove: b
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: div#torrents_browse-standard-size
+      remove: b
+      filters:
+        - name: regexp
+          args: (\d{1,4}\.\d{2}\s+?[T|G|M|k]B)
+    seeders:
+      selector: div#torrents_browse-standard-seeds span font
+    leechers:
+      selector: div#torrents_browse-standard-peers span font
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -4,7 +4,7 @@ name: Bithorlo
 description: "Bithorlo (BHO) is a HUNGARIAN Private Torrent Tracker for MOVIES / GENERAL"
 language: hu-HU
 type: private
-encoding: ISO-8859-2
+encoding: UTF-8
 links:
  - https://www.bithorlo.info/

@@ -15,40 +15,40 @@ caps:
    - {id: 19, cat: Books, desc: "E-book/Hun"}
    # Játék
    - {id: 38, cat: Console, desc: "Játék/Consol"}
-    - {id: 15, cat: PC/Games, desc: "Játék/ISO"}
    - {id: 37, cat: PC/Games, desc: "Játék/Rip"}
+    - {id: 15, cat: PC/Games, desc: "Játék/ISO"}
    # Filmek
+    - {id: 2, cat: Movies/DVD, desc: "DVD/Eng"}
    - {id: 51, cat: Movies/SD, desc: "Cam/Eng"}
    - {id: 50, cat: Movies/SD, desc: "Cam/Hun"}
-    - {id: 2, cat: Movies/DVD, desc: "DVD/Eng"}
-    - {id: 1, cat: Movies/DVD, desc: "DVD/Hun"}
    - {id: 42, cat: Movies/DVD, desc: "Dvd9/Eng"}
    - {id: 41, cat: Movies/DVD, desc: "Dvd9/Hun"}
+    - {id: 33, cat: TV, desc: "Sorozat/Eng"}
    - {id: 29, cat: Movies/HD, desc: "HD/Eng"}
    - {id: 28, cat: Movies/HD, desc: "HD/Hun"}
-    - {id: 33, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 5, cat: TV, desc: "Sorozat/Hun"}
    - {id: 52, cat: TV/HD, desc: "Sorozat/Eng/HD"}
    - {id: 53, cat: TV/HD, desc: "Sorozat/Hun/HD"}
+    - {id: 1, cat: Movies/DVD, desc: "DVD/Hun"}
+    - {id: 5, cat: TV, desc: "Sorozat/Hun"}
    - {id: 4, cat: Movies/SD, desc: "Xvid/Eng"}
    - {id: 3, cat: Movies/SD, desc: "Xvid/Hun"}
    # Zene
-    - {id: 12, cat: Audio, desc: "Zene/Eng"}
    - {id: 13, cat: Audio, desc: "Zene/Hun"}
+    - {id: 12, cat: Audio, desc: "Zene/Eng"}
    # Egyéb
-    - {id: 20, cat: Other, desc: "Képek"}
    - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 20, cat: Other, desc: "Képek"}
    # Program
    - {id: 54, cat: PC/0day, desc: "Win/Program/ISO"}
    - {id: 23, cat: PC/0day, desc: "Win/Program/Rip"}
    # Felnőtt tartalom
-    - {id: 9, cat: XXX, desc: "XXX/Film"}
    - {id: 10, cat: XXX, desc: "XXX/Kép"}
+    - {id: 9, cat: XXX, desc: "XXX/Film"}

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

@@ -67,22 +67,22 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: sort
+  - name: sortBy
    type: select
-    label: Sort requested from site
-    default: 4
+    label: SortBy requested from site
+    default: 2
    options:
-      4: created
-      7: seeders
-      5: size
+      2: created
+      5: seeders
+      3: size
      1: title
-  - name: type
+  - name: orderBy
    type: select
-    label: Order requested from site
-    default: desc
+    label: OrderBy requested from site
+    default: 0
    options:
-      desc: desc
-      asc: asc
+      0: desc
+      1: asc
  - name: info_activity
    type: info
    label: Account Inactivity
@@ -93,80 +93,83 @@ login:
  inputs:
    cookie: "{{ .Config.cookie }}"
  test:
-    path: index.php
-    selector: a[href="logout.php"]
+    path: index/
+    selector: a[href="/logout/"]

 search:
  paths:
-    - path: browse.php
+    # https://www.bithorlo.info/torrents/?action=search&categories[]=29&categories[]=4&search_text=&incldead=1&torrent_tags=
+    - path: torrents/
  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 freeleech
+    action: search
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    search_text: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 5 waiting for seed, 6 multiple upload
    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
+    sort: "{{ .Config.sortBy }}"
+    order_by: "{{ .Config.orderBy }}"

  headers:
    User-Agent: ["{{ .Config.useragent }}"]

  rows:
-    selector: tr[class^="browse"]
+    selector: table#TorrentTable > tbody > tr

  fields:
    category:
-      selector: a[href^="browse.php?cat="]
+      selector: td.fixed-width-category > a
      attribute: href
      filters:
        - name: querystring
-          args: cat
-        - name: trim # some torrents have an extra space
+          args: categories[]
    title:
-      selector: a[href^="torrent.php?id="]
-      attribute: title
+      selector: a.torrent-name
    details:
-      selector: a[href^="torrent.php?id="]
+      selector: a.torrent-name
      attribute: href
    download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="/download/"]
      attribute: href
    poster:
-      selector: a[href^="torrent.php?id="][onmouseover]
-      attribute: onmouseover
+      selector: span.custom-popover
+      attribute: data-bs-content
      filters:
        - name: regexp
-          args: ", '(.*)'"
-    size:
-      selector: td:nth-child(4)
-    grabs:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
+          args: \"(.+?)\"
    date:
-      selector: "a[style=\"font-size: 8pt;cursor: pointer;\"][title]"
+      selector: span.bg-green
      filters:
        - name: append
          args: " +01:00" # CET
        - name: dateparse
          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: td.fixed-width-size > span
+    grabs:
+      selector: td.fixed-width-completed
+    seeders:
+      selector: td.fixed-width-seeders
+    leechers:
+      selector: td.fixed-width-leechers
    description:
      case:
        img[src="./themes/Born/nemlatta.png"]: Unverified
        "*": Verified
    downloadvolumefactor:
      case:
-        img[title="Ingyenes letöltés"]: 0
+        "span:contains(\"FREE\")": 0
        "*": 1
    uploadvolumefactor:
-      selector: span:contains("Feltöltési szorzó")
-      filters:
-        - name: replace
-          args: ["Feltöltési szorzó × ", ""]
+      case:
+        "span:contains(\"2x\")": 2
+        "span:contains(\"3x\")": 3
+        "span:contains(\"4x\")": 4
+        "span:contains(\"5x\")": 5
+        "span:contains(\"6x\")": 6
+        "span:contains(\"7x\")": 7
+        "span:contains(\"8x\")": 8
+        "span:contains(\"9x\")": 9
+        "*": 1
    minimumratio:
      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
 # engine n/a
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -96,7 +96,7 @@ settings:
  - name: info
    type: info
    label: Layout
-    default: "<ol><li>Only the English Classic profile is supported.</li><li>Make sure to set the <b>Torrent Listing (Listeleme Biçimi)</b> option in your profile to <b>Classic (Klasik)</b></li><li>And set the <b>Language (Dil)</b> to <b>English</b></li><li>Using the <i>Modern</i> theme will prevent results, and using <i>Turkish</i> will prevent upload dates.</li></ol>"
+    default: "<ul><li>Only the English Classic profile is supported.</li><li>Make sure to set the <b>Torrent Listing (Listeleme Biçimi)</b> option in your profile to <b>Classic (Klasik)</b></li><li>And set the <b>Language (Dil)</b> to <b>English</b></li><li>Using the <i>Modern</i> theme will prevent results, and using <i>Turkish</i> will prevent upload dates.</li></ul>"
  - name: sort
    type: select
    label: Sort requested from site
@@ -112,6 +112,10 @@ settings:
    options:
      desc: desc
      asc: asc
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are getting the error <b>Found no results while trying to browse this tracker</b> then first access the site with your browser and check that you are not being forced to change your password because it has expired after 365 days."

 login:
  path: ?p=home&pid=1
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -66,6 +66,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -156,7 +157,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -166,16 +172,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.1.3
+# json UNIT3D 8.3.0b
--- a/src/Jackett.Common/Definitions/visionhd-api.yml
+++ b/src/Jackett.Common/Definitions/visionhd-api.yml
@@ -1,12 +1,12 @@
 ---
-id: visionhd-api
-name: ViSiON HD (API)
-description: "ViSiON HD is a Private Torrent Tracker for HD MOVIES / TV"
+id: bolly-api
+name: Bolly (API)
+description: "Bolly (Telly) is an INDIAN Private Tracker for MOVIES / TV"
 language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://vision-hd.org/
+  - https://bolly.wtf/

 caps:
  categorymappings:
@@ -17,6 +17,8 @@ caps:
    search: [q]
    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]

 settings:
  - name: apikey
@@ -25,7 +27,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://vision-hd.org/\" target=\"_blank\">ViSiON HD</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://bolly.wtf/\" target=\"_blank\">Bolly</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -58,6 +60,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -146,7 +149,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -156,16 +164,14 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
-# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 8.1.3
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/btarg.yml
+++ b/src/Jackett.Common/Definitions/btarg.yml
@@ -57,7 +57,7 @@ settings:
  - name: type
    type: select
    label: Order requested from site
-    default: desc
+    default: DESC
    options:
      DESC: desc
      ASC: asc
--- a/src/Jackett.Common/Definitions/btdirectory.yml
+++ b/src/Jackett.Common/Definitions/btdirectory.yml
@@ -0,0 +1,76 @@
+---
+id: btdirectory
+name: BTdirectory
+description: "BTdirectory (BT目录) is a Public DHT Crawler"
+language: en-US
+type: public
+encoding: UTF-8
+# current domain at https://cursor.vip/btmulu then follow links to the final search-movie link
+links:
+  - https://btmulu.work/
+  - https://www.btmulu.digital/
+
+caps:
+  categorymappings:
+    - {id: Other, cat: Other, desc: Other}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_category_8000
+    type: info_category_8000
+
+search:
+  paths:
+    # https://www.btmulu.digital/search-create.html
+    # https://btmulu.work/search.html?name=the+boys+s04e08
+    - path: "{{ if .Keywords }}search.html{{ else }}search-create.html{{ end }}"
+  inputs:
+    name: "{{ re_replace .Keywords \"[\\s]+\" \"+\" }}"
+
+  rows:
+    selector: article.item
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: Other
+    title:
+      selector: h4
+      remove: span
+    details:
+      selector: a[href^="/hash/"]
+      attribute: href
+    infohash:
+      selector: article.item
+      attribute: data-key
+    date:
+      selector: p
+      filters:
+        - name: regexp
+          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
+    files:
+      selector: p
+      filters:
+        - name: regexp
+          args: "File Count：(\\d+)"
+    size:
+      selector: p
+      filters:
+        - name: regexp
+          args: "Size：(\\d+\\.?\\d+ [K|M|G]B)"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.motorcycles/
+  - https://btsow.yachts/
 legacylinks:
-  - https://btsow.rest/
  - https://btsow.bar/
  - https://btsow.click/
  - https://btsow.cfd/
@@ -24,6 +23,7 @@ legacylinks:
  - https://btsow.skin/
  - https://btsow.makeup/
  - https://btsow.homes/
+  - https://btsow.motorcycles/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/bwtorrents.yml
+++ b/src/Jackett.Common/Definitions/bwtorrents.yml
@@ -180,6 +180,8 @@ search:

  rows:
    selector: table[width="1200"] > tbody > tr:has(a[href^="download.php/"])
+    filters:
+      - name: andmatch

  fields:
    category:
--- a/src/Jackett.Common/Definitions/capybarabr.yml
+++ b/src/Jackett.Common/Definitions/capybarabr.yml
@@ -73,6 +73,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -163,7 +164,13 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      optional: true
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -173,12 +180,16 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 1.0 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 1.0
--- a/src/Jackett.Common/Definitions/carpt.yml
+++ b/src/Jackett.Common/Definitions/carpt.yml
@@ -193,4 +193,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.12 2024-05-10
+# NexusPHP v1.8.13 2024-07-23
--- a/src/Jackett.Common/Definitions/centraltorrent.yml
+++ b/src/Jackett.Common/Definitions/centraltorrent.yml
@@ -1,163 +0,0 @@
---
-id: centraltorrent
-name: Central Torrent
-description: "Central Torrent is a POLISH Private Torrent Tracker for MOVIES / MUSIC"
-language: pl-PL
-type: private
-encoding: ISO-8859-2
-links:
-  - http://central-torrent.eu/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
-
-caps:
-  categorymappings:
-    - {id: 23, cat: TV/Anime, desc: "Animowane"}
-    - {id: 1, cat: PC, desc: "Aplikacje"}
-    - {id: 26, cat: Movies, desc: "Dzieci/Bajki"}
-    - {id: 29, cat: Books/EBook, desc: "E-books"}
-    - {id: 20, cat: Movies/SD, desc: "Filmy/DVD"}
-    - {id: 22, cat: Movies/SD, desc: "Filmy/RMVB"}
-    - {id: 35, cat: Movies/UHD, desc: "Filmy/UHD"}
-    - {id: 24, cat: Movies/HD, desc: "Filmy/x264"}
-    - {id: 36, cat: Movies/HD, desc: "Filmy/x265"}
-    - {id: 19, cat: Movies/SD, desc: "Filmy/XviD"}
-    - {id: 21, cat: Movies/SD, desc: "Filmy/XviD PL"}
-    - {id: 12, cat: PC/Games, desc: "Gry"}
-    - {id: 17, cat: PC/Games, desc: "Gry/Konsole"}
-    - {id: 4, cat: PC/Games, desc: "Gry/PC ISO"}
-    - {id: 28, cat: Other, desc: "GSM/PDA"}
-    - {id: 32, cat: Movies/BluRay, desc: "HD/Blu-ray"}
-    - {id: 31, cat: Audio/Lossless, desc: "Music/Lossless"}
-    - {id: 6, cat: Audio, desc: "Muzyka"}
-    - {id: 30, cat: Other, desc: "Rozne"}
-    - {id: 25, cat: TV/Sport, desc: "Sport"}
-    - {id: 27, cat: Audio/Video, desc: "Teledyski"}
-    - {id: 7, cat: TV, desc: "TV/Seriale"}
-    - {id: 9, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "User accounts of the Power User class and lower, inactive for a period longer than 42 days, are deleted. Therefore, if for some reason you cannot access Central Torrent for some time, park your account. Although you won't be able to download torrents, you can be sure that you won't have to log in for 64 days. However, if after this time you do not log in to your account, it will be deleted."
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  captcha:
-    type: image
-    selector: img.cimage
-    input: captcha
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.embedded:has(h2:contains("Error"))
-    - selector: form[action="takelogin.php"]
-      message:
-        text: "Login page detected at {{ .Config.sitelink }}."
-  test:
-    path: index.php
-    selector: a[href="/my.php"]
-
-download:
-  selectors:
-    - selector: a[href^="download.php/"]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 dead, 3 freeleech
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    # 0 all, 1 polish, 2 non-polish
-    polish: 0
-    # 0 name
-    blah: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table[onMouseover] > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(5)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss"
-    size:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    seeders:
-      selector: td:nth-child(9)
-    leechers:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      case:
-        img[src="pic/freedownload.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-#  tbsource
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -39,6 +39,8 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -82,6 +84,11 @@ login:
    path: torrents.php
    selector: a[href*="logout.php"]

+download:
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
 search:
  paths:
    - path: torrents.php
@@ -120,19 +127,11 @@ search:
      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="details.php?id="]
      attribute: href
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(8)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-last-child(7) > span[title]
      attribute: title
      optional: true
      filters:
@@ -142,7 +141,7 @@ search:
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-last-child(7):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -151,6 +150,14 @@ search:
          args: "yyyy-MM-ddHH:mm:ss zzz"
    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-child(6)
+    seeders:
+      selector: td.rowfollow:nth-last-child(5)
+    leechers:
+      selector: td.rowfollow:nth-last-child(4)
+    grabs:
+      selector: td.rowfollow:nth-last-child(3)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -168,4 +175,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP 73f201530b 2023-08-07
+# NexusPHP Standard v1.5 Beta 4 (customised)
--- a/src/Jackett.Common/Definitions/chilebt-api.yml
+++ b/src/Jackett.Common/Definitions/chilebt-api.yml
@@ -0,0 +1,194 @@
+---
+id: chilebt-api
+name: ChileBT (API)
+description: "ChileBT is a CHILEAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: es-CL
+type: private
+encoding: UTF-8
+links:
+  - https://chilebt.com/
+
+caps:
+  categorymappings:
+    - {id: 10, cat: Movies, desc: "Movies"}
+    - {id: 11, cat: TV, desc: "TV"}
+    - {id: 9, cat: Audio, desc: "Music"}
+    - {id: 7, cat: Other, desc: "Cultura / Educativos"}
+    - {id: 8, cat: PC/Games, desc: "Juegos"}
+    - {id: 6, cat: Books, desc: "EBook"}
+    - {id: 4, cat: TV/Anime, desc: "Anime"}
+    - {id: 5, cat: PC/0day, desc: "Aplicaciones / Programas"}
+    - {id: 14, cat: Movies, desc: "Infantil"}
+    - {id: 12, cat: Other/Misc, desc: "VIP"}
+    - {id: 13, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    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://chilebt.com/\" target=\"_blank\">ChileBT</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
+  - 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
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")
+
+search:
+  paths:
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  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
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title_optional:
+      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
+      # 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
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
+      # api returns False, True
+      selector: double_upload
+      case:
+        False: 1 # normal
+        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/chilebt.yml
+++ b/src/Jackett.Common/Definitions/chilebt.yml
@@ -1,211 +0,0 @@
---
-id: chilebt
-name: ChileBT
-description: "ChileBT is a CHILEAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: es-CL
-type: private
-encoding: UTF-8
-links:
-  - https://chilebt.com/
-
-caps:
-  categorymappings:
-    - {id: 10, cat: Movies, desc: "Movies"}
-    - {id: 11, cat: TV, desc: "TV"}
-    - {id: 9, cat: Audio, desc: "Music"}
-    - {id: 7, cat: Other, desc: "Cultura / Educativos"}
-    - {id: 8, cat: PC/Games, desc: "Juegos"}
-    - {id: 6, cat: Books, desc: "EBook"}
-    - {id: 4, cat: TV/Anime, desc: "Anime"}
-    - {id: 5, cat: PC/0day, desc: "Aplicaciones / Programas"}
-    - {id: 14, cat: Movies, desc: "Infantil"}
-    - {id: 12, cat: Other/Misc, desc: "VIP"}
-    - {id: 13, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    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: script[nonce]:contains("Error")
-      message:
-        selector: script[nonce]:contains("Error")
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: filterTorrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 50
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    # can search by genre but need range support. &genres[]=Action&genres[]=Comedy for Action and Comedy
-
-  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
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
-    genre:
-      selector: td:nth-last-child(6)
-      filters:
-        - name: replace
-          args: ["\n", ""]
-        - name: re_replace
-          args: ["(?i)(Science Fiction)", "Science_Fiction"]
-        - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science_Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
-    description:
-      text: "{{ .Result.genre }}"
-    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/"], a[href*="themoviedb.org/tv/"]
-      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
-# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.5
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 1.9.3
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -68,6 +68,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -158,7 +159,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -168,16 +174,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.6 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.6
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# json UNIT3D 8.1.0
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/coastalcrew.yml
+++ b/src/Jackett.Common/Definitions/coastalcrew.yml
@@ -66,10 +66,6 @@ settings:
  - name: password
    type: password
    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter FreeLeech only
-    default: false
  - name: onlyupload
    type: checkbox
    label: Filter OnlyUpload only
--- a/src/Jackett.Common/Definitions/comicat.yml
+++ b/src/Jackett.Common/Definitions/comicat.yml
@@ -1,16 +1,14 @@
 ---
 id: comicat
 name: comicat
-description: "comicat is a CHINESE Public tracker for Anime / Hentai / Manga"
+description: "comicat is a CHINESE Semi-Private tracker for Anime / Hentai / Manga"
 language: zh-CN
-type: public
+type: semi-private
 encoding: UTF-8
 requestDelay: 2
 links:
  - https://www.comicat.org/

-settings: []
-
 caps:
  categorymappings:
    - {id: 1, cat: TV/Anime, desc: "动画(Anime)"}
@@ -27,6 +25,15 @@ caps:
    music-search: [q]
    book-search: [q]

+settings: []
+
+login:
+  path: addon.php?r=document/view&page=visitor-test
+  method: form
+  form: form#visitor-test-form
+  inputs:
+    visitor_test: human
+
 search:
  paths:
    # https://www.comicat.org/ (latest)
--- a/src/Jackett.Common/Definitions/cpasbienclone.yml
+++ b/src/Jackett.Common/Definitions/cpasbienclone.yml
@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.cpasbien.tw/
+  - https://www.cpasbien.love/
 legacylinks:
  - https://www1.cpasbiens.ws/
  - https://www2.cpasbiens.ws/
@@ -22,6 +22,7 @@ legacylinks:
  - https://www.cpasbien.gg/
  - https://www.cpasbien.vip/
  - https://cpasbien.to/
+  - https://www.cpasbien.tw/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/dasunerwartete.yml
+++ b/src/Jackett.Common/Definitions/dasunerwartete.yml
@@ -15,11 +15,13 @@ caps:
    - {id: 32, cat: Movies/HD, desc: "HD"}
    - {id: 114, cat: Movies/UHD, desc: "UHD"}
    - {id: 140, cat: Movies/BluRay, desc: "BluRay"}
+    - {id: 143, cat: TV/Anime, desc: "Anime"}
    - {id: 138, cat: Movies, desc: "Pack`s"}
    # Serien
    - {id: 60, cat: TV/SD, desc: "SD"}
    - {id: 57, cat: TV/HD, desc: "HD"}
    - {id: 139, cat: TV/UHD, desc: "UHD"}
+    - {id: 144, cat: TV/Anime, desc: "Anime"}
    - {id: 59, cat: TV, desc: "Pack`s"}
    # Audio
    - {id: 110, cat: Audio/MP3, desc: "MP3"}
--- a/src/Jackett.Common/Definitions/datascene-api.yml
+++ b/src/Jackett.Common/Definitions/datascene-api.yml
@@ -91,6 +91,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -1,405 +0,0 @@
---
-id: demonoid
-name: Demonoid
-description: "Demonoid is a Semi-Private torrent site for MOVIES / TV / GENERAL"
-language: en-US
-type: semi-private
-encoding: UTF-8
-links:
-  - https://www.demonoid.is/
-  - https://www.dnoid.to/
-legacylinks:
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.link/ # Origin is unreachable Error code 523
-  - https://demonoid.mrunblock.guru/
-  - https://demonoid.torrentbay.to/
-  - https://demonoid.unblockit.click/
-  - https://demonoid.unblockit.asia/
-  - https://demonoid.unblockit.mov/
-  - https://demonoid.mrunblock.life/
-  - https://demonoid.unblockit.rsvp/
-  - https://demonoid.unblockit.vegas/
-  - https://demonoid.unblockit.esq/
-  - https://demonoid.unblockit.zip/
-  - https://demonoid.unblockit.foo/
-  - https://demonoid.unblockit.ing/
-  - https://demonoid.torrentbay.net/
-  - https://demonoid.mrunblock.bond/
-  - https://demonoid.nocensor.cloud/
-  - https://demonoid.unblockit.date/
-  - https://demonoid.unblockit.dad/
-  - https://demonoid.unblockit.africa/
-  - https://demonoid.unblockit.casa/ # 302
-  - https://unblockit.sbs/ # 526
-  - https://unblockit.ong/ # 526
-  - https://demonoid.unblockit.black/ # site broken by ad
-  - https://www.dnoid.pw/
-  - https://demonoid.torrentbay.st/
-
-caps:
-  categorymappings:
-    # fetch these from https://www.demonoid.is/cached/torrent_categories_script.js?v5
-    # Everything
-    - {id: 0, cat: Other/Misc, desc: "Miscellaneous"}
-    # Applications
-    - {id: 1, cat: PC/Mobile-Android, desc: "Applications Android"}
-    - {id: 2, cat: PC/Mobile-iOS, desc: "Applications phone / Ipod touch"}
-    - {id: 3, cat: PC, desc: "Applications Linux"}
-    - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
-    - {id: 5, cat: PC/Mobile-Other, desc: "Applications Mobile phone"}
-    - {id: 6, cat: PC, desc: "Applications PocketPC"}
-    - {id: 7, cat: PC/0day, desc: "Applications Windows"}
-    # Audio Books
-    - {id: 8, cat: Audio/Audiobook, desc: "Audio Books Action"}
-    - {id: 9, cat: Audio/Audiobook, desc: "Audio Books Adventure"}
-    - {id: 10, cat: Audio/Audiobook, desc: "Audio Books Biography"}
-    - {id: 11, cat: Audio/Audiobook, desc: "Audio Books Childrens"}
-    - {id: 12, cat: Audio/Audiobook, desc: "Audio Books Computers and Technology"}
-    - {id: 13, cat: Audio/Audiobook, desc: "Audio Books Contemporary"}
-    - {id: 14, cat: Audio/Audiobook, desc: "Audio Books Cooking"}
-    - {id: 15, cat: Audio/Audiobook, desc: "Audio Books Crafts and Hobbies"}
-    - {id: 16, cat: Audio/Audiobook, desc: "Audio Books Educational"}
-    - {id: 17, cat: Audio/Audiobook, desc: "Audio Books Fantasy"}
-    - {id: 18, cat: Audio/Audiobook, desc: "Audio Books Fiction"}
-    - {id: 19, cat: Audio/Audiobook, desc: "Audio Books General"}
-    - {id: 20, cat: Audio/Audiobook, desc: "Audio Books History"}
-    - {id: 21, cat: Audio/Audiobook, desc: "Audio Books Horror"}
-    - {id: 22, cat: Audio/Audiobook, desc: "Audio Books Humor"}
-    - {id: 23, cat: Audio/Audiobook, desc: "Audio Books Literary"}
-    - {id: 24, cat: Audio/Audiobook, desc: "Audio Books Magazine"}
-    - {id: 25, cat: Audio/Audiobook, desc: "Audio Books Mainstream"}
-    - {id: 26, cat: Audio/Audiobook, desc: "Audio Books Medicine and Health"}
-    - {id: 27, cat: Audio/Audiobook, desc: "Audio Books Mystery and Suspense"}
-    - {id: 28, cat: Audio/Audiobook, desc: "Audio Books Newspaper"}
-    - {id: 29, cat: Audio/Audiobook, desc: "Audio Books Nonfiction"}
-    - {id: 30, cat: Audio/Audiobook, desc: "Audio Books Other"}
-    - {id: 31, cat: Audio/Audiobook, desc: "Audio Books Paranormal"}
-    - {id: 32, cat: Audio/Audiobook, desc: "Audio Books Religion"}
-    - {id: 33, cat: Audio/Audiobook, desc: "Audio Books Romance"}
-    - {id: 34, cat: Audio/Audiobook, desc: "Audio Books RPG"}
-    - {id: 35, cat: Audio/Audiobook, desc: "Audio Books Sci-Fi"}
-    - {id: 36, cat: Audio/Audiobook, desc: "Audio Books Self-help"}
-    - {id: 37, cat: Audio/Audiobook, desc: "Audio Books Suspense"}
-    - {id: 38, cat: Audio/Audiobook, desc: "Audio Books Textbook"}
-    - {id: 39, cat: Audio/Audiobook, desc: "Audio Books Thriller"}
-    - {id: 40, cat: Audio/Audiobook, desc: "Audio Books Western"}
-    - {id: 41, cat: Audio/Audiobook, desc: "Audio Books Young Adult"}
-    # Books
-    - {id: 42, cat: Books/EBook, desc: "Books Action and Adventure"}
-    - {id: 43, cat: Books/EBook, desc: "Books Biography"}
-    - {id: 44, cat: Books/EBook, desc: "Books Childrens"}
-    - {id: 45, cat: Books/EBook, desc: "Books Computers and Technology"}
-    - {id: 46, cat: Books/EBook, desc: "Books Contemporary"}
-    - {id: 47, cat: Books/EBook, desc: "Books Cooking"}
-    - {id: 48, cat: Books/EBook, desc: "Books Crafts and Hobbies"}
-    - {id: 49, cat: Books/EBook, desc: "Books Educational"}
-    - {id: 50, cat: Books/EBook, desc: "Books Fantasy"}
-    - {id: 51, cat: Books/EBook, desc: "Books Fiction"}
-    - {id: 52, cat: Books/EBook, desc: "Books General"}
-    - {id: 53, cat: Books/EBook, desc: "Books History"}
-    - {id: 54, cat: Books/EBook, desc: "Books Horror"}
-    - {id: 55, cat: Books/EBook, desc: "Books Humor"}
-    - {id: 56, cat: Books/EBook, desc: "Books Literary"}
-    - {id: 57, cat: Books/Mags, desc: "Books Magazine"}
-    - {id: 58, cat: Books/EBook, desc: "Books Mainstream"}
-    - {id: 59, cat: Books/EBook, desc: "Books Medicine and Health"}
-    - {id: 60, cat: Books/EBook, desc: "Books Mystery and Suspense"}
-    - {id: 61, cat: Books/EBook, desc: "Books Newspaper"}
-    - {id: 62, cat: Books/EBook, desc: "Books Nonfiction"}
-    - {id: 63, cat: Books/EBook, desc: "Books Other"}
-    - {id: 64, cat: Books/EBook, desc: "Books Paranormal"}
-    - {id: 65, cat: Books/EBook, desc: "Books Religion"}
-    - {id: 66, cat: Books/EBook, desc: "Books Romance"}
-    - {id: 67, cat: Books/EBook, desc: "Books RPG"}
-    - {id: 68, cat: Books/EBook, desc: "Books Sci-Fi"}
-    - {id: 69, cat: Books/EBook, desc: "Books Self-help"}
-    - {id: 70, cat: Books/EBook, desc: "Books Suspense"}
-    - {id: 71, cat: Books/EBook, desc: "Books Textbook"}
-    - {id: 72, cat: Books/EBook, desc: "Books Thriller"}
-    - {id: 73, cat: Books/EBook, desc: "Books Western"}
-    - {id: 74, cat: Books/EBook, desc: "Books Young Adult"}
-    # Comics
-    - {id: 75, cat: Books/Comics, desc: "Comics Action / Adventure"}
-    - {id: 76, cat: Books/Comics, desc: "Comics Crime"}
-    - {id: 77, cat: Books/Comics, desc: "Comics Drama"}
-    - {id: 78, cat: Books/Comics, desc: "Comics Fantasy"}
-    - {id: 79, cat: Books/Comics, desc: "Comics Historical fiction"}
-    - {id: 80, cat: Books/Comics, desc: "Comics Horror"}
-    - {id: 81, cat: Books/Comics, desc: "Comics Illustrated novel"}
-    - {id: 82, cat: Books/Comics, desc: "Comics Manga"}
-    - {id: 83, cat: Books/Comics, desc: "Comics Other"}
-    - {id: 84, cat: Books/Comics, desc: "Comics Real-Life"}
-    - {id: 85, cat: Books/Comics, desc: "Comics Sci-Fi"}
-    - {id: 86, cat: Books/Comics, desc: "Comics Super Hero"}
-    # Games
-    - {id: 87, cat: PC, desc: "Games DOS"}
-    - {id: 88, cat: Console/Other, desc: "Games Dreamcast"}
-    - {id: 89, cat: Console/Other, desc: "Games Emulators"}
-    - {id: 90, cat: Console/Other, desc: "Games GameBoy"}
-    - {id: 91, cat: Console/Other, desc: "Games GameCube"}
-    - {id: 92, cat: PC, desc: "Games Linux"}
-    - {id: 93, cat: PC/Mac, desc: "Games Mac"}
-    - {id: 94, cat: PC/Mobile-Other, desc: "Games Mobile phone"}
-    - {id: 95, cat: Console/NDS, desc: "Games Nintendo DS"}
-    - {id: 96, cat: Console/Other, desc: "Games Palm"}
-    - {id: 97, cat: Console/PS3, desc: "Games Playstation"}
-    - {id: 98, cat: Console/Other, desc: "Games PocketPC"}
-    - {id: 99, cat: Console/PSP, desc: "Games PSP"}
-    - {id: 100, cat: Console/Wii, desc: "Games Wii / Wii U"}
-    - {id: 101, cat: PC/Games, desc: "Games Windows"}
-    - {id: 102, cat: Console/XBox, desc: "Games XBox"}
-    # Anime
-    - {id: 103, cat: TV/Anime, desc: "Anime Action"}
-    - {id: 104, cat: TV/Anime, desc: "Anime Adventure"}
-    - {id: 105, cat: TV/Anime, desc: "Anime Comedy"}
-    - {id: 106, cat: TV/Anime, desc: "Anime Drama"}
-    - {id: 107, cat: TV/Anime, desc: "Anime Fantasy"}
-    - {id: 108, cat: TV/Anime, desc: "Anime Horror"}
-    - {id: 109, cat: TV/Anime, desc: "Anime Other"}
-    - {id: 157, cat: TV/Anime, desc: "Anime Romance"}
-    - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
-    # Movies
-    - {id: 151, cat: Movies, desc: "Movies Action"}
-    - {id: 110, cat: Movies, desc: "Movies Adventure"}
-    - {id: 236, cat: Movies, desc: "Movies Animation"}
-    - {id: 111, cat: Movies, desc: "Movies Biography"}
-    - {id: 152, cat: Movies, desc: "Movies Comedy"}
-    - {id: 112, cat: Movies, desc: "Movies Concerts"}
-    - {id: 113, cat: Movies, desc: "Movies Crime"}
-    - {id: 114, cat: Movies, desc: "Movies Documentary"}
-    - {id: 115, cat: Movies, desc: "Movies Drama"}
-    - {id: 116, cat: Movies, desc: "Movies Family"}
-    - {id: 153, cat: Movies, desc: "Movies Fantasy"}
-    - {id: 117, cat: Movies, desc: "Movies Horror"}
-    - {id: 118, cat: Movies, desc: "Movies Musical"}
-    - {id: 119, cat: Movies, desc: "Movies Mystery"}
-    - {id: 120, cat: Movies, desc: "Movies Other"}
-    - {id: 121, cat: Movies, desc: "Movies Romance"}
-    - {id: 154, cat: Movies, desc: "Movies Sci-Fi"}
-    - {id: 159, cat: Movies, desc: "Movies Short-Film"}
-    - {id: 160, cat: Movies, desc: "Movies Sports"}
-    - {id: 161, cat: Movies, desc: "Movies Thriller"}
-    - {id: 162, cat: Movies, desc: "Movies Trailers"}
-    - {id: 163, cat: Movies, desc: "Movies War"}
-    - {id: 164, cat: Movies, desc: "Movies Western"}
-    # Music
-    - {id: 122, cat: Audio, desc: "Music Alternative"}
-    - {id: 123, cat: Audio, desc: "Music Bluegrass"}
-    - {id: 124, cat: Audio, desc: "Music Blues"}
-    - {id: 125, cat: Audio, desc: "Music Childrens"}
-    - {id: 126, cat: Audio, desc: "Music Christian"}
-    - {id: 127, cat: Audio, desc: "Music Classical"}
-    - {id: 128, cat: Audio, desc: "Music Comedy"}
-    - {id: 129, cat: Audio, desc: "Music Contemporary African"}
-    - {id: 130, cat: Audio, desc: "Music Country"}
-    - {id: 131, cat: Audio, desc: "Music Dance / Disco"}
-    - {id: 132, cat: Audio, desc: "Music Drum and Bass"}
-    - {id: 133, cat: Audio, desc: "Music Electro / Techno"}
-    - {id: 134, cat: Audio, desc: "Music Folk"}
-    - {id: 165, cat: Audio, desc: "Music Gospel"}
-    - {id: 166, cat: Audio, desc: "Music Grunge"}
-    - {id: 167, cat: Audio, desc: "Music Hip-Hop / Rap"}
-    - {id: 168, cat: Audio, desc: "Music Indie"}
-    - {id: 169, cat: Audio, desc: "Music Industrial"}
-    - {id: 170, cat: Audio, desc: "Music J-Pop"}
-    - {id: 171, cat: Audio, desc: "Music Jazz"}
-    - {id: 172, cat: Audio, desc: "Music Latin American"}
-    - {id: 173, cat: Audio, desc: "Music Melodic"}
-    - {id: 174, cat: Audio, desc: "Music Metal"}
-    - {id: 175, cat: Audio, desc: "Music Other"}
-    - {id: 176, cat: Audio, desc: "Music Pop"}
-    - {id: 177, cat: Audio, desc: "Music Punk"}
-    - {id: 178, cat: Audio, desc: "Music Radio Show"}
-    - {id: 179, cat: Audio, desc: "Music Reggae"}
-    - {id: 180, cat: Audio, desc: "Music Rhythm and blues"}
-    - {id: 181, cat: Audio, desc: "Music Rock"}
-    - {id: 182, cat: Audio, desc: "Music Soul"}
-    - {id: 183, cat: Audio, desc: "Music Soundtrack"}
-    - {id: 184, cat: Audio, desc: "Music Trance"}
-    - {id: 185, cat: Audio, desc: "Music Trip Hop"}
-    # Music Videos
-    - {id: 135, cat: Audio/Video, desc: "Music Videos Alternative"}
-    - {id: 136, cat: Audio/Video, desc: "Music Videos Bluegrass"}
-    - {id: 137, cat: Audio/Video, desc: "Music Videos Blues"}
-    - {id: 138, cat: Audio/Video, desc: "Music Videos Childrens"}
-    - {id: 139, cat: Audio/Video, desc: "Music Videos Christian"}
-    - {id: 186, cat: Audio/Video, desc: "Music Videos Classical"}
-    - {id: 187, cat: Audio/Video, desc: "Music Videos Comedy"}
-    - {id: 188, cat: Audio/Video, desc: "Music Videos Contemporary African"}
-    - {id: 189, cat: Audio/Video, desc: "Music Videos Country"}
-    - {id: 190, cat: Audio/Video, desc: "Music Videos Dance / Disco"}
-    - {id: 191, cat: Audio/Video, desc: "Music Videos Drum and Bass"}
-    - {id: 192, cat: Audio/Video, desc: "Music Videos Electro / Techno"}
-    - {id: 193, cat: Audio/Video, desc: "Music Videos Folk"}
-    - {id: 194, cat: Audio/Video, desc: "Music Videos Gospel"}
-    - {id: 195, cat: Audio/Video, desc: "Music Videos Grunge"}
-    - {id: 196, cat: Audio/Video, desc: "Music Videos Hip-Hop / Rap"}
-    - {id: 197, cat: Audio/Video, desc: "Music Videos Indie"}
-    - {id: 198, cat: Audio/Video, desc: "Music Videos Industrial"}
-    - {id: 199, cat: Audio/Video, desc: "Music Videos J-Pop"}
-    - {id: 200, cat: Audio/Video, desc: "Music Videos Jazz"}
-    - {id: 201, cat: Audio/Video, desc: "Music Videos Latin American"}
-    - {id: 202, cat: Audio/Video, desc: "Music Videos Melodic"}
-    - {id: 203, cat: Audio/Video, desc: "Music Videos Metal"}
-    - {id: 204, cat: Audio/Video, desc: "Music Videos Other"}
-    - {id: 205, cat: Audio/Video, desc: "Music Videos Pop"}
-    - {id: 206, cat: Audio/Video, desc: "Music Videos Punk"}
-    - {id: 207, cat: Audio/Video, desc: "Music Videos Radio Show"}
-    - {id: 208, cat: Audio/Video, desc: "Music Videos Reggae"}
-    - {id: 209, cat: Audio/Video, desc: "Music Videos Rhythm and blues"}
-    - {id: 210, cat: Audio/Video, desc: "Music Videos Rock"}
-    - {id: 211, cat: Audio/Video, desc: "Music Videos Soul"}
-    - {id: 212, cat: Audio/Video, desc: "Music Videos Soundtrack"}
-    - {id: 213, cat: Audio/Video, desc: "Music Videos Trance"}
-    - {id: 214, cat: Audio/Video, desc: "Music Videos Trip Hop"}
-    # Pictures
-    - {id: 140, cat: Other, desc: "Pictures Art"}
-    - {id: 141, cat: Other, desc: "Pictures Commercial"}
-    - {id: 142, cat: Other, desc: "Pictures Glamour"}
-    - {id: 215, cat: Other, desc: "Pictures Other"}
-    - {id: 216, cat: Other, desc: "Pictures Photojournalism"}
-    - {id: 217, cat: Other, desc: "Pictures Snapshots"}
-    - {id: 218, cat: Other, desc: "Pictures Sports"}
-    - {id: 219, cat: Other, desc: "Pictures Wildlife"}
-    # TV
-    - {id: 155, cat: TV, desc: "TV Action"}
-    - {id: 143, cat: TV, desc: "TV Adventure"}
-    - {id: 144, cat: TV, desc: "TV Biography"}
-    - {id: 145, cat: TV, desc: "TV Cartoons"}
-    - {id: 146, cat: TV, desc: "TV Comedy"}
-    - {id: 147, cat: TV, desc: "TV Concerts"}
-    - {id: 148, cat: TV, desc: "TV Crime"}
-    - {id: 149, cat: TV, desc: "TV Documentary"}
-    - {id: 156, cat: TV, desc: "TV Drama"}
-    - {id: 220, cat: TV, desc: "TV Family"}
-    - {id: 221, cat: TV, desc: "TV Fantasy"}
-    - {id: 222, cat: TV, desc: "TV Horror"}
-    - {id: 223, cat: TV, desc: "TV Musical"}
-    - {id: 224, cat: TV, desc: "TV Mystery"}
-    - {id: 225, cat: TV, desc: "TV Other"}
-    - {id: 226, cat: TV, desc: "TV Reality"}
-    - {id: 227, cat: TV, desc: "TV Romance"}
-    - {id: 228, cat: TV, desc: "TV Sci-Fi"}
-    - {id: 229, cat: TV, desc: "TV Short film"}
-    - {id: 230, cat: TV, desc: "TV Sports"}
-    - {id: 231, cat: TV, desc: "TV Talk show"}
-    - {id: 232, cat: TV, desc: "TV Thriller"}
-    - {id: 233, cat: TV, desc: "TV Trailers"}
-    - {id: 234, cat: TV, desc: "TV War"}
-    - {id: 235, cat: TV, desc: "TV Western"}
-    # cat 7 Miscellaneous has no subcats
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    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>Access this tracker with your browser</li><li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: _
-    options:
-      _: created
-      S: seeders desc
-      s: seeders asc
-      B: size desc
-      b: size asc
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: /
-    selector: a[href^="/account_handler.php"]
-
-download:
-  infohash:
-    hash:
-      selector: tr:has(td:contains("Torrent hash"))
-      filters:
-        # 907617B7 070AACB6 08CC213C 5277368D 217C1666
-        - name: replace
-          args: [" ", ""]
-        - name: regexp
-          args: ([A-F|0-9]{40})
-    title:
-      selector: td.ctable_header
-      filters:
-        - name: replace
-          args: ["Details for ", ""]
-
-search:
-  paths:
-    # https://www.demonoid.is/files/?category=0&subcategory=0&quality=0&seeded=2&external=2&query=&sort=S
-    # https://www.demonoid.is/files/?c154&language=0&quality=0&seeded=2&query=world&to=1&sort=
-    # https://www.demonoid.is/files/?seeded=2&language=0&quality=0&to=1&query=world
-    - path: files/
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}&{{end}}"
-    # 0 seeded, 1 unseeded, 2 both
-    seeded: 2
-    # 0 all
-    quality: 0
-    # 0 Demonoid, 1 External, 2 Both
-    external: 2
-    # search in titles only
-    to: "{{ if .Query.IMDBID }}{{ else }}1{{ end }}"
-    query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
-    # does not return imdb link in results
-
-  rows:
-    selector: table.font_12px tbody tr:has(td[class^="tone_1"]):not(:has(script))
-    after: 1
-    dateheaders:
-      selector: td.added_today:not(:contains("Sponsored links"))
-      filters:
-        - name: replace
-          args: ["Added ", ""]
-        - name: replace
-          args: ["on ", ""]
-
-  fields:
-    category:
-      selector: a.subcategory
-      attribute: href
-      optional: true
-      default: 0
-      filters:
-        - name: querystring
-          args: subcategory
-    title:
-      selector: a[href^="/files/details/"]
-    details:
-      selector: a[href^="/files/details/"]
-      attribute: href
-    download:
-      selector: a[href^="/files/details/"]
-      attribute: href
-    description:
-      selector: td:nth-last-child(8)
-    size:
-      selector: td:nth-last-child(6)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/denofsimps-api.yml
+++ b/src/Jackett.Common/Definitions/denofsimps-api.yml
@@ -18,8 +18,9 @@ caps:
    - {id: 6, cat: XXX/WEB-DL, desc: "Privacy"}
    - {id: 10, cat: XXX/WEB-DL, desc: "Chaturbate"}
    - {id: 11, cat: XXX/WEB-DL, desc: "LoyalFans"}
-    - {id: 12, cat: XXX/WEB-DL, desc: "Patreon"}
-    - {id: 8, cat: XXX/WEB-DL, desc: "Fanvue"}
+    - {id: 12, cat: XXX/WEB-DL, desc: "CamSoda"}
+    - {id: 8, cat: XXX/WEB-DL, desc: "MyDirtyHobby"}
+    - {id: 14, cat: XXX/WEB-DL, desc: "Other"}

  modes:
    search: [q]
@@ -68,6 +69,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -138,7 +140,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -148,12 +155,16 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 1.0 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 1.0
--- a/src/Jackett.Common/Definitions/desitorrents-api.yml
+++ b/src/Jackett.Common/Definitions/desitorrents-api.yml
@@ -63,6 +63,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/dreamtracker.yml
+++ b/src/Jackett.Common/Definitions/dreamtracker.yml
@@ -123,7 +123,7 @@ settings:
  - name: info
    type: info
    label: Layout
-    default: "<ol><li>Only the English Classic profile is supported.</li><li>Make sure to set the <b>Torrent Listing</b> option in your profile to <b>Classic</b></li><li>And set the <b>Language</b> to <b>English</b></li><li>Using the <i>Modern</i> theme will prevent results, and using <i>Greek</i> will prevent upload dates.</li></ol>"
+    default: "<ul><li>Only the English Classic profile is supported.</li><li>Make sure to set the <b>Torrent Listing</b> option in your profile to <b>Classic</b></li><li>And set the <b>Language</b> to <b>English</b></li><li>Using the <i>Modern</i> theme will prevent results, and using <i>Greek</i> will prevent upload dates.</li></ul>"

 login:
  path: ?p=home&pid=1
--- a/src/Jackett.Common/Definitions/elitetorrent-wf.yml
+++ b/src/Jackett.Common/Definitions/elitetorrent-wf.yml
@@ -0,0 +1,131 @@
+---
+id: elitetorrent-wf
+name: Elitetorrent-wf
+description: "Elitetorrent-wf is a SPANISH Public tracker for MOVIES / TV"
+language: es-ES
+type: public
+encoding: UTF-8
+links:
+  - https://www.elitetorrent.wf/
+
+caps:
+  categories:
+    series: TV
+    peliculas: Movies
+    other: Other
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
+
+search:
+  paths:
+    - path: /
+  allowEmptyInputs: true
+  keywordsfilters:
+    # most ES/ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
+    - name: re_replace
+      args: ["(?i)S0?(\\d{1,2})", " $1 "]
+    - name: re_replace
+      args: ["(?i)E(\\d{2,3})", " $1 "]
+  inputs:
+    s: "{{ .Keywords }}"
+    x: 0
+    y: 0
+
+  rows:
+    selector: "#principal .miniboxs-ficha li:has(span:nth-of-type(2))"
+    filters:
+      - name: andmatch
+
+  fields:
+    category_movie:
+      selector: .meta a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^.*/(peliculas)/.*$"
+    category_tv:
+      selector: .meta a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^.*/(series)/.*$"
+    category:
+      text: "{{ if or .Result.category_movie .Result.category_tv }}{{ or .Result.category_movie .Result.category_tv }}{{ else }}other{{ end }}"
+    _quality:
+      selector: span:nth-of-type(2) > i
+      filters:
+        - name: replace
+          args: ["---", ""]
+    _language:
+      selector: span#idiomacio > i > img
+      attribute: title
+      filters:
+        - name: replace
+          args: ["Pelicula en ", ""]
+        - name: replace
+          args: ["Español Latino", "LATiN SPANiSH"]
+        - name: replace
+          args: ["Español Castellano", "SPANiSH"]
+        - name: replace
+          args: ["Ingles", "English"]
+        - name: replace
+          args: ["Subtitulado", " SPASUBS"]
+        - name: replace
+          args: ["VOSE", ""]
+    title:
+      selector: div.imagen > a
+      attribute: title
+      # normalize to SXXEYY format
+      filters:
+        - name: replace
+          args: [" – ", " "]
+        - name: replace
+          args: ["(", ""]
+        - name: replace
+          args: [")", ""]
+        - name: re_replace
+          args: ["(\\d{2})×(\\d{2})", "S$1E$2"]
+        - name: re_replace
+          args: ["(\\d{1})×(\\d{2})", "S0$1E$2"]
+        - name: append
+          args: " {{ .Result._quality }} {{ .Result._language }}"
+    details:
+      selector: .meta a
+      attribute: href
+    download:
+      selector: .meta a
+      attribute: href
+    poster:
+      selector: .imagen img
+      attribute: data-src
+    size_optional:
+      selector: .voto1
+      optional: true
+      filters:
+        - name: replace
+          args: ["desc.", "512 MB"]
+        - name: replace
+          args: ["s", ""]
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}512 MB{{ end }}"
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/exkinoray.yml
+++ b/src/Jackett.Common/Definitions/exkinoray.yml
@@ -6,9 +6,10 @@ language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
-  - http://exkinoray.fun/ # site does not support https
+  - https://exkinoray.ru/
 legacylinks:
  - http://exkinoray.tv/
+  - http://exkinoray.fun/ # site does not support https

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/extratorrent-st.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-st.yml
@@ -11,9 +11,6 @@ links:
  - https://extratorrent.proxyninja.org/
  - https://extratorrent.proxyninja.net/
 legacylinks:
-  - https://extratorrent.unblockit.asia/
-  - https://extratorrent.unblockit.mov/
-  - https://extratorrent.mrunblock.life/
  - https://extratorrent.unblockit.rsvp/
  - https://extratorrent.unblockit.vegas/
  - https://extratorrent.unblockit.esq/
@@ -29,6 +26,8 @@ legacylinks:
  - https://extratorrent.unblockit.sbs/ # 502
  - https://extratorrent.unblockit.ong/ # 502
  - https://extratorrent.unblockit.black/ # 502
+  - https://extratorrent.unblockit.meme/ # 502
+  - https://extratorrent.unblockit.download/ # 502

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/extremebits.yml
+++ b/src/Jackett.Common/Definitions/extremebits.yml
@@ -5,8 +5,6 @@ description: "ExtremeBits is a Private Torrent Tracker for EXTREME SPORTS"
 language: en-US
 type: private
 encoding: UTF-8
-certificates:
-  - 9ed38a5dc040a2d5a38d45fab2a47d0d0f9dbeaa # Expired 24 June 2024
 links:
  - https://extremebits.net/

--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -11,15 +11,12 @@ links:
  - https://eztv.tf/
  - https://eztv.yt/
  - https://eztv1.xyz/
-  - https://eztv.unblockit.black/
+  - https://eztv.unblockit.download/
 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.asia/
-  - https://eztv.unblockit.mov/
-  - https://eztv.mrunblock.life/
  - https://eztv.unblockit.rsvp/
  - https://eztv.unblockit.vegas/
  - https://eztv.unblockit.esq/
@@ -40,6 +37,8 @@ legacylinks:
  - https://eztv.proxyninja.org/ # layout=def_wlinks not working
  - https://eztv.abcproxy.org/
  - https://eztv.unblockit.ong/
+  - https://eztv.unblockit.black/
+  - https://eztv.unblockit.meme/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/f1carreras-api.yml
+++ b/src/Jackett.Common/Definitions/f1carreras-api.yml
@@ -63,6 +63,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -153,7 +154,9 @@ search:
      case:
        False: 1 # normal
        True: 2 # double
+    minimumratio:
+      text: 1.0
    minimumseedtime:
-      # 6 hours (as seconds = 6 x 60 x 60)
-      text: 21600
+      # 12 hours (as seconds = 12 x 60 x 60)
+      text: 43200
 # json UNIT3D 7.2.5
--- a/src/Jackett.Common/Definitions/fappaizuri.yml
+++ b/src/Jackett.Common/Definitions/fappaizuri.yml
@@ -58,6 +58,8 @@ settings:
    options:
      desc: desc
      asc: asc
+  - name: info_flaresolverr
+    type: info_flaresolverr

 login:
  method: post
--- a/src/Jackett.Common/Definitions/fearnopeer.yml
+++ b/src/Jackett.Common/Definitions/fearnopeer.yml
@@ -66,6 +66,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -156,7 +157,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -166,12 +172,16 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # Maintain global ratio above 0.6 or downloads will get disabled. No MST.
    minimumratio:
      text: 0.61
--- a/src/Jackett.Common/Definitions/file-shack.yml
+++ b/src/Jackett.Common/Definitions/file-shack.yml
@@ -1,176 +0,0 @@
---
-id: file-shack
-name: File-Shack
-description: "File-Shack is a Private tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://file-shack.xyz/
-
-caps:
-  categorymappings:
-    - {id: 6, cat: PC/0day, desc: "Apps: Windows"}
-    - {id: 7, cat: PC/Mac, desc: "Apps: Mac"}
-    - {id: 8, cat: PC, desc: "Apps: Linux"}
-    - {id: 75, cat: Movies/DVD, desc: "Movies: DVD"}
-    - {id: 26, cat: Movies/BluRay, desc: "Movies: Blu-Ray"}
-    - {id: 42, cat: Movies/HD, desc: "Movies: FHD-HD"}
-    - {id: 50, cat: Movies/WEB-DL, desc: "Movies: Web-Dl"}
-    - {id: 74, cat: Movies/SD, desc: "Movies: SD"}
-    - {id: 49, cat: Movies/UHD, desc: "Movies: 4k"}
-    - {id: 46, cat: Movies/3D, desc: "Movies: 3D"}
-    - {id: 24, cat: Movies, desc: "Movies: Packs"}
-    - {id: 28, cat: Movies/Other, desc: "Movies: Cartoons"}
-    - {id: 47, cat: XXX, desc: "Movies: XXX"}
-    - {id: 41, cat: TV/HD, desc: "TV: HD"}
-    - {id: 52, cat: TV/WEB-DL, desc: "TV: WEB-DL"}
-    - {id: 48, cat: TV, desc: "TV: Packs"}
-    - {id: 9, cat: TV/Documentary, desc: "TV: Documentaries"}
-    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Music: FLAC"}
-    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
-    - {id: 27, cat: Audio, desc: "Music: Pack"}
-    - {id: 53, cat: PC/Games, desc: "Games: Pc"}
-    - {id: 54, cat: Console, desc: "Games: PsP"}
-    - {id: 76, cat: Audio/Audiobook, desc: "Books: Audio"}
-    - {id: 77, cat: Books/EBook, desc: "Books: eBooks"}
-    - {id: 78, cat: TV/UHD, desc: "TV: 4k"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_results
-    type: info
-    label: Search results
-    default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Be active here, you must login at least once a month. Also, not downloading anything is considered being inactive (except if you're an uploader or VIP). The accounts inactive for 3 months are deleted."
-
-login:
-  path: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.myFrame:contains("Access Denied")
-  test:
-    path: index.php
-    selector: a[href^="account-logout.php"]
-
-search:
-  paths:
-    # https://file-shack.xyz/torrents-search.php?c22=1&c23=1&c76=1&c77=1&search=&incldead=0&freeleech=0&inclrosub=0
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    # 0 only active 1 incl dead 2 only dead
-    incldead: 1
-    # 0 all 1 not freeleech 2 only freeleech
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: title
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="torrents-details.php?id="]:not(a[onmouseover*="images/nocover.png"])
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: src=([^\s]+)
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: td:nth-child(4)
-    date:
-      # 15.11.21<br>07:47
-      selector: td:nth-child(5)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "d.MM.yyHH:mm"
-    grabs:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    genre:
-      selector: a:contains("Genre:")
-      filters:
-        - name: replace
-          args: ["Genre: ", ""]
-    _source:
-      case:
-        img[src="images/t_extern.png"]: External
-        "*": Local
-    description:
-      text: "{{ .Result._source }} - {{ .Result.genre }}"
-    downloadvolumefactor:
-      case:
-        img[src="images/t_extern.png"]: 0
-        img[src="images/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# global MR is 1.0 but torrents must be seeded for 1 day regardless of ratio
-#    minimumratio:
-#      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# engine n/a
--- a/src/Jackett.Common/Definitions/freefarm.yml
+++ b/src/Jackett.Common/Definitions/freefarm.yml
@@ -218,4 +218,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.12 2024-04-13
+# NexusPHP v1.8.13 2024-07-23
--- a/src/Jackett.Common/Definitions/generationfree-api.yml
+++ b/src/Jackett.Common/Definitions/generationfree-api.yml
@@ -89,6 +89,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -7,11 +7,14 @@ type: public
 encoding: UTF-8
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.in/
+  - https://www.gktorrent.sk/
 legacylinks:
+  # latest domains list
  - https://www.rantop.org/
  - https://www.torrent.ws/
  - https://www.protege-torrent.com/
+  - https://gktorrent.news/
+  # actual legacylinks
  - https://gktorrent.nocensor.click/
  - https://www.gktorrent.ph/
  - https://www.gktorrent.vc/
@@ -28,6 +31,7 @@ legacylinks:
  - https://www.gktorrent.xyz/
  - https://www.gktorrent.pm/
  - https://www.gktorrent.tw/
+  - https://www.gktorrent.in/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -8,12 +8,10 @@ encoding: UTF-8
 links:
  - https://glodls.to/
  - https://gtso.cc/
-  - https://glotorrents.unblockit.black/
+  - https://glotorrents.unblockit.download/
 legacylinks:
  - https://glodls.rocks/
  - https://gtdb.to/
-  - https://glotorrents.unblockit.asia/
-  - https://glotorrents.unblockit.mov/
  - https://glotorrents.unblockit.rsvp/
  - https://gtdb.cc/
  - https://glotorrents.unblockit.vegas/
@@ -32,6 +30,8 @@ legacylinks:
  - https://glotorrents.unblockit.ong/
  - https://glodls.unblockninja.com/ # blank
  - https://glodls.ninjaproxy1.com/ # blank
+  - https://glotorrents.unblockit.black/
+  - https://glotorrents.unblockit.meme/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/goodtracker.yml
+++ b/src/Jackett.Common/Definitions/goodtracker.yml
@@ -0,0 +1,155 @@
+---
+id: goodtracker
+name: GOOD tracker
+description: "GOOD tracker is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: ru-RU
+type: semi-private
+encoding: windows-1251
+links:
+  - http://good73.net/ # does not support https
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC/ISO, desc: "Приложения ISO"}
+    - {id: 9, cat: Books, desc: "Документация"}
+    - {id: 5, cat: PC/Games, desc: "Игры PC"}
+    - {id: 10, cat: Audio, desc: "Музыка"}
+    - {id: 11, cat: TV, desc: "Сериалы"}
+    - {id: 12, cat: TV/Anime, desc: "Аниме"}
+    - {id: 13, cat: Movies/DVD, desc: "Фильмы DVDRip"}
+    - {id: 14, cat: Movies/HD, desc: "Фильмы HDRip"}
+    - {id: 15, cat: Movies/DVD, desc: "Фильмы DVD"}
+    - {id: 21, cat: Movies/Other, desc: "Мультфильмы"}
+    - {id: 16, cat: Books/EBook, desc: "Книги"}
+    - {id: 18, cat: PC, desc: "Софт"}
+    - {id: 20, cat: Other, desc: "Temp"}
+    - {id: 22, cat: Console/PSP, desc: "SONY PSP"}
+    - {id: 23, cat: TV/Documentary, desc: "Документальные фильмы"}
+    - {id: 25, cat: Audio, desc: "Многоканальная музыка"}
+    - {id: 26, cat: TV/Sport, desc: "Спорт"}
+    - {id: 28, cat: Console/XBox, desc: "PlayStation/X-Box"}
+    - {id: 29, cat: PC/Mobile-Other, desc: "Мобильные устройства"}
+    - {id: 30, cat: Other, desc: "Клипы"}
+    - {id: 31, cat: Other, desc: "*nix"}
+    - {id: 34, cat: Audio/Audiobook, desc: "Аудиокниги"}
+    - {id: 35, cat: Audio/Video, desc: "Музыкальное DVD"}
+    - {id: 36, cat: Movies/3D, desc: "Фильмы 3D"}
+    - {id: 37, cat: Movies/HD, desc: "Фильмы HD/BD"}
+    - {id: 38, cat: Other, desc: "Обучающие материалы"}
+    - {id: 39, cat: Other, desc: "Фильмографии"}
+    - {id: 40, cat: Other, desc: "Трейлеры"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    book-search: [q]
+    music-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: 4
+    options:
+      1: title
+      4: added
+      5: size
+      7: seeders
+  - 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>Торрентов на страницу:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    submit: Вход!
+  error:
+    - selector: div.error:contains("Ошибка входа")
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # http://good73.net/browse.php?c9=1&search=&incldead=1&cat=0&browse=&sort=7&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 silver, 4 gold, 5 noseed, 6 dead for over 30 days
+    incldead: "{{ if .Config.freeleech }}4{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # site does not support imdbid searching or have imdbid in results
+
+  rows:
+    selector: tbody[id="highlighted"] > tr:has(a[href^="details.php?id="])
+    after: 1
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href*="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date:
+      # 2023-10-06 09:48:07
+      selector: font:contains("-")
+      filters:
+        - name: regexp
+          args: "(\\d{4}-\\d{2}-\\d{2}\\s\\d{2}:\\d{2}:\\d{2}) |"
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    files:
+      selector: td:nth-child(4)
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        img[src="pic/freedownload.gif"]: 0
+        img[src="pic/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# TBDEV custom v2.0
--- a/src/Jackett.Common/Definitions/greekdiamond.yml
+++ b/src/Jackett.Common/Definitions/greekdiamond.yml
@@ -1,189 +0,0 @@
---
-id: greekdiamond
-name: GreekDiamond
-description: "GreekDiamond is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: el-GR
-type: private
-encoding: UTF-8
-links:
-  - https://greekdiamond.info/
-
-caps:
-  categorymappings:
-    # TV
-    - {id: 22, cat: TV, desc: "TV Greek series"}
-    - {id: 23, cat: TV, desc: "TV series packs"}
-    # Movies
-    - {id: 21, cat: Movies, desc: "Movies World series"}
-    - {id: 12, cat: Movies/DVD, desc: "Movies DVDRIp"}
-    - {id: 13, cat: Movies/HD, desc: "Movies Hd rip x264"}
-    - {id: 14, cat: Movies/SD, desc: "Movies Cam-Ts-R6"}
-    - {id: 10, cat: Movies/HD, desc: "Movies 720p-1080p"}
-    - {id: 16, cat: Movies/BluRay, desc: "Movies Blue Ray"}
-    - {id: 17, cat: Movies, desc: "Movies pack"}
-    - {id: 18, cat: TV/Documentary, desc: "TV Documentary"}
-    - {id: 19, cat: Movies, desc: "Movies Greek"}
-    - {id: 51, cat: TV, desc: "TV Greek Packs"}
-    - {id: 52, cat: Movies, desc: "Movies Greek Packs"}
-    - {id: 53, cat: Movies/HD, desc: "BDRIP-BRRIP"}
-    # Music
-    - {id: 24, cat: Audio, desc: "Music Greek"}
-    - {id: 25, cat: Audio, desc: "Music Greek discografy"}
-    - {id: 26, cat: Audio, desc: "Music Rock"}
-    - {id: 27, cat: Audio, desc: "Music Rock discografy"}
-    - {id: 28, cat: Audio, desc: "Music Compat Disc Club"}
-    - {id: 29, cat: Audio, desc: "Music HipHop/Rap/RnB"}
-    - {id: 30, cat: Audio, desc: "Music Pop/Electronic"}
-    - {id: 31, cat: Audio, desc: "Music Soundtracks-VArtists"}
-    - {id: 32, cat: Audio/Video, desc: "Music videos"}
-    - {id: 50, cat: Audio/Other, desc: "Music Διάφορα (Other)"}
-    # Games
-    - {id: 33, cat: PC/Games, desc: "Games PC"}
-    - {id: 34, cat: Console/PSP, desc: "Games Playstation/PSP"}
-    - {id: 35, cat: Console/XBox, desc: "Games Xbox"}
-    # Children
-    - {id: 36, cat: TV/Anime, desc: "Anime /Μεταγλωτισμένα"}
-    - {id: 37, cat: TV/Anime, desc: "Anime /Subtitled"}
-    # Books
-    - {id: 40, cat: Books/Comics, desc: "Comics"}
-    - {id: 41, cat: Books/Mags, desc: "Magazines"}
-    - {id: 42, cat: Books/EBook, desc: "E-books"}
-    - {id: 43, cat: Books/EBook, desc: "PDF"}
-    # Other
-    - {id: 44, cat: Other, desc: "Images"}
-    - {id: 45, cat: TV/Sport, desc: "Football Leagues"}
-    - {id: 46, cat: TV/Sport, desc: "Formula 1"}
-    # Apps
-    - {id: 48, cat: PC/0day, desc: "Apps Win"}
-    - {id: 8, cat: PC, desc: "Apps Linux"}
-    - {id: 9, cat: PC/Mac, desc: "Apps Mac"}
-    - {id: 49, cat: PC/Mobile-Other, desc: "Apps Mobile"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: uid
-    type: text
-    label: Username
-  - name: pwd
-    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:
-  path: index.php?page=login
-  method: post
-  form: form[action="index.php?page=login"]
-  inputs:
-    uid: "{{ .Config.uid }}"
-    pwd: "{{ .Config.pwd }}"
-  error:
-    - selector: form[action="index.php?page=login&returnto=index.php"] table tr:nth-of-type(2) td span
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    page: torrents
-    search: "{{ .Keywords }}"
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    # 0 title 1 title&descr 2 descr
-    options: 0
-    # 0 all, 1 activeonly, 2 deadonly
-    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 }}"
-    # does not support imdbid search and does not ruturn imdb link in results
-
-  rows:
-    selector: table > tbody > tr > td > table.lista > tbody > tr:has(td[onmouseover="this.className='post'"])
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    # some users will have an extra wait time column before the bookmark column, so we count up from the bottom
-    date:
-      selector: td:nth-last-of-type(12)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy"
-    seeders:
-      selector: td:nth-last-of-type(10)
-    leechers:
-      selector: td:nth-last-of-type(9)
-    grabs:
-      selector: td:nth-last-of-type(8)
-    size:
-      selector: td:nth-last-of-type(6)
-    description:
-      selector: td:nth-last-of-type(4) img
-      attribute: title
-      filters:
-        - name: prepend
-          args: "Language: "
-    downloadvolumefactor:
-      case:
-        img[src="images/freeleech.gif"]: 0
-        img[src="gold/gold.gif"]: 0
-        img[src="gold/slver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# xbtit dt fm v20.0
--- a/src/Jackett.Common/Definitions/h-p2p.yml
+++ b/src/Jackett.Common/Definitions/h-p2p.yml
@@ -1,166 +0,0 @@
---
-id: h-p2p
-name: H-P2P
-description: "H-P2P is a Private Torrent Tracker for OnlyFans XXX"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://h-p2p.xyz/
-legacylinks:
-  - https://h-p2p.cam/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: XXX/WEB-DL, desc: "OnlyFans"}
-    - {id: 2, cat: XXX/WEB-DL, desc: "Fansly"}
-    - {id: 3, cat: XXX/WEB-DL, desc: "Privacy"}
-    - {id: 4, cat: XXX/WEB-DL, desc: "JustForFans"}
-    - {id: 5, cat: XXX/WEB-DL, desc: "ManyVids"}
-    - {id: 6, cat: XXX/WEB-DL, desc: "Clips4Sale"}
-    - {id: 7, cat: XXX/WEB-DL, desc: "Hentai"}
-    - {id: 8, cat: XXX/WEB-DL, desc: "JAV"}
-    - {id: 9, cat: XXX/WEB-DL, desc: "Paid Site"}
-    - {id: 10, cat: XXX/WEB-DL, desc: "HomeMade"}
-    - {id: 11, cat: XXX/WEB-DL, desc: "Other"}
-    - {id: 27, cat: XXX/WEB-DL, desc: "Gay"}
-    - {id: 28, cat: XXX/WEB-DL, desc: "XXX Movie"}
-
-  modes:
-    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://h-p2p.cam/\" target=\"_blank\">H-P2P</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: single_file_release_use_filename
-    type: checkbox
-    label: Use filename as title for single file releases
-    default: true
-  - 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
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-
-search:
-  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  headers:
-    Authorization: ["Bearer {{ .Config.apikey }}"]
-
-  inputs:
-    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
-    name: "{{ .Keywords }}"
-    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 75
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-
-  fields:
-    _id:
-      selector: ..id
-    category:
-      selector: category_id
-    title_optional:
-      selector: name
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    files:
-      selector: num_file
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    infohash:
-      selector: info_hash
-    poster:
-      text: "{{ .Config.sitelink }}files/img/torrent-cover_{{ .Result._id }}.jpg"
-    genre:
-      selector: meta.genres
-      filters:
-        - name: re_replace
-          args: ["(?i)(Science Fiction)", "Science_Fiction"]
-        - name: replace
-          args: [" & ", "_&_"]
-    description:
-      text: "{{ .Result.genre }}"
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
-      selector: created_at
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "MM/dd/yyyy HH:mm:ss zzz"
-    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 False, True
-      selector: double_upload
-      case:
-        False: 1 # normal
-        True: 2 # double
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# json UNIT3D 8.1.3 (custom)
--- a/src/Jackett.Common/Definitions/hd-unit3d-api.yml
+++ b/src/Jackett.Common/Definitions/hd-unit3d-api.yml
@@ -65,6 +65,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -155,7 +156,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -165,12 +171,16 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
--- a/src/Jackett.Common/Definitions/hdarea.yml
+++ b/src/Jackett.Common/Definitions/hdarea.yml
@@ -81,6 +81,11 @@ login:
    path: index.php
    selector: a[href="usercp.php"]

+download:
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
 search:
  paths:
    - path: torrents.php
@@ -120,14 +125,14 @@ search:
      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="details.php?id="]
      attribute: href
    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-last-child(6) > span[title]
      attribute: title
      optional: true
      filters:
@@ -137,7 +142,7 @@ search:
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-last-child(6):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -147,13 +152,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:nth-child(5)
+      selector: td.rowfollow:nth-last-child(5)
    seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-last-child(4)
    leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-last-child(3)
    grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-last-child(2)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -173,4 +178,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP Standard v1.5 Beta 4  (customised)
--- a/src/Jackett.Common/Definitions/hdatmos.yml
+++ b/src/Jackett.Common/Definitions/hdatmos.yml
@@ -179,4 +179,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.12 2024-07-13
--- a/src/Jackett.Common/Definitions/hddolby.yml
+++ b/src/Jackett.Common/Definitions/hddolby.yml
@@ -171,4 +171,4 @@ search:
      filters:
        - name: re_replace
          args: ["(?i)\\s*(剩余时间:|剩餘時間：|will end in)\\s*", ""]
-# NexusPHP 59e6a24 2024-5-9
+# NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/hdfans.yml
+++ b/src/Jackett.Common/Definitions/hdfans.yml
@@ -210,4 +210,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.9 2023-11-15
+# NexusPHP v1.8.12 2024-06-13
--- a/src/Jackett.Common/Definitions/hdfun.yml
+++ b/src/Jackett.Common/Definitions/hdfun.yml
@@ -1,229 +0,0 @@
---
-id: hdfun
-replaces:
-  - hdzone
-name: HDFun
-description: "HDFun (HDZone) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-CN
-type: private
-encoding: UTF-8
-links:
-  - https://hdzone.me/
-legacylinks:
-  - https://hdfun.me/
-
-caps:
-  categorymappings:
-    - {id: 411, cat: Movies/SD, desc: "Movies SD"}
-    - {id: 412, cat: Movies, desc: "Movies IPad"}
-    - {id: 413, cat: Movies/HD, desc: "Movies 720p"}
-    - {id: 414, cat: Movies/HD, desc: "Movies 1080p"}
-    - {id: 415, cat: Movies, desc: "Movies REMUX"}
-    - {id: 450, cat: Movies/BluRay, desc: "Movies Bluray"}
-    - {id: 499, cat: Movies/UHD, desc: "Movies UHD Blu-ray"}
-    - {id: 416, cat: Movies/UHD, desc: "Movies 2160p"}
-    - {id: 417, cat: TV/Documentary, desc: "Doc SD"}
-    - {id: 418, cat: TV/Documentary, desc: "Doc IPad"}
-    - {id: 419, cat: TV/Documentary, desc: "Doc 720p"}
-    - {id: 420, cat: TV/Documentary, desc: "Doc 1080p"}
-    - {id: 421, cat: TV/Documentary, desc: "Doc REMUX"}
-    - {id: 451, cat: TV/Documentary, desc: "Doc Bluray"}
-    - {id: 500, cat: TV/Documentary, desc: "Doc UHD Blu-ray"}
-    - {id: 422, cat: TV/Documentary, desc: "Doc 2160p"}
-    - {id: 423, cat: Audio/Video, desc: "TVMusic 720p"}
-    - {id: 424, cat: Audio/Video, desc: "TVMusic 1080i"}
-    - {id: 425, cat: TV/SD, desc: "TVShow SD"}
-    - {id: 426, cat: TV, desc: "TVShow IPad"}
-    - {id: 471, cat: TV, desc: "TVShow IPad"}
-    - {id: 427, cat: TV/HD, desc: "TVShow 720p"}
-    - {id: 472, cat: TV/HD, desc: "TVShow 720p"}
-    - {id: 428, cat: TV/HD, desc: "TVShow 1080i"}
-    - {id: 429, cat: TV/HD, desc: "TVShow 1080p"}
-    - {id: 430, cat: TV, desc: "TVShow REMUX"}
-    - {id: 452, cat: TV/HD, desc: "TVShow Bluray"}
-    - {id: 431, cat: TV/UHD, desc: "TVShow 2160p"}
-    - {id: 432, cat: TV/SD, desc: "TVSeries SD"}
-    - {id: 433, cat: TV, desc: "TVSeries IPad"}
-    - {id: 434, cat: TV/HD, desc: "TVSeries 720p"}
-    - {id: 435, cat: TV/HD, desc: "TVSeries 1080i"}
-    - {id: 436, cat: TV/HD, desc: "TVSeries 1080p"}
-    - {id: 437, cat: TV, desc: "TVSeries REMUX"}
-    - {id: 453, cat: TV/HD, desc: "TVSeries Bluray"}
-    - {id: 438, cat: TV/UHD, desc: "TVSeries 2160p"}
-    - {id: 439, cat: Audio, desc: "Music APE"}
-    - {id: 440, cat: Audio/Lossless, desc: "Music FLAC"}
-    - {id: 441, cat: Audio/Video, desc: "Music MV"}
-    - {id: 442, cat: TV/Sport, desc: "Sports 720p"}
-    - {id: 443, cat: TV/Sport, desc: "Sports 1080i"}
-    - {id: 444, cat: TV/Anime, desc: "Anime SD"}
-    - {id: 445, cat: TV/Anime, desc: "Anime IPad"}
-    - {id: 446, cat: TV/Anime, desc: "Anime 720p"}
-    - {id: 447, cat: TV/Anime, desc: "Anime 1080p"}
-    - {id: 448, cat: TV/Anime, desc: "Anime REMUX"}
-    - {id: 454, cat: TV/Anime, desc: "Anime Bluray"}
-    - {id: 409, cat: Other, desc: "Misc"}
-    - {id: 449, cat: TV/Anime, desc: "Anime 2160p"}
-    - {id: 501, cat: TV/Anime, desc: "Anime UHD Blu-ray"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, doubanid]
-    movie-search: [q, imdbid, doubanid]
-    music-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: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Nexus Master or above would never be deleted</li><li>Insane User or above would never be deleted if parked (at User CP)</li><li>Parked accounts would be deleted if users have not logged in for more than 120 days in a row</li><li>Un-parked accounts would be deleted if users have not logged in for more than 60 days in a row</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 7 days in a row.</li></ol>"
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[alt="CAPTCHA"]
-    input: imagestring
-  inputs:
-    secret: ""
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
-  test:
-    path: torrents.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    # currently supports only one query id at one time.
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
-    # 0 incldead, 1 active, 2 onlydead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdb
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    notnewword: 1
-
-  rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
-
-  fields:
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_default:
-      selector: a[href^="details.php?id="]
-    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date_elapsed:
-      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_added:
-      # time added
-      selector: td:nth-child(4):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    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.2
-# does not appear to be implemented, no h&r tag found
-#     minimumseedtime:
-#       # 14 days (as seconds = 2 x 24 x 60 x 60)
-#       text: 1209600
-    description:
-      selector: td:nth-child(2)
-      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/hdgalaktik.yml
+++ b/src/Jackett.Common/Definitions/hdgalaktik.yml
@@ -127,7 +127,7 @@ search:
          args: cat
    title:
      selector: a.link-secondary
-      attribute: onmouseover
+      attribute: title
      filters:
        - name: regexp
          args: \'>(.+?)</div
@@ -209,32 +209,19 @@ search:
    size:
      selector: td:nth-child(4)
    seeders:
-      selector: td:nth-child(6)
-      filters:
-        - name: split
-          args: ["|", 0]
+      selector: span[title="Раздают"]
    leechers:
-      selector: td:nth-child(6)
-      filters:
-        - name: split
-          args: ["|", 1]
-    date_today:
+      selector: span[title="Качают"]
+    date_day:
      # Сегодня в 18:22
-      selector: a[href^="browse.php?date="]:contains("Сегодня")
+      # Вчера в 20:52
+      selector: a[href^="browse.php?date="]:contains("Сегодня"), a[href^="browse.php?date="]:contains("Вчера")
      optional: true
      filters:
        - name: regexp
-          args: "(Сегодня в \\d{2}:\\d{2})"
+          args: "((Вчера в|Сегодня в)( \\d{2}:\\d{2}))"
        - name: replace
          args: ["Сегодня в", "Today"]
-        - name: fuzzytime
-    date_yday:
-      # Вчера в 20:52
-      selector: a[href^="browse.php?date="]:contains("Вчера")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(Вчера в \\d{2}:\\d{2})"
        - name: replace
          args: ["Вчера в", "Yesterday"]
        - name: fuzzytime
@@ -250,7 +237,7 @@ search:
        - name: dateparse
          args: "HH:mm dd/MM zzz"
    date:
-      text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday }}{{ or .Result.date_year .Result.date_today .Result.date_yday }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
    downloadvolumefactor:
      case:
        img[src="/pic/freedownload.gif"]: 0
--- a/src/Jackett.Common/Definitions/hdkylin.yml
+++ b/src/Jackett.Common/Definitions/hdkylin.yml
@@ -166,4 +166,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-07-13
--- a/src/Jackett.Common/Definitions/hdmayi.yml
+++ b/src/Jackett.Common/Definitions/hdmayi.yml
@@ -1,209 +0,0 @@
---
-id: hdmayi
-name: HDMaYi (小蚂蚁PT站)
-description: "HDMaYi (小蚂蚁PT站) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
-language: zh-CN
-type: private
-encoding: UTF-8
-links:
-  - https://hdmayi.com/
-legacylinks:
-  - http://hdmayi.com/
-
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
-    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/MV"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 408, cat: Audio, desc: "Music/音乐"}
-    - {id: 410, cat: PC, desc: "Softs/软件"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, doubanid]
-    movie-search: [q, imdbid, doubanid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2facode
-    type: text
-    label: 2FA code
-  - name: info_2fa
-    type: info
-    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the HDMaYi Web Site. Otherwise just leave it empty."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted</li><li>Elite User or above would never be deleted if parked (at User CP)</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row</li><li>Un-parked accounts would be deleted if users have not logged in for more than 150 days in a row</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[alt="CAPTCHA"]
-    input: imagestring
-  inputs:
-    secret: ""
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    two_step_code: "{{ .Config.2facode }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work)
-    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    notnewword: 1
-
-  rows:
-    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_default:
-      selector: a[href^="details.php?id="]
-    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img[data-src]
-      attribute: data-src
-    imdbid:
-      # site currently only has a badge and rating, the id is not present. just in case a future update.
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    doubanid:
-      # site currently only has a badge and rating, the id is not present. just in case a future update.
-      selector: a[href*="movie.douban.com/subject/"]
-      attribute: href
-    date_elapsed:
-      # time type: time elapsed (default)
-      selector: td.rowfollow:nth-child(4) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_added:
-      # time added
-      selector: td.rowfollow:nth-child(4):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    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-child(5)
-    seeders:
-      selector: td.rowfollow:nth-child(6)
-    leechers:
-      selector: td.rowfollow:nth-child(7)
-    grabs:
-      selector: td.rowfollow: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
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-    description_verified:
-      case:
-        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
-        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
-        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
-    description:
-      selector: td.rowfollow:nth-child(2)
-      remove: a, b, font, img, span
-      filters:
-        - name: prepend
-          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.6 2023-08-18
--- a/src/Jackett.Common/Definitions/hdolimpo-api.yml
+++ b/src/Jackett.Common/Definitions/hdolimpo-api.yml
@@ -56,6 +56,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/hdtorrentsit.yml
+++ b/src/Jackett.Common/Definitions/hdtorrentsit.yml
@@ -1,7 +1,7 @@
 ---
 id: hdtorrentsit
 name: HDTorrents.it
-description: "HDTorrents.it is an ITALIAN Private site for TV / MOVIES"
+description: "HDTorrents.it is an ITALIAN Private PAY2DL site for TV / MOVIES"
 language: it-IT
 type: private
 encoding: UTF-8
@@ -62,6 +62,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -161,7 +162,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -171,11 +177,15 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # as a pay site there is no MR or MST
-# json UNIT3D 8.1.3 (custom)
+# json UNIT3D 8.2.0 (custom)
--- a/src/Jackett.Common/Definitions/hebits.yml
+++ b/src/Jackett.Common/Definitions/hebits.yml
@@ -58,6 +58,10 @@ settings:
    type: info
    label: Account Inactivity
    default: "There is an automatic system for blocking inactive accounts. The system will block any account below Heb Prophet rank without activity for at least 90 days."
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are getting the error <b>Login failed: Selector \"a[href*=\"/logout.php?auth=\"]\" didn't match</b> then first access the site with your browser and check that you are not being forced to change your password because it has expired after 180 days."

 login:
  method: cookie
--- a/src/Jackett.Common/Definitions/hellashut-api.yml
+++ b/src/Jackett.Common/Definitions/hellashut-api.yml
@@ -0,0 +1,189 @@
+---
+id: hellashut-api
+name: HellasHut (API)
+description: "HellasHut is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-GR
+type: private
+encoding: UTF-8
+testlinktorrent: false
+links:
+  - https://hellashut.net/
+legacylinks:
+  - https://hellashut.de/
+
+caps:
+  categorymappings:
+    - {id: 85, cat: TV/Anime, desc: "Anime/Cartoon 4K"}
+    - {id: 28, cat: TV/Anime, desc: "Anime/Cartoon HD"}
+    - {id: 47, cat: TV/Anime, desc: "Anime/Cartoon HDTV"}
+    - {id: 48, cat: TV/Anime, desc: "Anime/Cartoon SD"}
+    - {id: 50, cat: TV/Anime, desc: "Anime/Cartoon SD Emb"}
+    - {id: 51, cat: TV/Anime, desc: "Anime/Cartoon TV"}
+    - {id: 77, cat: PC, desc: "Applications DOS"}
+    - {id: 20, cat: PC, desc: "Applications Linux"}
+    - {id: 19, cat: PC/Mac, desc: "Applications MAC"}
+    - {id: 68, cat: PC, desc: "Applications OS2 WARP"}
+    - {id: 21, cat: PC, desc: "Applications Other"}
+    - {id: 18, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 52, cat: Books, desc: "Books/Magazines All"}
+    - {id: 9, cat: TV/Documentary, desc: "Documentaries All"}
+    - {id: 53, cat: TV/Documentary, desc: "Documentaries Greek"}
+    - {id: 54, cat: TV/Documentary, desc: "Documentaries HD"}
+    - {id: 55, cat: Movies/DVD, desc: "DVD-R All"}
+    - {id: 17, cat: Console/Other, desc: "Games Other"}
+    - {id: 11, cat: Console/PS4, desc: "Games PSX"}
+    - {id: 10, cat: PC/Games, desc: "Games Windows"}
+    - {id: 13, cat: Console/XBox, desc: "Games Xbox"}
+    - {id: 56, cat: Other, desc: "Miscellaneous All"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "Mobile All"}
+    - {id: 1, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 2, cat: Movies/UHD, desc: "Movies 4K"}
+    - {id: 42, cat: Movies/BluRay, desc: "Movies BluRay"}
+    - {id: 78, cat: Movies/SD, desc: "Movies CAM"}
+    - {id: 58, cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: 84, cat: Movies, desc: "Movies Fake HD"}
+    - {id: 4, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 69, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 3, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 67, cat: Movies/SD, desc: "Movies SD Packs"}
+    - {id: 71, cat: Audio, desc: "Music CDA"}
+    - {id: 59, cat: Audio, desc: "Music Discographies"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 22, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 25, cat: Audio/Video, desc: "Music Video"}
+    - {id: 75, cat: Movies/HD, desc: "NO IN SUBS Movies HD"}
+    - {id: 76, cat: Movies/UHD, desc: "NO SUBS IN Movies 4K"}
+    - {id: 35, cat: TV/Sport, desc: "Sports HD"}
+    - {id: 34, cat: TV/Sport, desc: "Sports SD"}
+    - {id: 80, cat: Books, desc: "Tutorials Books"}
+    - {id: 79, cat: TV/Other, desc: "Tutorials Video"}
+    - {id: 5, cat: TV, desc: "TV Greek Movies"}
+    - {id: 6, cat: TV, desc: "TV Greek Series"}
+    - {id: 7, cat: TV, desc: "TV Greek Series Packs"}
+    - {id: 60, cat: TV, desc: "TV Greek Shows"}
+    - {id: 41, cat: TV/HD, desc: "TV HD"}
+    - {id: 61, cat: TV, desc: "TV Series"}
+    - {id: 82, cat: TV/UHD, desc: "TV Series 4K"}
+    - {id: 83, cat: TV/UHD, desc: "TV Series 4K Packs"}
+    - {id: 62, cat: TV, desc: "TV Series Emb"}
+    - {id: 63, cat: TV, desc: "TV Series Emb Packs"}
+    - {id: 64, cat: TV/HD, desc: "TV Series HD"}
+    - {id: 65, cat: TV/HD, desc: "TV Series HD Packs"}
+    - {id: 66, cat: TV, desc: "TV Series Packs"}
+    - {id: 73, cat: Movies/BluRay, desc: "UNTOUCHED BluRay"}
+    - {id: 72, cat: Movies/DVD, desc: "UNTOUCHED DVD"}
+
+  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: passkey
+    type: text
+    label: PassKey
+  - name: info_key
+    type: info
+    label: About your PassKey
+    default: "Find your PassKey by accessing your <a href=\"https://hellashut.net/\" target=\"_blank\">HellasHut</a> profile on the <i>My Profile</i> page and scrolling down to the <b>PassKey</b> field."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Accounts inactive for more than 45 days are automatically deleted."
+
+login:
+  path: login.php
+  method: form
+  form: form[action="login.php"]
+  captcha:
+    type: image
+    selector: img[src="captcha.php?ext=.gif"]
+    input: input[type="text"][size="6"]
+  inputs:
+    input[name="username"]: "{{ .Config.username }}"
+    input[name="password"]: "{{ .Config.password }}"
+  selectors: true
+  error:
+    - selector: td.embedded:contains("Access Denied")
+  test:
+    path: /
+    selector: a[href="account-logout.php"]
+
+download:
+  selectors:
+    - selector: a[href^="download.php?id="], a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: api.php
+      response:
+        type: json
+
+  inputs:
+    # https://hellashut.net/api.php?passkey=1234567890abcdef&search=&incldead=1&freeleech=0&c[]=85
+    passkey: "{{ .Config.passkey }}"
+    $raw: "{{ range .Categories }}&c[]={{.}}{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 both, 2 dead
+    incldead: 1
+    # 0 all, 1 nofree, 2 free
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}{{ end }}"
+
+  rows:
+    selector: torrents
+    count:
+      selector: results
+
+  fields:
+    _id:
+      selector: id
+    category:
+      selector: category
+    title:
+      selector: name
+    details:
+      text: "torrents-details.php?id={{ .Result._id }}"
+    download:
+      text: "{{ .Result.details }}"
+    imdbid:
+      selector: imdb
+    files:
+      selector: numfiles
+    size:
+      selector: size
+    date:
+      # unix
+      selector: added
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    downloadvolumefactor:
+      selector: freeleech
+      # 0 notfree, 1 free
+      case:
+        0: 1
+        1: 0
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 10 day (as seconds = 10 x 24 x 60 x 60)
+      text: 864000
+# JSON honAPI v2.2.4
--- a/src/Jackett.Common/Definitions/hqmusic.yml
+++ b/src/Jackett.Common/Definitions/hqmusic.yml
@@ -1,191 +0,0 @@
---
-id: hqmusic
-name: HQMusic
-description: "HQMusic is a Private Torrent Tracker for MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - http://hqmusic.info/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "Music"}
-
-  modes:
-    search: [q]
-    music-search: [q, album, artist, label, track, year, genre]
-
-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: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "User and Member classes must access their accounts regularly. Power Users and above are immune to inactivity pruning."
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-    login: "Log In"
-  error:
-    - selector: form#loginform > span.warning
-  test:
-    path: torrents.php
-    selector: a[href^="logout.php?auth="]
-
-search:
-  # http://hqmusic.info/ajax.php?artistname=John&groupname=Born&recordlabel=Sony&year=2012&filelist=Queen&freetorrent=&taglist=rock&tags_type=1&order_by=time&order_way=desc&filter_cat%5B1%5D=1&group_results=1&action=browse
-  paths:
-    - path: ajax.php
-      response:
-        type: json
-
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Keywords }}"
-    artistname: "{{ if and (.Query.Artist) (ne .Query.Artist \"VA\") }}{{ .Query.Artist }}{{ else }}{{ end }}"
-    groupname: "{{ .Query.Album }}"
-    recordlabel: "{{ .Query.Label }}"
-    year: "{{ .Query.Year }}"
-    filelist: "{{ .Query.Track }}"
-    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    taglist: "{{ .Query.Genre }}"
-    # 0 Any, 1 All
-    tags_type: 1
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    group_results: 1
-    action: browse
-
-  rows:
-    selector: response.results
-    attribute: torrents
-    multiple: true
-
-  fields:
-    _groupid:
-      selector: ..groupId
-    _torrentid:
-      selector: torrentId
-    category:
-      text: 1
-    artist:
-      selector: ..artist
-      filters:
-        - name: htmldecode
-    _groupName:
-      selector: ..groupName
-      filters:
-        - name: htmldecode
-    _releaseType:
-      selector: ..releaseType
-    album:
-      optional: true
-      text: "{{ if eq .Result._releaseType \"Album\" }}{{ .Result._groupName }}{{ else }}{{ end }}"
-    track:
-      optional: true
-      text: "{{ if eq .Result._releaseType \"Single\" }}{{ .Result._groupName }}{{ else }}{{ end }}"
-    year:
-      optional: true
-      selector: ..groupYear
-      filters:
-        - name: re_replace
-          args: ["^0$", ""]
-    _format:
-      selector: format
-    _encoding:
-      selector: encoding
-    _hasLog:
-      selector: hasLog
-    _logScore:
-      selector: logScore
-    _hasCue:
-      selector: hasCue
-    _media:
-      selector: media
-    year_remaster:
-      selector: remasterYear
-    title_remaster:
-      optional: true
-      selector: remasterTitle
-    title:
-      # John Mayer - Born And Raised [2012] [Album] FLAC / Lossless / Log (100%) / Cue / CD
-      # Duy - I Go [2022] [Single] Other / Lossless / WEB
-      text: "{{ .Result.artist }} - {{ .Result._groupName }} {{ if .Result.year }}[{{ .Result.year }}] {{ else }}{{ end }}[{{ .Result._releaseType }}] {{ .Result._format }} / {{ .Result._encoding }} {{ if eq .Result._hasLog \"True\" }}/ Log {{ else }}{{ end }}{{ if ne .Result._logScore \"0\" }}({{ .Result._logScore }}%){{ else }}{{ end }}{{ if eq .Result._hasCue \"True\" }} / Cue{{ else }}{{ end }} / {{ .Result._media }}{{ if ne .Result.year_remaster \"0\" }} / {{ .Result.year_remaster }}{{ else }}{{ end }}{{ if .Result.title_remaster }} {{ .Result.title_remaster }}{{ else }}{{ end }}"
-    details:
-      text: "torrents.php?id={{ .Result._groupid }}&torrentid={{ .Result._torrentid }}"
-    download:
-      text: "torrents.php?action=download&id={{ .Result._torrentid }}"
-    poster:
-      selector: ..cover
-    date:
-      selector: time
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: size
-    files:
-      selector: fileCount
-    grabs:
-      selector: snatches
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    genre:
-      selector: ..tags
-      filters:
-        - name: replace
-          args: [".", "_"]
-    description:
-      text: "{{ .Result.genre }}"
-    _free:
-      selector: isFreeleech
-    _neutral:
-      selector: isNeutralLeech
-    _personal:
-      selector: isPersonalFreeleech
-    downloadvolumefactor_special:
-      optional: true
-      text: "{{ if eq .Result._neutral \"True\" }}0{{ else }}{{ end }}{{ if eq .Result._free \"True\" }}0{{ else }}{{ end }}{{ if eq .Result._personal \"True\" }}0{{ else }}{{ end }}"
-    downloadvolumefactor:
-      text: "{{ if .Result.downloadvolumefactor_special }}{{ .Result.downloadvolumefactor_special }}{{ else }}1{{ end }}"
-    uploadvolumefactor:
-      text: "{{ if eq .Result._neutral \"True\" }}0{{ else }}1{{ end }}"
-    minimumratio:
-      text: 0.6
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# JSON Gazelle
--- a/src/Jackett.Common/Definitions/ilolicon.yml
+++ b/src/Jackett.Common/Definitions/ilolicon.yml
@@ -167,4 +167,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2) td:nth-child(2)
      remove: a, b, font, img
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.12 2024-07-13
--- a/src/Jackett.Common/Definitions/infinity-api.yml
+++ b/src/Jackett.Common/Definitions/infinity-api.yml
@@ -1,12 +1,12 @@
 ---
-id: rockethd
-name: RocketHD
-description: "RocketHD is a GERMAN Private Torrent Tracker for MOVIES / TV"
-language: de-DE
+id: infinity-api
+name: INFINITY (API)
+description: "INFINITY is a Private Torrent Tracker for MOVIES / TV"
+language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://r0k3t.li/
+  - https://infinitylibrary.net/

 caps:
  categorymappings:
@@ -25,7 +25,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://r0k3t.li/\" target=\"_blank\">RocketHD</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://infinitylibrary.net/\" target=\"_blank\">INFINITY</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -58,6 +58,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -126,6 +127,8 @@ search:
      filters:
        - name: re_replace
          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
    description:
@@ -146,7 +149,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -156,16 +164,17 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 8.0.2
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 8.1.3
--- a/src/Jackett.Common/Definitions/isohunt2.yml
+++ b/src/Jackett.Common/Definitions/isohunt2.yml
@@ -7,11 +7,11 @@ type: public
 encoding: UTF-8
 links:
  - https://isohunt.nz/
-  - https://isohunt.fun/
-  - https://isohunt.tv/
  - https://isohunt.ch/
 legacylinks:
-  - https://isohunt2.net/
+  - https://isohunt2.net/ # redirects to torrentproject.cc
+  - https://isohunt.fun/ # redirects to torrentproject.cc
+  - https://isohunt.tv/ # redirects to torrentproject.cc

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/itatorrents.yml
+++ b/src/Jackett.Common/Definitions/itatorrents.yml
@@ -74,6 +74,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -171,7 +172,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -181,13 +187,17 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.1.3 (custom)
+# json UNIT3D 8.2.0 (custom)
--- a/src/Jackett.Common/Definitions/jme-reunit3d-api.yml
+++ b/src/Jackett.Common/Definitions/jme-reunit3d-api.yml
@@ -69,6 +69,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/kimoji.yml
+++ b/src/Jackett.Common/Definitions/kimoji.yml
@@ -52,6 +52,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/knaben.yml
+++ b/src/Jackett.Common/Definitions/knaben.yml
@@ -104,7 +104,7 @@ settings:
  - name: type
    type: select
    label: Order requested from site
-    default: +
+    default: "+"
    options:
      "+": desc
      "-": asc
@@ -114,7 +114,7 @@ search:
    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}browse{{ end }}/0/1/{{ .Config.type }}{{ .Config.sort }}"

  rows:
-    selector: tr[title^="Cached "]
+    selector: tr[title^="Cached "], tr[title^="Checked "]

  fields:
    category:
--- a/src/Jackett.Common/Definitions/kufei.yml
+++ b/src/Jackett.Common/Definitions/kufei.yml
@@ -200,4 +200,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.12 2024-04-13
+# NexusPHP v1.8.13 2024-08-03
--- a/src/Jackett.Common/Definitions/laidbackmanor.yml
+++ b/src/Jackett.Common/Definitions/laidbackmanor.yml
@@ -65,6 +65,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/lastdigitalunderground.yml
+++ b/src/Jackett.Common/Definitions/lastdigitalunderground.yml
@@ -104,6 +104,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -194,7 +195,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -204,12 +210,16 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
--- a/src/Jackett.Common/Definitions/lat-team-api.yml
+++ b/src/Jackett.Common/Definitions/lat-team-api.yml
@@ -73,6 +73,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -168,7 +169,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -178,16 +184,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.25 but torrents must be seeded for 3 days regardless of ratio
 #    minimumratio:
 #      text: 0.25
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# json UNIT3D 8.0.2 (custom)
+# json UNIT3D 8.2.0 (custom)
--- a/src/Jackett.Common/Definitions/leech24-api.yml
+++ b/src/Jackett.Common/Definitions/leech24-api.yml
@@ -67,6 +67,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -157,7 +158,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -167,16 +173,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 1.0 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 1.0
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.1.3
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/libronube.yml
+++ b/src/Jackett.Common/Definitions/libronube.yml
@@ -0,0 +1,75 @@
+---
+id: libronube
+name: Libronube
+description: "Libronube is a Spanish Public tracker for EBOOKS"
+language: es-ES
+type: public
+encoding: UTF-8
+links:
+  - https://www.libronube.com/
+
+caps:
+  categorymappings:
+    - {id: ebook, cat: Books, desc: "EBook"}
+
+  modes:
+    search: [q]
+    book-search: [q]
+
+settings:
+  - name: ebook
+    type: select
+    label: Ebook Type
+    default: epub
+    options:
+      epub: EPUB
+      mobi: MOBI
+      pdf: PDF
+
+download:
+  selectors:
+    - selector: "a[href*=\"magnet\"][href*=\"{{ .Config.ebook }}\"]"
+      attribute: href
+      filters:
+        - name: replace
+          args: ["http://demagnetize.link/?magnet=", ""]
+        - name: urldecode
+
+search:
+  paths:
+    - path: dibros/
+  allowEmptyInputs: true
+  inputs:
+    q1: "{{ .Keywords }}"
+    sin_filtrar: on
+
+  rows:
+    selector: div.row[style^="margin-top"][style*="margin-bottom"]:first-of-type > div.ebookitem
+
+  fields:
+    category:
+      text: ebook
+    title:
+      selector: h1
+    details:
+      selector: a[href^="/descargar-"]
+      attribute: href
+    download:
+      selector: a[href^="/descargar-"]
+      attribute: href
+    poster:
+      selector: img.tapa
+      attribute: src
+    date:
+      text: now
+    size:
+      text: 512 MB
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/limetorrents.yml
+++ b/src/Jackett.Common/Definitions/limetorrents.yml
@@ -8,7 +8,7 @@ encoding: UTF-8
 # changes to this indexer should also be made to limetorrentsclone
 links:
  - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.black/
+  - https://limetorrents.unblockit.download/
  - https://limetorrents.unblockninja.com/
  - https://limetorrents.ninjaproxy1.com/
  - https://limetorrents.proxyninja.org/
@@ -16,8 +16,6 @@ links:
  - https://limetorrents.torrentbay.st/
  - https://limetorrents.torrentsbay.org/
 legacylinks:
-  - https://limetorrents.unblockit.asia/
-  - https://limetorrents.unblockit.mov/
  - https://limetorrents.unblockit.rsvp/
  - https://limetorrents.unblockit.vegas/
  - https://limetorrents.unblockit.esq/
@@ -33,6 +31,8 @@ legacylinks:
  - https://limetorrents.unblockit.sbs/
  - https://limetorrents.unblockit.ong/
  - https://limetorrents.abcproxy.org/
+  - https://limetorrents.unblockit.black/
+  - https://limetorrents.unblockit.meme/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/locadora.yml
+++ b/src/Jackett.Common/Definitions/locadora.yml
@@ -63,6 +63,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/lst.yml
+++ b/src/Jackett.Common/Definitions/lst.yml
@@ -70,6 +70,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -160,7 +161,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -170,16 +176,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 1.0 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 1.0
    minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 8.0.2
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/mactorrentsdownload.yml
+++ b/src/Jackett.Common/Definitions/mactorrentsdownload.yml
@@ -10,7 +10,7 @@ links:

 caps:
  categorymappings:
-    - {id: "applications", cat: PC/Mac, desc: "Apps"}
+    - {id: "apps", cat: PC/Mac, desc: "Apps"}
    - {id: "games", cat: PC/Games, desc: Games}
    - {id: "design-assets", cat: Other, desc: Design Assets}
    - {id: "uncategorized", cat: Other, desc: Uncategorized}
--- a/src/Jackett.Common/Definitions/malayabits-api.yml
+++ b/src/Jackett.Common/Definitions/malayabits-api.yml
@@ -64,6 +64,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -150,7 +151,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -160,12 +166,16 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
--- a/src/Jackett.Common/Definitions/marinetracker.yml
+++ b/src/Jackett.Common/Definitions/marinetracker.yml
@@ -20,17 +20,6 @@ caps:
    - {id: 308, cat: Books, desc: "Shipbuilding & Shiprepairing-Shipbuilding Standard @ Register"}
    - {id: 196, cat: Books, desc: "Shipbuilding & Shiprepairing-Welding"}
    - {id: 195, cat: Books, desc: "Shipbuilding & Shiprepairing-Turnary"}
-    - {id: 226, cat: Books, desc: "Mobile Apps for Seafarers"}
-    - {id: 6, cat: PC, desc: "Maritime Software"}
-    - {id: 12, cat: PC, desc: "Maritime Software-Answers to tests"}
-    - {id: 211, cat: PC, desc: "Maritime Software-Navigation soft & Charts"}
-    - {id: 13, cat: PC, desc: "Maritime Software-Marine Tests"}
-    - {id: 19, cat: PC, desc: "Maritime Software-Training software"}
-    - {id: 14, cat: PC, desc: "Maritime Software-Maritime Simulators"}
-    - {id: 20, cat: PC, desc: "Maritime Software-Calculation soft"}
-    - {id: 179, cat: PC, desc: "Maritime Software-Programming and SDK software"}
-    - {id: 317, cat: PC, desc: "Maritime Software-Shareware (demo, trial)"}
-    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
    - {id: 21, cat: Books, desc: "Deckofficer's Library"}
    - {id: 283, cat: Books, desc: "Deckofficer's Library-Radar at sea"}
    - {id: 114, cat: Books, desc: "Deckofficer's Library-Watch keeping"}
@@ -45,18 +34,6 @@ caps:
    - {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"}
-    - {id: 42, cat: Books, desc: "Safety of Navigation"}
-    - {id: 307, cat: Books, desc: "Safety of Navigation-Life Safety at Sea"}
-    - {id: 306, cat: Books, desc: "Safety of Navigation-Casualties and Incidents"}
-    - {id: 305, cat: Books, desc: "Safety of Navigation-Safety Digest, Lessons from Marine Accident Reports"}
-    - {id: 304, cat: Books, desc: "Safety of Navigation-Fire fighting at sea"}
-    - {id: 303, cat: Books, desc: "Safety of Navigation-Anti-Piracy Security"}
-    - {id: 302, cat: Books, desc: "Safety of Navigation-Emergency and life-saving equipment"}
-    - {id: 301, cat: Books, desc: "Safety of Navigation-Cybersecurity"}
-    - {id: 8, cat: Movies, desc: "Video for Seamen"}
-    - {id: 234, cat: Movies, desc: "Video for Seamen-Video for Deck Officers"}
-    - {id: 233, cat: Movies, desc: "Video for Seamen-Video for Marine Engineers"}
-    - {id: 235, cat: Movies, desc: "Video for Seamen-Other videos"}
    - {id: 102, cat: Books, desc: "Marine Engineer's Library"}
    - {id: 316, cat: Books, desc: "Marine Engineer's Library-Marine Fuels & Lubricants"}
    - {id: 28, cat: Books, desc: Marine Engineer's Library-Ship's systems and mechanisms"}
@@ -71,15 +48,6 @@ caps:
    - {id: 108, cat: Books, desc: Marine Engineer's Library-Hydraulics"}
    - {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: 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"}
-    - {id: 268, cat: Books, desc: "English for seamen-English for ETO's"}
-    - {id: 269, cat: Books, desc: "English for seamen-English for Shipbuilders"}
-    - {id: 270, cat: Books, desc: "English for seamen-RU↔EN dictionaries & phrasebooks"}
-    - {id: 265, cat: Books, desc: "English for seamen-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
-    - {id: 271, cat: Books, desc: "English for seamen-Business English and Correspondence"}
-    - {id: 205, cat: Books, desc: "General english"}
    - {id: 101, cat: Books, desc: "Electrical Technical Officer's Library"}
    - {id: 29, cat: Books, desc: "Electrical Technical Officer's Library-Marine Electronics"}
    - {id: 103, cat: Books, desc: "Electrical Technical Officer's Library-Ship's automatics"}
@@ -90,31 +58,74 @@ caps:
    - {id: 107, cat: Books, desc: "Electrical Technical Officer's Library-ETO Handbooks"}
    - {id: 105, cat: Books, desc: "Electrical Technical Officer's Library-Sources of electricity"}
    - {id: 37, cat: Books, desc: "Organization and management of maritime transport"}
-    - {id: 11, cat: Books, desc: "Section for cadets"}
-    - {id: 285, cat: Books, desc: "Section for cadets-Encyclopedias and atlases"}
-    - {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"}
-    - {id: 113, cat: Books, desc: "Medicine"}
-    - {id: 299, cat: Books, desc: "Sailing Kitchen"}
+    - {id: 6, cat: PC, desc: "Maritime Software"}
+    - {id: 211, cat: PC, desc: "Maritime Software-Navigation soft & Charts"}
+    - {id: 13, cat: PC, desc: "Maritime Software-Marine Tests"}
+    - {id: 19, cat: PC, desc: "Maritime Software-Training software"}
+    - {id: 20, cat: PC, desc: "Maritime Software-Calculation soft"}
+    - {id: 14, cat: PC, desc: "Maritime Software-Maritime Simulators"}
+    - {id: 376, cat: PC, desc: "Maritime Software-Games"}
+    - {id: 179, cat: PC, desc: "Maritime Software-Programming and SDK software"}
+    - {id: 317, cat: PC, desc: "Maritime Software-Shareware (demo, trial)"}
+    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
+    - {id: 226, cat: Books, desc: "Mobile Apps for Seafarers"}
+    - {id: 380, cat: PC, desc: "Mobile Apps for Seafarers-Apps for Deck Officers"}
+    - {id: 381, cat: PC, desc: "Mobile Apps for Seafarers-Apps for Marine Engineers"}
+    - {id: 383, cat: PC, desc: "Mobile Apps for Seafarers-Exam Apps &amp;Test Answers"}
+    - {id: 384, cat: PC, desc: "Mobile Apps for Seafarers-Foreign languages learning"}
+    - {id: 382, cat: PC, desc: "Mobile Apps for Seafarers-Other mobile Apps"}
+    - {id: 8, cat: Movies, desc: "Video for Seamen"}
+    - {id: 377, cat: Movies, desc: "Video for Seamen-Documentary video"}
+    - {id: 234, cat: Movies, desc: "Video for Seamen-Video for Deck Officers"}
+    - {id: 233, cat: Movies, desc: "Video for Seamen-Video for Marine Engineers"}
+    - {id: 235, cat: Movies, desc: "Video for Seamen-Other videos"}
+    - {id: 42, cat: Books, desc: "Safety of Navigation"}
+    - {id: 307, cat: Books, desc: "Safety of Navigation-Life Safety at Sea"}
+    - {id: 306, cat: Books, desc: "Safety of Navigation-Casualties and Incidents"}
+    - {id: 305, cat: Books, desc: "Safety of Navigation-Safety Digest, Lessons from Marine Accident Reports"}
+    - {id: 304, cat: Books, desc: "Safety of Navigation-Fire fighting at sea"}
+    - {id: 303, cat: Books, desc: "Safety of Navigation-Anti-Piracy Security"}
+    - {id: 302, cat: Books, desc: "Safety of Navigation-Emergency and life-saving equipment"}
+    - {id: 301, cat: Books, desc: "Safety of Navigation-Cybersecurity"}
+    - {id: 10, cat: Books, desc: "English for seamen"}
+    - {id: 270, cat: Books, desc: "English for seamen-EN↔RU dictionaries & phrasebooks"}
+    - {id: 387, cat: Books, desc: "English for seamen-English for Radio Operators"}
+    - {id: 266, cat: Books, desc: "English for seamen-English for Deck Officers"}
+    - {id: 267, cat: Books, desc: "English for seamen-English for Marine Engineers"}
+    - {id: 268, cat: Books, desc: "English for seamen-English for ETO's"}
+    - {id: 269, cat: Books, desc: "English for seamen-English for Shipbuilders"}
+    - {id: 388, cat: Books, desc: "English for seamen-English for Yachtsmen"}
+    - {id: 265, cat: Books, desc: "English for seamen-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
+    - {id: 271, cat: Books, desc: "English for seamen-Business English and Correspondence"}
+    - {id: 205, cat: Books, desc: "General english"}
    - {id: 39, cat: Books, desc: "Purpose-built ships"}
+    - {id: 250, cat: Books, desc: "Purpose-built ships-LNG \ LPG - CNG"}
    - {id: 51, cat: Books, desc: "Purpose-built ships-Oil & Chemical Tankers"}
    - {id: 52, cat: Books, desc: "Purpose-built ships-Dry cargo vessels"}
-    - {id: 250, cat: Books, desc: "Purpose-built ships-LNG \ LPG"}
    - {id: 284, cat: Books, desc: "Purpose-built ships-Nuclear powered ships"}
    - {id: 54, cat: Books, desc: "Purpose-built ships-Passenger ships"}
+    - {id: 385, cat: Books, desc: "Purpose-built ships-Towing vessels"}
    - {id: 248, cat: Books, desc: "Purpose-built ships-Fishing vessels"}
    - {id: 239, cat: Books, desc: "Purpose-built ships-Offshore"}
    - {id: 349, cat: Books, desc: "Purpose-built ships-Dynamic positioning vessels"}
+    - {id: 386, cat: Books, desc: "Purpose-built ships-Submarine vehicles"}
+    - {id: 212, cat: Books, desc: "Ship's documentation"}
+    - {id: 190, cat: Books, desc: "Catalogs"}
+    - {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: 113, cat: Books, desc: "Medicine"}
+    - {id: 299, cat: Books, desc: "Sailing Kitchen"}
+    - {id: 11, cat: Books, desc: "Section for cadets"}
+    - {id: 285, cat: Books, desc: "Section for cadets-Encyclopedias and atlases"}
    - {id: 330, cat: Books, desc: "Examinations"}
-    - {id: 333, cat: Books, desc: "Examinations-IMU CET"}
-    - {id: 334, cat: Books, desc: "Examinations-NCV"}
-    - {id: 336, cat: Books, desc: "Examinations-ASM"}
-    - {id: 337, cat: Books, desc: "Examinations-TME"}
-    - {id: 338, cat: Books, desc: "Examinations-MEO"}
-    - {id: 341, cat: Books, desc: "Examinations-Chief Mates (Phase I)"}
+    - {id: 12, cat: Books, desc: "Examinations-Answers to tests"}
+    - {id: 333, cat: Books, desc: "Examinations-IMU CET (Indian Maritime University Common Entrance Test)"}
+    - {id: 334, cat: Books, desc: "Examinations-NCV (Near Coastal Voyages)"}
+    - {id: 336, cat: Books, desc: "Examinations-ASM (Master)"}
+    - {id: 337, cat: Books, desc: "Examinations-TME (Trainee Marine Engineer)"}
+    - {id: 338, cat: Books, desc: "Examinations-MEO (Maritime Engineering Officer)"}
+    - {id: 341, cat: Books, desc: "Examinations-Chief Mates (Phase I) & Orals"}
    - {id: 343, cat: Books, desc: "Examinations-ROR - Colregs"}
    - {id: 335, cat: Books, desc: "Examinations-Second Mates"}
    - {id: 342, cat: Books, desc: "Examinations-Chief Mates (Phase II)"}
@@ -128,6 +139,7 @@ caps:
    - {id: 287, cat: Audio, desc: "Audio-Non-Fiction"}
    - {id: 288, cat: Audio, desc: "Audio-♬ Music"}
    - {id: 111, cat: Books, desc: "Yachting, sailing, boating"}
+    - {id: 389, cat: Books, desc: "Yachting, sailing, boating-Sailboat terminology"}
    - {id: 345, cat: Books, desc: "Yachting, sailing, boating-Solar boats"}
    - {id: 318, cat: Books, desc: "Yachting, sailing, boating-Sailing life"}
    - {id: 300, cat: Books, desc: "Yachting, sailing, boating-RYA"}
@@ -192,29 +204,31 @@ caps:
    - {id: 198, cat: Books, desc: "Navy"}
    - {id: 260, cat: Books, desc: "Navy-Naval shipbuilding (1950 - 20??)"}
    - {id: 272, cat: Books, desc: "Navy-Naval magazines"}
+    - {id: 294, cat: Books, desc: "Environmental protection"}
+    - {id: 242, cat: Books, desc: "Foreign language books"}
+    - {id: 344, cat: Books, desc: "Foreign language books-Yachting"}
    - {id: 218, cat: Books, desc: "Maritime Fiction"}
+    - {id: 350, cat: Other, desc: "Art"}
    - {id: 243, cat: Books, desc: "Rarity"}
    - {id: 244, cat: Books, desc: "Rarity-1900 - 1950"}
    - {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: 220, cat: Books, desc: "Fishing & Spearfishing"}
    - {id: 319, cat: Books, desc: "Fishing tackle and knots"}
-    - {id: 294, cat: Books, desc: "Environmental protection"}
    - {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: 242, cat: Books, desc: "Foreign language books"}
-    - {id: 344, cat: Books, desc: "Foreign language books-Yachting"}
-    - {id: 350, cat: Other, desc: "Art"}
-    - {id: 324, cat: Other, desc: "Posters, placards, signs"}
    - {id: 187, cat: Books, desc: "Others (not maritime)"}
    - {id: 38, cat: Books, desc: "Archive-Uncategorized"}
    - {id: 162, cat: Books, desc: "Archive"}
-#    - {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: 379, cat: Books, desc: "Archive-Video materials (Archive)"}
+    - {id: 378, cat: Books, desc: "Archive-Audio materials (Archive) "}
+    - {id: 322, cat: Books, desc: "Archive-No seeds"}
+#    - {id: 325, cat: Other, desc: "Corrupt torrents (hash errors)"} # we filter these out in the rows selector
    - {id: 295, cat: Books, desc: "Archive-Unregistered"}

  modes:
--- a/src/Jackett.Common/Definitions/miobt.yml
+++ b/src/Jackett.Common/Definitions/miobt.yml
@@ -3,9 +3,9 @@ id: miobt
 replaces:
  - kisssub
 name: MioBT
-description: "MioBT is a CHINESE Public torrent index"
+description: "MioBT is a CHINESE Semi-Private torrent index"
 language: zh-CN
-type: public
+type: semi-private
 encoding: UTF-8
 links:
  - https://miobt.com/
@@ -29,6 +29,13 @@ caps:

 settings: []

+login:
+  path: addon.php?r=document/view&page=visitor-test
+  method: form
+  form: form#visitor-test-form
+  inputs:
+    visitor_test: human
+
 search:
  paths:
    # https://miobt.com/search.php?keyword=moon+720p
@@ -51,21 +58,14 @@ search:
      filters:
        - name: regexp
          args: show-([0-9A-Fa-f]{40})
-    date_today:
-       # 今天 00:35	 (Today)
+    date_day:
+      # 今天 00:35	 (Today)
+      # 昨天 22:50	 (Yesterday)
      optional: true
-      selector: td:nth-child(1):contains("今天")
+      selector: td:nth-child(1):contains("今天"),  td:nth-child(1):contains("昨天")
      filters:
        - name: replace
          args: ["今天", "Today"]
-        - name: append
-          args: " +08:00" # CST
-        - name: fuzzytime
-    date_yday:
-      # 昨天 22:50	 (Yesterday)
-      optional: true
-      selector: td:nth-child(1):contains("昨天")
-      filters:
        - name: replace
          args: ["昨天", "Yesterday"]
        - name: append
@@ -81,7 +81,7 @@ search:
        - name: dateparse
          args: "yyyy/MM/dd zzz"
    date:
-      text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday }}{{ or .Result.date_year .Result.date_today .Result.date_yday }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
    size:
      selector: td:nth-child(4)
    seeders:
--- a/src/Jackett.Common/Definitions/monikadesign-api.yml
+++ b/src/Jackett.Common/Definitions/monikadesign-api.yml
@@ -67,6 +67,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
--- a/src/Jackett.Common/Definitions/newheaven.yml
+++ b/src/Jackett.Common/Definitions/newheaven.yml
@@ -0,0 +1,216 @@
+---
+id: newheaven
+name: New Heaven
+description: New Heaven is a GERMAN Private tracker for MOVIES / AUDIO / TV / GENERAL
+language: de-DE
+type: private
+encoding: iso-8859-1
+requestDelay: 2
+links:
+  - https://newheaven.nl/
+legacylinks:
+  - https://torrentheaven.myfqdn.info/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC/Games, desc: GAMES- PC}
+    - {id: 3, cat: Console, desc: GAMES - Sonstige}
+    - {id: 59, cat: Console/PS4, desc: GAMES - PlayStation}
+    - {id: 60, cat: Console/PSP, desc: GAMES- PSP}
+    - {id: 63, cat: Console/Wii, desc: GAMES - Wii}
+    - {id: 67, cat: Console/XBox 360, desc: GAMES - XBOX 360}
+    - {id: 68, cat: PC/Mobile-Other, desc: GAMES - PDA / Handy}
+    - {id: 72, cat: Console/NDS, desc: GAMES - NDS}
+    - {id: 7, cat: Movies/DVD, desc: MOVIES - DVD}
+    - {id: 8, cat: Movies/SD, desc: MOVIES - SD}
+    - {id: 37, cat: Movies/DVD, desc: MOVIES - DVD Spezial}
+    - {id: 41, cat: Movies/Foreign, desc: MOVIES - International}
+    - {id: 101, cat: Movies/HD, desc: MOVIES - 720p}
+    - {id: 102, cat: Movies/HD, desc: MOVIES - 1080p}
+    - {id: 103, cat: Movies/HD, desc: MOVIES - AVCHD}
+    - {id: 104, cat: Movies/BluRay, desc: MOVIES - Blu Ray}
+    - {id: 106, cat: Movies/3D, desc: MOVIES - 3D}
+    - {id: 109, cat: Movies/UHD, desc: MOVIES - 4K}
+    - {id: 14, cat: Audio/MP3, desc: AUDIO - Musik}
+    - {id: 15, cat: Audio/Audiobook, desc: AUDIO - Hoerbuecher}
+    - {id: 16, cat: Audio/Audiobook, desc: AUDIO - Hoerspiele}
+    - {id: 36, cat: Audio/Lossless, desc: AUDIO - Flac}
+    - {id: 42, cat: Audio/Other, desc: AUDIO/Soundtracks}
+    - {id: 58, cat: Audio/Video, desc: AUDIO - Musikvideos}
+    - {id: 18, cat: TV/SD, desc: TV/Serien - Serien SD}
+    - {id: 19, cat: TV/HD, desc: TV/Serien - Serien HD 720p}
+    - {id: 20, cat: TV/HD, desc: TV/Serien - Serien HD 1080p}
+    - {id: 49, cat: TV/SD, desc: TV/Serien - Serien DVD}
+    - {id: 51, cat: TV/Documentary, desc: TV/Serien - Doku SD}
+    - {id: 52, cat: TV/Documentary, desc: TV/Serien - Doku HD}
+    - {id: 53, cat: TV, desc: TV/Serien - Serien Complete Packs}
+    - {id: 54, cat: TV/Sport, desc: TV/Serien - Sport}
+    - {id: 66, cat: TV/Foreign, desc: TV/Serien - International}
+    - {id: 110, cat: TV/UHD, desc: TV/Serien - 4K}
+    - {id: 22, cat: Books/EBook, desc: MISC - EBooks}
+    - {id: 24, cat: Other, desc: MISC - Sonstiges}
+    - {id: 25, cat: Other, desc: MISC- Tonspuren}
+    - {id: 108, cat: TV/Anime, desc: TV/Serien - Anime}
+    - {id: 28, cat: PC, desc: APPLICATIONS - PC}
+    - {id: 29, cat: PC/Mobile-Other, desc: APPLICATIONS - Mobile}
+    - {id: 30, cat: PC, desc: APPLICATIONS - Sonstige}
+    - {id: 70, cat: PC, desc: APPLICATIONS - Linux}
+    - {id: 71, cat: PC/Mac, desc: APPLICATIONS - Mac}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech and OnlyUpload at NewHeaven
+    default: "<ul><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></ul>"
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: torrent_added
+    options:
+      torrent_added: created
+      torrent_seeder: seeders
+      torrent_size: size
+      torrent_name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: d
+    options:
+      d: desc
+      a: asc
+      n: none
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href*="index.php?strWebValue=account&strWebAction=logout"]
+
+search:
+  paths:
+    # 25 rows per page
+    - path: index.php
+      inputs:
+        page: 0
+    - path: index.php
+      inputs:
+        page: 1
+    - path: index.php
+      inputs:
+        page: 2
+    - path: index.php
+      inputs:
+        page: 3
+
+  inputs:
+    strWebValue: torrent
+    strWebAction: search
+    sort: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+    $raw: "{{ range .Categories }}dirs{{.}}=1&{{end}}"
+    searchstring: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 inactive, 2 all
+    type: 2
+    do_search: suchen
+    # 0 any, 1 1day, 7 1week, 30 30days, 90 90days
+    time: 0
+    # title, nfo, descr, all
+    details: "{{ if .Query.IMDBID }}descr{{ else }}title{{ end }}"
+
+  rows:
+    selector: "table.torrenttable > tbody > tr:not(:has(td.torrenttableheader)){{ if .Config.onlyupload }}:has(img[src$=\"/onlyup.png\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="index.php?strWebValue=torrent&strWebAction=search&dir="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: dir
+    title:
+      selector: a[href*="index.php?strWebValue=torrent&strWebAction=details&id="]
+    details:
+      selector: a[href*="index.php?strWebValue=torrent&strWebAction=details&id="]
+      attribute: href
+    _id:
+      selector: a[href*="index.php?strWebValue=torrent&strWebAction=details&id="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: id
+    download:
+      text: "index.php?strWebValue=torrent&strWebAction=download&id={{ .Result._id }}"
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+      filters:
+        - name: querystring
+          args: url
+      # 2 flavours of dates
+    date_day:
+      # Heute 13:30
+      # Gestern 09:10
+      selector: font:has(a):contains("Heute"), font:has(a):contains("Gestern")
+      optional: true
+      filters:
+        - name: regexp
+          args: "((Heute|Gestern)(\\s\\d{2}\\:\\d{2}))"
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
+    date_year:
+      # 16.04.2021 20:01
+      selector: font:has(a):not(:contains("Heute")):not(:contains("Gestern"))
+      optional: true
+      filters:
+        - name: regexp
+          args: "(\\d{2}\\.\\d{2}.\\d{4}\\s\\d{2}\\:\\d{2})"
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(4)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        div:contains("50% DL"): 0.5
+        div:contains("25% DL"): 0.25
+        img[src$="/onlyup.png"]: 0 # only upload is counted
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/freeleech.png"]: 0 # nothing is counted
+        div:contains("200% UP"): 2
+        "*": 1
+    minimumratio:
+      text: 0.8
+# Aeonflux
--- a/src/Jackett.Common/Definitions/nextjav.yml
+++ b/src/Jackett.Common/Definitions/nextjav.yml
@@ -1,66 +0,0 @@
---
-id: nextjav
-name: NextJAV
-description: "NextJAV is a Public tracker for Asian 3X (JAV)"
-language: en-US
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://nextjav.com/
-
-caps:
-  categories:
-    XXX: XXX
-
-  modes:
-    search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a.btn-download
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/torrent?torrentsearch={{ .Keywords }}{{ else }}{{ end }}"
-
-  rows:
-    selector: div.status-publish
-
-  fields:
-    category:
-      text: XXX
-    title:
-      selector: a[href^="/torrent/detail/"]
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 3]
-    details:
-      selector: a[href^="/torrent/detail/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrent/detail/"]
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date:
-      text: now
-    size:
-      selector: h2
-      filters:
-        - name: regexp
-          args: (\d+\.\d+ GB)$
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/nicept.yml
+++ b/src/Jackett.Common/Definitions/nicept.yml
@@ -187,4 +187,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-07-13
--- a/src/Jackett.Common/Definitions/noname-clubl.yml
+++ b/src/Jackett.Common/Definitions/noname-clubl.yml
@@ -727,12 +727,11 @@ caps:
  allowrawsearch: true

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
  - name: stripcyrillic
    type: checkbox
    label: Strip Cyrillic Letters
@@ -767,16 +766,7 @@ settings:
    default: This Indexer requires specific columns to be active on your account search settings.<br>Login to the web site and ensure that only the <b>Автор</b> (Author) and <b>Форум</b> (Forum) checkboxes are ticked in the <b>Показывать колонку</b> (Show Columns) section of the <b>Настройки поиска Torrent</b> (Torrent Search Settings) page.<br>Having other columns active may prevent the Indexer processing/displaying results correctly.

 login:
-  path: forum/login.php
-  method: form
-  form: form#loginFrm
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    autologin: 1
-    redirect: index.php
-  error:
-    - selector: span.gen:contains("Вы ввели")
+  method: cookie
  test:
    path: forum/index.php
    selector: table.menutable a.mainmenu:contains("Выход")
--- a/src/Jackett.Common/Definitions/ntelogo.yml
+++ b/src/Jackett.Common/Definitions/ntelogo.yml
@@ -68,6 +68,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -161,7 +162,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -171,13 +177,17 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.1.0
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/okpt.yml
+++ b/src/Jackett.Common/Definitions/okpt.yml
@@ -104,7 +104,7 @@ search:
    notnewword: 1

  rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])

  fields:
    category:
--- a/src/Jackett.Common/Definitions/oldgreektracker.yml
+++ b/src/Jackett.Common/Definitions/oldgreektracker.yml
@@ -27,19 +27,43 @@ caps:
    - {id: 25, cat: Other, desc: "Pictures"}
    - {id: 73, cat: Console, desc: "Games"}
    - {id: 74, cat: PC/Games, desc: "PC Games"}
+    - {id: 88, cat: Movies/HD, desc: "Greek Movies HD"}
+    - {id: 89, cat: Movies/BluRay, desc: "Greek Movies BluRay"}
+    - {id: 94, cat: Movies/DVD, desc: "Greek Movies DvDRiP"}
+    - {id: 90, cat: Movies/SD, desc: "Greek Movies Remux"}
+    - {id: 91, cat: Movies/WEB-DL, desc: "Greek Movies WEB-DL"}
+    - {id: 93, cat: TV/HD, desc: "Greek TV HD"}
+    - {id: 97, cat: TV/Anime, desc: "Greek Anime HD"}
+    - {id: 98, cat: TV/Documentary, desc: "Greek Documentaries HD"}
+    - {id: 95, cat: TV/HD, desc: "Greek TV BluRay HD"}
+    - {id: 96, cat: TV/WEB-DL, desc: "Greek TV WEB-DL HD"}
    - {id: 15, cat: Movies/SD, desc: "Movies"}
-    - {id: 16, cat: Movies/SD, desc: "DVDRip-WEBRip-BRRip"}
+    - {id: 105, cat: Movies, desc: "Movies Animation"}
+    - {id: 103, cat: Movies/BluRay, desc: "Movies BluRay"}
+    - {id: 101, cat: Movies/BluRay, desc: "Movies BRRip"}
+    - {id: 106, cat: Movies, desc: "Movies Cartoons"}
+    - {id: 99, cat: Movies/DVD, desc: "Movies DVDRip"}
    - {id: 20, cat: Movies/SD, desc: "Filmographies"}
+    - {id: 107, cat: Movies, desc: "Greek Animation"}
+    - {id: 81, cat: Movies/BluRay, desc: "Greek BRRip"}
+    - {id: 108, cat: Movies, desc: "Greek Cartoons"}
+    - {id: 82, cat: Movies/DVD, desc: "Greek DVDRip"}
+    - {id: 16, cat: Movies/SD, desc: "DVDRip-WEBRip-BRRip"}
    - {id: 21, cat: Movies/SD, desc: "Greek Filmographies"}
    - {id: 17, cat: Movies/SD, desc: "Greek Movies"}
    - {id: 19, cat: Audio/Video, desc: "Greek Music Videos"}
+    - {id: 80, cat: Movies/SD, desc: "Greek WEBRip"}
+    - {id: 102, cat: Movies/SD, desc: "Movies"}
    - {id: 18, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 104, cat: Movies/SD, desc: "Movies Remux"}
+    - {id: 100, cat: Movies/SD, desc: "Movies WEBRip"}
    - {id: 41, cat: Movies/HD, desc: "Movies HD"}
    - {id: 50, cat: Movies/HD, desc: "BluRay / 1080p"}
    - {id: 51, cat: Movies/UHD, desc: "BluRay / 4K (UHD)"}
    - {id: 49, cat: Movies/HD, desc: "BluRay / 720p"}
    - {id: 45, cat: Movies/BluRay, desc: "BluRay Disk / 1080p"}
    - {id: 66, cat: Movies/BluRay, desc: "BluRay Disk / 4K (UHD)"}
+    - {id: 110, cat: Movies/HD, desc: "Bluray MicroHD"}
    - {id: 42, cat: Movies/HD, desc: "Remux / 1080p"}
    - {id: 46, cat: Movies/UHD, desc: "Remux / 4K (UHD)"}
    - {id: 47, cat: Movies/WEB-DL, desc: "WEB-DL / 1080p"}
@@ -47,16 +71,21 @@ caps:
    - {id: 43, cat: Movies/WEB-DL, desc: "WEB-DL / 720p"}
    - {id: 8, cat: Audio, desc: "Music"}
    - {id: 71, cat: Audio, desc: "Collections"}
+    - {id: 87, cat: Audio, desc: "Collections Greek"}
    - {id: 68, cat: Audio, desc: "Discographies"}
+    - {id: 86, cat: Audio, desc: "Greek Discographies"}
    - {id: 10, cat: Audio/Lossless, desc: "Greek Music FLAC"}
    - {id: 9, cat: Audio/MP3, desc: "Greek Music MP3"}
+    - {id: 92, cat: Audio/Other, desc: "Greek Soundtracks"}
    - {id: 12, cat: Audio/Lossless, desc: "Music FLAC"}
    - {id: 11, cat: Audio/MP3, desc: "Music MP3"}
    - {id: 72, cat: Audio/Other, desc: "Soundtracks"}
    - {id: 28, cat: TV/SD, desc: "TV"}
    - {id: 29, cat: TV/Anime, desc: "Anime"}
+    - {id: 85, cat: TV/Other, desc: "BRRip TV"}
    - {id: 31, cat: TV/Other, desc: "Cartoons"}
    - {id: 37, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 83, cat: TV/Other, desc: "DVDRip Tv"}
    - {id: 70, cat: TV/SD, desc: "DVDRip-WEBRip-BRRip"}
    - {id: 30, cat: TV/Anime, desc: "Greek Anime"}
    - {id: 32, cat: TV/Other, desc: "Greek Cartoon"}
@@ -70,6 +99,7 @@ caps:
    - {id: 75, cat: TV/SD, desc: "TV Series"}
    - {id: 76, cat: TV/SD, desc: "TV Shows"}
    - {id: 78, cat: TV/Sport, desc: "TV Sports"}
+    - {id: 84, cat: TV/SD, desc: "WEBRip TV"}
    - {id: 54, cat: TV/HD, desc: "TV HD"}
    - {id: 56, cat: TV/HD, desc: "BluRay / 1080p"}
    - {id: 57, cat: TV/UHD, desc: "BluRay / 4K (UHD)"}
--- a/src/Jackett.Common/Definitions/oldtoonsworld.yml
+++ b/src/Jackett.Common/Definitions/oldtoonsworld.yml
@@ -67,6 +67,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -157,7 +158,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -167,16 +173,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 8.0.2
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/onlyencodes-api.yml
+++ b/src/Jackett.Common/Definitions/onlyencodes-api.yml
@@ -62,6 +62,7 @@ login:
    - selector: a[href*="/login"]
      message:
        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
@@ -152,7 +153,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -162,16 +168,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 2 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
      # 2 days (as seconds = 2 x 24 x 60 x 60)
      text: 172800
-# json UNIT3D 8.1.3
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/oshenpt.yml
+++ b/src/Jackett.Common/Definitions/oshenpt.yml
@@ -192,4 +192,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.12 2024-05-10
+# NexusPHP v1.8.13 2024-08-03
--- a/src/Jackett.Common/Definitions/oxtorrent-co.yml
+++ b/src/Jackett.Common/Definitions/oxtorrent-co.yml
@@ -7,11 +7,13 @@ type: public
 encoding: UTF-8
 links:
  - https://www.oxtorrent.co/
-  - https://oxtorrent.unblockit.black/
+  - https://oxtorrent.unblockit.download/
 legacylinks:
  - https://oxtorrent.unblockit.casa/
  - https://oxtorrent.unblockit.sbs/
  - https://oxtorrent.unblockit.ong/
+  - https://oxtorrent.unblockit.black/
+  - https://oxtorrent.unblockit.meme/

 caps:
  categorymappings:
--- a/Show More
+++ b/Show More