wukong: add Chinese private tracker. resolves #14595 (#14596 )

rousi: typo fix
zmpt: update MR & MST
2025-09-10 13:48:02 +02:00 · 2023-07-28 19:45:12 +01:00 · 2023-07-28 18:54:48 +01:00 · 2023-07-28 18:45:23 +01:00 · 2023-07-28 18:02:50 +01:00 · 2023-07-28 17:40:07 +01:00
407 changed files with 11672 additions and 6479 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -2,6 +2,7 @@ name: Bug report
 description: Create a report of your issue
 body:
 - type: checkboxes
+  id: troubleshooting
  attributes:
    label: Have you checked our Troubleshooting page for your issue?
    description: Please read the <a href="https://github.com/Jackett/Jackett/wiki/Troubleshooting">Troubleshooting</a> page for steps to resolve common issues.
@@ -9,6 +10,7 @@ body:
      - label: I have checked the Troubleshooting page
        required: true
 - type: checkboxes
+  id: already-an-issue
  attributes:
    label: Is there already an issue for your problem?
    description: Please make sure you are not creating an already submitted <a href="https://github.com/Jackett/Jackett/issues">Issue</a>. Check closed issues as well, because your issue may have already been fixed.
@@ -16,6 +18,7 @@ body:
      - label: I have checked older issues, open and closed
        required: true
 - type: checkboxes
+  id: contributing-guidelines
  attributes:
    label: Have you read our Contributing Guidelines?
    description: Please read our <a href="https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md">Contributing Guidelines</a> before submitting your issue to ensure a prompt response to your bug.
@@ -23,6 +26,7 @@ body:
      - label: I have read the Contributing Guidelines
        required: true
 - type: textarea
+  id: environment
  attributes:
    label: Environment
    description: Please provide the details of the system Jackett is running on. The best way to do this is to restart Jackett, access the dashboard, view the log, and copy/paste replacing the example below with the last 10 Info lines at the bottom of the log.
@@ -40,12 +44,14 @@ body:
  validations:
    required: true
 - type: textarea
+  id: description
  attributes:
    label: Description
    description: List steps to reproduce the error and details on what happens and what you expected to happen.
  validations:
    required: true
 - type: textarea
+  id: error-logs
  attributes:
    label: Logged Error Messages
    description: |
@@ -55,6 +61,7 @@ body:
  validations:
    required: true
 - type: textarea
+  id: screenshots
  attributes:
    label: Screenshots
    description: Place any screenshots of the issue here if needed
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+#### Description
+A few sentences describing the overall goals of the pull request's commits.
+
+#### Screenshot (if UI related)
+
+#### Issues Fixed or Closed by this PR
+
+* Fixes #XXXX
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) be

 Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar3](https://github.com/mylar3/mylar3), [Lidarr](https://github.com/lidarr/lidarr), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc.) into tracker-site-specific http queries, parses the html or json response, and then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.

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

 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)

@@ -28,9 +28,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ØMagnet
 * 1337x
 * ACG.RIP
- * ACGsou (36DM)
 * Anidex
 * AniLibria
+ * Anime Time
 * Anime Tosho
 * AniRena
 * AniSource
@@ -41,7 +41,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BitRu
 * BitSearch
 * BT.etree
- * BT4G
 * BTDIGG
 * BTMET
 * BTSOW
@@ -65,7 +64,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * EZTV
 * FileListing
 * FireBit
- * freshMeat
 * Frozen Layer
 * GamesTorrents
 * GkTorrent
@@ -99,6 +97,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * NNTT
 * NoNaMe Club (NNM-Club)
 * Nyaa.si
+ * OKPT
 * OneJAV
 * ParnuXi
 * PC-torrent
@@ -107,15 +106,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PornoTorrent
 * ProPorn
 * Rapidzona
- * RARBG
 * RinTorNeT
- * Rus-media
 * RuTor
 * RuTracker.RU
 * Seedoff
 * Sexy-Pics
 * Shana Project
 * ShowRSS
+ * SimpleAnime
 * Solid Torrents
 * sosulki
 * SubsPlease
@@ -131,22 +129,23 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Torrent9 clone
 * Torrent911
 * TorrentFunk
+ * TorrentDownloads
 * TorrentGalaxy (TGx)
 * TorrentKitty
 * TorrentProject2
 * TorrentQQ (토렌트큐큐)
 * Torrents.csv
 * TorrentSir (토렌트썰)
- * Torrentv
 * TorrentView (토렌트뷰)
- * TorrentWhiz ( 토렌트위즈)
+ * TorrentWhiz (토렌트위즈)
 * Torrentz2eu
 * Torrentz2nz
 * TrahT
 * truPornolabs
 * UnionDHT
 * VSTHouse
- * VST Torrents
+ * VST Torrentz
+ * VSTorrent
 * xxxAdultTorrent
 * XXXClub
 * xxxtor
@@ -162,24 +161,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Anime-Free
 * AnimeLayer
 * ArenaBG
- * BitNova
 * BookTracker
 * BootyTape
 * Catorrent
- * Darmowe torrenty
 * Deildu
 * Demonoid
 * Devil-Torrents
- * DimeADozen (EzTorrent)
 * DXP (Deaf Experts)
 * Electro-Torrent
- * EliteTorrent-pl
 * EniaHD
 * Erai-Raws
 * Ex-torrenty
 * ExKinoRay
 * ExtremlymTorrents
- * Fenyarnyek-Tracker
 * File-Tracker
 * Gay-Torrents.net
 * Genesis-Movement
@@ -190,13 +184,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Il CorSaRo Blu
 * Kinorun
 * Kinozal
- * Lightning-Tor
 * LostFilm.tv
 * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
 * Marine Tracker
+ * Masters-TB
 * Mazepa
 * Metal Tracker
 * Moviesite
+ * MovieWorld (Flicker)
+ * MuseBootlegs (MB)
 * MVGroup Forum
 * MVGroup Main
 * NetHD (VietTorrent)
@@ -225,7 +221,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TribalMixes
 * Union Fansub
 * UniOtaku
- * vTorrent
 * xTorrenty
 * YggTorrent (YGG)
 * ZOMB
@@ -238,14 +233,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * 1ptbar
 * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
 * 2xFree
- * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
+ * 3ChangTrai (3CT)
 * 3D Torrents (3DT)
+ * 3Wmg
 * 4thD (4th Dimension)
 * 52PT
 * 720pier
 * Abnormal
 * ABtorrents (ABT + RNS)
- * Acervos [![(invite needed)][inviteneeded]](#)
 * Acid Lounge (A-L)
 * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
 * Aftershock
@@ -261,19 +256,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
 * ArabP2P
 * ArabTorrents [![(invite needed)][inviteneeded]](#)
- * aro.lol
 * AsianCinema
 * AsianDVDClub
 * Audiences
 * AudioNews (AN)
 * Aussierul.es [![(invite needed)][inviteneeded]](#)
 * AvistaZ (AsiaTorrents)
- * Back-ups [![(invite needed)][inviteneeded]](#)
+ * Azusa [![(invite needed)][inviteneeded]](#)
+ * Back-ups
 * BakaBT
 * BeiTai
 * Best-Core
 * BeyondHD (BHD)
 * Bibliotik
+ * biho (必火pt)
 * Bit-Bázis
 * BIT-HDTV
 * Bitded
@@ -293,7 +289,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BroadcasTheNet (BTN)
 * BroadCity
 * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BrSociety [![(invite needed)][inviteneeded]](#)
+ * BrSociety
 * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
 * BTSCHOOL
 * BWTorrents
@@ -303,11 +299,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * CarPT
 * CartoonChaos (CC)
 * Cathode-Ray.Tube (CRT)
- * CCFBits [![(invite needed)][inviteneeded]](#)
+ * Central Torrent
 * CeskeForum
 * CGPeers [![(invite needed)][inviteneeded]](#)
 * CHDBits [![(invite needed)][inviteneeded]](#)
+ * cheggit
 * ChileBT
+ * CiNEFiLHD
 * Cinemageddon [![(invite needed)][inviteneeded]](#)
 * CinemaMovieS_ZT
 * Cinematik [![(invite needed)][inviteneeded]](#)
@@ -318,17 +316,22 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * CrazyHD
 * CrazySpirits
 * CrnaBerza
+ * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
 * DANISH BYTES
+ * Darius Tracker
+ * Dark-Shadow
 * DataScene (DS)
 * DataTalli
 * DesiTorrents
 * Diablo Torrent [![(invite needed)][inviteneeded]](#)
 * DICMusic
 * DigitalCore
+ * DimeADozen (EzTorrent)
 * DiscFan
 * DivTeam
 * DocsPedia
 * Dream Tracker
+ * Drugari
 * Ebooks-Shares
 * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
 * eShareNet
@@ -340,25 +343,28 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * FANO.IN [![(invite needed)][inviteneeded]](#)
 * Fantastic Heaven
 * Fantastiko
+ * Fappaizuri
+ * FastScene
 * Femdomcult
 * FileList (FL)
 * FinElite (FE)
 * FinVip
 * Flux-Zone
+ * Free Farm (自由农场)
 * FunFile (FF)
 * FunkyTorrents (FT)
 * Fuzer (FZ)
 * GainBound [![(invite needed)][inviteneeded]](#)
 * Gay-Torrents.org
 * GAYtorrent.ru
- * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
+ * GazelleGames (GGn)
 * Generation-Free
 * GigaTorrents
 * GimmePeers (formerly ILT)
 * GiroTorrent
 * GreatPosterWall (GPW)
 * GreekDiamond
- * Greek Team [![(invite needed)][inviteneeded]](#)
+ * Greek Team
 * HaiDan
 * Haitang
 * HappyFappy
@@ -379,17 +385,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HDFans
 * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
 * HDMaYi
- * HDMonkey
+ * HDPT [![(invite needed)][inviteneeded]](#)
 * HDRoute [![(invite needed)][inviteneeded]](#)
 * HDSky [![(invite needed)][inviteneeded]](#)
 * HDTime
- * HDTorrents.it [![(invite needed)][inviteneeded]](#)
 * HDTurk
 * HDU
+ * HDVIDEO
 * HDZone
 * Hebits
- * HellasHut
 * HHanClub
+ * HomePornTorrents (HPT)
 * House of Devil
 * HQMusic
 * iAnon
@@ -397,8 +403,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ImmortalSeed (iS)
 * Immortuos
 * Indietorrents [![(invite needed)][inviteneeded]](#)
+ * Infire
 * Insane Tracker
 * IPTorrents (IPT)
+ * ItaTorrents
 * JME-REUNIT3D
 * JoyHD [![(invite needed)][inviteneeded]](#)
 * JPopsuki
@@ -408,33 +416,39 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Keep Friends [![(invite needed)][inviteneeded]](#)
 * Korsar
 * KrazyZone
+ * Kufei (库非)
 * Kufirc
 * LastFiles
 * Le Saloon
+ * LaidBackManor
 * Lat-Team [![(invite needed)][inviteneeded]](#)
+ * Le-Cinephile
 * LearnBits
 * LearnFlakes
 * leech24
- * LemonHD
 * Les-Cinephiles
+ * Lesbians4u
 * Libble
 * LibraNet (LN)
 * LinkoManija [![(invite needed)][inviteneeded]](#)
 * Locadora
 * LosslessClub [![(invite needed)][inviteneeded]](#)
 * LST
- * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
+ * M-Team TP (MTTP)
 * MaDs Revolution
 * magic-heaven
 * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
 * Majomparádé (TurkDepo)
+ * Mansão dos Animes (MDAN)
 * MegamixTracker
 * MeseVilág (Fairytale World)
+ * MetalGuru
 * Milkie
 * MIRcrew
 * MMA-Torrents [![(invite needed)][inviteneeded]](#)
 * MNV (Max-New-Vision)
 * MOJBLiNK
+ * MonikaDesign (MDU) [![(invite needed)][inviteneeded]](#)
 * MoreThanTV (MTV)
 * MouseBits
 * Movie-Torrentz
@@ -445,13 +459,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Nebulance (NBL) (TransmiTheNet)
 * NicePT
 * NorBits
+ * NORDiCHD
+ * Ntelogo
 * Old Toons World
 * OpenCD [![(invite needed)][inviteneeded]](#)
 * Orpheus
 * OshenPT
 * OurBits (HDPter)
 * P2PBG
- * Partis
+ * Panda
+ * Party-Tracker
 * PassThePopcorn (PTP)
 * Peeratiko
 * Peers.FM
@@ -471,16 +488,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PTerClub
 * PTFiles (PTF)
 * PThome [![(invite needed)][inviteneeded]](#)
+ * PT分享站 (itzmx)
 * PTSBAO
 * PTtime
 * Punk's Horror Tracker
 * PuntoTorrent
 * PuTao
- * Puur-Hollands
 * PWTorrents (PWT)
 * R3V WTF! [![(invite needed)][inviteneeded]](#)
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
+ * RareShare2
 * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
 * Redacted (PassTheHeadphones)
 * RedBits
@@ -489,16 +507,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * RetroFlix
 * RevolutionTT
 * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
- * RPTorrents
- * SceneHD  [![(invite needed)][inviteneeded]](#)
+ * Rousi
+ * SceneHD [![(invite needed)][inviteneeded]](#)
 * SceneRush
 * SceneTime
- * SDBits [![(invite needed)][inviteneeded]](#)
 * Secret Cinema
 * SeedFile
+ * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
 * Shareisland
- * SharkPT
- * Shazbat [![(invite needed)][inviteneeded]](#)
+ * Shazbat
 * SiamBIT
 * SkipTheCommercials
 * SkipTheTrailers
@@ -536,9 +553,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * The Vault [![(invite needed)][inviteneeded]](#)
 * The-Crazy-Ones
 * The-New-Fun
- * TheDarkCommunity (TDC)
 * TheEmpire (TE)
 * TheLeachZone (TLZ)
+ * TheRebels
 * TheScenePlace (TSP)
 * Thor's Land
 * TJUPT
@@ -555,6 +572,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentBytes (TBy)
 * TorrentCCF (TCCF)
 * TorrentDay (TD)
+ * Torrenteros (TTR)
 * TorrentHeaven [![(invite needed)][inviteneeded]](#)
 * TorrentHR [![(invite needed)][inviteneeded]](#)
 * Torrenting (TT)
@@ -565,22 +583,26 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentSeeds (TS)
 * TotallyKids (TK)
 * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
- * TranceTraffic [![(invite needed)][inviteneeded]](#)
- * Trezzor [![(invite needed)][inviteneeded]](#)
+ * TranceTraffic
+ * TreZzoR [![(invite needed)][inviteneeded]](#)
 * TurkSeed
 * TurkTorrent (TT)
 * TV Chaos UK (TVCUK)
 * TvRoad
 * TVstore
- * Twilight Torrents
 * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
+ * UBits
 * UHDBits
+ * UltraHD
 * UnionGang
 * UnleashTheCartoons
 * UnlimitZ
+ * Uploads
+ * UTOPIA
 * White Angel
 * World-In-HD [![(invite needed)][inviteneeded]](#)
 * World-of-Tomorrow
+ * Wukong
 * x-ite.me (XM)
 * xBytesV2
 * XSpeeds (XS)
@@ -595,7 +617,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ZonaQ
 </details>

-Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com to get them fixed/improved.
+Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com or jacketttest -at- gmail.com to get them fixed/improved.

 ### Aggregate indexers

--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,7 +2,7 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
  majorVersion: 0
-  minorVersion: 20
+  minorVersion: 21
  patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
--- a/jackett_launcher.bat
+++ b/jackett_launcher.bat
@@ -10,7 +10,7 @@ if errorlevel 1 (
  goto continue
 ) else (
  echo JackettUpdater is still running
-  ping -n 2 127.0.0.1 > nul
+  timeout /t 1 /nobreak > nul
  goto loop
 )

--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -0,0 +1,13 @@
+<Project>
+    <!-- Common to all Jackett Projects -->
+    <PropertyGroup>
+        <!-- Specifies whether it's one of our own libraries -->
+        <JackettProject>false</JackettProject>
+        <JackettProject Condition="$(MSBuildProjectName.StartsWith('Jackett'))">true</JackettProject>
+    </PropertyGroup>
+
+    <!-- Set the Product and Version info for our own projects -->
+    <PropertyGroup Condition="'$(JackettProject)'=='true'">
+        <PathMap>$(MSBuildProjectDirectory)=./$(MSBuildProjectName)/</PathMap>
+    </PropertyGroup>
+</Project>
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -72,11 +72,6 @@ function getHashArgs() {
    }, prev), {});
 }

-function insertWordWrap(str) {
-    // insert optional word wrap after punctuation to avoid overflows on long scene titles
-    return str.replace(/([\.\-_\/\\])/g, "$1\u200B");
-}
-
 function type_filter(indexer) {
  return indexer.type == this.value;
 }
@@ -125,6 +120,7 @@ function loadJackettSettings() {

        $("#jackett-savedir").val(data.blackholedir);
        $("#jackett-allowext").attr('checked', data.external);
+        $("#jackett-local-bind-address").val(data.local_bind_address);
        $("#jackett-allowcors").attr('checked', data.cors);
        $("#jackett-allowupdate").attr('checked', data.updatedisabled);
        $("#jackett-prerelease").attr('checked', data.prerelease);
@@ -466,7 +462,7 @@ function displayUnconfiguredIndexersList() {
        $('#indexers div.dataTables_filter input').focusWithoutScrolling();
    });

-    $("#modals").append(UnconfiguredIndexersDialog);
+    $("#modals").html(UnconfiguredIndexersDialog);

    $('#add-selected-indexers').click(function () {
        var selectedIndexers = $('#unconfigured-indexer-datatable').DataTable().$('input[type="checkbox"]');
@@ -804,7 +800,7 @@ function newConfigModal(title, config, caps, link, alternativesitelinks, descrip
        link: link,
        description: description
    }));
-    $("#modals").append(configForm);
+    $("#modals").html(configForm);
    populateConfigItems(configForm, config);

    if (alternativesitelinks.length >= 1) {
@@ -1048,14 +1044,13 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {
    var selectedIndexers = [];
    if (selectedIndexer)
      selectedIndexers = selectedIndexer.split(",");
-    $('#select-indexer-modal').remove();
    var releaseTemplate = Handlebars.compile($("#jackett-search").html());
    var releaseDialog = $(releaseTemplate({
        filters: availableFilters,
        active: selectedFilter
    }));

-    $("#modals").append(releaseDialog);
+    $("#modals").html(releaseDialog);

    releaseDialog.on('shown.bs.modal', function () {
        releaseDialog.find('#searchquery').focusWithoutScrolling();
@@ -1155,12 +1150,6 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {

        var trackerId = filterId || "all";
        api.resultsForIndexer(trackerId, queryObj, function (data) {
-            for (var i = 0; i < data.Results.length; i++) {
-                var item = data.Results[i];
-                item.Title = insertWordWrap(item.Title);
-                item.CategoryDesc = insertWordWrap(item.CategoryDesc);
-            }
-
            $('#jackett-search-perform').html($('#search-button-ready').html());
            var searchResults = $('#searchResults');
            searchResults.empty();
@@ -1307,7 +1296,7 @@ $.fn.dataTable.ext.search = [
 ];

 function updateSearchResultTable(element, results) {
-    var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
+    var resultsTemplate = Handlebars.compile($("#jackett-search-results").text());
    element.html($(resultsTemplate(results)));
    element.find('tr.jackett-search-results-row').each(function () {
        updateReleasesRow(this);
@@ -1504,11 +1493,6 @@ function bindUIButtons() {

    $("#jackett-show-releases").click(function () {
        api.getServerCache(function (data) {
-            for (var i = 0; i < data.length; i++) {
-                var item = data[i];
-                item.Title = insertWordWrap(item.Title);
-                item.CategoryDesc = insertWordWrap(item.CategoryDesc);
-            }
            var releaseTemplate = Handlebars.compile($("#jackett-releases").html());
            var item = {
                releases: data,
@@ -1597,7 +1581,7 @@ function bindUIButtons() {
                    });
                }
            });
-            $("#modals").append(releaseDialog);
+            $("#modals").html(releaseDialog);
            releaseDialog.modal("show");
        }).fail(function () {
            doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
@@ -1616,7 +1600,7 @@ function bindUIButtons() {
                logs: data
            };
            var releaseDialog = $(releaseTemplate(item));
-            $("#modals").append(releaseDialog);
+            $("#modals").html(releaseDialog);
            releaseDialog.modal("show");
        }).fail(function () {
            doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
@@ -1628,6 +1612,7 @@ function bindUIButtons() {
        var jackett_basepathoverride = $("#jackett-basepathoverride").val();
        var jackett_baseurloverride = $("#jackett-baseurloverride").val();
        var jackett_external = $("#jackett-allowext").is(':checked');
+        var jackett_local_bind_address = $("#jackett-local-bind-address").val();
        var jackett_cors = $("#jackett-allowcors").is(':checked');
        var jackett_update = $("#jackett-allowupdate").is(':checked');
        var jackett_prerelease = $("#jackett-prerelease").is(':checked');
@@ -1649,6 +1634,7 @@ function bindUIButtons() {
        var jsonObject = {
            port: jackett_port,
            external: jackett_external,
+            local_bind_address: jackett_local_bind_address,
            cors: jackett_cors,
            updatedisabled: jackett_update,
            prerelease: jackett_prerelease,
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -179,6 +179,10 @@
            <span class="input-header">External access: </span>
            <input id="jackett-allowext" class="form-control input-right" type="checkbox" />
        </div>
+        <div class="input-area">
+            <span class="input-header">Local bind address: </span>
+            <input id="jackett-local-bind-address" class="form-control input-right" type="text" value="" placeholder="127.0.0.1">
+        </div>
        <div class="input-area">
            <span class="input-header">Allow CORS: </span>
            <input id="jackett-allowcors" class="form-control input-right" type="checkbox" />
@@ -465,11 +469,11 @@
                                    <td class="fit">{{jacketTimespan PublishDate}}</td>
                                    <td class="fit">{{jacketTimespan FirstSeen}}</td>
                                    <td class="fit">{{Tracker}}</td>
-                                    <td class="Title"><a href="{{Details}}">{{Title}}</a> <span class="release-labels"></span></td>
+                                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
                                    <td class="fit">{{Size}}</td>
                                    <td class="fit">{{jacketSize Size}}</td>
                                    <td class="fit">{{Files}}</td>
-                                    <td class="fit Cat">{{CategoryDesc}}</td>
+                                    <td class="fit Cat" style="word-break: break-all">{{CategoryDesc}}</td>
                                    <td class="fit">{{Grabs}}</td>
                                    <td class="fit">{{Seeders}}</td>
                                    <td class="fit">{{Peers}}</td>
@@ -529,10 +533,10 @@
                    </div>
                    <div class="modal-body">
                        <p>You can search all configured indexers from this screen.</p>
-                        <label for="text">Query</label>
+                        <label for="searchquery">Query</label>
                        <input class="form-control" type="text" name="query" id="searchquery" />
                        {{#if filters}}
-                        <label for="filter">Filter</label>
+                        <label for="searchFilter">Filter</label>
                        <select name="filter" id="searchFilter">
                          <option value="all">all</option>
                          {{#each filters}}
@@ -540,9 +544,9 @@
                          {{/each}}
                        </select>
                        {{/if}}
-                        <label for="tracker">Tracker</label>
+                        <label for="searchTracker">Tracker</label>
                        <select name="tracker" id="searchTracker" multiple="multiple"></select>
-                        <label for="category">Category</label>
+                        <label for="searchCategory">Category</label>
                        <select name="category" id="searchCategory" multiple="multiple"></select>
                        <button id="jackett-search-perform" class="btn btn-success btn-sm"><span class="fa fa-search"></span></button>
                        <div id="searchResults"></div>
@@ -592,11 +596,11 @@
                    <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"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
+                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <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>
-                    <td class="text-center Cat">{{CategoryDesc}}</td>
+                    <td class="text-center Cat" style="word-break: break-all">{{CategoryDesc}}</td>
                    <td class="text-center">{{Grabs}}</td>
                    <td class="text-center">{{Seeders}}</td>
                    <td class="text-center">{{Peers}}</td>
@@ -756,6 +760,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2023010701"></script>
+    <script type="text/javascript" src="../custom.js?changed=2023071401"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Content/libs/handlebarsmoment.js
+++ b/src/Jackett.Common/Content/libs/handlebarsmoment.js
@@ -20,7 +20,7 @@ Handlebars.registerHelper('jacketTimespan', function (context, block) {

    var hours = timeSpan.asHours();
    if (hours < 48) {
-        return Math.round(hours) + 'h ago';
+        return parseFloat(hours).toFixed(1) + 'h ago';
    }

    var days = timeSpan.asDays();
--- a/src/Jackett.Common/Definitions/0daykiev.yml
+++ b/src/Jackett.Common/Definitions/0daykiev.yml
@@ -6,6 +6,8 @@ language: ru-RU
 type: private
 encoding: windows-1251
 links:
+  - https://tracker.0day.community/
+legacylinks:
  - https://tracker.0day.kiev.ua/

 caps:
--- a/src/Jackett.Common/Definitions/0magnet.yml
+++ b/src/Jackett.Common/Definitions/0magnet.yml
@@ -6,6 +6,10 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
+  - https://0magnet.co/
+  - https://13mag.net/
+  - https://16mag.net/
+legacylinks:
  - https://0magnet.com/
  - https://9mag.net/

--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -13,17 +13,14 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337x.unblockit.click/
-  - https://1337x.mrunblock.guru/
+  - https://1337x.unblockit.rsvp/
  - https://1337x.unblockninja.com/
+  - https://1337x.mrunblock.bond/
 legacylinks:
  - https://1337x.is/
  - https://1337x.nocensor.work/
-  - https://1337x.unblockit.how/
-  - https://1337x.unblockit.cam/
  - https://1337x.nocensor.biz/
  - https://1337x.gd/
-  - https://1337x.unblockit.day/
  - https://1337x.unblockit.llc/
  - https://1337x.unblockit.blue/
  - https://1337x.unblockit.name/
@@ -40,6 +37,11 @@ legacylinks:
  - https://1337x.nocensor.art/
  - https://1337x.unblockit.bio/
  - https://1337x.unblockit.boo/
+  - https://1337x.mrunblock.guru/
+  - https://1337x.mrunblock.life/ # cloudflare 403
+  - https://1337x.unblockit.click/
+  - https://1337x.unblockit.asia/
+  - https://1337x.unblockit.mov/

 caps:
  categorymappings:
@@ -187,6 +189,10 @@ search:
    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Other{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}4{{ else }}1{{ end }}/"

+  keywordsfilters:
+    - name: re_replace # daily standard S2023 > 2023
+      args: ["\\bS(20\\d{2})\\b", "$1"]
+
  rows:
    selector: tr:has(a[href^="/torrent/"])

--- a/src/Jackett.Common/Definitions/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -1,7 +1,7 @@
 ---
 id: 1ptbar
 name: 1ptbar
-description: "1ptbar is a CHINESE Private Torrent Tracker for Movies, TV, and e-Learning"
+description: "1ptbar is a CHINESE Private Torrent Tracker for MOVIES / TV / E-LEARNING"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -25,26 +25,28 @@ caps:

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

 settings:
-  - name: cookie
+  - name: username
    type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><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>"
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 1ptbar Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: sort
    type: select
    label: Sort requested from site
@@ -61,27 +63,47 @@ settings:
    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.

 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
  inputs:
-    cookie: "{{ .Config.cookie }}"
+    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: torrents.php
+    path: index.php
+    selector: a[href="logout.php"]

 search:
  paths:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    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
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    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, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -114,8 +136,13 @@ search:
      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-last-of-type(6) > span[title]
@@ -161,5 +188,5 @@ search:
        "*": 1
    description:
      selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.32 2022-12-05
+      remove: a, b, font, img, span
+# NexusPHP v1.8.4 2023-06-18
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/src/Jackett.Common/Definitions/2fast4you.yml
@@ -144,6 +144,7 @@ login:
        remove: table
  test:
    path: torrents-search.php
+    selector: a[href="account-logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/2xfree.yml
+++ b/src/Jackett.Common/Definitions/2xfree.yml
@@ -11,6 +11,7 @@ links:

 caps:
  categorymappings:
+    # special.php
    - {id: 401, cat: Movies, desc: "Movies(电影)", default: true}
    - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
    - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true}
@@ -19,7 +20,6 @@ caps:
    - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)", default: true}
    - {id: 407, cat: TV/Sport, desc: "Sports(体育运动)", default: true}
    - {id: 408, cat: Audio, desc: "HQ Audio(音乐)", default: true}
-    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
    - {id: 410, cat: Books, desc: "eBook(电子书)", default: true}
    - {id: 411, cat: PC/Games, desc: "PCGame(游戏)", default: true}
    - {id: 413, cat: Audio/Video, desc: "AV(无码)", default: true}
@@ -29,14 +29,17 @@ caps:
    - {id: 422, cat: XXX, desc: "HGame(H游戏)", default: true}
    - {id: 423, cat: XXX, desc: "IV(写真影片)", default: true}
    - {id: 424, cat: XXX, desc: "IV(写真图集)", default: true}
-    # special
-    - {id: 526, cat: Movies, desc: "VRMovies(3D/VR电影)", default: true}
-    - {id: 527, cat: TV, desc: "VRSeries(3D/VR剧集)", default: true}
-    - {id: 528, cat: Audio/Video, desc: "AV(VR无码)", default: true}
-    - {id: 529, cat: Audio/Video, desc: "AV(VR有码)", default: true}
-    - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)", default: true}
-    - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)", default: true}
-    - {id: 532, cat: Other, desc: "VRTools(VR工具软件)", default: true}
+    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
+    # torrents.php
+    - {id: 526, cat: Movies, desc: "3DMovies(3D电影)", default: false}
+    - {id: 527, cat: TV, desc: "3DSeries(3D剧集)", default: false}
+    - {id: 533, cat: Movies, desc: "VRMovies(VR电影)", default: false}
+    - {id: 534, cat: TV, desc: "VRSeries(VR剧集)", default: false}
+    - {id: 528, cat: Audio/Video, desc: "AV(VR无码)", default: false}
+    - {id: 529, cat: Audio/Video, desc: "AV(VR有码)", default: false}
+    - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)", default: false}
+    - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)", default: false}
+    - {id: 532, cat: Other, desc: "VRTools(VR工具软件)", default: false}

  modes:
    search: [q]
@@ -58,7 +61,7 @@ settings:
  - 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 ICC2022 Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 2xFree Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -83,6 +86,10 @@ settings:
    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_ulslr
+    type: info
+    label: Upload Speed Limit Rule
+    default: The upload bandwidth shall not exceed 120Mbps, that is, the upload speed shall not exceed 15MB/s.

 login:
  path: login.php
@@ -103,17 +110,16 @@ login:
    trackerssl: yes
  error:
    - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("Failed"))
  test:
    path: index.php
    selector: a[href="logout.php"]

 search:
  paths:
-    - path: torrents.php
-      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 413, 420, 421, 422, 423, 424]
    - path: special.php
-      categories: [526, 527, 528, 529, 530, 531, 532]
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 413, 420, 421, 422, 423, 424]
+    - path: torrents.php
+      categories: [526, 527, 533, 534, 528, 529, 530, 531, 532]
  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 }}"
@@ -213,5 +219,5 @@ search:
      text: 86400
    description:
      selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.8.0 2023-01-26
+      remove: a, b, font, img, span
+# NexusPHP v1.8.2 2023-05-08
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -1,7 +1,7 @@
 ---
 id: 3changtrai
 name: 3ChangTrai
-description: "3ChangTrai (3CT) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV"
+description: "3ChangTrai (3CT) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: vi-VN
 type: private
 encoding: UTF-8
@@ -100,7 +100,6 @@ search:
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
    notnewword: 1
-    # does not return imdb link in results

  rows:
    selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -126,7 +125,7 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    poster:
-      selector: img.lazyload
+      selector: img[data-src]
      attribute: data-src
    imdbid:
      selector: a[href*="imdb.com/title/tt"]
@@ -174,7 +173,10 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
    description:
-      selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP v3.0 2020-04-30
+      selector: td:nth-child(3)
+      remove: a, b, font, img, span
+# NexusPHP 3ChangTrai v3.0 2020-04-30
--- a/src/Jackett.Common/Definitions/3dtorrents.yml
+++ b/src/Jackett.Common/Definitions/3dtorrents.yml
@@ -104,6 +104,9 @@ search:
      filters:
        - name: querystring
          args: category
+        - name: re_replace
+          args: ["(\\b0\\b)", "31"]
+
    title:
      selector: a[href^="index.php?page=torrent-details&id="]
    details:
--- a/src/Jackett.Common/Definitions/3wmg.yml
+++ b/src/Jackett.Common/Definitions/3wmg.yml
@@ -0,0 +1,192 @@
+---
+id: 3wmg
+name: 3Wmg
+description: "3Wmg is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://www.3wmg.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影", default: true}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫", default: true}
+    - {id: 406, cat: Audio, desc: "Music/音乐", default: true}
+    - {id: 407, cat: Other/Misc, desc: "Leanrning学习", default: true}
+    - {id: 409, cat: Books, desc: "Ebook电子书", default: true}
+    - {id: 410, cat: Other, desc: "Misc/其他", default: true}
+    # special
+    - {id: 411, cat: XXX, desc: "Uncensored无码", default: false}
+    - {id: 412, cat: XXX, desc: "Censored有码", default: false}
+    - {id: 413, cat: XXX, desc: "Lgbt同志", default: false}
+    - {id: 414, cat: XXX, desc: "III三级、写真", default: false}
+    - {id: 415, cat: XXX, desc: "Animations动漫", default: false}
+    - {id: 416, cat: XXX, desc: "Other其他", default: false}
+
+  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 3Wmg 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.
+
+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("失敗"))
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 409, 410]
+    - path: special.php
+      categories: [411, 412, 413, 414, 415, 416]
+  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
+    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(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
+    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
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.6.0-beta12 2020-06-23
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -40,10 +40,6 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: sort
    type: select
    label: Sort requested from site
@@ -71,6 +67,7 @@ login:
    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
+    selector: a[href="usercp.php"]

 search:
  paths:
@@ -96,6 +93,12 @@ search:
    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:
@@ -103,12 +106,6 @@ search:
      attribute: title
      optional: true
      default: "{{ .Result.title_default }}"
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
    details:
      selector: a[href^="details.php?id="]
      attribute: href
@@ -158,12 +155,12 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
    minimumratio:
      text: 1
    minimumseedtime:
      # 1 day (as seconds = 24 x 60 x 60)
      text: 86400
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -138,7 +138,8 @@ login:
  error:
    - selector: .error
  test:
-    path: browse.php
+    path: index.php
+    selector: a[href^="/logout.php?c="]

 search:
  path: browse.php
--- a/src/Jackett.Common/Definitions/abnormal.yml
+++ b/src/Jackett.Common/Definitions/abnormal.yml
@@ -93,6 +93,7 @@ login:
        text: " - Bad username/password."
  test:
    path: /
+    selector: form#logoutForm

 search:
  paths:
--- a/src/Jackett.Common/Definitions/abtorrents.yml
+++ b/src/Jackett.Common/Definitions/abtorrents.yml
@@ -102,7 +102,8 @@ settings:
 login:
  method: cookie
  test:
-    path: browse.php
+    path: index.php
+    selector: a[href*="logout.php?hash_please="]

 search:
  paths:
@@ -139,20 +140,22 @@ search:
    files:
      selector: td:nth-last-child(9)
    date_day:
-      # Yesterday<br/>6:00 AM
-      selector: td:nth-last-child(7):contains("day")
      # auto adjusted by site account profile
+      # Yesterday, 6:00 AM
+      selector: td:nth-last-child(7) > span[title*="day"]
+      attribute: title
      optional: true
      filters:
        - name: fuzzytime
    date_year:
-      # Aug 6 2021<br/>7:25 PM
-      selector: td:nth-last-child(7):not(:contains("day"))
      # auto adjusted by site account profile
+      # Aug 6 2021, 7:25 PM
+      selector: td:nth-last-child(7) > span[title]:not([title*="day"])
+      attribute: title
      optional: true
      filters:
        - name: dateparse
-          args: "MMM d yyyy h:mm tt"
+          args: "MMM d yyyy, h:mm tt"
    date:
      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
    size:
--- a/src/Jackett.Common/Definitions/acgsou.yml
+++ b/src/Jackett.Common/Definitions/acgsou.yml
@@ -1,111 +0,0 @@
---
-id: acgsou
-name: ACGsou
-description: "ACGsou (36DM) is a CHINESE Public torrent tracker for ANIME"
-language: zh-CN
-type: public
-followredirect: true
-encoding: UTF-8
-requestDelay: 5
-links:
-  - https://www.36dm.club/
-  - https://www.36dm.com/
-legacylinks:
-  - https://www.acgsou.com/
-  - https://acgsou.com/
-  - http://www.acgsou.com/
-  - http://acgsou.com/
-  - http://www.36dm.club/
-  - https://36dm.com/
-  - http://36dm.com/
-  - http://www.36dm.com/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: TV/Anime, desc: "动画分类 (Anime)"}
-    - {id: 7, cat: TV/Anime, desc: "新番连载 (Anime New Fan Series)"}
-    - {id: 8, cat: TV/Anime, desc: "完整动画 (Anime Collection)"}
-    - {id: 9, cat: Movies/Other, desc: "剧场版 (Anime Movie)"}
-    - {id: 10, cat: TV/Anime, desc: "DVDRIP (Anime DVDRIP)"}
-    - {id: 11, cat: TV/Anime, desc: "BDRIP (Anime BDRIP)"}
-    - {id: 5, cat: TV/Anime, desc: "RAW/ISO"}
-    - {id: 3, cat: Books/Comics, desc: "漫画分类 (Manga)"}
-    - {id: 12, cat: Books/Comics, desc: "连载漫画 (Manga Serial)"}
-    - {id: 13, cat: Books/Comics, desc: "完整漫画 (Manga Complete)"}
-    - {id: 14, cat: Books/Comics, desc: "原版漫画 (Manga Original)"}
-    - {id: 4, cat: Audio, desc: "动漫音乐 (Anime Music)"}
-    - {id: 15, cat: Audio/Video, desc: "动画MV (Music Video)"}
-    - {id: 20, cat: TV, desc: "日剧 (Drama Japanese)"}
-    - {id: 21, cat: TV, desc: "特摄片 (Drama Special)"}
-    - {id: 6, cat: Other, desc: "其他资源 (Other)"}
-    - {id: 16, cat: Other, desc: "其他动画 (Other Animation)"}
-    - {id: 17, cat: Other, desc: "声优视频 (Voice Video)"}
-    - {id: 19, cat: Other, desc: "动漫资讯 (Anime Information)"}
-    - {id: 18, cat: PC/Games, desc: "游戏 (Games)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  paths:
-    # https://www.acgsou.com/1.html
-    # https://www.acgsou.com/search.php?keyword=test
-    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}1.html{{ end }}"
-
-  rows:
-    selector: table tbody tr[class^="alt"]:has(td:nth-child(3) a)
-
-  fields:
-    category:
-      selector: td:nth-child(2) a
-      attribute: href
-      filters:
-        - name: regexp
-          args: "sort-(\\d+)-1.html"
-    title:
-      selector: td:nth-child(3) a
-    details:
-      selector: td:nth-child(3) a
-      attribute: href
-    download:
-      selector: td:nth-child(3) a
-      attribute: href
-    date_year:
-      selector: td:nth-child(1):contains(":")
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "MM/dd HH:mm zzz"
-    date_years:
-      selector: td:nth-child(1):not(:contains(":"))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy/MM/dd zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_years }}{{ or .Result.date_year .Result.date_years }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(4)
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# BTMaster 2.1.1
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/src/Jackett.Common/Definitions/acidlounge.yml
@@ -105,7 +105,8 @@ login:
  error:
    - selector: div.errorWrap
  test:
-    path: browse.php
+    path: index.php
+    selector: a[href$="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/acrossthetasman.yml
+++ b/src/Jackett.Common/Definitions/acrossthetasman.yml
@@ -49,6 +49,7 @@ login:
    do: login
  test:
    path: torrents.php
+    selector: a[href*="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -5,6 +5,8 @@ description: "Aftershock is a HUNGARIAN Private Torrent Tracker for MOVIES / GEN
 language: hu-HU
 type: private
 encoding: iso-8859-1
+certificates:
+  - b4950382d327e06126231edb455062842c717727 # expired 26 July 2023
 links:
  - https://aftershock-tracker.net/
 legacylinks:
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -35,7 +35,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://aither.cc/\" target =_blank>Aither</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://aither.cc/\" target=\"_blank\">Aither</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -60,8 +60,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -69,15 +67,17 @@ login:

 search:
  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
    - 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
-    api_token: "{{ .Config.apikey }}"
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
    seasonNumber: "{{ .Query.Season }}"
@@ -89,7 +89,6 @@ search:
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
-    page: 1

  keywordsfilters:
    - name: re_replace
@@ -98,8 +97,6 @@ search:
  rows:
    selector: data
    attribute: attributes
-    count:
-      selector: meta.total

  fields:
    category:
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -178,6 +178,9 @@ search:
    _quality:
      selector: div.list-group-item-content p.m-0 span.badge-primary:contains("1080p"), div.list-group-item-content p.m-0 span.badge-primary:contains("720p"), div.list-group-item-content p.m-0 span.badge-primary:contains("4k")
      optional: true
+      filters:
+        - name: replace
+          args: ["4k", "2160p"]
    _year:
      selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#246AB6;"]
      optional: true
--- a/src/Jackett.Common/Definitions/anilibria.yml
+++ b/src/Jackett.Common/Definitions/anilibria.yml
@@ -31,7 +31,7 @@ settings:
 search:
  paths:
    # https://github.com/anilibria/docs/blob/master/api_v3.md
-    - path: "https://api.anilibria.tv/v3/{{ if .Keywords }}searchTitles{{ else }}getUpdates{{ end }}"
+    - path: "https://api.anilibria.tv/v3/title/{{ if .Keywords }}search{{ else }}updates{{ end }}"
      response:
        type: json

--- a/src/Jackett.Common/Definitions/animetime.yml
+++ b/src/Jackett.Common/Definitions/animetime.yml
@@ -0,0 +1,69 @@
+---
+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
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+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:
+      text: Anime
+    title:
+      selector: div.flex.flex-wrap ~ p
+    details:
+      text: "{{ .Config.sitelink }}search?query={{ .Result.title }}"
+    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
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/animetracker.yml
+++ b/src/Jackett.Common/Definitions/animetracker.yml
@@ -37,7 +37,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://animetracker.cc/\" target =_blank>AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animetracker.cc/\" target=\"_blank\">AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -62,8 +62,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -71,15 +69,17 @@ login:

 search:
  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
    - 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
-    api_token: "{{ .Config.apikey }}"
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
    seasonNumber: "{{ .Query.Season }}"
@@ -91,7 +91,6 @@ search:
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
-    page: 1

  keywordsfilters:
    - name: re_replace
@@ -100,8 +99,6 @@ search:
  rows:
    selector: data
    attribute: attributes
-    count:
-      selector: meta.total

  fields:
    category:
--- a/src/Jackett.Common/Definitions/animeworld-api.yml
+++ b/src/Jackett.Common/Definitions/animeworld-api.yml
@@ -40,7 +40,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://animeworld.cx/\" target =_blank>AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target=\"_blank\">AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -65,8 +65,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -74,15 +72,17 @@ login:

 search:
  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
    - 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
-    api_token: "{{ .Config.apikey }}"
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
    seasonNumber: "{{ .Query.Season }}"
@@ -94,13 +94,10 @@ search:
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
-    page: 1

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

  fields:
    categorydesc:
--- a/src/Jackett.Common/Definitions/anisource.yml
+++ b/src/Jackett.Common/Definitions/anisource.yml
@@ -6,8 +6,6 @@ language: en-US
 type: public
 encoding: UTF-8
 requestDelay: 2
-certificates:
-  - 7b36f0dc75d3340727b6f74bbdbde46ec59b7037 # expired 12 Feb 2023
 links:
  - https://asnet.pw/

@@ -54,12 +52,12 @@ search:
    details:
      selector: a[href*="/showprofile/"]
      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
+    infohash:
+      selector: a[href*="/showprofile/"]
      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
    date:
      selector: font[color="Black"]
      filters:
--- a/src/Jackett.Common/Definitions/anthelion-api.yml
+++ b/src/Jackett.Common/Definitions/anthelion-api.yml
@@ -31,7 +31,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Key by accessing your <a href=\"https://anthelion.me/\" target =_blank>Anthelion</a> account <i>Settings</i> page and scrolling down to the <b>API Key</b> section.<br>Tick the <b>Search</b> and <b>Download</b> checkboxes and click the <b>save profile</b> button to generate the key."
+    default: "Find or Generate a new API Key by accessing your <a href=\"https://anthelion.me/\" target=\"_blank\">Anthelion</a> account <i>Settings</i> page and scrolling down to the <b>API Key</b> section.<br>Tick the <b>Search</b> and <b>Download</b> checkboxes and click the <b>save profile</b> button to generate the key."

 login:
  path: api.php
--- a/src/Jackett.Common/Definitions/arabafenice.yml
+++ b/src/Jackett.Common/Definitions/arabafenice.yml
@@ -124,6 +124,7 @@ login:
            args: ["');", ""]
  test:
    path: index.php
+    selector: a[href="logout.php"]

 download:
  before:
--- a/src/Jackett.Common/Definitions/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -2,7 +2,7 @@
 id: arabp2p
 name: ArabP2P
 description: "ArabP2P is an ARABIC Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ar-AR
+language: ar-AE
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/arabtorrents.yml
+++ b/src/Jackett.Common/Definitions/arabtorrents.yml
@@ -2,7 +2,7 @@
 id: arabtorrents
 name: ArabTorrents
 description: "ArabTorrents is an ARABIC Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ar-AR
+language: ar-AE
 type: private
 encoding: windows-1256
 requestDelay: 2
@@ -145,7 +145,7 @@ download:
    path: takethanks.php
    method: post
    inputs:
-      torrentid: "{{ .DownloadUri.Query.id }}"
+      torrentid: "{{ re_replace .DownloadUri.PathAndQuery \".*download-torrent-(\\d+).*\" \"$1\"}}"

 search:
  paths:
@@ -169,22 +169,22 @@ search:
      args: ["^(.+)$", "*$1*"]

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

  fields:
    category:
-      selector: td a[href*="/browse.php?category="]
+      selector: td a[href*="/torrent-category-"]
      attribute: href
      filters:
-        - name: querystring
-          args: category
+        - name: regexp
+          args: "torrent-category-(\\d+)\/"
    title:
-      selector: td a[href*="/details.php?id="]
+      selector: td div.tooltip-target
    details:
-      selector: td a[href*="/details.php?id="]
+      selector: span a[href*="/details.php?id="]
      attribute: href
    download:
-      selector: a[href*="/download.php?id="]
+      selector: a[href*="/download-torrent-"]
      attribute: href
    date:
      selector: td:nth-child(2) > div:nth-child(3)
--- a/src/Jackett.Common/Definitions/arenabg.yml
+++ b/src/Jackett.Common/Definitions/arenabg.yml
@@ -28,6 +28,7 @@ caps:
    - {id: 20, cat: Movies/HD, desc: "Movies / Movies HD"}
    - {id: 21, cat: Movies/HD, desc: "Movies / x265"}
    - {id: 22, cat: Movies/UHD, desc: "Movies / 4K"}
+    - {id: 59, cat: Movies/HD, desc: "Movies / AV1"}
    - {id: 2, cat: TV, desc: "Series"}
    - {id: 23, cat: TV/HD, desc: "Series / TV Episodes HD"}
    - {id: 24, cat: TV, desc: "Series / TV Episodes"}
--- a/src/Jackett.Common/Definitions/asiandvdclub.yml
+++ b/src/Jackett.Common/Definitions/asiandvdclub.yml
@@ -94,6 +94,8 @@ search:
    category:
      selector: img[class^="cat-"]
      attribute: class
+      optional: true
+      default: 12
      case:
        img.cat-anime: 1
        img.cat-hk: 2
--- a/src/Jackett.Common/Definitions/audiences.yml
+++ b/src/Jackett.Common/Definitions/audiences.yml
@@ -41,10 +41,6 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: sort
    type: select
    label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
    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.

 login:
  method: cookie
--- a/src/Jackett.Common/Definitions/aussierules.yml
+++ b/src/Jackett.Common/Definitions/aussierules.yml
@@ -51,6 +51,7 @@ login:
    - selector: table:contains("An error has occured!")
  test:
    path: browse.php
+    selector: a[href*="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/azusa.yml
+++ b/src/Jackett.Common/Definitions/azusa.yml
@@ -0,0 +1,173 @@
+---
+id: azusa
+name: Azusa
+description: "Azusa is a CHINESE Torrent Tracker focusing on Comics"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://azusa.wiki/
+
+caps:
+  categorymappings:
+    - {id: 404, cat: PC/Games, desc: "Game"}
+    - {id: 402, cat: Books/Comics, desc: "Comic"}
+    - {id: 403, cat: Books/EBook, desc: "Light Novel"}
+    - {id: 407, cat: Other, desc: "CG"}
+    - {id: 409, cat: Audio, desc: "Music"}
+
+  modes:
+    search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Uploads 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.
+
+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: ""
+  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: "{{ .Keywords }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: 0
+    # 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
+    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
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.7.20 2022-08-05
--- a/src/Jackett.Common/Definitions/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -8,7 +8,8 @@ encoding: UTF-8
 requestDelay: 5
 links:
  - https://badasstorrents.com/
-  - https://badasstorrents.mrunblock.guru/
+  - https://badasstorrents.mrunblock.bond/
+  - https://badasstorrents.nocensor.click/
 legacylinks:
  - https://badasstorrents.nocensor.work/
  - https://badasstorrents.nocensor.biz/
@@ -16,6 +17,8 @@ legacylinks:
  - https://badasstorrents.nocensor.world/
  - https://badasstorrents.nocensor.lol/
  - https://badasstorrents.nocensor.art/
+  - https://badasstorrents.mrunblock.guru/
+  - https://badasstorrents.mrunblock.life/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/beitai.yml
+++ b/src/Jackett.Common/Definitions/beitai.yml
@@ -163,5 +163,5 @@ search:
        "*": 1
    description:
      selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/bigfangroup.yml
+++ b/src/Jackett.Common/Definitions/bigfangroup.yml
@@ -90,14 +90,17 @@ settings:

 search:
  # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
+  headers:
+    Referer: ["{{ .Config.sitelink }}browse.php?search={{ .Keywords }}&cat=0&incldead=1&year=0&format=0"]
  paths:
+    # https://bigfangroup.org/browse.php?ajax=1&search=the+librarian&cat=0&incldead=0&year=0&format=0
    - path: browse.php
  inputs:
+    ajax: 1
    search: "{{ .Keywords }}"
    cat: 0
    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver, 7 BFG
    incldead: 1
-    ajax: 1
    year: 0
    format: 0
    s: "{{ .Config.sort }}"
--- a/src/Jackett.Common/Definitions/biho.yml
+++ b/src/Jackett.Common/Definitions/biho.yml
@@ -0,0 +1,190 @@
+---
+id: biho
+name: biho
+description: "biho (必火pt) is a CHINESE Private site for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://www.biho.xyz/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐视频"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 408, cat: Console, desc: "Games/游戏"}
+    - {id: 409, cat: PC, desc: "Software/软件"}
+    - {id: 410, cat: Books, desc: "Ebook/电子书"}
+    - {id: 411, cat: Other, desc: "Travel/旅游"}
+    - {id: 412, cat: Other, desc: "Misc/其他"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the biho 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.
+
+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
+    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:
+      selector: a[href^="details.php?id="]
+    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-last-of-type(6) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00"
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-last-of-type(6):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
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.0 2022-12-08
--- a/src/Jackett.Common/Definitions/bitbazis.yml
+++ b/src/Jackett.Common/Definitions/bitbazis.yml
@@ -11,43 +11,31 @@ links:

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

  modes:
    search: [q]
@@ -99,7 +87,7 @@ login:
 search:
  paths:
    - path: browse.php
-      categories: [85, 86, 15, 16, 17, 19, 83, 82, 94, 95, 92, 93, 64, 24, 22, 58, 69, 68, 91, 25, 26, 84, 71, 31, 81, 49, 27, 50, 14, 65, 54, 67, 70]
+      categories: [85, 86, 15, 16, 17, 19, 83, 82, 94, 95, 92, 93, 22, 58, 64, 24, 70, 27, 50, 69, 68, 91, 25, 26, 84, 71, 31, 54, 81, 67, 49, 14, 65, 97]
      inputs:
        # 0 all, 1 active, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
        incldead: 0
@@ -117,22 +105,26 @@ search:
    # can support genre searching but you need to know the id, eg &genre23=1 for Comedy (id is 23)

  rows:
-    selector: "tr[class^=\"toriadatok_\"]{{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
+    selector: "tr[class^=\"toriadatok\"]{{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"

  fields:
    categorydesc:
      selector: img[src^="pic/kategoria/"]
      attribute: title
    title:
-      selector: a.preview
+      selector: font[class="tori"], a.preview
    _id:
      selector: td.tori_infok
      attribute: id
+      optional: true
      filters:
        - name: regexp
          args: (\d+)
    details:
-      text: "details.php?id={{ .Result._id }}#adatlap"
+      selector: a[href^="details.php?id="]
+      attribute: href
+      optional: true
+      default: "details.php?id={{ .Result._id }}#adatlap"
    download:
      text: "download.php?torrent={{ .Result._id }}"
    poster:
@@ -142,14 +134,14 @@ search:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    size:
-      selector: td[id^="tsize_"]
+      selector: td[id^="tsize"]
    date:
      # 36 perce
      # 13 órája  és 59 perce
      # 2 napja  és 10 órája
      # 1 hete  és 1 napja
      # 1 éve  és 30 hete
-      selector: td[id^="t_added_"] > span
+      selector: td[id^="t_added"] > span
      filters:
        - name: replace
          args: ["és ", " "]
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -84,7 +84,8 @@ settings:
 login:
  method: cookie
  test:
-    path: browse.php
+    path: index.php
+    selector: a[href="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@@ -58,6 +58,7 @@ login:
    - selector: td.embedded:has(h2:contains("bejelentkezés"))
  test:
    path: browse.php
+    selector: a[href*="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/bitnova.yml
+++ b/src/Jackett.Common/Definitions/bitnova.yml
@@ -1,119 +0,0 @@
---
-id: bitnova
-name: BitNova
-description: "BitNova is a POLISH Semi-Private Torrent Tracker for 0DAY / GENERAL"
-language: pl-PL
-type: semi-private
-encoding: UTF-8
-links:
-  - https://bitnova.info/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: PC, desc: "Programy"}
-    - {id: 2, cat: PC/0day, desc: "Programy dla Windows"}
-    - {id: 3, cat: PC, desc: "Programy dla Linux"}
-    - {id: 4, cat: PC/Mac, desc: "Programy dla Mac"}
-    - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 6, cat: Books, desc: "eBooki"}
-    - {id: 8, cat: Movies, desc: "Dla dzieci"}
-    - {id: 9, cat: Movies, desc: "Filmy"}
-    - {id: 10, cat: Movies/SD, desc: "Filmy (S)VCD"}
-    - {id: 11, cat: Movies/SD, desc: "DivX/XviD"}
-    - {id: 12, cat: Movies/DVD, desc: "Filmy DVD"}
-    - {id: 13, cat: Movies/BluRay, desc: "Filmy HDDVD/BluRay"}
-    - {id: 14, cat: Movies/SD, desc: "Filmy RMVB"}
-    - {id: 15, cat: Movies/HD, desc: "Filmy x264"}
-    - {id: 342, cat: Movies/3D, desc: "Filmy 3D"}
-    - {id: 16, cat: Console, desc: "Gry"}
-    - {id: 17, cat: Console, desc: "Gry na konsole"}
-    - {id: 18, cat: PC/Games, desc: "Gry komputerowe"}
-    - {id: 19, cat: PC/Mobile-Other, desc: "GSM/PDA"}
-    - {id: 20, cat: PC/Mobile-Other, desc: "GSM/PDA Dodatki"}
-    - {id: 21, cat: PC/Mobile-Other, desc: "GSM/PDA Filmy"}
-    - {id: 22, cat: PC/Mobile-Other, desc: "GSM/PDA Gry"}
-    - {id: 23, cat: PC/Mobile-Other, desc: "GSM/PDA Programy"}
-    - {id: 24, cat: Audio, desc: "Muzyka"}
-    - {id: 25, cat: Audio/MP3, desc: "Muzyka Albumy"}
-    - {id: 26, cat: Audio/Video, desc: "Muzyka Teledyski/Koncerty"}
-    - {id: 27, cat: Other, desc: "Różne"}
-    - {id: 28, cat: TV/Sport, desc: "Sport"}
-    - {id: 29, cat: TV, desc: "TV"}
-    - {id: 30, cat: XXX, desc: "Erotyka"}
-
-  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: login.php?act=login
-  method: post
-  inputs:
-    login: "{{ .Config.username }}"
-    pass: "{{ .Config.password }}"
-    remember: 1
-  error:
-    - selector: div#errmsg
-  test:
-    path: /
-    selector: a[href^="/login.php?act=logout"]
-
-search:
-  paths:
-    - path: search
-  inputs:
-    q: "{{ if .Query.Keywords }}{{ .Query.Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    cid: 0
-
-  rows:
-    selector: table#searchRes > tbody > tr
-
-  fields:
-    category:
-      selector: a[href^="/torrenty/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)-
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["/torrent/", "/torrent/download/"]
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# engine v2.0
--- a/src/Jackett.Common/Definitions/bitru.yml
+++ b/src/Jackett.Common/Definitions/bitru.yml
@@ -58,7 +58,7 @@ search:
  inputs:
    s: "{{ .Keywords }}"
    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
-    $raw: "{{ if .Config.adverts }}{{ else }}&rek=no{{ end}}"
+    rek: "{{ if .Config.adverts }}{{ else }}no{{ end }}"

  keywordsfilters:
    - name: re_replace # S01 or S01E01 to 1 сезон
--- a/src/Jackett.Common/Definitions/bitsearch.yml
+++ b/src/Jackett.Common/Definitions/bitsearch.yml
@@ -8,12 +8,15 @@ encoding: UTF-8
 requestDelay: 2
 links:
  - https://bitsearch.to/
-  - https://bitsearch.mrunblock.guru/
+  - https://bitsearch.nocensor.click/
+  - https://bitsearch.mrunblock.bond/
 legacylinks:
  - https://bitsearch.nocensor.biz/
  - https://bitsearch.nocensor.sbs/
  - https://bitsearch.nocensor.world/
  - https://bitsearch.nocensor.lol/
+  - https://bitsearch.mrunblock.guru/
+  - https://bitsearch.mrunblock.life/ # This web property is not accessible via this address.

 caps:
  categories:
@@ -91,7 +94,7 @@ search:
    category:
      selector: a.category
    title:
-      selector: h5
+      selector: h5 a
    details:
      selector: h5 a
      attribute: href
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -29,7 +29,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://blutopia.cc/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.cc/\" target=\"_blank\">Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -54,8 +54,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -63,15 +61,17 @@ login:

 search:
  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
    - 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
-    api_token: "{{ .Config.apikey }}"
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
    seasonNumber: "{{ .Query.Season }}"
--- a/src/Jackett.Common/Definitions/boxingtorrents.yml
+++ b/src/Jackett.Common/Definitions/boxingtorrents.yml
@@ -26,6 +26,7 @@ caps:
    - {id: 4, cat: TV/Sport, desc: "Full - Poor"}
    - {id: 14, cat: TV/Sport, desc: "HD"}
    - {id: 7, cat: TV/Sport, desc: "Misc"}
+    - {id: 18, cat: TV/Sport, desc: "Instructional"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/brsociety-api.yml
+++ b/src/Jackett.Common/Definitions/brsociety-api.yml
@@ -10,7 +10,7 @@ links:

 caps:
  categorymappings:
-    - {id: 1, cat: TV, desc: "Cursos"}
+    - {id: 1, cat: Other, desc: "Cursos"}
    - {id: 2, cat: Books/EBook, desc: "eBooks"}
    - {id: 5, cat: Books/Mags, desc: "Revistas"}
    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
@@ -30,7 +30,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://brsociety.club/\" target =_blank>BrSociety</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target=\"_blank\">BrSociety</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -55,8 +55,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -64,27 +62,22 @@ login:

 search:
  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
    - 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
-    api_token: "{{ .Config.apikey }}"
    $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
-    page: 1

  keywordsfilters:
    - name: re_replace
@@ -93,8 +86,6 @@ search:
  rows:
    selector: data
    attribute: attributes
-    count:
-      selector: meta.total

  fields:
    category:
@@ -110,28 +101,6 @@ search:
      optional: true
    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 }}"
    files:
      selector: num_file
    seeders:
@@ -169,6 +138,6 @@ search:
    minimumratio:
      text: 1.0
    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 6.5.0
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# json UNIT3D 6.5.0 (custom)
--- a/src/Jackett.Common/Definitions/bt4g.yml
+++ b/src/Jackett.Common/Definitions/bt4g.yml
@@ -1,77 +0,0 @@
---
-id: bt4g
-name: BT4G
-description: "BT4G is a Public metadata crawler for magnets"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://bt4g.org/
-
-caps:
-  categories:
-    Application: PC
-    Archive file: Other
-    Audio: Audio
-    Doc: Books
-    Other: Other
-    Video: Movies
-    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-search:
-  paths:
-    # https://bt4g.org/search/2021
-    # site does not support cat search
-    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-
-  rows:
-    selector: div.row > div.col > div:has(h5)
-
-  fields:
-    title:
-      selector: a
-    category:
-      selector: span.cpill
-    category|append:
-      # add tv to video
-      optional: true
-      selector: span.cpill
-      filters:
-        - name: replace
-          args: ["Video", "TV"]
-    details:
-      selector: a
-      attribute: href
-    infohash:
-      selector: a
-      attribute: href
-      filters:
-        - name: replace
-          args: ["/magnet/", ""]
-    date:
-      selector: span:nth-last-child(5) b
-      filters:
-        - name: dateparse
-          args: "yyyy-MM-dd"
-    files:
-      selector: span:nth-last-child(4) b
-    size:
-      selector: span:nth-last-child(3) b
-    seeders:
-      selector: span:nth-last-child(2) b
-    leechers:
-      selector: span:nth-last-child(1) b
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/btdigg.yml
+++ b/src/Jackett.Common/Definitions/btdigg.yml
@@ -7,7 +7,6 @@ type: public
 encoding: UTF-8
 links:
  - https://btdig.com/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.link/
 legacylinks:
  - http://btdiggwzoyrwwbiv.onion.ly/
  - https://btdiggwzoyrwwbiv.onion.ly/
@@ -15,6 +14,7 @@ legacylinks:
  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.pet/ # not found
  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/ # 504 gateway timeout
  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.to/ # 504 gateway timeout
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.link/ # Origin is unreachable Error code 523

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -150,5 +150,5 @@ search:
      text: 1.0
    description:
      selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -7,13 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.hair/
+  - https://btsow.makeup/
 legacylinks:
-  - https://btsow.surf/
-  - https://btsow.com/
-  - https://btsow.cam/
-  - https://btsow.digital/
-  - https://btsow.shop/
  - https://btsow.us/
  - https://btsow.one/
  - https://btsow.rest/
@@ -26,6 +21,9 @@ legacylinks:
  - https://btsow.beauty/
  - https://btsow.mom/
  - https://btsow.boats/
+  - https://btsow.hair/
+  - https://btsow.bond/
+  - https://btsow.skin/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/bulltorrent.yml
+++ b/src/Jackett.Common/Definitions/bulltorrent.yml
@@ -7,13 +7,14 @@ type: public
 encoding: UTF-8
 links:
  - https://www.bulltorrent.com/
-  - https://toros.mrunblock.guru/
 legacylinks:
  - https://toros.nocensor.space/
  - https://toros.nocensor.work/
  - https://www.toros.co/
  - https://toros.nocensor.biz/
  - https://toros.nocensor.lol/
+  - https://toros.mrunblock.guru/
+  - https://toros.mrunblock.life/ # Gateway time-out Error code 504

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/bwtorrents.yml
+++ b/src/Jackett.Common/Definitions/bwtorrents.yml
@@ -123,6 +123,8 @@ caps:
    - {id: 217, cat: Movies, desc: "Tamil-Movies | Remuxes BluRay"}
    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
    - {id: 219, cat: TV, desc: "TV-Bengali Tv"}
+    - {id: 220, cat: TV, desc: "TV-Shemaroo Umang"}
+    - {id: 221, cat: TV, desc: "TV-JioTv"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/byrbt.yml
+++ b/src/Jackett.Common/Definitions/byrbt.yml
@@ -38,10 +38,6 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: sort
    type: select
    label: Sort requested from site
@@ -58,6 +54,10 @@ settings:
    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.

 login:
  path: login.php
@@ -76,8 +76,6 @@ login:
    trackerssl: yes
  error:
    - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("failed!"))
-    - selector: td.embedded:has(h2:contains("Failed"))
  test:
    path: index.php
    selector: a[href^="logout.php?key="]
@@ -105,7 +103,7 @@ search:

  fields:
    category:
-      selector: a[href^="?cat="]
+      selector: a[href^="torrents.php?cat="]
      attribute: href
      filters:
        - name: querystring
@@ -169,12 +167,12 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
    minimumratio:
      text: 1.0
    minimumseedtime:
      # 1 day (as seconds = 1 x 24 x 60 x 60)
      text: 86400
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
 # NexusPHP v1.5 beta 5 20120707
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -9,6 +9,7 @@ links:
  - https://byrut.org/
 legacylinks:
  - https://byrutor.org/
+  - https://byrutdb.org/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -73,7 +73,8 @@ login:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
  test:
-    path: browse.php
+    path: index.php
+    selector: a[href^="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/carpt.yml
+++ b/src/Jackett.Common/Definitions/carpt.yml
@@ -188,5 +188,5 @@ search:
      text: 86400
    description:
      selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.31 2022-11-14
+      remove: a, b, font, img, span
+# NexusPHP v1.7.38 2023-05-14
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -163,7 +163,7 @@ search:
      optional: true
      filters:
        - name: re_replace
-          args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
+          args: ["[ ]at|[//\xa0\\s,]+", " "]
    date_year:
      # February 09, 2019, 06:35:08 AM
      selector: td:nth-child(5):not(:contains("day"))
@@ -171,7 +171,7 @@ search:
      optional: true
      filters:
        - name: re_replace
-          args: ["[,]|[\\s+]|[//\xa0],\\/g", " "]
+          args: ["[//\xa0\\s,]+", " "]
        - name: dateparse
          args: "MMMM dd yyyy hh:mm:ss tt"
    date:
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/src/Jackett.Common/Definitions/ccfbits.yml
@@ -1,152 +0,0 @@
---
-id: ccfbits
-name: CCFBits
-description: "CCFBits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-CN
-type: private
-encoding: UTF-8
-links:
-  - https://ccfbits.org/
-
-caps:
-  categorymappings:
-    # 高清电影
-    - {id: 39, cat: Movies/HD, desc: "HD-DVD原盘"}
-    - {id: 40, cat: Movies/BluRay, desc: "Blu-ray原盘"}
-    - {id: 30, cat: Movies/HD, desc: "高清电影1080p"}
-    - {id: 2, cat: Movies/HD, desc: "高清电影720p"}
-    # 高清电视剧
-    - {id: 7, cat: TV/HD, desc: "高清欧美剧"}
-    - {id: 32, cat: TV/HD, desc: "高清国产剧"}
-    - {id: 34, cat: TV/HD, desc: "高清港台剧"}
-    - {id: 36, cat: TV/HD, desc: "高清日韩剧"}
-    # 其他高清视频
-    - {id: 12, cat: TV/Documentary, desc: "高清纪录片"}
-    - {id: 11, cat: TV/Sport, desc: "高清体育"}
-    - {id: 23, cat: TV/Anime, desc: "高清动漫"}
-    - {id: 4, cat: Audio/Video, desc: "高清MV/综艺"}
-    # 电视剧集包
-    - {id: 38, cat: TV/HD, desc: "欧美剧包"}
-    - {id: 33, cat: TV/HD, desc: "国产剧包"}
-    - {id: 35, cat: TV/HD, desc: "港台剧包"}
-    - {id: 37, cat: TV/HD, desc: "日韩剧包"}
-    # 非高清和其他
-    - {id: 43, cat: TV/SD, desc: "HR_HDTV"}
-    - {id: 20, cat: Movies/DVD, desc: "DVD"}
-    - {id: 42, cat: Movies/SD, desc: "XviD"}
-    - {id: 3, cat: Audio, desc: "无损音乐"}
-    - {id: 22, cat: Other, desc: "杂项"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
-  test:
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 active 1 incldead 2 deadonly
-    incldead: 1
-    fullsearch: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    d: "{{ .Config.sort }}"
-
-  rows:
-    selector: table[border="1"][cellpadding="5"] > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      filters:
-        - name: split
-          args: ["\n", 0]
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php/"]
-      attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    files:
-      selector: a[href$="&filelist=1"]
-    grabs:
-      selector: a[href^="snatches.php?id"]
-      filters:
-        - name: replace
-          args: ["次", ""]
-    size:
-      selector: td:nth-child(7)
-      remove: a
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    downloadvolumefactor:
-      case:
-        "font[color=\"#C20603\"]:contains(\"免费\")": 0
-        "font:has([src=\"/pic/arrowdown1.gif\"]):contains(\"0.5x\")": 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "font:has([src=\"/pic/arrowup1.gif\"]):contains(\"1.5x\")": 1.5
-        "font:has([src=\"/pic/arrowup1.gif\"]):contains(\"2x\")": 2
-        "*": 1
-    description:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2)
-      remove: a, img
-#  Discuz! 7.2
--- a/src/Jackett.Common/Definitions/centraltorrent.yml
+++ b/src/Jackett.Common/Definitions/centraltorrent.yml
@@ -0,0 +1,159 @@
+---
+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.
+
+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/ceskeforum.yml
+++ b/src/Jackett.Common/Definitions/ceskeforum.yml
@@ -41,10 +41,6 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: sort
    type: select
    label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
    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.

 login:
  path: takelogin.php
@@ -170,7 +170,7 @@ search:
        "*": 1
    description:
      selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
    genre:
      selector: table.torrentname > tbody > tr > td:first-child
      remove: a
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -79,6 +79,7 @@ login:
    - selector: td.embedded:has(h2:contains("failed"))
  test:
    path: torrents.php
+    selector: a[href*="logout.php"]

 search:
  paths:
@@ -165,5 +166,5 @@ search:
        "*": 1
    description:
      selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/cheggit.yml
+++ b/src/Jackett.Common/Definitions/cheggit.yml
@@ -0,0 +1,165 @@
+---
+id: cheggit
+name: cheggit
+description: "cheggit is a Private site for 3X"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.cheggit.me/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "Amateur"}
+    - {id: 2, cat: XXX, desc: "Anal"}
+    - {id: 5, cat: XXX, desc: "Asian"}
+    - {id: 6, cat: XXX, desc: "BBW"}
+    - {id: 30, cat: XXX, desc: "BDSM"}
+    - {id: 36, cat: XXX, desc: "Big Ass"}
+    - {id: 8, cat: XXX, desc: "Big Tits"}
+    - {id: 7, cat: XXX, desc: "Black"}
+    - {id: 9, cat: XXX, desc: "Classic"}
+    - {id: 37, cat: XXX, desc: "Creampie"}
+    - {id: 10, cat: XXX, desc: "Cumshot"}
+    - {id: 11, cat: XXX, desc: "DVD-R"}
+    - {id: 12, cat: XXX, desc: "Fetish"}
+    - {id: 14, cat: XXX, desc: "Gang Bang / Orgy"}
+    - {id: 39, cat: XXX, desc: "Gay / Bi"}
+    - {id: 56, cat: XXX, desc: "Hairy"}
+    - {id: 35, cat: XXX, desc: "Hardcore"}
+    - {id: 44, cat: XXX, desc: "HD Porn"}
+    - {id: 3, cat: XXX, desc: "Hentai / 3D"}
+    - {id: 25, cat: XXX, desc: "Homemade"}
+    - {id: 43, cat: XXX, desc: "Interracial"}
+    - {id: 16, cat: XXX, desc: "Latina"}
+    - {id: 23, cat: XXX, desc: "Lesbian"}
+    - {id: 52, cat: XXX, desc: "Lingerie"}
+    - {id: 27, cat: XXX, desc: "Magazines"}
+    - {id: 53, cat: XXX, desc: "Manga / Comic"}
+    - {id: 18, cat: XXX, desc: "Masturbation"}
+    - {id: 26, cat: XXX, desc: "Mature"}
+    - {id: 40, cat: XXX, desc: "Megapack"}
+    - {id: 41, cat: XXX, desc: "Natural Tits"}
+    - {id: 17, cat: XXX, desc: "Oral"}
+    - {id: 29, cat: XXX, desc: "Other"}
+    - {id: 47, cat: XXX, desc: "Parody"}
+    - {id: 21, cat: XXX, desc: "Pictures / Images"}
+    - {id: 50, cat: XXX, desc: "Piss"}
+    - {id: 55, cat: XXX, desc: "Porn Music Videos"}
+    - {id: 46, cat: XXX, desc: "Pregnant / Preggo"}
+    - {id: 15, cat: XXX, desc: "Shemale / TS"}
+    - {id: 22, cat: XXX, desc: "Siterip"}
+    - {id: 20, cat: XXX, desc: "Softcore"}
+    - {id: 49, cat: XXX, desc: "Squirt"}
+    - {id: 34, cat: XXX, desc: "Straight"}
+    - {id: 19, cat: XXX, desc: "Teen"}
+    - {id: 45, cat: XXX, desc: "Voyeur"}
+    - {id: 13, cat: PC/Games, desc: "XXX Games / Apps"}
+
+  modes:
+    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: 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_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    keeplogged: 1
+  error:
+    - selector: span.warning:contains(" was incorrect.")
+  test:
+    path: index.php
+    selector: a[href^="logout.php?auth="]
+
+search:
+  paths:
+    # https://www.cheggit.me/torrents.php?filter_cat[1]=1&order_by=time&order_way=desc&filter_freeleech=1&searchtext=&search_type=0&taglist=&tags_type=0
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    searchtext: "{{ .Keywords }}"
+    # 0=any, 1=all
+    search_type: 1
+
+  rows:
+    selector: table#torrent_table > tbody > tr:not(tr.colhead)
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: \[(\d+)\]
+    title:
+      selector: a[href^="torrents.php?id="]
+    details:
+      selector: a[href^="torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download"]
+      attribute: href
+    description:
+      selector: div.tags
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: span.time
+      attribute: title
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "MMM dd yyyy, HH:mm zzz"
+    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$="/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.51
+# engine n/a
--- a/src/Jackett.Common/Definitions/chilebt.yml
+++ b/src/Jackett.Common/Definitions/chilebt.yml
@@ -2,7 +2,7 @@
 id: chilebt
 name: ChileBT
 description: "ChileBT is a CHILEAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: es-419
+language: es-CL
 type: private
 encoding: UTF-8
 links:
@@ -88,7 +88,7 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    sorting: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
-    qty: 100
+    qty: 50
    page: 0
    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
--- a/src/Jackett.Common/Definitions/cinefilhd.yml
+++ b/src/Jackett.Common/Definitions/cinefilhd.yml
@@ -0,0 +1,173 @@
+---
+id: cinefilhd
+name: CiNEFiLHD
+description: "CiNEFiLHD is a Private Torrent Tracker for MOVIES / TV /  MUSIC"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - http://cinefilhd.xyz/
+  - http://cinefilhd.sytes.net/
+legacylinks:
+  - http://www.cinefilhd.org/
+
+caps:
+  categorymappings:
+    - {id: 37, cat: Movies/HD, desc: "Internal/HD-1080p"}
+    - {id: 17, cat: Movies/HD, desc: "Internal/HD-720p"}
+    - {id: 30, cat: TV/HD, desc: "Internal/HDTV"}
+    - {id: 15, cat: Movies/HD, desc: "Internal/mHD"}
+    - {id: 40, cat: Movies, desc: "Internal/Mp4"}
+    - {id: 26, cat: Movies, desc: "Internal/Remux"}
+    - {id: 45, cat: Movies/WEB-DL, desc: "Internal/WEB-DL"}
+    - {id: 5, cat: Movies/BluRay, desc: "Movies/BluRay"}
+    - {id: 38, cat: Movies/HD, desc: "Movies/HD-1080p"}
+    - {id: 10, cat: Movies/HD, desc: "Movies/HD-720p"}
+    - {id: 29, cat: Movies/HD, desc: "Movies/mHD"}
+    - {id: 41, cat: Movies, desc: "Movies/Mp4"}
+    - {id: 39, cat: Movies, desc: "Movies/Remux"}
+    - {id: 44, cat: Movies/WEB-DL, desc: "Movies/WEB-DL"}
+    - {id: 23, cat: Audio/Lossless, desc: "Lossless"}
+    - {id: 14, cat: Audio/MP3, desc: "MP3-Packs"}
+    - {id: 22, cat: Audio/MP3, desc: "Music-MP3"}
+    - {id: 43, cat: Audio/Video, desc: "Music/1080p"}
+    - {id: 42, cat: Audio/Video, desc: "Music/720p"}
+    - {id: 12, cat: TV/HD, desc: "HDTV-Packs"}
+    - {id: 21, cat: TV/HD, desc: "Movies/HDTV"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, genre]
+    movie-search: [q, imdbid, genre]
+    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
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    submitme: LOGIN
+  error:
+    - selector: h2:contains("failed")
+      message:
+        selector: td.colhead2
+  test:
+    path: index.php
+    selector: a[href^="logout.php?hash_please="]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    # note: site uses the catsX[]=nn method which cardigann does not support.
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.Genre }}{{ .Query.Genre }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.Genre }}{{ else }}{{ .Keywords }}{{ end }}"
+    # title, descr, genre, all
+    searchin: "{{ if .Query.IMDBID }}descr{{else}}{{end}}{{ if .Query.Genre }}genre{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.Genre }}{{ else }}title{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 no, 1 yes
+    only_free: "{{ if .Config.freeleech }}1{{else}}0{{end}}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.mainouter table > tbody > tr:has(a[href^="details.php?id="]), table.mainouter table > tbody > tr[id^="kdescr"]
+    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?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="][onmouseover]
+      attribute: onmouseover
+      filters:
+          #  onmouseover="Tip('<img class=\'pup\' src=\'https://image.tmdb.org/t/p/original/x96AdPlpl4MjUP2DeUhRJifhCMd.jpg\' width=
+        - name: regexp
+          args: src=\\'(.*?)\\'
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    files:
+      selector: td:nth-child(5)
+    date_day:
+      # Today<br/>10:20 AM
+      # Yesterday<br/>08:03 PM
+      selector: td:nth-child(7):contains("day")
+      # auto adjusted by site account profile
+      optional: true
+    date_year:
+      # Feb 14 2019<br/>10:20 AM
+      selector: td:nth-child(7):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: dateparse
+          args: "MMM d yyyy hh:mm tt"
+    date:
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(9)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    genre:
+      selector: td:nth-child(2)
+      remove: a, font
+    description:
+      text: "{{ .Result.genre }}"
+    downloadvolumefactor:
+      case:
+        tr.freeleech_color: 0
+        tr.highlight: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# U-232 v3
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -70,6 +70,7 @@ login:
    - selector: table:contains("Login failed!")
  test:
    path: my.php
+    selector: a[href="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/classix.yml
+++ b/src/Jackett.Common/Definitions/classix.yml
@@ -26,6 +26,7 @@ login:
    - selector: div.myContent:contains("Access Denied")
  test:
    path: index.php
+    selector: a[href="account-logout.php"]

 download:
  selectors:
--- a/src/Jackett.Common/Definitions/coastalcrew.yml
+++ b/src/Jackett.Common/Definitions/coastalcrew.yml
@@ -10,11 +10,10 @@ links:

 caps:
  categorymappings:
-    - {id: 62, cat: Books/EBook, desc: "EBook"}
-    - {id: 69, cat: Books/Mags, desc: "Zeitung"}
    - {id: 30, cat: TV/Anime, desc: "Filme - Animie"}
    - {id: 28, cat: Movies/BluRay, desc: "Filme - Bluray"}
    - {id: 31, cat: Movies/Other, desc: "Filme - Bollywood"}
+    - {id: 77, cat: TV/Documentary, desc: "Filme - DokusHD"}
    - {id: 32, cat: Movies/DVD, desc: "Filme - DVD"}
    - {id: 33, cat: Movies/HD, desc: "Filme - HD"}
    - {id: 34, cat: Movies, desc: "Filme - Klassiker"}
@@ -22,14 +21,17 @@ caps:
    - {id: 36, cat: Movies/SD, desc: "Filme - SD"}
    - {id: 37, cat: Movies/UHD, desc: "Filme - UHD"}
    - {id: 38, cat: Movies/HD, desc: "Filme - x264"}
-    - {id: 63, cat: Movies, desc: "Fuer Unsere Kleinsten"}
-    - {id: 64, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
    - {id: 39, cat: Audio, desc: "Musik - Alben"}
+    - {id: 72, cat: Audio, desc: "Musik - Charts"}
    - {id: 40, cat: Audio, desc: "Musik - Diskografie"}
+    - {id: 75, cat: Audio/Lossless, desc: "Musik - Flac"}
    - {id: 41, cat: Audio/Audiobook, desc: "Musik - Hoerbuch"}
+    - {id: 74, cat: Audio/Other, desc: "Musik - Kids"}
    - {id: 42, cat: Audio, desc: "Musik - Mixe"}
-    - {id: 43, cat: Audio/MP3, desc: "Musik - MP3"}
    - {id: 66, cat: Audio, desc: "Musik - Pack"}
+    - {id: 70, cat: Audio, desc: "Musik - Sampler Deu."}
+    - {id: 71, cat: Audio, desc: "Musik - Sampler Int."}
+    - {id: 76, cat: Audio/Other, desc: "Musik - Soundtrack"}
    - {id: 44, cat: Audio/Video, desc: "Musik - Video"}
    - {id: 45, cat: PC, desc: "Programme - Linux"}
    - {id: 48, cat: PC/Mac, desc: "Programme - Mac"}
@@ -39,7 +41,11 @@ caps:
    - {id: 51, cat: TV, desc: "Serien - Klassiker"}
    - {id: 52, cat: TV, desc: "Serien - Pack"}
    - {id: 53, cat: TV/Sport, desc: "Serien - Sport"}
+    - {id: 62, cat: Books/EBook, desc: "EBook"}
+    - {id: 63, cat: Movies, desc: "Fuer Unsere Kleinsten"}
+    - {id: 64, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
    - {id: 60, cat: Other, desc: "Sonstiges"}
+    - {id: 69, cat: Books/Mags, desc: "Zeitung"}
    - {id: 54, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
    - {id: 55, cat: Console, desc: "Spiele - Konsolen"}
    - {id: 57, cat: PC/Games, desc: "Spiele - Mac / Linux / PC"}
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -7,33 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbiens911.fr/
+  - https://jardattraction.fr/
 legacylinks:
-  - https://labastidevivante.fr/
-  - http://www.cpasbiens.cc/
-  - http://www.cpabien.cm/
-  - http://cpabien.cm/
-  - http://cpasbiens1.com/
-  - http://cpabien.mx/
-  - http://www.cpabien.bz/
-  - http://cpabien.org/
-  - http://cpabien.cc/
-  - http://cpabien.co/
-  - http://cpabien.la/
-  - http://cpabien.club/
-  - http://www.cpabien.io/
-  - https://ww1.cpabien.io/
-  - https://wvw.cpabien.cm/
-  - https://www.cpabien.io/
-  - https://www.cpabien9.net/
-  - https://wwv.cpabien.cm/
-  - http://www.cpabien.cx/
-  - https://www.cpasbien.blue/
-  - https://www.cpabien.cx/
-  - https://www.cpasbien.re/
-  - http://www.cpasbien.io/
-  - https://www.cpabien.bz/
-  - https://www.cpabien.link/
  - https://www.cpasbiens.cz/
  - https://www.cpasbiens.bz/
  - https://www.cpasbien.vg/
@@ -46,6 +21,8 @@ legacylinks:
  - https://www.cpasbien-fr.nz/
  - https://vwwvwvwvvw.cpasbien-fr.nz/
  - https://cpasbiens3.fr/
+  - https://labastidevivante.fr/
+  - https://cpasbiens911.fr/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/dajiao.yml
+++ b/src/Jackett.Common/Definitions/dajiao.yml
@@ -0,0 +1,194 @@
+---
+id: dajiao
+name: Dajiao
+description: "Dajiao (打胶) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://dajiao.cyou/
+
+caps:
+  categorymappings:
+    - {id: 414, cat: Console, desc: "Games/游戏"}
+    - {id: 412, cat: Audio/Audiobook, desc: "Audio Books/有声书"}
+    - {id: 409, cat: Other, desc: "Others/音乐"}
+    - {id: 411, cat: Books/Comics, desc: "Manga/漫画"}
+    - {id: 413, cat: Books/EBook, desc: "E-Books/电子书"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 403, cat: TV, desc: "TV Variety Shows/综艺"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 416, cat: TV, desc: "TV Shows/电视节目"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Kufei 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.
+
+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
+    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, 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
+    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
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.4 2023-06-13
--- a/src/Jackett.Common/Definitions/danishbytes-api.yml
+++ b/src/Jackett.Common/Definitions/danishbytes-api.yml
@@ -36,14 +36,14 @@ settings:
  - name: info_apikey
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://danishbytes.club/\" target=\"_blank\">DanishBytes</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: rsskey
    type: text
    label: RSSKey
  - name: info_rsskey
    type: info
    label: About your RSS key
-    default: "Find or Generate a new RSS key by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</a> account <i>My Security</i> page and clicking on the <b>RSS Key (RID)</b> tab."
+    default: "Find or Generate a new RSS key by accessing your <a href=\"https://danishbytes.club/\" target=\"_blank\">DanishBytes</a> account <i>My Security</i> page and clicking on the <b>RSS Key (RID)</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -68,8 +68,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -81,8 +79,10 @@ search:
      response:
        type: json

+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
  inputs:
-    api_token: "{{ .Config.apikey }}"
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    search: "{{ .Keywords }}"
    imdb: "{{ .Query.IMDBIDShort }}"
--- a/src/Jackett.Common/Definitions/dariustracker.yml
+++ b/src/Jackett.Common/Definitions/dariustracker.yml
@@ -0,0 +1,177 @@
+---
+id: dariustracker
+name: Darius Tracker
+description: "Darius Tracker is a HUNGARIAN Private Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://dariustracker.hu/
+
+caps:
+  categorymappings:
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+    - {id: 88, cat: XXX, desc: "Film/DVD/XXX"}
+    - {id: 62, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
+    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 89, cat: XXX, desc: "Film/HD/XXX"}
+    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
+    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 64, cat: Movies/SD, desc: "Film/XviD/Pack"}
+    - {id: 70, cat: TV/Sport, desc: "Film/XviD/Sport"}
+    - {id: 33, cat: XXX, desc: "Film/XviD/XXX"}
+    - {id: 90, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 31, cat: PC/Games, desc: "Játék/Pc/Iso"}
+    - {id: 29, cat: PC/Games, desc: "Játék/Pc/Rip"}
+    - {id: 54, cat: Console/PS3, desc: "Játék/PS2/PS3"}
+    - {id: 32, cat: Console/XBox, desc: "Játék/XBOX"}
+    - {id: 50, cat: Books, desc: "Könyv/Eng"}
+    - {id: 27, cat: Books, desc: "Könyv/Hun"}
+    - {id: 65, cat: Other, desc: "Képek"}
+    - {id: 66, cat: XXX, desc: "Képek/XXX"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 68, cat: Movies/DVD, desc: "Mese/DVD"}
+    - {id: 69, cat: Movies/SD, desc: "Mese/XviD"}
+    - {id: 67, cat: PC/Mobile-Other, desc: "Mobiltelefon"}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
+    - {id: 81, cat: PC/ISO, desc: "Program/Iso"}
+    - {id: 49, cat: PC, desc: "Program/Rip"}
+    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: 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: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: name
+      5: size
+      4: added
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table[cellpadding="5"]:contains("Hiba")
+  test:
+    path: index.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    # https://dariustracker.hu/browse.php?viewMode=&c68=1&c69=1&search=&incldead=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c[{{.}}]=1&{{end}}"
+    viewMode: ""
+    search: "{{ .Keywords }}"
+    # 0 active, 1 active and dead, 2 deadonly,  3 my torrents, 4 seedless
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: "table[cellpadding=\"5\"] > tbody > tr > td > table[cellpadding=\"5\"] > tbody > tr:has(a[href^=\"download.php?torrent=\"]){{ if .Config.freeleech }}:has(img[src$=\"/arrowdown.png\"] ~ span:contains(\"0x\")){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)(Név: |Első név: -)|Második név: -", ""]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a.preview
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    files:
+      selector: td:nth-last-child(7)
+    date:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: td:nth-last-child(4) b
+    grabs:
+      selector: td:nth-last-child(3)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      selector: img[src$="/arrowdown.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    uploadvolumefactor:
+      selector: img[src$="/arrowup.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -0,0 +1,203 @@
+---
+id: dark-shadow
+name: Dark-Shadow
+description: "Dark-Shadow is a GERMAN Private site for TV / MOVIES / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://dark-shadow.me/
+legacylinks:
+  - https://dark-shadow.ml/
+  - https://projekt.dark-shadow.me/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 28, cat: Movies/SD, desc: "Filme SD"}
+    - {id: 32, cat: Movies/HD, desc: "Filme HD"}
+    - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
+    - {id: 138, cat: Movies, desc: "Filme Pack`s"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
+    - {id: 57, cat: TV/HD, desc: "Serien HD"}
+    - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
+    - {id: 59, cat: TV, desc: "Serien Pack`s"}
+    # Audio
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
+    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
+    - {id: 52, cat: Audio, desc: "Audio Pack"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Audio Hörbuch"}
+    - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
+    # Apps
+    - {id: 12, cat: PC/0day, desc: "Apps Windows"}
+    - {id: 125, cat: PC/Mac, desc: "Apps Mac-OSX"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Apps Mobil"}
+    - {id: 141, cat: PC/ISO, desc: "Apps Other"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku Reihe"}
+    # Spiel
+    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
+    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
+    - {id: 24, cat: Console, desc: "Spiel Konsole"}
+    - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
+    # Sport
+    - {id: 61, cat: TV/Sport, desc: "Sport HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport SD"}
+    # ePaper
+    - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"}
+    - {id: 137, cat: Books/Comics, desc: "ePaper Comics"}
+    # XXX
+    - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
+    - {id: 73, cat: XXX/x264, desc: "XXX HD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"}
+    #  Internal
+    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+  keywordsfilters:
+    # prefix and postfix percent wildcard as well as replacing spaces between words
+    - name: re_replace
+      args: ["\\W+", "%"]
+    - name: re_replace
+      args: ["^(.+)$", "%$1%"]
+
+  rows:
+    selector: "div.selection_wrap{{ if .Config.freeleech }}:root:has(div.onlyup){{ else }}{{ end }}"
+
+  fields:
+    category_p1:
+      selector: div.kat_cat_pic_name
+    category_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
+    title:
+      selector: a.selection_a
+      filters:
+        # remove [REQ] and anything else in [] that prefixes titles
+        - name: re_replace
+          args: ["^(\\[.*\\])(.*)", "$2"]
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a[href^="download_ssl.php?torrent="]
+      attribute: href
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ad
+    grabs:
+      selector: div.selection_unter_ae
+    date_day:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
+    date_year:
+      # 30.02.2018 um 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    description:
+      selector: selection_unter_af
+    seeders:
+      selector: div.selection_unter_aa
+    leechers:
+      selector: div.selection_unter_aaa
+    downloadvolumefactor:
+      case:
+        ":root:has(div.onlyup)": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 36 hours (as seconds = 36 x 60 x 60)
+      text: 129600
+# 3xT
--- a/src/Jackett.Common/Definitions/datascene-api.yml
+++ b/src/Jackett.Common/Definitions/datascene-api.yml
@@ -36,7 +36,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://datascene.xyz/\" target =_blank>DataScene</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://datascene.xyz/\" target=\"_blank\">DataScene</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -61,8 +61,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -70,15 +68,17 @@ login:

 search:
  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
    - 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
-    api_token: "{{ .Config.apikey }}"
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
    seasonNumber: "{{ .Query.Season }}"
@@ -90,7 +90,6 @@ search:
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
-    page: 1

  keywordsfilters:
    - name: re_replace
@@ -99,8 +98,6 @@ search:
  rows:
    selector: data
    attribute: attributes
-    count:
-      selector: meta.total

  fields:
    category:
@@ -111,6 +108,8 @@ search:
      selector: details_link
    download:
      selector: download_link
+    infohash:
+      selector: info_hash
    poster:
      selector: meta.poster
      filters:
--- a/src/Jackett.Common/Definitions/deildu.yml
+++ b/src/Jackett.Common/Definitions/deildu.yml
@@ -63,7 +63,8 @@ login:
    password: "{{ .Config.password }}"
    keeplogged: 1
  test:
-    path: my.php
+    path: index.php
+    selector: a[href^="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -10,15 +10,12 @@ links:
  - https://www.demonoid.is/
  - https://www.dnoid.to/
  - https://www.dnoid.pw/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.link/
-  - https://demonoid.unblockit.click/
-  - https://demonoid.torrentbay.to/
-  - https://demonoid.mrunblock.guru/
+  - https://demonoid.unblockit.rsvp/
+  - https://demonoid.torrentbay.net/
+  - https://demonoid.mrunblock.bond/
+  - https://demonoid.nocensor.click/
 legacylinks:
-  - https://demonoid.unblockit.how/
-  - https://demonoid.unblockit.cam/
  - https://demonoid.nocensor.biz/
-  - https://demonoid.unblockit.day/
  - https://demonoid.unblockit.llc/
  - https://demonoid.unblockit.blue/
  - https://demonoid.unblockit.name/
@@ -39,6 +36,13 @@ legacylinks:
  - https://demonoid.unblockit.boo/
  - 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/

 caps:
  categorymappings:
@@ -308,10 +312,6 @@ settings:
    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: info_themes
-    type: info
-    label: About themes
-    default: Only the default theme <b>Demonoid - v5</b> is supported. If you are using v3 then change it in your <i>User Control Panel</i> or you will get 0 results.
  - name: sort
    type: select
    label: Sort requested from site
@@ -328,17 +328,24 @@ login:
  inputs:
    cookie: "{{ .Config.cookie }}"
  test:
-    path: files/
+    path: /
+    selector: a[href^="/account_handler.php"]

 download:
  infohash:
    hash:
-      selector: div:contains("Torrent hash") > div.col-md-5 > div
+      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: h1[id="torrent--title"]
+      selector: td.ctable_header
+      filters:
+        - name: replace
+          args: ["Details for ", ""]

 search:
  paths:
@@ -361,11 +368,10 @@ search:
    # does not return imdb link in results

  rows:
-    # only the default theme "Demonoid - v5" is supported
-    selector: table.table tbody tr.table__row:has(td[class*="tone_"])
+    selector: table.font_12px tbody tr:has(td[class^="tone_1"]):not(:has(script))
    after: 1
    dateheaders:
-      selector: tr td.table__separator:not(:contains("Sponsored links"))
+      selector: td.added_today:not(:contains("Sponsored links"))
      filters:
        - name: replace
          args: ["Added ", ""]
@@ -374,7 +380,7 @@ search:

  fields:
    category:
-      selector: span.table__column__subtext > a:nth-child(2)
+      selector: a.subcategory
      attribute: href
      optional: true
      default: 0
@@ -389,25 +395,16 @@ search:
    download:
      selector: a[href^="/files/details/"]
      attribute: href
-    poster:
-      selector: div[title]
-      attribute: data-bs-content
-      filters:
-        - name: regexp
-          args: src='(.+?)'
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
    description:
-      selector: td:nth-last-child(7)
+      selector: td:nth-last-child(8)
    size:
-      selector: td:nth-last-child(5)
+      selector: td:nth-last-child(6)
    grabs:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
    seeders:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
    leechers:
-      selector: td:nth-last-child(1)
+      selector: td:nth-last-child(2)
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/desitorrents-api.yml
+++ b/src/Jackett.Common/Definitions/desitorrents-api.yml
@@ -29,7 +29,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://desitorrents.tv/\" target =_blank>DesiTorrents</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://desitorrents.tv/\" target=\"_blank\">DesiTorrents</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -54,8 +54,6 @@ settings:
 login:
  path: /api/torrents
  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
  error:
    - selector: a[href*="/login"]
      message:
@@ -63,15 +61,17 @@ login:

 search:
  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
    - 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
-    api_token: "{{ .Config.apikey }}"
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
    seasonNumber: "{{ .Query.Season }}"
@@ -83,7 +83,6 @@ search:
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
-    page: 1

  keywordsfilters:
    - name: re_replace
@@ -92,8 +91,6 @@ search:
  rows:
    selector: data
    attribute: attributes
-    count:
-      selector: meta.total

  fields:
    category:
--- a/src/Jackett.Common/Definitions/diablotorrent.yml
+++ b/src/Jackett.Common/Definitions/diablotorrent.yml
@@ -65,6 +65,7 @@ login:
    rhash: 123
  test:
    path: browse
+    selector: a[href*="logout"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/digitalcore.yml
+++ b/src/Jackett.Common/Definitions/digitalcore.yml
@@ -71,6 +71,10 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: p2p_releases_only
+    type: checkbox
+    label: Search P2P releases only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
@@ -109,6 +113,7 @@ search:
    index: 0
    limit: 100
    order: "{{ .Config.type }}"
+    p2p: "{{ if .Config.p2p_releases_only }}true{{ else }}{{ end }}"
    page: search
    searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }} {{ else }}{{ end }}{{ .Keywords }}"
    section: all
--- a/src/Jackett.Common/Definitions/dimeadozen.yml
+++ b/src/Jackett.Common/Definitions/dimeadozen.yml
@@ -1,9 +1,9 @@
 ---
 id: dimeadozen
 name: DimeADozen
-description: "DimeADozen (EzTorrent) is a Semi-Private Torrent Tracker for BOOTLEG MUSIC"
+description: "DimeADozen (EzTorrent) is a Private Torrent Tracker for BOOTLEG MUSIC"
 language: en-GB
-type: semi-private
+type: private
 encoding: UTF-8
 links:
  - http://www.dimeadozen.org/ # site does not support https ERR_CONNECTION_REFUSED
--- a/src/Jackett.Common/Definitions/discfan.yml
+++ b/src/Jackett.Common/Definitions/discfan.yml
@@ -84,7 +84,7 @@ login:
        selector: td.text
  test:
    path: index.php
-    selector: a[href^="userdetails.php?id="]
+    selector: a[href*="userdetails.php?id="]

 search:
  paths:
@@ -184,4 +184,4 @@ search:
          args: "cat={{ .Result._cat }} - "
    minimumratio:
      text: 0.9
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP v1.8.4 2023-06-16
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -92,6 +92,7 @@ login:
    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
+    selector: a[href="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/dreamtracker.yml
+++ b/src/Jackett.Common/Definitions/dreamtracker.yml
@@ -92,6 +92,7 @@ caps:
    - {id: 117, cat: Audio, desc: "Compact Disc Club"}
    - {id: 20, cat: Audio/Video, desc: "Music Videos"}
    - {id: 118, cat: Audio, desc: "Dream Radio Music"}
+    - {id: 124, cat: Movies, desc: "VIP Movies"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/drugari.yml
+++ b/src/Jackett.Common/Definitions/drugari.yml
@@ -0,0 +1,216 @@
+---
+id: drugari
+name: Drugari
+description: "Drugari is a CROATIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: hr-HR
+type: private
+encoding: UTF-8
+links:
+  - http://drugari.org/ # does not support https, ERR_CONNECTION_CLOSED
+
+caps:
+  categorymappings:
+    - {id: 3, cat: TV/Anime, desc: "ANIMIRANI"}
+    - {id: 4, cat: PC, desc: "Appz"}
+    - {id: 1, cat: Movies, desc: "BEZ PRAVILA"}
+    - {id: 39, cat: Movies, desc: "BEZ PREVODA"}
+    - {id: 41, cat: Movies, desc: "BEZ PREVODA Filmovi"}
+    - {id: 40, cat: TV, desc: "BEZ PREVODA Serije"}
+    - {id: 7, cat: TV/Documentary, desc: "DOKUMENTARNI"}
+    - {id: 18, cat: Movies, desc: "DOMACI FILMOVI"}
+    - {id: 49, cat: Movies, desc: "DOMACI FILMOVI Predstava"}
+    - {id: 10, cat: Movies/DVD, desc: "DVD FILMOVI"}
+    - {id: 37, cat: TV, desc: "Emisije"}
+    - {id: 8, cat: Movies, desc: "FILM"}
+    - {id: 34, cat: Movies, desc: "FILM Kolekcije"}
+    - {id: 56, cat: Movies, desc: "FILM Kratki"}
+    - {id: 48, cat: Movies, desc: "FILM Ruski Film"}
+    - {id: 23, cat: Movies/SD, desc: "FILM TS"}
+    - {id: 24, cat: Movies, desc: "FILM TV RIP"}
+    - {id: 38, cat: Movies, desc: "FILM- Western"}
+    - {id: 22, cat: Movies/HD, desc: "FILM x264/x265-Filmovi"}
+    - {id: 21, cat: Movies/SD, desc: "FILM XviD/Strani Filmovi"}
+    - {id: 15, cat: Console, desc: "IGRE"}
+    - {id: 19, cat: Books, desc: "KNJIGE"}
+    - {id: 53, cat: Audio/Audiobook, desc: "KNJIGE Audio"}
+    - {id: 52, cat: Books/Mags, desc: "KNJIGE Casopisi"}
+    - {id: 55, cat: Books/EBook, desc: "KNJIGE pdf"}
+    - {id: 14, cat: Audio, desc: "MUZIKA"}
+    - {id: 50, cat: Audio, desc: "MUZIKA Domaca Diskografija"}
+    - {id: 29, cat: Audio, desc: "MUZIKA DVD Muzika"}
+    - {id: 33, cat: Audio/Lossless, desc: "MUZIKA FLAC"}
+    - {id: 35, cat: Audio, desc: "MUZIKA Karaoke"}
+    - {id: 32, cat: Audio/MP3, desc: "MUZIKA MP3"}
+    - {id: 31, cat: Audio/Other, desc: "MUZIKA Muzika Ostalo"}
+    - {id: 51, cat: Audio, desc: "MUZIKA Strana Diskografija"}
+    - {id: 30, cat: Audio/Video, desc: "MUZIKA Video Muzika"}
+    - {id: 11, cat: Other, desc: "RAZNO"}
+    - {id: 20, cat: TV, desc: "SERIJE"}
+    - {id: 27, cat: TV, desc: "SERIJE Domace Serije"}
+    - {id: 54, cat: TV, desc: "SERIJE Ruske Serije"}
+    - {id: 28, cat: TV, desc: "SERIJE Strane Serije"}
+    - {id: 16, cat: Other, desc: "SLIKE"}
+    - {id: 12, cat: TV/Sport, desc: "SPORT"}
+    - {id: 6, cat: Other, desc: "STRANI TORENTI"}
+    - {id: 5, cat: Other, desc: "STRIP"}
+    - {id: 13, cat: Other, desc: "UPUTSTVA"}
+    - {id: 25, cat: XXX, desc: "XXX"}
+    - {id: 47, cat: XXX, desc: "XXX XXX-Strip"}
+    - {id: 42, cat: TV, desc: "Za Decu"}
+    - {id: 43, cat: TV, desc: "Za Decu Edukativni Programi"}
+    - {id: 44, cat: Console, desc: "Za Decu Igrice"}
+    - {id: 45, cat: Books, desc: "Za Decu Knjige"}
+    - {id: 46, cat: Audio, desc: "Za Decu Muzika"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    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: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The Default is <i>30</i>.
+  - 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 read any new mail you may have received. You cannot browse torrents with unread mail outstanding."
+
+login:
+  path: login.php?
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img#regimage
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+  error:
+    - selector: table:contains("Greska")
+  test:
+    path: index.php
+    selector: a[href*="/logout.php?logouthash="]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href*="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    - path: browse.php
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "%"]
+  inputs:
+    do: search
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    # yes, no
+    include_dead_torrents: yes
+    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
+    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
+    # does not return imdb link in results
+
+  rows:
+    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title_default:
+      # is usually abbreaviated
+      selector: a[href*="/details.php?id="]
+    title:
+      # while still abbreviated, is usually longer than the default
+      selector: div.tooltip-content div
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    poster:
+      selector: img[src*="/torrents/images/"]
+      attribute: src
+    date:
+      selector: td:nth-child(2)
+      # auto adjusted by site account profile
+      filters:
+        - name: regexp
+          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    description:
+      # Wait: 4 h
+      # Cekanje: 4 h
+      selector: div.tooltip-content > div:last-child
+    downloadvolumefactor:
+      case:
+        img[src$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 1.1
+    minimumseedtime:
+      # 60 hours (as seconds = 60 x 60 x 60)
+      text: 216000
+# TS Special Edition v.8.0
--- a/src/Jackett.Common/Definitions/ebookbay.yml
+++ b/src/Jackett.Common/Definitions/ebookbay.yml
@@ -14,6 +14,7 @@ caps:
    - {id: "Action/Adventure", cat: Books/EBook, desc: "Action/Adventure"}
    - {id: "Animals", cat: Books/EBook, desc: "Animals"}
    - {id: "Arts", cat: Books/EBook, desc: "Arts"}
+    - {id: "Audio Books", cat: Audio/Audiobook, desc: "Audio Books"}
    - {id: "Beauty", cat: Books/EBook, desc: "Beauty"}
    - {id: "Business", cat: Books/EBook, desc: "Business"}
    - {id: "Certification", cat: Books/EBook, desc: "Certification"}
@@ -29,7 +30,7 @@ caps:
    - {id: "Fantasy", cat: Books/EBook, desc: "Fantasy"}
    - {id: "Gardening", cat: Books/EBook, desc: "Gardening"}
    - {id: "Health", cat: Books/EBook, desc: "Health"}
-    - {id: "Historical", cat: Books/EBook, desc: "Historical"}
+    - {id: "Historical Fiction", cat: Books/EBook, desc: "Historical Fiction"}
    - {id: "History", cat: Books/EBook, desc: "History"}
    - {id: "Horror", cat: Books/EBook, desc: "Horror"}
    - {id: "Humorous", cat: Books/EBook, desc: "Humorous"}
@@ -64,6 +65,7 @@ caps:
  modes:
    search: [q]
    book-search: [q]
+    music-search: [q]

 settings: []

@@ -92,7 +94,7 @@ search:
    - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"

  rows:
-    selector: "div#content > div.poststuff, div#content > div.poststuff + div.entry:has(a.download)"
+    selector: "div#content > div.poststuff:has(~ div.entry a.download), div#content > div.poststuff ~ div.entry:has(a.download)"
    after: 1

  fields:
@@ -101,8 +103,10 @@ search:
      optional: true
      default: Other
      filters:
+        - name: re_replace
+          args: ["(?i)\\bEbooks?\\b", ""]
        - name: regexp
-          args: "E book under:\\s+(.+?)\\s"
+          args: "E book under:\\s+(.+?)\\s?\\\xA0"
    title:
      selector: div.postname a
    details:
--- a/src/Jackett.Common/Definitions/electro-torrent.yml
+++ b/src/Jackett.Common/Definitions/electro-torrent.yml
@@ -6,6 +6,8 @@ language: pl-PL
 type: semi-private
 encoding: UTF-8
 links:
+  - https://electro-torrent.pl/
+legacylinks:
  - http://electro-torrent.pl/

 caps:
@@ -49,12 +51,20 @@ caps:
    book-search: [q]

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><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: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
  - name: multilang
    type: checkbox
    label: Replace MULTi by another language in release name
@@ -68,25 +78,17 @@ settings:
      MULTi POLISH: MULTi POLISH

 login:
-  path: logowanie
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[src^="img.php?size=3"]
-    input: vImageCodP
+  method: cookie
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: ""
-  error:
-    - selector: div#center-side:contains("Logowanie nie")
+    cookie: "{{ .Config.cookie }}"
  test:
    path: /
    selector: a[href$="/logout.php"]

 search:
  # http://electro-torrent.pl/szukaj.php?search=&typ=torrent&cat=0
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
  paths:
    - path: szukaj.php
  allowEmptyInputs: true
--- a/src/Jackett.Common/Definitions/elitetorrent-pl.yml
+++ b/src/Jackett.Common/Definitions/elitetorrent-pl.yml
@@ -1,153 +0,0 @@
---
-id: elitetorrent-pl
-name: EliteTorrent-pl
-description: "EliteTorrent-pl is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-PL
-type: semi-private
-encoding: UTF-8
-links:
-  - https://elitetorrent.pl/
-
-caps:
-  categorymappings:
-    - {id: 13, cat: Movies, desc: "Filmy"}
-    - {id: 1, cat: Movies, desc: "DivX - XviD"}
-    - {id: 6, cat: Movies, desc: "RMVB"}
-    - {id: 41, cat: Movies, desc: "VCD - SVCD"}
-    - {id: 11, cat: Movies, desc: "DVD-R"}
-    - {id: 38, cat: Movies, desc: "HDTV-HD-DVD"}
-    - {id: 46, cat: Movies, desc: "x 264"}
-    - {id: 47, cat: Movies, desc: "3D"}
-    - {id: 48, cat: Movies, desc: "4K"}
-    - {id: 56, cat: Movies, desc: "Seriale"}
-    - {id: 14, cat: PC/Games, desc: "Gry"}
-    - {id: 3, cat: PC/Games, desc: "Gry PC"}
-    - {id: 15, cat: Console, desc: "Gry Konsole"}
-    - {id: 51, cat: Books, desc: "Poradniki i inne"}
-    - {id: 17, cat: Audio, desc: "Muzyka"}
-    - {id: 18, cat: Audio, desc: "Albumy"}
-    - {id: 19, cat: Audio/Video, desc: "Teledyski/Koncerty"}
-    - {id: 20, cat: TV/Documentary, desc: "Dokumenty"}
-    - {id: 21, cat: Books/EBook, desc: "E-Booki"}
-    - {id: 50, cat: Audio/Audiobook, desc: "Audiobooki"}
-    - {id: 23, cat: Books/Comics, desc: "Komiksy"}
-    - {id: 52, cat: Books/Mags, desc: "Czasopisma"}
-    - {id: 40, cat: PC, desc: "Programy"}
-    - {id: 7, cat: PC/0day, desc: "Windows"}
-    - {id: 39, cat: PC/Mac, desc: "Linux + Macintosh"}
-    - {id: 31, cat: Other, desc: "Inne"}
-    - {id: 8, cat: Other, desc: "Dla Dzieci"}
-    - {id: 9, cat: TV/Sport, desc: "Sport"}
-    - {id: 44, cat: PC/Mobile-Other, desc: "GSM - PDA"}
-    - {id: 43, cat: TV/Anime, desc: "Manga - Anime"}
-    - {id: 42, cat: Other/Misc, desc: "Pozostałe - Różne"}
-    - {id: 49, cat: XXX, desc: "Erotyka"}
-    - {id: 5, cat: XXX/x264, desc: "Filmy"}
-    - {id: 53, cat: XXX/ImageSet, desc: "Zdjęcia"}
-    - {id: 54, cat: XXX/Other, desc: "Czasopisma erotyczne"}
-    - {id: 55, cat: XXX/Other, desc: "Gry erotyczne"}
-
-  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: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: POLISH
-    options:
-      POLISH: POLISH
-      MULTi POLISH: MULTIi POLISH
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrentów na stronę:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: form
-  form: form
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: font[color="#FF0000"]
-  test:
-    path: index.php
-    selector: a[href^="logout.php?check_hash="]
-
-search:
-  paths:
-    # https://elitetorrent.pl/torrents.php?erotyka=1&page=1
-    - path: torrents.php
-  inputs:
-    # does not support multi category selection. so using default for all
-    # $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    category: 0
-    search: "{{ .Keywords }}"
-    erotyka: 1
-    page: 1
-    # does not support sorting results, or imdbid searching, or have imdb in results
-
-  rows:
-    selector: table.lista[width="100%"]:not(table[align]) > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_phase1:
-      selector: a[href^="details.php?id="]
-    title_multilang:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
-        - name: re_replace
-          args: ["(?i)\\b(pl)\\b", "POLISH"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date:
-      selector: td:nth-child(6)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy HH:mm:ss"
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(9)
-    leechers:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/estone.yml
+++ b/src/Jackett.Common/Definitions/estone.yml
@@ -83,7 +83,8 @@ login:
          - name: replace
            args: ["\");", ""]
  test:
-    path: letoltes.php
+    path: index.php
+    selector: a[href="logout.php"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/extratorrent-st.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-st.yml
@@ -7,14 +7,12 @@ type: public
 encoding: UTF-8
 links:
  - https://extratorrent.st/
-  - https://extratorrent.unblockit.click/
-  - https://extratorrent.mrunblock.guru/
+  - https://extratorrent.unblockit.rsvp/
+  - https://extratorrent.mrunblock.bond/
+  - https://extratorrent.nocensor.click/
 legacylinks:
  - https://extratorrent.nocensor.work/
-  - https://extratorrent.unblockit.how/
-  - https://extratorrent.unblockit.cam/
  - https://extratorrent.nocensor.biz/
-  - https://extratorrent.unblockit.day/
  - https://extratorrent.unblockit.llc/
  - https://extratorrent.unblockit.blue/
  - https://extratorrent.unblockit.name/
@@ -31,6 +29,11 @@ legacylinks:
  - https://extratorrent.nocensor.art/
  - https://extratorrent.unblockit.bio/
  - https://extratorrent.unblockit.boo/
+  - https://extratorrent.mrunblock.guru/
+  - https://extratorrent.unblockit.click/
+  - https://extratorrent.unblockit.asia/
+  - https://extratorrent.unblockit.mov/
+  - https://extratorrent.mrunblock.life/

 caps:
  categorymappings:
@@ -97,7 +100,7 @@ search:
      args: ["[\\s]+", "."]

  rows:
-    selector: tr[class^="tl"]
+    selector: tr[class^="tl"]:has(a[href^="magnet:?xt="])
    filters:
      - name: andmatch

--- a/src/Jackett.Common/Definitions/exttorrents.yml
+++ b/src/Jackett.Common/Definitions/exttorrents.yml
@@ -9,13 +9,14 @@ requestDelay: 5
 links:
  - https://ext.to/
  - https://search.extto.com/
-  - https://extranet.torrentbay.to/
+  - https://extranet.torrentbay.net/
 legacylinks:
  - https://ext.unblockninja.com/
  - https://t.extto.com/
  - https://torrent.extto.com/
  - https://site.extto.com/
  - https://ext.torrentbay.to/
+  - https://extranet.torrentbay.to/

 caps:
  categorymappings:
@@ -122,6 +123,8 @@ search:
    category:
      selector: td:nth-child(1) div div a:last-child
      attribute: href
+      optional: true
+      default: "/other/"
    title:
      selector: td:nth-child(1) div a
    details:
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -13,15 +13,15 @@ links:
  - https://eztv.yt/
  - https://eztv1.xyz/
  - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.click/
-  - https://eztv.mrunblock.guru/
+  - https://eztv.unblockit.rsvp/
+  - https://eztv.mrunblock.bond/
+  - https://eztv.nocensor.click/
 legacylinks:
  - https://eztv.ag/ # redirects to .re
  - https://eztv.it/ # redirects to .re
  - https://eztv.ch/ # redirects to .re
  - https://eztv.io/
  - https://eztv.nocensor.biz/
-  - https://eztv.unblockit.day/
  - https://eztv.unblockit.llc/
  - https://eztv.unblockit.blue/
  - https://eztv.unblockit.name/
@@ -38,6 +38,11 @@ legacylinks:
  - https://eztv.nocensor.art/
  - https://eztv.unblockit.bio/
  - https://eztv.unblockit.boo/
+  - https://eztv.mrunblock.guru/
+  - https://eztv.unblockit.click/
+  - https://eztv.unblockit.asia/
+  - https://eztv.unblockit.mov/
+  - https://eztv.mrunblock.life/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/fanoin.yml
+++ b/src/Jackett.Common/Definitions/fanoin.yml
@@ -92,6 +92,7 @@ login:
    - selector: td.embedded:has(h2:contains("failed"))
  test:
    path: browse_old.php
+    selector: a[href="logout.php"]

 search:
  paths:
--- a/Show More
+++ b/Show More