myspleen: switch to cookie method. #15869

Update rudub.yml
aussierules: fixed default value for include dead torrents
2025-12-19 12:58:04 +01:00 · 2025-02-23 05:53:41 +13:00 · 2025-02-23 05:17:22 +13:00 · 2025-02-22 00:34:14 +02:00 · 2025-02-22 07:43:55 +13:00 · 2025-02-22 07:42:04 +13:00
276 changed files with 6054 additions and 7016 deletions
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 #### Supported Systems
 * Windows 10 Version 1607+ or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#windows)
 * Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux)
-* macOS 12.0+ (Monterey) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos)
+* macOS 13.0+ (Ventura) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos)

 #### Supported Trackers
 <details> <summary> <b> Supported Public Trackers </b> </summary>
@@ -33,15 +33,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ACG.RIP
 * Anidex
 * AniLibria
+ * Anime Time
 * Anime Tosho
 * AniRena
 * AniSource
+ * ApacheTorrent
 * AudioBook Bay (ABB)
 * Badass Torrents
 * Bangumi Moe
 * BigFANGroup
 * BitRu
 * BitSearch
+ * BluDV
 * BlueRoms
 * BT.etree
 * BTdirectory (BT目录)
@@ -62,9 +65,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * EXT Torrents
 * ExtraTorrent.st
 * EZTV
- * Frozen Layer
+ * FilmesHdTorrent
 * GamesTorrents
- * GkTorrent
 * GloDLS
 * GTorrent.pro
 * Idope
@@ -76,6 +78,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * kickasstorrents.to
 * kickasstorrents.ws
 * Knaben
+ * LAPUMiA
 * LePorno.info
 * Libronube
 * LimeTorrents
@@ -88,31 +91,29 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * MixTapeTorrent
 * MoviesDVDR
 * MyPornClub
- * Myporno
 * Newstudio
 * Nipponsei
- * NNTT
 * NoNaMe Club (NNM-Club)
+ * NorTorrent
 * Nyaa.si
+ * NyaaPantsu
 * OneJAV
 * OxTorrent
 * OxTorrent-vip
 * OpenSharing
- * ParnuXi
 * PC-torrent
 * PornoTorrent
 * PornRips
 * Postman
 * ProPorn
 * Rapidzona
+ * RedeTorrent
 * RinTorNeT
 * RuTor
 * RuTracker.RU
- * Seedoff
 * Sexy-Pics
 * Shana Project
 * ShowRSS
- * SimpleAnime
 * Solid Torrents
 * sosulki
 * SubsPlease
@@ -127,16 +128,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * torrent.by
 * torrent-pirat
 * Torrent9
- * Torrent9-tel
 * TorrentFunk
+ * TorrentDosFilmes
 * TorrentDownload
+ * TorrentGalaxy
 * TorrentKitty
 * TorrentProject2
 * TorrentQQ (토렌트큐큐)
 * Torrents.csv
 * TorrentSir (토렌트썰)
 * TorrentView (토렌트뷰)
- * TorrentWhiz (토렌트위즈)
 * Torrentz2nz
 * TrahT
 * truPornolabs
@@ -152,11 +153,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * YourBittorrent
 * YTS.ag
 * zetorrents
+ * ZkTorrent
 </details>

 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>

 * AniDUB
+ * Anime Time (login)
 * AnimeLayer
 * ArenaBG
 * Best-Torrents [PAY2DL]
@@ -200,6 +203,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * NetHD (VietTorrent)
 * Newstudio (login)
 * NoNaMe Club (NNM-Club) (login)
+ * Polskie-Torrenty
 * PornoLab
 * PussyTorrents
 * Rainbow Tracker
@@ -230,8 +234,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht

 * 0day.kiev
 * 1ptbar
- * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
- * 3ChangTrai (3CT)
+ * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
 * 3D Torrents (3DT)
 * 4thD (4th Dimension) [![(invite needed)][inviteneeded]](#)
 * 52PT
@@ -275,7 +278,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Bitpalace
 * BitPorn
 * Bitspyder
- * BitStream
 * BitTorrentFiles
 * BiTTuRK
 * BJ-Share (BJ) [![(invite needed)][inviteneeded]](#)
@@ -295,19 +297,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * CapybaraBR
 * Carp-Hunter
 * Carpathians
- * CarPT
+ * CarPT [![(invite needed)][inviteneeded]](#)
 * Cathode-Ray.Tube (CRT)
 * CD File
 * CeskeForum
 * CGPeers [![(invite needed)][inviteneeded]](#)
 * CHDBits [![(invite needed)][inviteneeded]](#)
 * ChileBT
- * CineClassics
 * Cinemageddon [![(invite needed)][inviteneeded]](#)
 * CinemaMovieS_ZT
 * Cinematik
 * CinemaZ (EuTorrents)
- * Classix
 * Coastal-Crew
 * ConCen [![(invite needed)][inviteneeded]](#)
 * Concertos
@@ -320,8 +320,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Dark-Shadow
 * Das Unerwartete (D-U)
 * DataScene (DS)
- * DenOfSimps (DoS)
- * DesiTorrents
+ * DesiTorrents [![(invite needed)][inviteneeded]](#)
 * Diablo Torrent
 * DICMusic [![(invite needed)][inviteneeded]](#)
 * DigitalCore
@@ -329,10 +328,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * DiscFan [![(invite needed)][inviteneeded]](#)
 * DivTeam
 * DocsPedia
- * Dream Tracker [![(invite needed)][inviteneeded]](#)
 * Drugari
 * Ebooks-Shares [![(invite needed)][inviteneeded]](#)
 * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
+ * eMuwarez
 * Enthralled
 * eShareNet
 * eStone (BigTorrent)
@@ -341,24 +340,24 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ExtremeBits
 * F1Carreras
 * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastiko [![(invite needed)][inviteneeded]](#)
 * Fappaizuri
 * FearNoPeer
 * Femdomcult
 * FileList (FL)
- * FinElite (FE)
+ * FinElite (FE) [![(invite needed)][inviteneeded]](#)
 * FinVip
 * Flux-Zone
 * Free Farm (自由农场)
 * FSM
 * FunFile (FF)
- * FunkyTorrents (FT)
+ * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
 * FutureTorrent
 * Fuzer (FZ)
 * Gay-Torrents.org
 * GAYtorrent.ru
 * GazelleGames (GGn)
- * Generation-Free
+ * Generation-Free [![(invite needed)][inviteneeded]](#)
+ * GGPT
 * GigaTorrents
 * GimmePeers (formerly ILT)
 * GiroTorrent
@@ -366,26 +365,24 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HaiDan
 * Hǎitáng (海棠PT)
 * HappyFappy
- * Hares Club (白兔俱乐部) [![(invite needed)][inviteneeded]](#)
 * Hawke-uno
- * HD Dolby
+ * HD Dolby [![(invite needed)][inviteneeded]](#)
 * HD Zero
 * HD-Club [![(invite needed)][inviteneeded]](#)
- * HD-Forever (HDF) [![(invite needed)][inviteneeded]](#)
+ * HD-Forever (HDF)
 * HD-Olimpo [![(invite needed)][inviteneeded]](#)
 * HD-Only (HDO)
 * HD-Space (HDS)
- * HD-Torrents (HDT) [![(invite needed)][inviteneeded]](#)
+ * HD-Torrents (HDT)
 * HD-UNiT3D
- * HD4FANS [![(invite needed)][inviteneeded]](#)
 * HDArea (HDA)
 * HDAtmos
 * HDBits [![(invite needed)][inviteneeded]](#)
 * HDCiTY (HDC) [![(invite needed)][inviteneeded]](#)
+ * HDClone
 * HDFans
 * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
 * HDKylin (麒麟)
- * HDPT (明教) [![(invite needed)][inviteneeded]](#)
 * HDRoute [![(invite needed)][inviteneeded]](#)
 * HDSky [![(invite needed)][inviteneeded]](#)
 * HDT-LaFenice
@@ -397,11 +394,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Hebits
 * HellasHut
 * HHanClub
+ * HHD
 * HomePornTorrents (HPT)
 * House of Devil
 * HUDBT (蝴蝶) [![(invite needed)][inviteneeded]](#)
 * iAnon
- * ICC2022 (冰淇淋)
+ * ICC2022 (冰淇淋) [![(invite needed)][inviteneeded]](#)
 * ilolicon PT
 * ImmortalSeed (iS)
 * Immortuos
@@ -419,8 +417,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * KamePT [![(invite needed)][inviteneeded]](#)
 * Karagarga [![(invite needed)][inviteneeded]](#)
 * Keep Friends [![(invite needed)][inviteneeded]](#)
- * Kelu
- * KIMOJI
+ * Kelu [![(invite needed)][inviteneeded]](#)
 * Korsar [![(invite needed)][inviteneeded]](#)
 * KrazyZone
 * Kufei (库非)
@@ -433,7 +430,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Le-Cinephile
 * LearnBits
 * LearnFlakes
- * Leech24
+ * LemonHD [![(invite needed)][inviteneeded]](#)
 * Lesbians4u
 * Libble
 * LibraNet (LN)
@@ -441,7 +438,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Locadora
 * LosslessClub [![(invite needed)][inviteneeded]](#)
 * LST
- * LustHive
 * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
 * MaDs Revolution
 * Majomparádé (TurkDepo)
@@ -464,7 +460,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Nebulance (NBL) (TransmiTheNet)
 * NewHeaven (TorrentHeavenResurrection) [![(invite needed)][inviteneeded]](#)
 * NicePT
+ * Nirvana
 * NorBits
+ * NordicQuality
 * Ntelogo
 * Nusanta(RA.RE)
 * OKPT
@@ -512,19 +510,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * R3V WTF! [![(invite needed)][inviteneeded]](#)
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
+ * Rain
 * RareShare2
 * Red Leaves (红叶) [![(invite needed)][inviteneeded]](#)
 * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
 * Redacted (PassTheHeadphones)
- * RedBits
 * ReelFlix
- * Resurrect The Net [![(invite needed)][inviteneeded]](#)
 * RetroFlix
 * RevolutionTT [![(invite needed)][inviteneeded]](#)
+ * RocketHD
 * Romanian Metal Torrents (RMT)
 * RoTorrent
 * Rousi
- * RPTScene (RPTorrents)
+ * SAMARITANO
 * SATClubbing
 * SceneHD [![(invite needed)][inviteneeded]](#)
 * SceneRush
@@ -537,7 +535,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Shazbat
 * SiamBIT
 * SnowPT (SSPT)
- * SoulVoice (聆音Club)
+ * SoulVoice (聆音Club) [![(invite needed)][inviteneeded]](#)
 * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
 * SpeedCD
 * Speedmaster HD [![(invite needed)][inviteneeded]](#)
@@ -554,22 +552,21 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TeamOS
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * teracod (Movie Zone)
- * TGay
 * The Crazy Ones
 * The Falling Angels (TFA)
 * The Geeks
+ * The Kitchen
 * The New Retro
- * The Occult [![(invite needed)][inviteneeded]](#)
+ * The Occult
 * The Old School
 * The Paradiese
 * The Place [![(invite needed)][inviteneeded]](#)
- * The Shinning (TsH)
 * The Show
- * The Vault [![(invite needed)][inviteneeded]](#)
+ * The Vault
 * The-New-Fun
 * TheEmpire (TE)
 * TheLeachZone (TLZ)
- * TheScenePlace (TSP)
+ * ThePiratedShip
 * TJUPT (北洋园PT)
 * TLFBits [![(invite needed)][inviteneeded]](#)
 * TmGHuB [![(invite needed)][inviteneeded]](#)
@@ -578,7 +575,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Tornado
 * Torrent Heaven (Dutch)
 * Torrent Network (TN)
- * Torrent Sector Crew (TSC)
 * Torrent Trader [![(invite needed)][inviteneeded]](#)
 * Torrent-Explosiv
 * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
@@ -590,18 +586,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentDay (TD)
 * TorrentDD
 * Torrenteros (TTR)
- * TorrentHR [![(invite needed)][inviteneeded]](#)
+ * TorrentHR
 * Torrenting (TT)
 * Torrentland
 * TorrentLeech (TL)
- * TorrentLeech.pl
+ * TorrentLeech.pl [![(invite needed)][inviteneeded]](#)
 * TorrentSeeds (TS)
 * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
 * TrackerMK
 * TranceTraffic
 * Trellas (Magico) [![(invite needed)][inviteneeded]](#)
 * TreZzoR
- * TurkNova
 * TurkSeed
 * TurkTorrent (TT)
 * TV Chaos UK (TVCUK)
@@ -618,21 +613,21 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Vault network
 * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
 * White Angel
- * WinterSakura
+ * WinterSakura [![(invite needed)][inviteneeded]](#)
 * World-In-HD [![(invite needed)][inviteneeded]](#)
- * World-of-Tomorrow
+ * World-of-Tomorrow [![(invite needed)][inviteneeded]](#)
 * Wukong (悟空问道)
 * x-ite.me (XM)
 * Xider-Torrent
- * XperienceBytes (XPB)
 * XSpeeds (XS)
 * Xthor [![(invite needed)][inviteneeded]](#)
- * xTorrenty
+ * xTorrenty [![(invite needed)][inviteneeded]](#)
 * XtremeBytes
 * XWT-Classics
 * XWTorrents (XWT)
 * YggTorrent (YGG)
 * YOiNKED
+ * YUSCENE
 * Zamunda.net
 * Zelka.org
 * ZmPT (织梦)
@@ -666,17 +661,17 @@ t=book:
 Examples:

 ```
-.../api?apikey=APIKEY&t=search&cat=1,3&q=Show+Title+S01E02
+.../api?apikey=APIKEY&t=search&cat=100002,100003&q=Show+Title+S01E02

-.../api?apikey=APIKEY&t=tvsearch&cat=1,3&q=Show+Title&season=1&ep=2
-.../api?apikey=APIKEY&t=tvsearch&cat=1,3&genre=comedy&season=2023&ep=02/13
+.../api?apikey=APIKEY&t=tvsearch&cat=5000&q=Show+Title&season=1&ep=2
+.../api?apikey=APIKEY&t=tvsearch&cat=5040,5045&genre=comedy&season=2023&ep=02/13

-.../api?apikey=APIKEY&t=movie&cat=2&q=Movie+Title&year=2023
-.../api?apikey=APIKEY&t=movie&cat=2&imdbid=tt1234567
+.../api?apikey=APIKEY&t=movie&cat=100001&q=Movie+Title&year=2023
+.../api?apikey=APIKEY&t=movie&cat=2000&imdbid=tt1234567

-.../api?apikey=APIKEY&t=music&cat=4&album=Title&artist=Name
+.../api?apikey=APIKEY&t=music&cat=100004&album=Title&artist=Name

-.../api?apikey=APIKEY&t=book&cat=5,6&genre=horror&publisher=Stuff
+.../api?apikey=APIKEY&t=book&cat=100005,100006&genre=horror&publisher=Stuff
 ```

 ### Filter indexers
@@ -722,17 +717,18 @@ Using the "all" indexer has no advantages (besides reduced management overhead),
 To get all Jackett indexers including their capabilities you can use `t=indexers` on the "all" indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.

 ## Installation on Windows
-We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
+We recommend you install Jackett as a Windows service using the supplied [Windows installer](https://github.com/Jackett/Jackett/releases/latest/download/Jackett.Installer.Windows.exe). You may also download the [zipped version](https://github.com/Jackett/Jackett/releases/latest/download/Jackett.Binaries.Windows.zip) if you would like to configure everything manually.

 To get started with using the installer for Jackett, follow the steps below:

 1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net80#dependencies
-2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
-3. When prompted if you would like this app to make changes to your computer, select "yes".
-4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
-5. Once the installation has finished, check the "Launch Jackett" box to get started.
-6. Navigate your web browser to http://127.0.0.1:9117
-7. You're now ready to begin adding your trackers and using Jackett.
+2. Download the latest version of the [Windows installer](https://github.com/Jackett/Jackett/releases/latest/download/Jackett.Installer.Windows.exe)
+3. Run the Jackett.Installer.Windows.exe program.
+4. When prompted if you would like this app to make changes to your computer, select "yes".
+5. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
+6. Once the installation has finished, check the "Launch Jackett" box to get started.
+7. Navigate your web browser to http://127.0.0.1:9117
+8. You're now ready to begin adding your trackers and using Jackett.

 When installed as a service the tray icon acts as a way to open/start/stop Jackett. If you opted to not install it as a service then Jackett will run its web server from the tray tool.

@@ -803,7 +799,7 @@ On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chri
 ## Installation on macOS

 ### Prerequisites
-macOS 12.0+ (Monterey) or greater
+macOS 13.0+ (Ventura) or greater

 ### Install as service
 1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
--- a/src/Jackett.Common/Definitions/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -5,23 +5,41 @@ description: "1ptbar is a CHINESE Private Torrent Tracker for MOVIES / TV / E-LE
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
  - https://1ptba.com/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movie(電影)"}
-    - {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: "Music Videos(音樂短片/演唱會)"}
-    - {id: 407, cat: TV/Sport, desc: "Sports(體育賽事)"}
-    - {id: 408, cat: Audio, desc: "HQ Audio(高品质音频)"}
-    - {id: 410, cat: PC/0day, desc: "Software(軟體)"}
-    - {id: 411, cat: PC/Games, desc: "Games(電子遊戲)"}
-    - {id: 412, cat: Books/EBook, desc: "eBook(電子書)"}
-    - {id: 409, cat: Other, desc: "Misc(其他)"}
+    - {id: 401, cat: Movies, desc: "Movie(電影)", 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/Video, desc: "Music Videos(音樂短片/演唱會)", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports(體育賽事)", default: true}
+    - {id: 408, cat: Audio, desc: "HQ Audio(高品质音频)", default: true}
+    - {id: 410, cat: PC/0day, desc: "Software(軟體)", default: true}
+    - {id: 411, cat: PC/Games, desc: "Games(電子遊戲)", default: true}
+    - {id: 412, cat: Books/EBook, desc: "eBook(電子書)", default: true}
+    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
+    - {id: 610, cat: XXX/x264, desc: "AV(有碼)/HD Censored", default: false}
+    - {id: 611, cat: XXX/x264, desc: "AV(無碼)/HD Uncensored", default: false}
+    - {id: 612, cat: XXX/SD, desc: "AV(有碼)/SD Censored", default: false}
+    - {id: 613, cat: XXX/SD, desc: "AV(無碼)/SD Uncensored", default: false}
+    - {id: 614, cat: XXX/DVD, desc: "AV(無碼)/DVDiSo Uncensored", default: false}
+    - {id: 615, cat: XXX/DVD, desc: "AV(有碼)/DVDiSo Censored", default: false}
+    - {id: 616, cat: XXX/UHD, desc: "AV(有碼)/Blu-Ray Censored", default: false}
+    - {id: 617, cat: XXX/UHD, desc: "AV(無碼)/Blu-Ray Uncensored", default: false}
+    - {id: 618, cat: XXX/Pack, desc: "AV(網站)/0Day", default: false}
+    - {id: 619, cat: XXX/Pack, desc: "IV(寫真影集)/Video Collection", default: false}
+    - {id: 620, cat: XXX/ImageSet, desc: "IV(寫真圖集)/Picture Collection", default: false}
+    - {id: 621, cat: XXX/Other, desc: "H-Game(遊戲)", default: false}
+    - {id: 622, cat: XXX/Other, desc: "H-Anime(動畫)", default: false}
+    - {id: 623, cat: XXX/Other, desc: "H-Comic(漫畫)", default: false}
+    - {id: 624, cat: XXX/Other, desc: "Adult film(成人電影)", default: false}
+    - {id: 625, cat: XXX/Other, desc: "AV(Gay)/HD", default: false}

  modes:
    search: [q]
@@ -74,6 +92,10 @@ settings:
    type: info
    label: Account Inactivity
    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+  - name: info_special
+    type: info
+    label: Special Categories
+    default: "Only <b>Power User</b> or above can view Special section. Searching for XXX categories by users below this class will result in search errors."

 login:
  path: login.php
@@ -101,6 +123,9 @@ login:
 search:
  paths:
    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 410, 411, 412, 409]
+    - path: special.php
+      categories: [610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625]
  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 }}"
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/src/Jackett.Common/Definitions/2fast4you.yml
@@ -1,227 +0,0 @@
---
-id: 2fast4you
-name: 2 Fast 4 You
-description: "2 Fast 4 You is a FRENCH Private site for TV / MOVIES / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://2f4y.me/
-legacylinks:
-  - http://www.2f4y.me/
-  - https://www.2f4y.me/
-
-caps:
-  categorymappings:
-    - {id: 10, cat: TV/Anime, desc: "Animation: HD720P"}
-    - {id: 11, cat: TV/Anime, desc: "Animation: HD1080P"}
-    - {id: 56, cat: TV/Anime, desc: "Animation: DVDRip"}
-    - {id: 18, cat: PC/0day, desc: "Applications: PC"}
-    - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
-    - {id: 17, cat: PC/0day, desc: "Applications: Autres"}
-    - {id: 67, cat: TV, desc: "Autres: Emission TV"}
-    - {id: 68, cat: TV/Sport, desc: "Autres: Sport"}
-    - {id: 40, cat: Other, desc: "Autres: Autres"}
-    - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
-    - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
-    - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip"}
-    - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
-    - {id: 50, cat: Books, desc: "E-Books: Manuel Français"}
-    - {id: 49, cat: Books, desc: "E-Books: Manuel Anglais"}
-    - {id: 36, cat: Books, desc: "E-Books: Livres Français"}
-    - {id: 53, cat: Books, desc: "E-Books: Livre Anglais"}
-    - {id: 52, cat: Books, desc: "E-Books: Revue - Journaux"}
-    - {id: 51, cat: Books, desc: "E-Books: BD"}
-    - {id: 95, cat: Movies, desc: "Films: Film Divx XviD"}
-    - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 71, cat: Movies/WEB-DL, desc: "Films: WEB-DL"}
-    - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 72, cat: Movies/SD, desc: "Films: TVRip/HDTV"}
-    - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
-    - {id: 57, cat: Movies/SD, desc: "Films: TS/CAM"}
-    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
-    - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
-    - {id: 1, cat: Movies/HD, desc: "Films: HD720P"}
-    - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
-    - {id: 90, cat: Movies/HD, desc: "Films: HD X265"}
-    - {id: 92, cat: Movies/HD, desc: "Films: 4K"}
-    - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
-    - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
-    - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
-    - {id: 91, cat: Movies/HD, desc: "Films: RemuX"}
-    - {id: 89, cat: Movies/HD, desc: "Films: BD/BR Rip"}
-    - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
-    - {id: 97, cat: Movies, desc: "Films: Cours Métrage"}
-    - {id: 79, cat: TV/Anime, desc: "Mangas: HD"}
-    - {id: 81, cat: TV/Anime, desc: "Mangas: HD VOSTFR"}
-    - {id: 85, cat: TV/Anime, desc: "Mangas: Web-DL"}
-    - {id: 86, cat: TV/Anime, desc: "Mangas: TV-RIP"}
-    - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
-    - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
-    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
-    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
-    - {id: 96, cat: Audio/MP3, desc: "Musique: PlayList MP3"}
-    - {id: 94, cat: Audio, desc: "Musique: Podcast"}
-    - {id: 58, cat: Audio, desc: "Musique: Concert"}
-    - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
-    - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
-    - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
-    - {id: 12, cat: TV/Anime, desc: "Serie TV: Animation"}
-    - {id: 74, cat: TV, desc: "Serie TV: TVRip"}
-    - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
-    - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
-    - {id: 98, cat: TV/Anime, desc: "Serie TV: Manga VOSTFR"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTi FRENCH: MULTi FRENCH
-      ENGLISH: ENGLISH
-      MULTi ENGLISH: MULTi ENGLISH
-      VOSTFR: VOSTFR
-      MULTi VOSTFR: MULTi VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR and SUBFRENCH with ENGLISH
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: order
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: form:contains("Erreur")
-      message:
-        selector: form
-        remove: table
-  test:
-    path: torrents-search.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 any, 1 French, 2 English, 3 Multi, 4-8 32-41
-    lang: 0
-    sort: "{{ .Config.sort}}"
-    order: "{{ .Config.order}}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["^$", "%"] # replace empty search string with %
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr[class^="t-row"]
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_phase1:
-      selector: a[href^="torrents-details.php?id="]
-      filters:
-        - name: replace
-          args: [" - (Nouveau!)", ""]
-    title_vostfr:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
-    title_phase2:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["torrents-details.php", "download.php"]
-    poster:
-      selector: img.rounded-img
-      attribute: src
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    date:
-      text: now
-    downloadvolumefactor:
-      case:
-        img[title="freeleech"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "*": 1
-    minimumratio:
-      text: 0.75
-# engine n/a
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -173,7 +173,7 @@ search:
        img.pro_2up: 2
        "*": 1
    minimumratio:
-      text: 1
+      text: 1.1
    minimumseedtime:
      # 1 day (as seconds = 24 x 60 x 60)
      text: 86400
--- a/src/Jackett.Common/Definitions/abtorrents.yml
+++ b/src/Jackett.Common/Definitions/abtorrents.yml
@@ -13,58 +13,52 @@ links:
 caps:
  categorymappings:
    - {id: 10, cat: Audio/Audiobook, desc: "Action/Adventure"}
+    - {id: 80, cat: Audio/Audiobook, desc: "Adult/Erotica"}
    - {id: 20, cat: Audio/Audiobook, desc: "Biography/Memoirs"}
    - {id: 30, cat: Audio/Audiobook, desc: "Business "}
    - {id: 40, cat: Audio/Audiobook, desc: "Childrens"}
-    - {id: 50, cat: Audio/Audiobook, desc: "Humor (Comedy)"}
-    - {id: 60, cat: Audio/Audiobook, desc: "Comics"}
    - {id: 70, cat: Audio/Audiobook, desc: "Computers "}
-    - {id: 80, cat: Audio/Audiobook, desc: "Adult/Erotica"}
+    - {id: 260, cat: Audio/Audiobook, desc: "Crime/Thriller/Mystery"}
    - {id: 90, cat: Audio/Audiobook, desc: "Fantasy-General"}
    - {id: 100, cat: Audio/Audiobook, desc: "Fantasy-Youth"}
    - {id: 110, cat: Audio/Audiobook, desc: "Files"}
-    - {id: 120, cat: Audio/Audiobook, desc: "Foreign Language"}
    - {id: 130, cat: Audio/Audiobook, desc: "General Fiction"}
    - {id: 140, cat: Audio/Audiobook, desc: "Historical Fiction"}
    - {id: 150, cat: Audio/Audiobook, desc: "History"}
    - {id: 160, cat: Audio/Audiobook, desc: "Horror"}
+    - {id: 50, cat: Audio/Audiobook, desc: "Humor (Comedy)"}
    - {id: 170, cat: Audio/Audiobook, desc: "Literature"}
    - {id: 175, cat: Audio/Audiobook, desc: "LitRPG"}
    - {id: 180, cat: Audio/Audiobook, desc: "Mystery "}
    - {id: 190, cat: Audio/Audiobook, desc: "Non-Fiction"}
+    - {id: 215, cat: Audio/Audiobook, desc: "Paranormal Romance"}
    - {id: 200, cat: Audio/Audiobook, desc: "Radio Drama"}
    - {id: 210, cat: Audio/Audiobook, desc: "Romance"}
+    - {id: 240, cat: Audio/Audiobook, desc: "Sci-Fi Apocalypse"}
    - {id: 220, cat: Audio/Audiobook, desc: "Science"}
    - {id: 230, cat: Audio/Audiobook, desc: "Science Fiction "}
-    - {id: 240, cat: Audio/Audiobook, desc: "Sci-Fi Apocalypse"}
    - {id: 250, cat: Audio/Audiobook, desc: "Self Improvement"}
    - {id: 270, cat: Audio/Audiobook, desc: "Suspense"}
    - {id: 280, cat: Audio/Audiobook, desc: "Talk Radio"}
-    - {id: 260, cat: Audio/Audiobook, desc: "Crime/Thriller/Mystery"}
    - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy"}
    - {id: 300, cat: Audio/Audiobook, desc: "Western"}
    - {id: 400, cat: Books/EBook, desc: "[E] Action/Adventure"}
    - {id: 410, cat: Books/EBook, desc: "[E] Adult / Erotica"}
    - {id: 420, cat: Books/EBook, desc: "[E] Arts & Crafts (Hobbies)"}
    - {id: 430, cat: Books/EBook, desc: "[E] Biography/Memoirs"}
-    - {id: 730, cat: Books/EBook, desc: "[E] Collections"}
-    - {id: 440, cat: Books/EBook, desc: "[E] Comic Books"}
    - {id: 450, cat: Books/EBook, desc: "[E] Computer Learning"}
    - {id: 460, cat: Books/EBook, desc: "[E] Cookery"}
    - {id: 470, cat: Books/EBook, desc: "[E] Crime/Thriller/Mystery"}
    - {id: 480, cat: Books/EBook, desc: "[E] Fantasy"}
-    - {id: 490, cat: Books/EBook, desc: "[E] Forteana"}
    - {id: 500, cat: Books/EBook, desc: "[E] General Fiction"}
    - {id: 510, cat: Books/EBook, desc: "[E] Historical Fiction"}
    - {id: 520, cat: Books/EBook, desc: "[E] History/Documentary"}
    - {id: 530, cat: Books/EBook, desc: "[E] Horror"}
    - {id: 540, cat: Books/EBook, desc: "[E] Humor (Comedy)"}
-    - {id: 550, cat: Books/EBook, desc: "[E] LGBT"}
    - {id: 560, cat: Books/EBook, desc: "[E] Literary Fiction"}
    - {id: 565, cat: Books/EBook, desc: "[E] LitRPG"}
    - {id: 570, cat: Books/EBook, desc: "[E] Magazines - all"}
    - {id: 580, cat: Books/EBook, desc: "[E] Non-Fiction"}
-    - {id: 585, cat: Books/EBook, desc: "[E] Other Languages"}
    - {id: 590, cat: Books/EBook, desc: "[E] Paranormal Romance"}
    - {id: 600, cat: Books/EBook, desc: "[E] Reference/Educational"}
    - {id: 610, cat: Books/EBook, desc: "[E] Religion and Spirituality"}
@@ -106,6 +100,8 @@ settings:
 login:
  # using cookie method because login page simplecaptcha generates Exception: Cannot access child value on Newtonsoft.Json.Linq.JValue.
  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
    selector: a[href*="logout.php?hash_please="]
--- a/src/Jackett.Common/Definitions/acrossthetasman.yml
+++ b/src/Jackett.Common/Definitions/acrossthetasman.yml
@@ -47,6 +47,8 @@ login:
    vb_login_password: "{{ .Config.password }}"
    cookieuser: 1
    do: login
+  error:
+    - selector: div.restore:contains("invalid username or password")
  test:
    path: torrents.php
    selector: a[href*="logout.php"]
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -115,7 +115,7 @@ search:
    type: "{{ .Config.type }}"

  rows:
-    selector: table tbody#torrent_background tr:has(a.index)
+    selector: table tbody#torrent_background tr:has(a.index):has(span.icon_check_alt)
    filters:
      - name: andmatch

--- a/src/Jackett.Common/Definitions/agsvpt.yml
+++ b/src/Jackett.Common/Definitions/agsvpt.yml
@@ -11,6 +11,7 @@ links:
  - https://abroad.agsvpt.com/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
    - {id: 401, cat: Movies, desc: "Movie(电影)", default: true}
    - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
@@ -22,7 +23,6 @@ caps:
    - {id: 406, cat: Audio/Video, desc: "MV(演唱", default: true}
    - {id: 407, cat: TV/Sport, desc: "Sports(体育)", default: true}
    - {id: 408, cat: Audio/Audiobook, desc: "Audio(音频)", default: true}
-    # special
    - {id: 413, cat: PC/Games, desc: "Game(游戏)", default: false}
    - {id: 416, cat: Books/Comics, desc: "Comic(漫画)", default: false}
    - {id: 412, cat: PC/0day, desc: "Software(软件)", default: false}
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -57,7 +57,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "You must log in to the Aither web site with your browser once every 120 days to prevent your account from getting disabled."
+    default: "You must log in to the Aither web site with your browser once every90 days to prevent your account from getting disabled."

 login:
  path: /api/torrents
@@ -152,7 +152,7 @@ search:
      selector: created_at
      filters:
        - name: append
-          args: " -01:00" # EGT
+          args: " +00:00" # UTC
        - name: dateparse
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
@@ -188,4 +188,4 @@ search:
    minimumseedtime:
      # 5 days (as seconds = 5 x 24 x 60 x 60)
      text: 432000
-# json UNIT3D 8.3.2 (custom)
+# json UNIT3D 8.3.5
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -29,14 +29,14 @@ caps:
    - {id: 25, cat: PC, desc: "Aplicativos: Linux"}
    - {id: 23, cat: PC/Mobile-Android, desc: "Aplicativos: Android"}
    - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"}
-    - {id: 73, cat: Books, desc: "Cursos: Video Aula"}
-    - {id: 72, cat: Books, desc: "Cursos: Apostila"}
-    - {id: 71, cat: Books, desc: "Cursos: Cursos"}
-    - {id: 67, cat: Books, desc: "Ebook: Livros"}
-    - {id: 112, cat: Books, desc: "Ebook: HQs"}
-    - {id: 147, cat: Books, desc: "Ebook: Mangas"}
+    - {id: 73, cat: Other, desc: "Cursos: Video Aula"}
+    - {id: 72, cat: Other, desc: "Cursos: Apostila"}
+    - {id: 71, cat: Other, desc: "Cursos: Cursos"}
+    - {id: 67, cat: Books/EBook, desc: "Ebook: Livros"}
+    - {id: 112, cat: Books/Comics, desc: "Ebook: HQs"}
+    - {id: 147, cat: Books/Comics, desc: "Ebook: Mangas"}
    - {id: 121, cat: Audio/Audiobook, desc: "Ebook: Audio-book"}
-    - {id: 68, cat: Books, desc: "Ebook: Revistas"}
+    - {id: 68, cat: Books/Mags, desc: "Ebook: Revistas"}
    - {id: 119, cat: Movies, desc: "Filmes:"}
    - {id: 70, cat: XXX, desc: "Fotos: Revistas, Livros e Fotos"}
    - {id: 51, cat: Console/PS3, desc: "Jogos: Ps3"}
--- a/src/Jackett.Common/Definitions/anime-time.yml
+++ b/src/Jackett.Common/Definitions/anime-time.yml
@@ -0,0 +1,83 @@
+---
+id: anime-time
+name: Anime Time
+description: "Anime Time is a Public Torrent Tracker for ANIME."
+language: en-US
+type: public
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://animetime.cc/
+
+caps:
+  categories:
+    anime: TV/Anime
+    books: Books
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://animetime.cc/search?query=
+    - path: "{{ if .Keywords }}search{{ else }}{{ end }}"
+
+  inputs:
+    query: "{{ .Keywords }}"
+
+  keywordsfilters:
+    - name: trim
+    - name: re_replace
+      args: ["\\W+", "%"]
+
+  rows:
+    selector: div.flow-root > div.divide-y > div.p-2.space-y-2
+
+  fields:
+    category:
+      selector: span.badge.badge-primary
+    title:
+      selector: a[href*="/view/"]
+    details:
+      selector: a[href*="/view/"]
+      attribute: href
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    date:
+      selector: span[data-tip]
+      attribute: data-tip
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: span.badge.badge-ghost
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    genre:
+      selector: span.badge.badge-secondary, span.badge.badge-error
+      filters:
+        - name: replace
+          args: ["non english", "non_english"]
+        - name: replace
+          args: ["music video", "music_video"]
+        - name: replace
+          args: ["Anime Time", "Anime_Time"]
+    description:
+      text: "{{ .Result.genre }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/anime-timel.yml
+++ b/src/Jackett.Common/Definitions/anime-timel.yml
@@ -0,0 +1,103 @@
+---
+id: anime-timel
+name: Anime TimeL
+description: "This is the Anime Time indexer with Login enabled in the config to include NSFW content."
+language: en-US
+type: semi-private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://animetime.cc/
+
+caps:
+  categories:
+    anime: TV/Anime
+    books: Books
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: auth/log-in
+  method: form
+  form: form[action$="/auth/log-in"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    remember_me: true
+  error:
+    - selector: span.text-error
+  test:
+    path: /
+    selector: form[action$="/auth/log-out"]
+
+search:
+  paths:
+    # https://animetime.cc/search?query=
+    - path: "{{ if .Keywords }}search{{ else }}{{ end }}"
+
+  inputs:
+    query: "{{ .Keywords }}"
+
+  keywordsfilters:
+    - name: trim
+    - name: re_replace
+      args: ["\\W+", "%"]
+
+  rows:
+    selector: div.flow-root > div.divide-y > div.p-2.space-y-2
+
+  fields:
+    category:
+      selector: span.badge.badge-primary
+    title:
+      selector: a[href*="/view/"]
+    details:
+      selector: a[href*="/view/"]
+      attribute: href
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    date:
+      selector: span[data-tip]
+      attribute: data-tip
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: span.badge.badge-ghost
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    genre:
+      selector: span.badge.badge-secondary, span.badge.badge-error
+      filters:
+        - name: replace
+          args: ["non english", "non_english"]
+        - name: replace
+          args: ["music video", "music_video"]
+        - name: replace
+          args: ["Anime Time", "Anime_Time"]
+    description:
+      text: "{{ .Result.genre }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/animelovers-api.yml
+++ b/src/Jackett.Common/Definitions/animelovers-api.yml
@@ -193,4 +193,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.2.0
+# json UNIT3D 8.3.4
--- a/src/Jackett.Common/Definitions/anthelion-api.yml
+++ b/src/Jackett.Common/Definitions/anthelion-api.yml
@@ -91,6 +91,8 @@ search:
      selector: codec
    _container:
      selector: container
+      filters:
+        - name: toupper
    _media:
      selector: media
      filters:
@@ -122,7 +124,11 @@ search:
      filters:
        - name: htmldecode
        - name: append
-          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}{{ if and (.Result._releaseGroup) (ne .Result._releaseGroup \"NULL\") }}-{{ .Result._releaseGroup }}{{ else }}{{ end }}"
+          args: " {{ .Result.year }} {{ .Result._resolution }} {{ .Result._media }} {{ .Result._container }} {{ .Result._codec }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}{{ if and (.Result._releaseGroup) (ne .Result._releaseGroup \"NULL\") }}-{{ .Result._releaseGroup }}{{ else }}{{ end }}"
+        - name: replace
+          args: ["M2TS H265", "M2TS HEVC"]
+        - name: replace
+          args: ["M2TS H264", "M2TS AVC"]
    details:
      selector: guid
    download:
--- a/src/Jackett.Common/Definitions/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -52,7 +52,6 @@ caps:
    - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
    - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
    - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 117, cat: TV, desc: "رمضان 2024 (Ramadan)"}
    # المرئيات الاجنبية Foreign Movies
    - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
    - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
@@ -79,6 +78,7 @@ caps:
    - {id: 25, cat: Audio, desc: "القران الكريم (The Holy Quran)"}
    - {id: 27, cat: Audio, desc: "محاضرات (Lectures)"}
    - {id: 26, cat: Audio, desc: "اناشيد (Chants)"}
+    - {id: 118, cat: Audio, desc: "برامج صوتية (Programs)"}
    # برامج  Software
    - {id: 22, cat: PC, desc: "برامج عربية (Arabic Software)"}
    - {id: 23, cat: PC, desc: "برامج عامه (Public Software)"}
--- a/src/Jackett.Common/Definitions/arenabg.yml
+++ b/src/Jackett.Common/Definitions/arenabg.yml
@@ -34,6 +34,7 @@ caps:
    - {id: 24, cat: TV, desc: "Series / TV Episodes"}
    - {id: 25, cat: TV, desc: "Series / TV Boxset"}
    - {id: 26, cat: TV/HD, desc: "Series / TV Boxset HD"}
+    - {id: 60, cat: TV/UHD, desc: "Series / 4K"}
    - {id: 3, cat: Audio, desc: "Music"}
    - {id: 27, cat: Audio/MP3, desc: "Music / MP3"}
    - {id: 28, cat: Audio/Video, desc: "Music / Video"}
--- a/src/Jackett.Common/Definitions/audiences.yml
+++ b/src/Jackett.Common/Definitions/audiences.yml
@@ -65,7 +65,7 @@ settings:
    default: "Account retention rules:<ol><li>Users with Extreme User and above will be retained forever</li><li>Starting from 20230701, the non-login ban time will be adjusted to:<ul><li>(Home Alone) User - 40 days</li><li>(Young and vigorous) Power User - 60 days</li><li>(Children of Jianghu) Elite User - 80 days</li><li>(Street Fighter) Crazy User - 100 days</li><li>(non-stop) Insane User - 120 days</li><li>(Outstanding Citizen) Veteran User - 180 days</li></ul></li><li>Users with no traffic (i.e. uploading/downloading data) If it is 0) If you do not log in for 7 consecutive days will be disabled</li><li>'Parked accounts' no longer enjoy the benefits of retaining accounts, and are also subject to the above rules.</li></ol>"

 login:
-  # using cookie method because site has cloudflare challenge and flaresolverr is currently broken. Switch to standard nexus login when fixed.
+  # using cookie method because site regularly disables login page for certain events during the year
  method: cookie
  inputs:
    cookie: "{{ .Config.cookie }}"
--- a/src/Jackett.Common/Definitions/aussierules.yml
+++ b/src/Jackett.Common/Definitions/aussierules.yml
@@ -35,7 +35,7 @@ settings:
  - name: dead
    label: Include Dead Torrents
    type: select
-    default: No
+    default: no
    options:
      yes: Yes
      no: No
--- a/src/Jackett.Common/Definitions/azusa.yml
+++ b/src/Jackett.Common/Definitions/azusa.yml
@@ -22,19 +22,11 @@ caps:
    book-search: [q]

 settings:
-  - name: username
+  - name: cookie
    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."
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -61,27 +53,13 @@ settings:
    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
+  # using cookie method because site regularly disables login page for certain events during the year
+  method: cookie
  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("失败"))
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
-    selector: a[href="logout.php"]
+    selector: a[href^="logout.php?csrf_token="]

 search:
  paths:
@@ -148,11 +126,17 @@ search:
    size:
      selector: td.rowfollow:nth-child(5)
    seeders:
-      selector: td.rowfollow:nth-child(6)
+      selector: a[href$="dllist=1#seeders"]
+      optional: true
+      default: 0
    leechers:
-      selector: td.rowfollow:nth-child(7)
+      selector: a[href$="dllist=1#leechers"]
+      optional: true
+      default: 0
    grabs:
-      selector: td.rowfollow:nth-child(8)
+      selector: a[href^="viewsnatches.php?id="]
+      optional: true
+      default: 0
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -170,4 +154,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.7.20 2022-08-05
+# NexusPHP v1.7.20 2022-08-05 (custom)
--- a/src/Jackett.Common/Definitions/backups.yml
+++ b/src/Jackett.Common/Definitions/backups.yml
@@ -17,6 +17,7 @@ caps:
    - {id: 64, cat: Audio/Audiobook, desc: "Audiobooks"}
    - {id: 71, cat: Console, desc: "Batocera"}
    - {id: 4, cat: Movies/BluRay, desc: "Blu-Ray"}
+    - {id: 86, cat: Console, desc: "Chinese Systems"}
    - {id: 22, cat: Console, desc: "CoinOps"}
    - {id: 42, cat: Console, desc: "CoinOPS Official"}
    - {id: 65, cat: Console, desc: "CoinOps Unofficial"}
@@ -28,12 +29,13 @@ caps:
    - {id: 41, cat: Console, desc: "Dragon"}
    - {id: 5, cat: Books, desc: "EBooks"}
    - {id: 80, cat: PC, desc: "Emulation Media"}
-    - {id: 61, cat: Console, desc: "emuxtras"}
+    - {id: 61, cat: PC, desc: "emuxtras"}
    - {id: 69, cat: TV, desc: "Entertainment"}
    - {id: 84, cat: TV, desc: "GOG DRM FREE"}
    - {id: 77, cat: PC, desc: "Hyperspin"}
    - {id: 34, cat: TV, desc: "Kids"}
    - {id: 43, cat: Console, desc: "LB No Intro"}
+    - {id: 85, cat: PC, desc: "MAME Rom Sets"}
    - {id: 33, cat: TV/Sport, desc: "MMA/Boxing"}
    - {id: 32, cat: Movies, desc: "Movie Pack"}
    - {id: 6, cat: Movies, desc: "Movies/XVID"}
@@ -43,16 +45,18 @@ caps:
    - {id: 59, cat: Console, desc: "P-R-U"}
    - {id: 8, cat: PC/Games, desc: "PC Games"}
    - {id: 50, cat: Console, desc: "PlayBox"}
+    - {id: 87, cat: Console, desc: "Playnite"}
    - {id: 30, cat: Console, desc: "Playstation"}
-    - {id: 62, cat: Console, desc: "RaspberryPi"}
-    - {id: 83, cat: Console, desc: "Retro eXo"}
-    - {id: 56, cat: Console, desc: "Retro Minis"}
+    - {id: 62, cat: PC, desc: "RaspberryPi"}
+    - {id: 83, cat: PC, desc: "Retro eXo"}
+    - {id: 56, cat: PC, desc: "Retro Minis"}
    - {id: 81, cat: PC, desc: "Retro Scene Releases"}
-    - {id: 67, cat: Console, desc: "Retrobat"}
+    - {id: 67, cat: PC, desc: "Retrobat"}
+    - {id: 88, cat: PC, desc: "RetroFE"}
    - {id: 79, cat: PC, desc: "RGB-Pi"}
    - {id: 76, cat: Console, desc: "RGS"}
-    - {id: 27, cat: Console, desc: "Roms and Emulators"}
-    - {id: 68, cat: Console, desc: "Schmoomer's"}
+    - {id: 27, cat: PC, desc: "Roms and Emulators"}
+    - {id: 68, cat: PC, desc: "Schmoomer's"}
    - {id: 57, cat: Console, desc: "Sega"}
    - {id: 74, cat: PC, desc: "Sleyk/SGC"}
    - {id: 40, cat: TV, desc: "Soaps"}
--- a/src/Jackett.Common/Definitions/bestcore.yml
+++ b/src/Jackett.Common/Definitions/bestcore.yml
@@ -106,6 +106,8 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
+  error:
+    - selector: :root:contains("Sikertelen bejelentkezés")
  test:
    path: index.php
    selector: a[href^="logout.php?c="]
--- a/src/Jackett.Common/Definitions/bitbazis.yml
+++ b/src/Jackett.Common/Definitions/bitbazis.yml
@@ -10,30 +10,29 @@ links:
  - https://bitbazis.net/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
-    - {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: 85, cat: Movies/SD, desc: "Film-Cam", default: true}
    - {id: 22, cat: TV, desc: "Sorozat-Hun", default: true}
-    - {id: 64, cat: Movies, desc: "Film-Pack", default: true}
-    - {id: 24, cat: Audio/Video, desc: "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: 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: "FLAC-Hun", default: true}
    - {id: 71, cat: Audio/Lossless, desc: "FLAC-Eng", default: true}
-    - {id: 31, cat: PC/Games, desc: "Játék", default: true}
+    - {id: 27, cat: Books/EBook, desc: "Könyv", default: true}
    - {id: 81, cat: PC/0day, desc: "Program", default: true}
-    - {id: 14, cat: Other, desc: "Egyéb", default: true}
+    - {id: 31, cat: PC/Games, desc: "Játék", default: true}
+    - {id: 69, cat: TV/Anime, desc: "Mese-SD", default: true}
+    - {id: 91, cat: TV/Anime, desc: "Mese-HD", default: true}
+    - {id: 64, cat: Movies, desc: "Film-Pack", default: true}
+    - {id: 92, cat: Movies/UHD, desc: "Film-UHD", default: true}
    - {id: 66, cat: XXX/ImageSet, desc: "XXX", 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: "Klip", default: true}
+    - {id: 14, cat: Other, desc: "Egyéb", default: true}

  modes:
    search: [q]
@@ -82,12 +81,12 @@ login:
    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
-    selector: li[onclick^="window.open('logout.php?k="]
+    selector: i.fa-arrow-right-from-bracket[title="Kilépés"]

 search:
  paths:
    - path: browse.php
-      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]
+      categories: [15, 83, 94, 85, 22, 25, 26, 84, 71, 27, 81, 31, 69, 91, 64, 92, 24, 14]
      inputs:
        # 0 all, 1 active, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
        incldead: 0
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -114,7 +114,7 @@ search:
    User-Agent: ["{{ .Config.useragent }}"]

  rows:
-    selector: table#TorrentTable > tbody > tr
+    selector: table#torrenttable > tbody > tr

  fields:
    category:
--- a/src/Jackett.Common/Definitions/bitmagnet.yml
+++ b/src/Jackett.Common/Definitions/bitmagnet.yml
@@ -7,6 +7,7 @@ type: semi-private
 encoding: UTF-8
 links:
  - http://127.0.0.1:3333/
+  - http://bitmagnet:3333/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/bitporn.yml
+++ b/src/Jackett.Common/Definitions/bitporn.yml
@@ -98,7 +98,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Inactive accounts will be deleted based on the following rules:<ul><li>Elite-ranked or higher-ranked accounts are never deleted after parking (in the control panel).</li><li>Veteran-ranked or higher-ranked accounts are never deleted.</li><li>Parked accounts are deleted if users haven't logged in for more than 400 days.</li><li>Non-parked accounts are deleted if users haven't logged in for more than 150 days.</li><li>Accounts with both uploaded and downloaded quantities at 0 will be deleted if users haven't logged in for more than 100 consecutive days.</li></ul>"
+    default: "You must log in to the site at least once a month; otherwise, your account will be suspended."

 login:
  path: takelogin.php
@@ -132,7 +132,7 @@ search:
    notnewword: 1

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

  fields:
    category:
@@ -208,4 +208,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.5 2023-07-06
+# NexusPHP v2.3 (custom)
--- a/src/Jackett.Common/Definitions/blueroms.yml
+++ b/src/Jackett.Common/Definitions/blueroms.yml
@@ -70,51 +70,37 @@ search:
    at: "{{ .Config.sort }}"

  rows:
-    selector: table.table-striped > tbody > tr
+    selector: div.row > div.col-xs-12

  fields:
    category:
-      selector: td:nth-child(1) a
+      selector: p.card-text a
      attribute: href
    _platform:
-      selector: td:nth-child(1)
+      selector: p.card-text a
    title:
-      selector: td:nth-child(2)
+      selector: h4.card-title a
      filters:
        - name: append
          args: " - {{ .Result._platform }}"
    details:
-      selector: td:nth-child(2) a
+      selector: h4.card-title a
      attribute: href
    download:
-      selector: td:nth-child(3) a
+      selector: div.card-footer a
      attribute: href
    size:
-      selector: td:nth-child(4)
-    date_year:
-      selector: td:nth-child(5):not(:contains("-"))
-      optional: true
-      filters:
-        - name: dateparse
-          args: "yyyy"
-    date_month:
-      selector: td:nth-child(5):contains("-")
-      optional: true
+      selector: p.card-text
      filters:
        - name: regexp
-          args: (\d{4}-\d{2})
-        - name: dateparse
-          args: "yyyy-MM"
-    date_day:
-      selector: td:nth-child(5):contains("-")
-      optional: true
+          args: (\d+\.?\d+[T|G|K]iB)
+    date:
+      selector: p.card-text
      filters:
        - name: regexp
          args: (\d{4}-\d{2}-\d{2})
        - name: dateparse
          args: "yyyy-MM-dd"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day .Result.date_month }}{{ or .Result.date_year .Result.date_day .Result.date_month }}{{ else }}now{{ end }}"
    seeders:
      text: 1
    leechers:
--- a/src/Jackett.Common/Definitions/bluraytracker.yml
+++ b/src/Jackett.Common/Definitions/bluraytracker.yml
@@ -17,9 +17,7 @@ caps:
    - {id: 17, cat: Movies/UHD, desc: " |- 4k/UHD Filmy "}
    - {id: 31, cat: Movies/BluRay, desc: " |- Bluray DB/BD/DVD"}
    - {id: 51, cat: Movies/3D, desc: " |- 3D Filmy"}
-    - {id: 14, cat: Movies/SD, desc: " |- DivX"}
    - {id: 45, cat: Movies/Other, desc: " |- Kreslené/Anime"}
-    - {id: 16, cat: Movies/SD, desc: " |- CAM/Kino"}
    - {id: 40, cat: TV, desc: "-----TV-----"}
    - {id: 32, cat: TV, desc: " |- Serialy CZ/SK/EN"}
    - {id: 47, cat: TV, desc: " |- Serialy"}
@@ -30,8 +28,9 @@ caps:
    - {id: 19, cat: PC/Mac, desc: " |- Programy MacOS"}
    - {id: 7, cat: Audio, desc: "-----Hudba-----"}
    - {id: 39, cat: Audio/Audiobook, desc: " |- Mluvene Slovo"}
-    - {id: 21, cat: Audio, desc: " |- MP3/FLAC"}
+    - {id: 21, cat: Audio/MP3, desc: " |- MP3"}
    - {id: 43, cat: Audio/Other, desc: " |- SoundTrack"}
+    - {id: 53, cat: Audio/Lossless, desc: " |- Flac"}
    - {id: 2, cat: PC/Games, desc: "--Hry--"}
    - {id: 3, cat: Console/PS3, desc: " |- Sony PS"}
    - {id: 4, cat: Console/Wii, desc: " |- Wii"}
@@ -40,7 +39,6 @@ caps:
    - {id: 28, cat: Console/NDS, desc: " |- Nintendo"}
    - {id: 42, cat: Books, desc: "Knihy A Časopisy"}
    - {id: 36, cat: Other, desc: "Ostatní"}
-    - {id: 46, cat: XXX, desc: "XXX (18+)"}
    # not listed
    - {id: 41, cat: Movies, desc: "VIP Torrent"}
    - {id: 48, cat: Movies, desc: " |- RLS"}
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -13,14 +13,17 @@ legacylinks:
 caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 8, cat: Other, desc: "Other"}
    - {id: 2, cat: TV, desc: "TV Show"}
    - {id: 3, cat: Movies/Other, desc: "FANRES"}
    - {id: 5, cat: Movies/Other, desc: "Trailer"}
+    - {id: 9, cat: Audio/Video, desc: "Live Concert"}

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

 settings:
  - name: apikey
@@ -188,4 +191,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.3.3
+# json UNIT3D 8.3.6
--- a/src/Jackett.Common/Definitions/btdirectory.yml
+++ b/src/Jackett.Common/Definitions/btdirectory.yml
@@ -7,8 +7,13 @@ type: public
 encoding: UTF-8
 # current domain at https://cursor.vip/btmulu then follow links to the final search-movie link
 links:
+  - https://www.btmulu.one/
+  - https://www.btmulu.cyou/
+legacylinks:
  - https://btmulu.work/
+  - https://www.btmulu.asia/
  - https://www.btmulu.digital/
+  - https://www.btmulu.pw/

 caps:
  categorymappings:
@@ -48,8 +53,11 @@ search:
      selector: a[href^="/hash/"]
      attribute: href
    infohash:
-      selector: article.item
-      attribute: data-key
+      selector: a[href^="/hash/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
    date:
      selector: p
      filters:
--- a/src/Jackett.Common/Definitions/byrbt.yml
+++ b/src/Jackett.Common/Definitions/byrbt.yml
@@ -28,12 +28,11 @@ caps:
    music-search: [q]

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -68,16 +67,10 @@ settings:
    default: "Account retention rules:<ol><li>Newly registered users who have not generated any traffic within 14 days (that is, the upload/download data are both 0) will be deleted</li><li>Users with a user level of Peasant that have failed to successfully improve their sharing rate within 14 days will be deleted.</li></ol>"

 login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
+  # using cookie method because login page is dynamically generated with JS
+  method: cookie
  inputs:
-    logintype: username
-    userinput: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    autologin: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
    selector: a[href^="logout.php?key="]
--- a/src/Jackett.Common/Definitions/capybarabr.yml
+++ b/src/Jackett.Common/Definitions/capybarabr.yml
@@ -1,6 +1,6 @@
 ---
 id: capybarabr
-name: CapybaraBR
+name: CapybaraBR (API)
 description: "CapybaraBR is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: pt-BR
 type: private
@@ -17,7 +17,7 @@ caps:
    - {id: 6, cat: Movies, desc: "Desenhos Animados"}
    - {id: 5, cat: Console, desc: "Jogos"}
    - {id: 9, cat: PC, desc: "Programas"}
-    - {id: 10, cat: Audio, desc: "HQs"}
+    - {id: 10, cat: Books/Comics, desc: "HQs"}
    - {id: 11, cat: Books/EBook, desc: "Livros"}
    - {id: 12, cat: Other, desc: "Cursos"}
    - {id: 13, cat: Books/Mags, desc: "Revistas"}
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -72,6 +72,8 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
+  error:
+    - selector: table.main:contains("Sikertelen bejelentkezés")
  test:
    path: index.php
    selector: a[href^="logout.php"]
--- a/src/Jackett.Common/Definitions/carphunter.yml
+++ b/src/Jackett.Common/Definitions/carphunter.yml
@@ -10,6 +10,7 @@ links:
  - https://carp-hunter.hu/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
    - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng", default: true}
    - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun", default: true}
--- a/src/Jackett.Common/Definitions/carpt.yml
+++ b/src/Jackett.Common/Definitions/carpt.yml
@@ -193,4 +193,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.14 2024-09-24
+# NexusPHP v1.8.15 2024-12-10
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -1,6 +1,6 @@
 ---
 id: cinematik
-name: Cinematik
+name: Cinematik (API)
 description: "A tracker for full BD and DVD discs of non-mainstream movies, niche cinema and arthouse."
 language: en-US
 type: private
@@ -190,4 +190,4 @@ search:
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# json UNIT3D 8.2.0
+# json UNIT3D 8.3.6
--- a/src/Jackett.Common/Definitions/classix.yml
+++ b/src/Jackett.Common/Definitions/classix.yml
@@ -1,186 +0,0 @@
---
-id: classix
-name: Classix
-description: "Classix is a Private Torrent Tracker for classic MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - http://classix-unlimited.co.uk/ # site does not support https ERR_CONNECTION_CLOSED
-
-caps:
-  categorymappings:
-    - {id: 59, cat: PC/0day, desc: "Apps: Movies: Misc"}
-    - {id: 55, cat: PC/0day, desc: "Apps: Graphics Editing GNU/Linux"}
-    - {id: 53, cat: PC/0day, desc: "Apps: Apps DVD/Blu-Ray Copy Mac"}
-    - {id: 57, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copy GNU/Linux"}
-    - {id: 51, cat: PC/0day, desc: "Apps: Graphics Editing Mac"}
-    - {id: 58, cat: PC/0day, desc: "Apps: Music Editing & Recording GNU/"}
-    - {id: 52, cat: PC/0day, desc: "Apps: Apps DVD Editing Mac"}
-    - {id: 56, cat: PC/0day, desc: "Apps: DVD Editing GNU/Linux"}
-    - {id: 54, cat: PC/0day, desc: "Apps: Music Editing & Recording Mac"}
-    - {id: 18, cat: PC/0day, desc: "Apps: Graphics Editing PC"}
-    - {id: 19, cat: PC/0day, desc: "Apps: DVD Editing PC"}
-    - {id: 20, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copying PC"}
-    - {id: 21, cat: PC/0day, desc: "Apps: Music Editing & Recording PC"}
-    - {id: 66, cat: Other, desc: "grumpyman: pending torrents"}
-    - {id: 67, cat: Books/EBook, desc: "Media: pdf"}
-    - {id: 49, cat: Movies/HD, desc: "Movies: HD-Compressed Or Stripped"}
-    - {id: 47, cat: Movies/Other, desc: "Movies: Covers & Artwork"}
-    - {id: 48, cat: Movies/SD, desc: "Movies: DVD-Compressed Or Stripped"}
-    - {id: 1, cat: Movies/DVD, desc: "Movies: DVD-Untouched"}
-    - {id: 50, cat: Movies, desc: "Movies: Made For TV"}
-    - {id: 2, cat: Movies/SD, desc: "Movies: Divx/Xvid/Avi"}
-    - {id: 60, cat: Movies/HD, desc: "Movies: HD-mkv/mts"}
-    - {id: 65, cat: Movies/Foreign, desc: "Movies: Movies - w/additional lang/sub"}
-    - {id: 42, cat: Movies/HD, desc: "Movies: HD-Untouched"}
-    - {id: 3, cat: Movies/SD, desc: "Movies: SVCD/VCD"}
-    - {id: 71, cat: Movies/UHD, desc: "Movies: 4K-Untouched"}
-    - {id: 4, cat: Movies/Other, desc: "Movies: Other"}
-    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Music: Lossless"}
-    - {id: 24, cat: Audio/Video, desc: "Music: DVD"}
-    - {id: 70, cat: Audio/Video, desc: "Music: HD"}
-    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
-    - {id: 27, cat: Audio/Other, desc: "Music: Other"}
-    - {id: 63, cat: Other, desc: "Other: Educational/Instructional"}
-    - {id: 61, cat: Books/EBook, desc: "Other: Related Material"}
-    - {id: 37, cat: Other, desc: "Other: Images"}
-    - {id: 62, cat: TV, desc: "TV: Mini-Series"}
-    - {id: 64, cat: TV/Other, desc: "TV: Covers & Art Work"}
-    - {id: 69, cat: TV/SD, desc: "TV: Series - Compressed"}
-    - {id: 5, cat: TV/SD, desc: "TV: Series: DVD"}
-    - {id: 73, cat: TV/HD, desc: "TV: Complete Series HD"}
-    - {id: 72, cat: TV/SD, desc: "TV: Complete Series DVD"}
-    - {id: 41, cat: TV/HD, desc: "TV: Series: HD"}
-    - {id: 74, cat: TV, desc: "TV: Series Compilation: DVD or HD"}
-    - {id: 6, cat: TV/SD, desc: "TV: Divx/Xvid/AVI"}
-    - {id: 7, cat: TV/SD, desc: "TV: SVCD/VCD"}
-    - {id: 68, cat: TV, desc: "TV: .mkv"}
-
-  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: info_free
-    type: info
-    label: About Freeleech at Classix
-    default: This appears to only be uploads by the admin <b>grumpyman57</b>.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.myContent:contains("Access Denied")
-  test:
-    path: index.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-# category search returns results from unrelated categories
-#     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    cat: 0
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all, 1 english, etc
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not support imdbid search and does not return imdb link in results
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-
-  rows:
-    selector: table > tbody > tr:has(a[href^="torrents.php?cat="])
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="torrents-details.php?id="]
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?)>"
-    date:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Date Added: </b>(\\d{2}-\\d{2}-\\d{4})<br />"
-        - name: dateparse
-          args: "MM-dd-yyyy"
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    genre:
-      selector: a[href^="torrents.php?gen="]
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      # returned results not marked as freeleech
-      text: "{{ if .Config.freeleech }}0{{ else }}1{{ end }}"
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine TorrentTrader v2-svn
--- a/src/Jackett.Common/Definitions/concertos.yml
+++ b/src/Jackett.Common/Definitions/concertos.yml
@@ -105,6 +105,43 @@ search:
      selector: td.torrents__size
    date:
      selector: td.torrents__age
+      filters:
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    seeders:
      selector: td:nth-last-child(3)
    leechers:
--- a/src/Jackett.Common/Definitions/crabpt.yml
+++ b/src/Jackett.Common/Definitions/crabpt.yml
@@ -5,22 +5,27 @@ description: "CrabPT (蟹黄堡) is a CHINESE Private Torrent Tracker for MOVIES
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
  - https://crabpt.vip/

 caps:
  categorymappings:
-    - {id: 401, cat: Movies, desc: "电影 / Movies"}
-    - {id: 402, cat: TV, desc: "电视剧 / TVSeries"}
-    - {id: 413, cat: TV/Other, desc: "短剧 / Playlet"}
-    - {id: 408, cat: Audio, desc: "音乐 / Music"}
-    - {id: 405, cat: TV/Anime, desc: "动漫 / Anime"}
-    - {id: 406, cat: Audio/Video, desc: "MV"}
-    - {id: 403, cat: Movies, desc: "综艺 / TV Shows"}
-    - {id: 407, cat: TV/Sport, desc: "体育竞技 / Sports"}
-    - {id: 404, cat: TV/Documentary, desc: "纪录片 / Documentary"}
-    - {id: 409, cat: Other, desc: "其他 / Other"}
-    - {id: 415, cat: Books/Comics, desc: "漫画 / Cartoon"}
+    - {id: 401, cat: Movies, desc: "电影 / Movies", default: true}
+    - {id: 402, cat: TV, desc: "电视剧 / TVSeries", default: true}
+    - {id: 413, cat: TV/Other, desc: "短剧 / Playlet", default: true}
+    - {id: 408, cat: Audio, desc: "音乐 / Music", default: true}
+    - {id: 405, cat: TV/Anime, desc: "动漫 / Anime", default: true}
+    - {id: 406, cat: Audio/Video, desc: "MV", default: true}
+    - {id: 403, cat: Movies, desc: "综艺 / TV Shows", default: true}
+    - {id: 407, cat: TV/Sport, desc: "体育竞技 / Sports", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片 / Documentary", default: true}
+    - {id: 409, cat: Other, desc: "其他 / Other", default: true}
+    - {id: 415, cat: Books/Comics, desc: "漫画 / Cartoon", default: true}
+    - {id: 414, cat: Console, desc: "游戏 / Game", default: true}
+    - {id: 412, cat: Other, desc: "学习 / Study", default: true}
+    - {id: 411, cat: Audio/Audiobook, desc: "有声书 / Audiobook", default: true}
+    - {id: 410, cat: Books/EBook, desc: "电子书 / Ebook", default: true}

  modes:
    search: [q]
@@ -67,6 +72,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_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li> Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"

 login:
  path: login.php
@@ -94,6 +103,9 @@ login:
 search:
  paths:
    - path: torrents.php
+      categories: [401, 402, 413, 408, 405, 406, 403, 407, 404, 409]
+    - path: special.php
+      categories: [415, 414, 412, 411, 410]
  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 }}"
@@ -110,7 +122,7 @@ search:
    notnewword: 1

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

  fields:
    category:
--- a/src/Jackett.Common/Definitions/cyanbug.yml
+++ b/src/Jackett.Common/Definitions/cyanbug.yml
@@ -148,7 +148,7 @@ search:
      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(4) > span[title]
      attribute: title
      optional: true
      filters:
@@ -158,7 +158,7 @@ search:
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(4):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -168,17 +168,17 @@ search:
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-child(5)
    seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(6)
      optional: true
      default: 1
    leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(7)
      optional: true
      default: 1
    grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(8)
      optional: true
      default: 1
    downloadvolumefactor:
@@ -204,9 +204,9 @@ search:
        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
    description:
-      selector: td:nth-child(2)
+      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.9 2023-09-29
+# NexusPHP v1.8.14 2024-10-07
--- a/src/Jackett.Common/Definitions/dajiao.yml
+++ b/src/Jackett.Common/Definitions/dajiao.yml
@@ -191,4 +191,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-06-13
+# NexusPHP v1.8.15 2024-12-10
--- a/src/Jackett.Common/Definitions/danishbytes-api.yml
+++ b/src/Jackett.Common/Definitions/danishbytes-api.yml
@@ -17,10 +17,11 @@ caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Sound"}
+    - {id: 5, cat: PC/0day, desc: "Apps"}
    - {id: 4, cat: PC/Games, desc: "Games"}
-    - {id: 5, cat: PC/0day, desc: "Appz"}
-    - {id: 8, cat: Books, desc: "Bookz"}
+    - {id: 3, cat: Audio, desc: "Sound"}
+    - {id: 8, cat: Books, desc: "Books"}
+    - {id: 17, cat: Audio/Audiobook, desc: "AudioBooks"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -1,7 +1,7 @@
 ---
 id: dark-shadow
 name: Dark-Shadow
-description: "Dark-Shadow is a GERMAN Private site for TV / MOVIES / GENERAL"
+description: "Dark-Shadow (D-S) is a GERMAN Private Torrent Tracker for TV / MOVIES / GENERAL"
 language: de-DE
 type: private
 encoding: UTF-8
@@ -13,56 +13,40 @@ legacylinks:

 caps:
  categorymappings:
-    # Movie
-    - {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: 28, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 145, cat: Movies/SD, desc: "Filme all SD"}
-    - {id: 138, cat: Movies, desc: "Filme Pack's"}
-    # Serien
-    - {id: 57, cat: TV/HD, desc: "Serien HD"}
-    - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
-    - {id: 60, cat: TV/SD, desc: "Serien SD"}
-    - {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: 14, cat: TV/Documentary, desc: "Doku HD"}
-    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
-    - {id: 123, cat: TV/Documentary, desc: "Doku Pack's"}
-    # Spiel
-    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
-    - {id: 24, cat: Console, desc: "Spiel Konsole"}
-    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
-    - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
-    # Sport
-    - {id: 61, cat: TV/Sport, desc: "Sport HD"}
-    - {id: 62, cat: TV/Sport, desc: "Sport SD"}
-    - {id: 144, cat: TV/Sport, desc: "Sport Wrestling"}
-    # 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: 143, cat: XXX/x264, desc: "XXX HD / SD"}
-    - {id: 75, cat: XXX/Pack, desc: "XXX Pack's"}
-    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic's"}
-    #  Internal
-    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
-    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
-    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
+    - {id: 32, cat: Movies/HD, desc: "Filme > HD"}
+    - {id: 28, cat: Movies/SD, desc: "Filme > SD"}
+    - {id: 114, cat: Movies/UHD, desc: "Filme > UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "Filme > BluRay"}
+    - {id: 138, cat: Movies, desc: "Filme > Pack's"}
+    - {id: 57, cat: TV/HD, desc: "Serien > HD"}
+    - {id: 60, cat: TV/SD, desc: "Serien > SD"}
+    - {id: 139, cat: TV/UHD, desc: "Serien > UHD"}
+    - {id: 59, cat: TV, desc: "Serien > Pack's"}
+    - {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"}
+    - {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"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku > HD"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku > SD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku > Pack's"}
+    - {id: 17, cat: PC/Games, desc: "Spiel > PC"}
+    - {id: 24, cat: Console, desc: "Spiel > Konsole"}
+    - {id: 126, cat: Console/Other, desc: "Spiel > Mobil"}
+    - {id: 121, cat: Console, desc: "Spiel > Wimmelbild"}
+    - {id: 61, cat: TV/Sport, desc: "Sport > HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport > SD"}
+    - {id: 144, cat: TV/Sport, desc: "Sport > Wrestling"}
+    - {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"}
+    - {id: 143, cat: XXX/x264, desc: "XXX > HD / SD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX > Pack's"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX > Pic's"}

  modes:
    search: [q]
@@ -75,29 +59,21 @@ settings:
  - name: info_password
    type: info
    label: About Password Expiry
-    default: "Dark Shadow has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login to the WEB site, and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
+    default: "D-S has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://dark-shadow.me/login.php\" target=\"_blank\">Dark-Shadow</a>,  and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
  - 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
-      seeds: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
+  - name: onlyupload
+    type: checkbox
+    label: Search OnlyUpload
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at D-S
+    default: "OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech)."
  - name: info_activity
    type: info
    label: Account Inactivity
@@ -106,103 +82,76 @@ settings:
 login:
  path: login.php
  method: form
-  form: form[action="/login.php"]
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  form: form
  inputs:
-    username: "{{ .Config.username }}"
+    login_identifier: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
+    loggiin: Login
  error:
-    - selector: div#login_error
+    - selector: div.error-message
  test:
    path: index.php
    selector: a[href="logout.php"]

 search:
  paths:
+    # https://dark-shadow.me//selection.php?ajax=true&search=&page=1&visible=no&free=no&c32=1&c28=1
    - path: selection.php
+      response:
+        type: json
+
  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    ajax: true
    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%"]
+    page: 1
+    # all=active+inactive, yes=active, no=inactive (the default is all, which ajax simply drops the parm)
+    # visible: all
+    # all=all+onlyup, yes=onlyup, no=without onlyup (the default is all, which ajax simply drops the parm)
+    free: "{{ if .Config.onlyupload }}yes{{ else }}{{ end }}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"

  rows:
-    selector: div.selection_wrap
+    selector: $

  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 }}"
+      selector: category
+      filters:
+        - name: htmldecode
    title:
-      selector: a.selection_a
-      filters:
-        # remove [REQ] and anything else in [] that prefixes titles
-        - name: re_replace
-          args: ["^(\\[.*\\])(.*)", "$2"]
+      selector: name
+    _id:
+      selector: id
    details:
-      selector: a.selection_a
-      attribute: href
+      text: "details.php?id={{ .Result._id }}"
    download:
-      selector: a[href^="download"]
-      attribute: href
+      selector: download_link
    poster:
-      selector: div[id^="details"] img
-      attribute: src
+      selector: cover
    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
+      selector: size
+    date:
+      # 25.12.2024 16:02
+      selector: added
      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
+          args: "dd.MM.yyyy HH:mm zzz"
    seeders:
-      selector: div.selection_unter_aa
+      selector: seeders
    leechers:
-      selector: div.selection_unter_aaa
+      selector: leechers
+    _onlyup:
+      selector: free_button:contains(Only Upload)
+      optional: true
    downloadvolumefactor:
-      case:
-        ":root:has(div.onlyup)": 0 # GLobal Freeleech event
-        "*": 1
+      text: "{{ if .Result._onlyup }}0{{ else }}1{{ end }}"
    uploadvolumefactor:
      text: 1
    minimumratio:
      text: 1.0
    minimumseedtime:
-      # 36 hours (as seconds = 36 x 60 x 60)
+      # 1.5 days (as seconds = 1.5 x 24 x 60 x 60)
      text: 129600
-# 3xT
+# THX JSON
--- a/src/Jackett.Common/Definitions/dasunerwartete.yml
+++ b/src/Jackett.Common/Definitions/dasunerwartete.yml
@@ -10,66 +10,60 @@ links:

 caps:
  categorymappings:
-    # Filme
-    - {id: 28, cat: Movies/SD, desc: "SD"}
-    - {id: 32, cat: Movies/HD, desc: "HD"}
-    - {id: 114, cat: Movies/UHD, desc: "UHD"}
-    - {id: 140, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 143, cat: TV/Anime, desc: "Anime"}
-    - {id: 138, cat: Movies, desc: "Pack`s"}
-    # Serien
-    - {id: 60, cat: TV/SD, desc: "SD"}
-    - {id: 57, cat: TV/HD, desc: "HD"}
-    - {id: 139, cat: TV/UHD, desc: "UHD"}
-    - {id: 144, cat: TV/Anime, desc: "Anime"}
-    - {id: 59, cat: TV, desc: "Pack`s"}
-    # Audio
-    - {id: 110, cat: Audio/MP3, desc: "MP3"}
-    - {id: 48, cat: Audio/Lossless, desc: "Flac"}
-    - {id: 52, cat: Audio, desc: "Pack"}
-    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
-    - {id: 120, cat: Audio/Video, desc: "Videos"}
-    # Apps
-    - {id: 12, cat: PC/0day, desc: "Windows"}
-    - {id: 125, cat: PC/Mac, desc: "Mac-OSX"}
-    - {id: 11, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 141, cat: PC, desc: "PC"}
-    # Doku
-    - {id: 15, cat: TV/Documentary, desc: "SD"}
-    - {id: 14, cat: TV/Documentary, desc: "HD"}
-    - {id: 123, cat: TV/Documentary, desc: "Reihe"}
-    # Spiel
-    - {id: 126, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 17, cat: PC/Games, desc: "PC"}
-    - {id: 24, cat: Console, desc: "Konsole"}
-    - {id: 121, cat: Console, desc: "Wimmelbild"}
-    # Sport
-    - {id: 61, cat: TV/Sport, desc: "HD"}
-    - {id: 62, cat: TV/Sport, desc: "SD"}
-    # ePaper
-    - {id: 96, cat: Books/Mags, desc: "Zeitungen"}
-    - {id: 136, cat: Books/EBook, desc: "E-Book"}
-    - {id: 137, cat: Books/Comics, desc: "Comics"}
-    # XXX
-    - {id: 76, cat: XXX/SD, desc: "SD"}
-    - {id: 73, cat: XXX/x264, desc: "HD"}
-    - {id: 75, cat: XXX/Pack, desc: "Pack"}
-    - {id: 142, cat: XXX/ImageSet, desc: "Pic´s"}
-    # Internal
-    - {id: 129, cat: Movies/SD, desc: "Film SD"}
-    - {id: 128, cat: Movies/HD, desc: "Film HD"}
-    - {id: 131, cat: TV/SD, desc: "Serie SD"}
-    - {id: 130, cat: TV/HD, desc: "Serien HD"}
-    - {id: 132, cat: Other, desc: "Sonstiges"}
+    - {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: 143, cat: TV/Anime, desc: "Filme > Anime"}
+    - {id: 138, cat: Movies, desc: "Filme > Packs"}
+    - {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: 144, cat: TV/Anime, desc: "Serien > Anime"}
+    - {id: 59, cat: TV, desc: "Serien > Packs"}
+    - {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"}
+    - {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, desc: "Apps > Other"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku > SD"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku > HD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku > Reihe"}
+    - {id: 126, cat: PC/Mobile-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"}
+    - {id: 61, cat: TV/Sport, desc: "Sport > HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport > SD"}
+    - {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"}
+    - {id: 76, cat: XXX/SD, 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"}
+    - {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 > Serien 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]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
    music-search: [q]
    book-search: [q]

 settings:
+  - name: info_password
+    type: info
+    label: About Password Expiry
+    default: "D-U has an <b>20 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://dasunerwartete.biz/login.php\" target=\"_blank\">Das Unerwartete</a>, and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
  - name: username
    type: text
    label: Username
@@ -78,28 +72,12 @@ settings:
    label: Password
  - name: onlyupload
    type: checkbox
-    label: Filter OnlyUpload only
+    label: Search OnlyUpload
    default: false
  - name: info_free
    type: info
    label: About OnlyUpload at D-U
-    default: "<ul><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li></ul>"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 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
+    default: "OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech)."
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -124,80 +102,65 @@ login:
    selector: a[href="logout.php"]

 search:
-  # https://dasunerwartete.biz/selection.php?scat[]=60&scat[]=15&search=&blah=0&orderby=added&sort=desc
-  path: selection.php
+  paths:
+    # https://dasunerwartete.biz/torrents_search.php?ajax=true&search=1080p&page=1&imdb=1034320&free=yes&c32=1
+    - path: torrents_search.php
+      response:
+        type: json
+
  inputs:
-    $raw: "{{ range .Categories }}scat[]={{.}}&{{end}}"
+    ajax: true
    search: "{{ .Keywords }}"
-    # 0 name, 1 descr, 2 both
-    blah: 0
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-    # site does not support imdbid search from the browse.php page or return imdb links in results
+    page: 1
+    imdb: "{{ .Query.IMDBIDShort }}"
+    # all=active+inactive, yes=active, no=inactive (the default is all, which ajax simply drops the parm)
+    # visible: all
+    # all=all+onlyup, yes=onlyup, no=without onlyup (the default is all, which ajax simply drops the parm)
+    free: "{{ if .Config.onlyupload }}yes{{ else }}{{ end }}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"

  rows:
-    selector: "div.selection_wrap{{ if .Config.onlyupload }}:has(img[src=\"/pic/free.gif\"]){{ else }}{{ end }}"
+    selector: $

  fields:
-    category:
-      selector: a[href^="selection.php?cat="]
-      attribute: href
+    categorydesc:
+      selector: category
      filters:
-        - name: querystring
-          args: cat
+        - name: htmldecode
    title:
-      selector: a[href^="details.php?id="]
+      selector: name
+    _id:
+      selector: id
    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+      text: "details.php?id={{ .Result._id }}"
    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
+      selector: download_link
    poster:
-      selector: img[src^="cloud-data/"]
-      attribute: src
+      selector: cover
    size:
-      selector: div.selection_unter_ad
-    grabs:
-      selector: div.selection_unter_ae
-    seeders:
-      selector: div.selection_unter_aa
-    leechers:
-      selector: div.selection_unter_aaa
-    date_day:
-      # Heute 03:27:27
-      # Gestern 21:00:59
-      selector: div.selection_unter_ab:contains("Heute"), div.selection_unter_ab:contains("Gestern")
-      optional: true
-      filters:
-        - name: replace
-          args: ["Heute ", "Today"]
-        - name: replace
-          args: ["Gestern ", "Yesterday"]
-        - name: append
-          args: " +01:00" # CET
-    date_year:
-      # 14.03.2024 um 20:43:07
-      selector: div.selection_unter_ab:not(:contains("Heute")):not(:contains("Gestern"))
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: replace
-          args: ["um ", ""]
-        - name: dateparse
-          args: "dd.MM.yyyy HH:mm:ss zzz"
+      selector: size
    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      # 25.12.2024 16:02
+      selector: added
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm zzz"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    _onlyup:
+      selector: free_button:contains(Only Upload)
+      optional: true
    downloadvolumefactor:
-      case:
-        img[src="/pic/free.gif"]: 0
-        "*": 1
+      text: "{{ if .Result._onlyup }}0{{ else }}1{{ end }}"
    uploadvolumefactor:
      text: 1
    minimumratio:
      text: 1.0
    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# THX custom
+      # 1.5 days (as seconds = 1.5 x 24 x 60 x 60)
+      text: 129600
+# THX JSON (custom)
--- a/src/Jackett.Common/Definitions/datascene-api.yml
+++ b/src/Jackett.Common/Definitions/datascene-api.yml
@@ -82,7 +82,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "<ul><li>Accounts with zero activity (0 bytes download and 0 bytes upload) are automatically deleted after 30 days.</li><li>Inactive VIP and unparked accounts are automatically deleted after 40 days.</li></ul>"
+    default: "<ul><li>Accounts with zero activity (0 bytes download and 0 bytes upload) are automatically deleted after 30 days.</li><li>Inactive account under the rank of VIP that are unparked are automatically deleted after 40 days.</li></ul>"

 login:
  path: /api/torrents
--- a/src/Jackett.Common/Definitions/deildu.yml
+++ b/src/Jackett.Common/Definitions/deildu.yml
@@ -62,6 +62,8 @@ login:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
    keeplogged: 1
+  error:
+    - selector: table.main:contains("Login failed")
  test:
    path: index.php
    selector: a[href^="logout.php"]
--- a/src/Jackett.Common/Definitions/diablotorrent.yml
+++ b/src/Jackett.Common/Definitions/diablotorrent.yml
@@ -10,6 +10,7 @@ links:
  - https://diablotorrent.net/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
    # Film
    - {id: 49, cat: Movies/SD, desc: "Film > Cam", default: true}
@@ -100,6 +101,8 @@ login:
    login: 1
    belepes: 1
    rhash: 123
+  error:
+    - selector: :root:contains("{\"hiba\":true,")
  test:
    path: browse
    selector: a[href*="logout"]
--- a/src/Jackett.Common/Definitions/digitalcore.yml
+++ b/src/Jackett.Common/Definitions/digitalcore.yml
@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 links:
  - https://digitalcore.club/
+  - https://prxy.digitalcore.club/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/dreamtracker.yml
+++ b/src/Jackett.Common/Definitions/dreamtracker.yml
@@ -1,232 +0,0 @@
---
-id: dreamtracker
-name: Dream Tracker
-description: "Dream Tracker is a Subscription only GREEK Private tracker for TV / MOVIES / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://dream-tracker.net/
-
-caps:
-  categorymappings:
-    # Anime
-    - {id: 113, cat: TV/Anime, desc: "Anime"}
-    - {id: 114, cat: TV/Anime, desc: "Anime Series"}
-    - {id: 115, cat: Movies/Other, desc: "Anime Movies"}
-    # VIP
-    - {id: 122, cat: Other, desc: "Only VIP"}
-    - {id: 123, cat: Audio, desc: "VIP Music"}
-    - {id: 124, cat: Movies, desc: "VIP Movies"}
-    # Kids Stuff
-    - {id: 1, cat: Movies/Other, desc: "Kids Stuff"}
-    - {id: 14, cat: Movies/Other, desc: "Cartoon No Subs"}
-    - {id: 16, cat: Movies/Other, desc: "Cartoon Sub. No Embed."}
-    - {id: 17, cat: Movies/Other, desc: "Cartoon Sub. Embed."}
-    - {id: 31, cat: Movies/Other, desc: "Cartoon in Greek "}
-    - {id: 107, cat: Movies/Other, desc: "Kids in Greek"}
-    - {id: 120, cat: Movies/Other, desc: "Cartoon Series"}
-    - {id: 88, cat: Audio/Other, desc: "Music Kids"}
-    # Movies Subs No Embed.
-    - {id: 38, cat: Movies, desc: "Movies Subs No Embed."}
-    - {id: 40, cat: Movies/SD, desc: "DVDscr - PPVRiP - WebRip -Web-DL- TVRiP"}
-    - {id: 41, cat: Movies/SD, desc: "DVDRrip/R6/R5 Xvid/x264"}
-    - {id: 42, cat: Movies/SD, desc: "BDRip/BRRip/HDRip/480p"}
-    - {id: 43, cat: Movies/HD, desc: "HD - 720p"}
-    - {id: 44, cat: Movies/HD, desc: "HD - 1080p"}
-    - {id: 104, cat: Movies/HD, desc: "Micro"}
-    # Movies Subs Embed.
-    - {id: 45, cat: Movies, desc: "Movies Subs Embed."}
-    - {id: 47, cat: Movies/SD, desc: "DVDscr - PPVRiP - WebRip - Web-DL-TVRiP"}
-    - {id: 48, cat: Movies/SD, desc: "DVDRrip/R6/R5 Xvid/x264"}
-    - {id: 49, cat: Movies/SD, desc: "BDRip/BRRip/HDRip/480p"}
-    - {id: 50, cat: Movies/HD, desc: "HD - 720p"}
-    - {id: 51, cat: Movies/HD, desc: "HD - 1080p"}
-    - {id: 105, cat: Movies/HD, desc: "Micro"}
-    # Movie Packs
-    - {id: 90, cat: Movies, desc: "Movie Packs"}
-    - {id: 91, cat: Movies, desc: "Movie Packs Greek"}
-    - {id: 106, cat: Movies/Foreign, desc: "Movie Packs Foreign"}
-    # Movies in Greek
-    - {id: 56, cat: Movies, desc: "Movies in Greek"}
-    - {id: 57, cat: Movies, desc: "Movies in Greek"}
-    - {id: 58, cat: Movies, desc: "Movies Greek All Time Classics"}
-    - {id: 98, cat: Movies, desc: "Greek Filmographies"}
-    - {id: 99, cat: Movies/HD, desc: "HD 1080p"}
-    - {id: 100, cat: Movies/HD, desc: "HD 720p"}
-    # Movies 3D + 4K
-    - {id: 97, cat: Movies, desc: "Movies 3D + 4K"}
-    - {id: 111, cat: Movies/UHD, desc: "Movies 4K"}
-    - {id: 112, cat: Movies/3D, desc: "Movies 3D"}
-    # Tv Shows & Series
-    - {id: 59, cat: TV, desc: "Tv Shows & Series"}
-    - {id: 62, cat: TV/Foreign, desc: "Tv Shows Foreign"}
-    - {id: 63, cat: TV, desc: "Tv Shows Greek"}
-    - {id: 126, cat: TV/Foreign, desc: "Mini Series Foreign"}
-    - {id: 64, cat: TV/Foreign, desc: "Series Foreign"}
-    - {id: 65, cat: TV, desc: "Series Greek"}
-    - {id: 92, cat: TV/Foreign, desc: "Series Foreign Packs"}
-    - {id: 93, cat: TV, desc: "Series Greek Packs"}
-    # Sports
-    - {id: 66, cat: TV/Sport, desc: "Sports"}
-    - {id: 67, cat: TV/Sport, desc: "Sports"}
-    # Documentary
-    - {id: 68, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 69, cat: TV/Documentary, desc: "Documentary"}
-    # Applications
-    - {id: 6, cat: PC/0day, desc: "Applications"}
-    - {id: 74, cat: PC/0day, desc: "Windows"}
-    - {id: 73, cat: PC/Mobile-Android, desc: "Applications Mobile"}
-    # eBooks & Images
-    - {id: 87, cat: Books/EBook, desc: "eBooks & Images"}
-    - {id: 83, cat: Books/EBook, desc: "Ebooks"}
-    - {id: 110, cat: Books/Mags, desc: "EMagazines"}
-    - {id: 82, cat: Other, desc: "Pics & Images"}
-    - {id: 119, cat: Audio/Audiobook, desc: "Audio Books"}
-    # Games
-    - {id: 2, cat: PC/Games, desc: "Games"}
-    - {id: 27, cat: PC/Games, desc: "PC"}
-    # Music
-    - {id: 7, cat: Audio, desc: "Music"}
-    - {id: 75, cat: Audio/MP3, desc: "Music Greek"}
-    - {id: 76, cat: Audio/MP3, desc: "Music Greek Discographies"}
-    - {id: 116, cat: Audio/Lossless, desc: "Greek Flac"}
-    - {id: 77, cat: Audio/Foreign, desc: "Music Foreign"}
-    - {id: 78, cat: Audio/Foreign, desc: "Music Foreign Discographies"}
-    - {id: 94, cat: Audio/Lossless, desc: "Foreign Flac"}
-    - {id: 117, cat: Audio, desc: "Compact Disc Club"}
-    - {id: 20, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 118, cat: Audio, desc: "Dream Radio Music"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_vip
-    type: info
-    label: VIP
-    default: "On 1st March 2024 this site became VIP only. You will not be able to access the Torrents page with this indexer if you do not have a subscription membership."
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: info
-    type: info
-    label: Layout
-    default: "<ul><li>Only the English Classic profile is supported.</li><li>Make sure to set the <b>Torrent Listing</b> option in your profile to <b>Classic</b></li><li>And set the <b>Language</b> to <b>English</b></li><li>Using the <i>Modern</i> theme will prevent results, and using <i>Greek</i> will prevent upload dates.</li></ul>"
-
-login:
-  path: ?p=home&pid=1
-  method: form
-  form: form#sls_form
-  submitpath: ajax/login.php
-  inputs:
-    action: login
-    loginbox_membername: "{{ .Config.username }}"
-    loginbox_password: "{{ .Config.password }}"
-    loginbox_remember: 1
-  selectorinputs:
-    securitytoken:
-      selector: "script:contains(\"stKey: \")"
-      filters:
-        - name: regexp
-          args: "stKey: \"(.+?)\","
-  error:
-    - selector: ":contains(\"-ERROR-\")"
-  test:
-    path: ?p=home&pid=1
-    selector: a[href*="/?p=logout&"]
-
-search:
-  paths:
-    - path: /
-  inputs:
-    p: torrents
-    pid: 10
-    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
-    keywords: "{{ .Keywords }}"
-    # name, description, both, uploader
-    search_type: name
-
-  rows:
-    selector: "table#torrents_table_classic tr:has(td.torrent_name){{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
-
-  fields:
-    title:
-      selector: a[href*="?p=torrents&pid=10&action=details"]
-    category:
-      selector: div.category_image > a
-      attribute: href
-      filters:
-        - name: querystring
-          args: cid
-    details:
-      selector: a[href*="?p=torrents&pid=10&action=details"]
-      attribute: href
-    download:
-      selector: a[href*="?p=torrents&pid=10&action=download"]
-      attribute: href
-    date_day:
-      # Uploaded Friday at 05:11 by
-      # Uploaded Today at 00:48 by
-      # Uploaded Yesterday at 23:57 by
-      selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: regexp
-          args: "Uploaded (.+?) by"
-        - name: fuzzytime
-    date_year:
-      # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: regexp
-          args: "Uploaded (.+?) by"
-        - name: dateparse
-          args: "dd-MM-yyyy HH:mm"
-    date_unix:
-      # within the hour (unix)
-      selector: abbr[data-time]
-      attribute: data-time
-      optional: true
-    date:
-      text: "{{ if or .Result.date_day .Result.date_year .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_unix }}{{ else }}now{{ end }}"
-    size:
-      selector: a[rel="torrent_size"]
-    seeders:
-      selector: a[rel="torrent_seeders"]
-    leechers:
-      selector: a[rel="torrent_leechers"]
-    grabs:
-      selector: a[rel="times_completed"]
-    poster:
-      selector: a[rel="fancybox"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        "img[src$=\"/silver.gif\"]": 0.5
-        "img[src$=\"/torrent_free.png\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "img[src$=\"/torrent_multiple_upload.png\"]": 2
-        "*": 1
-    minimumseedtime:
-      # 110 hours  (as seconds = 110 x 60 x 60)
-      text: 396000
-    minimumratio:
-      text: 1.0
-# TSUE 2.2
--- a/src/Jackett.Common/Definitions/theshinning-api.yml
+++ b/src/Jackett.Common/Definitions/theshinning-api.yml
@@ -1,48 +1,43 @@
 ---
-id: theshinning-api
-name: The Shinning (API)
-description: "The Shinning (TsH) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
+id: emuwarez
+name: eMuwarez (API)
+description: "eMuwarez is a SPANISH Private Torrent Tracker for MOVIES / TV"
+language: es-ES
 type: private
 encoding: UTF-8
 links:
-  - https://theshinning.me/
-legacylinks:
-  - https://theshinning.org
-  - https://theshinning.org/
+  - https://emuwarez.it/

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Console, desc: "Game"}
-    - {id: 5, cat: PC, desc: "Application"}
-    - {id: 7, cat: TV/Sport, desc: "Wrestling"}
-    - {id: 8, cat: Books, desc: "Ebooks"}
-    - {id: 11, cat: Movies, desc: "TSH-Movie"}
-    - {id: 12, cat: TV, desc: "TSH-Serien"}
-    - {id: 13, cat: XXX, desc: "XxX"}
+    - {id: 1, cat: Movies, desc: "Películas"}
+    - {id: 2, cat: TV, desc: "Series"}

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

 settings:
+  - name: ip_filtering
+    type: info
+    label: "IP Filtering"
+    default: "eMuwarez blocks Non-Spanish IP addresses. A <b>FlareSolverr</b> error means your IP was not accepted."
  - name: apikey
    type: text
    label: APIKey
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://theshinning.me/\" target=\"_blank\">The Shinning</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://emuwarez.it/\" target=\"_blank\">eMuwarez</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -105,8 +100,15 @@ search:
  fields:
    category:
      selector: category_id
-    title:
+    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }} Spanish"
    details:
      selector: details_link
    download:
@@ -128,17 +130,13 @@ search:
      selector: meta.genres
      filters:
        - name: re_replace
-          args: ["(?i)^None$", ""]
+          args: ["(?i)(Ciencia ficción)", "Ciencia_ficción"]
        - name: re_replace
-          args: ["(?i)(Science Fiction)", "Science_Fiction"]
-        - name: re_replace
-          args: ["(?i)(TV Movie)", "TV_Movie"]
+          args: ["(?i)(Película de TV)", "Película_de_TV"]
        - name: replace
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -155,7 +153,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -165,13 +168,19 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
-      # api returns 0=false, 1=true
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
+      # api returns False, True
      selector: double_upload
      case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+    minimumratio:
+      text: 2.0
    minimumseedtime:
-      # 2.5 days (as seconds = 2.5 x 24 x 60 x 60)
-      text: 216000
-# json UNIT3D 6.5.0
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 8.2.0
--- a/src/Jackett.Common/Definitions/enthralled.yml
+++ b/src/Jackett.Common/Definitions/enthralled.yml
@@ -76,7 +76,7 @@ search:
    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
-    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
+    selector: table#torrent_table > tbody > tr[class^="torrent shaded_row"]:has(a[href*="action=download"])

  fields:
    category:
--- a/src/Jackett.Common/Definitions/enthralled2fa.yml
+++ b/src/Jackett.Common/Definitions/enthralled2fa.yml
@@ -70,7 +70,7 @@ search:
    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
-    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
+    selector: table#torrent_table > tbody > tr[class^="torrent shaded_row"]:has(a[href*="action=download"])

  fields:
    category:
--- a/src/Jackett.Common/Definitions/ex-torrenty.yml
+++ b/src/Jackett.Common/Definitions/ex-torrenty.yml
@@ -65,7 +65,7 @@ settings:
    default: POLISH
    options:
      POLISH: POLISH
-      MULTi POLISH: MULTIi POLISH
+      MULTi POLISH: MULTi POLISH

 login:
  # using cookie method because login page has embedded Google reCAPTCHA
--- a/src/Jackett.Common/Definitions/exttorrents.yml
+++ b/src/Jackett.Common/Definitions/exttorrents.yml
@@ -22,55 +22,55 @@ legacylinks:
 caps:
  categorymappings:
    - {id: "/anime/", cat: TV/Anime, desc: Anime}
-    - {id: "/anime/english-translated/", cat: TV/Anime, desc: "Anime English Translated"}
+    - {id: "/anime//english-translated/english-translated/", cat: TV/Anime, desc: "Anime English Translated"}
    - {id: "/applications/", cat: PC, desc: Apps}
-    - {id: "/applications/android/", cat: PC/Mobile-Android, desc: "Apps Android"}
-    - {id: "/applications/ios/", cat: PC/Mobile-iOS, desc: "Apps iOS"}
-    - {id: "/applications/linux/", cat: PC, desc: "Apps Linux"}
-    - {id: "/applications/mac/", cat: PC/Mac, desc: "Apps Mac"}
-    - {id: "/applications/other-applications/", cat: PC/Mobile-Other, desc: "Apps Other"}
-    - {id: "/applications/windows/", cat: PC/0day, desc: "Apps Windows"}
+    - {id: "/applications//android/android/", cat: PC/Mobile-Android, desc: "Apps Android"}
+    - {id: "/applications//ios/ios/", cat: PC/Mobile-iOS, desc: "Apps iOS"}
+    - {id: "/applications//linux/linux/", cat: PC, desc: "Apps Linux"}
+    - {id: "/applications//mac/mac/", cat: PC/Mac, desc: "Apps Mac"}
+    - {id: "/applications//other-applications/other-applications/", cat: PC/Mobile-Other, desc: "Apps Other"}
+    - {id: "/applications//windows/windows/", cat: PC/0day, desc: "Apps Windows"}
    - {id: "/books/", cat: Books, desc: Books}
-    - {id: "/books/audio-books/", cat: Audio/Audiobook, desc: "Books Audiobooks"}
-    - {id: "/books/comics/", cat: Books/Comics, desc: "Books Comics"}
-    - {id: "/books/ebooks/", cat: Books/EBook, desc: "Books Ebooks"}
+    - {id: "/books//audio-books/audio-books/", cat: Audio/Audiobook, desc: "Books Audiobooks"}
+    - {id: "/books//comics/comics/", cat: Books/Comics, desc: "Books Comics"}
+    - {id: "/books//ebooks/ebooks/", cat: Books/EBook, desc: "Books Ebooks"}
    - {id: "/games/", cat: PC/Games, desc: Games}
-    - {id: "/games/nds/", cat: Console/NDS, desc: "Games NDS"}
-    - {id: "/games/other-games/", cat: Console/Other, desc: "Games Other"}
-    - {id: "/games/pc-games/", cat: PC/Games, desc: "Games PC"}
-    - {id: "/games/ps3/", cat: Console/PS3, desc: "Games PS3"}
-    - {id: "/games/ps4/", cat: Console/PS4, desc: "Games PS4"}
-    - {id: "/games/psp/", cat: Console/PSP, desc: "Games PSP"}
-    - {id: "/games/switch/", cat: Console/Other, desc: "Games Switch"}
-    - {id: "/games/wii/", cat: Console/Wii, desc: "Games Wii"}
-    - {id: "/games/xbox360/", cat: Console/XBox 360, desc: "Games Xbox360"}
-    - {id: "/games/mac/", cat: PC/Mac, desc: "Games Mac"}
+    - {id: "/games//nds/nds/", cat: Console/NDS, desc: "Games NDS"}
+    - {id: "/games//other-games/other-games/", cat: Console/Other, desc: "Games Other"}
+    - {id: "/games//pc-games/pc-games/", cat: PC/Games, desc: "Games PC"}
+    - {id: "/games//ps3/ps3/", cat: Console/PS3, desc: "Games PS3"}
+    - {id: "/games//ps4/ps4/", cat: Console/PS4, desc: "Games PS4"}
+    - {id: "/games//psp/psp/", cat: Console/PSP, desc: "Games PSP"}
+    - {id: "/games//switch/switch/", cat: Console/Other, desc: "Games Switch"}
+    - {id: "/games//wii/wii/", cat: Console/Wii, desc: "Games Wii"}
+    - {id: "/games//xbox360/xbox360/", cat: Console/XBox 360, desc: "Games Xbox360"}
+    - {id: "/games//mac/mac/", cat: PC/Mac, desc: "Games Mac"}
    - {id: "/movies/", cat: Movies, desc: Movies}
-    - {id: "/movies/3d-movies/", cat: Movies/3D, desc: "Movies 3D"}
-    - {id: "/movies/bollywood/", cat: Movies, desc: "Movies Bollywood"}
-    - {id: "/movies/documentary/", cat: Movies, desc: "Movies Documentary"}
-    - {id: "/movies/dubbed-movies/", cat: Movies, desc: "Movies Dubbed"}
-    - {id: "/movies/dvd/", cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: "/movies/highres-movies/", cat: Movies/HD, desc: "Movies Highres"}
-    - {id: "/movies/mp4/", cat: Movies, desc: "Movies MP4"}
-    - {id: "/movies/other-movies/", cat: Movies, desc: "Movies Other Movies"}
-    - {id: "/movies/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
-    - {id: "/movies/music-videos/", cat: Audio/Video, desc: "Movies Music videos"}
-    - {id: "/movies/movie-clips/", cat: Movies/Other, desc: "Movies Movie clips"}
+    - {id: "/movies//3d-movies/3d-movies/", cat: Movies/3D, desc: "Movies 3D"}
+    - {id: "/movies//bollywood/bollywood/", cat: Movies, desc: "Movies Bollywood"}
+    - {id: "/movies//documentary/documentary/", cat: Movies, desc: "Movies Documentary"}
+    - {id: "/movies//dubbed-movies/dubbed-movies/", cat: Movies, desc: "Movies Dubbed"}
+    - {id: "/movies//dvd/dvd/", cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: "/movies//highres-movies/highres-movies/", cat: Movies/HD, desc: "Movies Highres"}
+    - {id: "/movies//mp4/mp4/", cat: Movies, desc: "Movies MP4"}
+    - {id: "/movies//other-movies/other-movies/", cat: Movies, desc: "Movies Other Movies"}
+    - {id: "/movies//ultrahd/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
+    - {id: "/movies//music-videos/music-videos/", cat: Audio/Video, desc: "Movies Music videos"}
+    - {id: "/movies//movie-clips/movie-clips/", cat: Movies/Other, desc: "Movies Movie clips"}
    - {id: "/music/", cat: Audio, desc: Music}
-    - {id: "/music/aac/", cat: Audio, desc: "Music AAC"}
-    - {id: "/music/lossless/", cat: Audio/Lossless, desc: "Music Lossless"}
-    - {id: "/music/mp3/", cat: Audio/MP3, desc: "Music MP3"}
-    - {id: "/music/other-music/", cat: Audio/Other, desc: "Music Other"}
-    - {id: "/music/radio-shows/", cat: Audio, desc: "Music Radio Shows"}
+    - {id: "/music//aac/aac/", cat: Audio, desc: "Music AAC"}
+    - {id: "/music//lossless/lossless/", cat: Audio/Lossless, desc: "Music Lossless"}
+    - {id: "/music//mp3/mp3/", cat: Audio/MP3, desc: "Music MP3"}
+    - {id: "/music//other-music/other-music/", cat: Audio/Other, desc: "Music Other"}
+    - {id: "/music//radio-shows/radio-shows/", cat: Audio, desc: "Music Radio Shows"}
    - {id: "/other/", cat: Other, desc: Other}
    - {id: "/tv/", cat: TV, desc: TV}
    - {id: "/xxx/", cat: XXX, desc: XXX}
-    - {id: "/xxx/games/", cat: XXX/Other, desc: "XXX Games"}
-    - {id: "/xxx/hentai/", cat: XXX/Other, desc: "XXX Hentai"}
-    - {id: "/xxx/magazines/", cat: XXX/Other, desc: "XXX Magazines"}
-    - {id: "/xxx/pictures/", cat: XXX/ImageSet, desc: "XXX Pictures"}
-    - {id: "/xxx/video/", cat: XXX, desc: "XXX Video"}
+    - {id: "/xxx//games/games/", cat: XXX/Other, desc: "XXX Games"}
+    - {id: "/xxx//hentai/hentai/", cat: XXX/Other, desc: "XXX Hentai"}
+    - {id: "/xxx//magazines/magazines/", cat: XXX/Other, desc: "XXX Magazines"}
+    - {id: "/xxx//pictures/pictures/", cat: XXX/ImageSet, desc: "XXX Pictures"}
+    - {id: "/xxx//video/video/", cat: XXX, desc: "XXX Video"}
    - {id: "/video/", cat: XXX, desc: "XXX Video"}

  modes:
@@ -101,26 +101,39 @@ settings:

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/{{ end }}"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/2/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/2/{{ end }}"
+    # https://ext.to/browse/?sort=age&order=desc&age=4&with_adult=1
+    # https://ext.to/browse/?sort=age&order=desc&q=wipeout&with_adult=1
+    - path: browse/
+    - path: browse/
+      inputs:
+        page: 2
      followredirect: true
-
-  keywordsfilters:
-    - name: tolower
-    - name: trim
-    - name: re_replace
-      args: ["[^\\w]+", "-"]
+  inputs:
+    q: "{{ .Keywords }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # 0=last 24 hours, 1=last 3 days, 2=last week, 3=last 2 weeks, 4=last month
+    age: "{{ if .Keywords }}{{ else }}0{{ end }}"
+    # familysafe 0=enabled, 1=disabled
+    with_adult: 1

  rows:
    selector: table.table-striped > tbody > tr

  fields:
-    category_optional:
-      selector: td:nth-child(1) div div a:last-child
+    category_part1:
+      selector: td:nth-child(1) div div a:nth-child(2)
      attribute: href
      optional: true
+    category_part2:
+      selector: td:nth-child(1) div div a:nth-child(3)
+      attribute: href
+      optional: true
+    category_combined:
+      text: "{{ .Result.category_part1 }}{{ .Result.category_part2 }}"
+      optional: true
    category:
-      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}/other/{{ end }}"
+      text: "{{ if .Result.category_combined }}{{ .Result.category_combined }}{{ else }}/other/{{ end }}"
    title:
      selector: td:nth-child(1) div a
    details:
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -42,7 +42,8 @@ search:

  keywordsfilters:
    - name: re_replace
-      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
+      args: ["\\bS\\d{2,3}\\b", ""] # remove season tag without episode (search doesn't support it)
+    - name: trim
    # fixes for site search issues - Prowlarr #1094
    - name: replace
      args: ["-", ""]
--- a/src/Jackett.Common/Definitions/f1carreras-api.yml
+++ b/src/Jackett.Common/Definitions/f1carreras-api.yml
@@ -22,10 +22,11 @@ caps:
    - {id: 10, cat: TV/Sport, desc: "DTM"}
    - {id: 11, cat: TV/Sport, desc: "Rally"}
    - {id: 12, cat: TV/Sport, desc: "WEC"}
+    - {id: 13, cat: TV/Sport, desc: "Other Series"}

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    tv-search: [q, season, ep]

 settings:
  - name: apikey
@@ -34,11 +35,15 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://f1carreras.xyz/\" target=\"_blank\">F1Carreras</a> account <i>Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://f1carreras.xyz/\" target=\"_blank\">F1Carreras</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -83,9 +88,6 @@ search:
    # disabled due to not being properly mapped
    # 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 }}"
@@ -105,27 +107,21 @@ search:
  fields:
    category:
      selector: category_id
-    title:
+    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
      selector: download_link
    infohash:
      selector: info_hash
-    poster:
-      selector: meta.poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -142,7 +138,12 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -152,15 +153,17 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
-    minimumratio:
-      text: 1.0
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
    minimumseedtime:
-      # 1 day (as seconds = 1 x 24 x 60 x 60)
-      text: 86400
-# json UNIT3D 7.2.5 (custom)
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 8.3.4 (custom)
--- a/src/Jackett.Common/Definitions/fantastiko.yml
+++ b/src/Jackett.Common/Definitions/fantastiko.yml
@@ -1,223 +0,0 @@
---
-id: fantastiko
-name: Fantastiko
-description: "Fantastiko is a GREEK Private Torrent Tracker for SCI-FI / FANTASY / HORROR MOVIES / TV / GENERAL"
-language: el-GR
-type: private
-encoding: UTF-8
-links:
-  - https://fantastiko.space/
-legacylinks:
-  - http://fantastiko.space/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 14, cat: Movies/BluRay, desc: "Movies DVDRip/BRRip"}
-    - {id: 56, cat: Movies/HD, desc: "Movies BluRay 720p/1080p/2160p"}
-    - {id: 17, cat: Movies/DVD, desc: "Movies DVD5/9"}
-    - {id: 49, cat: Movies, desc: "Movies Packs/filmographies"}
-    - {id: 50, cat: Movies/Other, desc: "Movies Others (screener-webrip-tvrip)"}
-    - {id: 53, cat: Movies/SD, desc: "Movies VHS"}
-    - {id: 51, cat: Movies, desc: "Movies Short films"}
-    - {id: 52, cat: Movies, desc: "Movie Serials"}
-    - {id: 32, cat: TV, desc: "Series"}
-    - {id: 38, cat: TV, desc: "TV Episodes"}
-    - {id: 39, cat: TV, desc: "TV Packs"}
-    - {id: 57, cat: TV/WEB-DL, desc: "Web Episodes"}
-    - {id: 65, cat: TV/WEB-DL, desc: "Web Episode Packs"}
-    - {id: 64, cat: TV, desc: "Video Episodes"}
-    - {id: 66, cat: TV, desc: "Video Episode Packs"}
-    - {id: 36, cat: TV/Anime, desc: "Animation"}
-    - {id: 54, cat: TV/Anime, desc: "Animation Movies"}
-    - {id: 55, cat: TV/Anime, desc: "Animation TV Series"}
-    - {id: 60, cat: TV/Anime, desc: "Animation Web Series"}
-    - {id: 61, cat: TV/Anime, desc: "Animation Video Series"}
-    - {id: 59, cat: TV/Anime, desc: "Animation Shorts"}
-    - {id: 33, cat: TV/Documentary, desc: "Ντοκιμαντέρ/Τηλ.Εκπομπές (Documentaries)"}
-    - {id: 58, cat: TV, desc: "Supermarionation"}
-    - {id: 62, cat: TV, desc: "Supermarionation Movies"}
-    - {id: 63, cat: TV, desc: "Supermarionation  Series"}
-    - {id: 34, cat: Books, desc: "Βιβλία"}
-    - {id: 40, cat: Books/EBook, desc: "E-Books"}
-    - {id: 41, cat: Audio/Audiobook, desc: "Audio Books"}
-    - {id: 42, cat: Books/Mags, desc: "Περιοδικά (Magazines)"}
-    - {id: 35, cat: Books/Comics, desc: "Comics"}
-    - {id: 37, cat: Other, desc: "Παραστάσεις (Theater)"}
-    - {id: 45, cat: Other, desc: "Photos"}
-    - {id: 7, cat: Audio/Other, desc: "Music/Soundtrack"}
-    - {id: 2, cat: PC/Games, desc: "Games"}
-    - {id: 46, cat: PC, desc: "Software"}
-    - {id: 47, cat: Other, desc: "Κατασκευές (Constructions)"}
-    - {id: 48, cat: Other, desc: "Borg Cube"}
-
-  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_activity
-    type: info
-    label: Account Inactivity
-    default: "Newcomers with zero offer and participation are deleted after 1 week. Those users who fall into a ratio below 1 or make 3 hit'n'runs (2 for newcomers) become a redshirt (this means limited access to the tracker, removal of invites and reset of forum statistics) and at 5, if they don't enter the seed and 15 days pass, they are banned to the nearest barren planet..."
-
-login:
-  path: ?p=home&pid=1
-  method: form
-  form: form#sls_form
-  submitpath: /ajax/login.php
-  inputs:
-    action: login
-    loginbox_membername: "{{ .Config.username }}"
-    loginbox_password: "{{ .Config.password }}"
-    loginbox_remember: 1
-  selectorinputs:
-    securitytoken:
-      selector: "script:contains(\"stKey: \")"
-      filters:
-        - name: regexp
-          args: "stKey: \"(.+?)\","
-  error:
-    - selector: ":contains(\"-ERROR-\")"
-  test:
-    path: ?p=home&pid=1
-    selector: a#logout
-
-search:
-  paths:
-    - path: /
-  keywordsfilters:
-    - name: re_replace # add brackets to year on searchquery if missing
-      args: ["\\(*((19|20)\\d{2})\\)*", "($1)"]
-    - name: re_replace
-      args: ["[^\\w\\d\\(\\)]+", "%"]
-  inputs:
-    p: torrents
-    pid: 32
-    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
-    keywords: "{{ .Keywords }}"
-    # name, description, both, uploader
-    search_type: name
-  error:
-    - selector: div#show_error
-
-  rows:
-    selector: "tr:has(a[href*=\"?p=torrents\"][href*=\"&cid=\"]){{ if .Config.freeleech }}:has(img[src*=\"torrent_free.png\"]){{ else }}{{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href*="?p=torrents"][href*="&cid="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cid
-    title:
-      selector: a[href*="?p=torrents"][href*="&action=details"]
-    details:
-      selector: a[href*="?p=torrents"][href*="&action=details"]
-      attribute: href
-    download:
-      selector: a[href*="?p=torrents"][href*="&action=download"]
-      attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: a[rel="torrent_size"]
-    seeders:
-      selector: a[rel="torrent_seeders"]
-    leechers:
-      selector: a[rel="torrent_leechers"]
-    grabs:
-      selector: a[rel="times_completed"]
-    poster:
-      selector: a[rel="fancybox"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        "img[src*=\"torrent_free.png\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    date_day:
-      selector: td.torrent_name:contains("day"), td.torrent_name:contains("σήμερα"), td.torrent_name:contains("εχθές"), td.torrent_name:contains("Δευτέρα"), td.torrent_name:contains("Τρίτη"), td.torrent_name:contains("Τετάρτη"), td.torrent_name:contains("Πέμπτη"), td.torrent_name:contains("Παρασκευή"), td.torrent_name:contains("Σάββατο"), td.torrent_name:contains("Κυριακή")
-      # auto adjusted by site account profile
-      optional: true
-      remove: span, a
-      filters:
-        - name: replace
-          args: ["Uploaded ", ""]
-        - name: replace
-          args: [" by", ""]
-        - name: replace
-          args: ["Ανέβηκε ", ""] # Uploaded
-        - name: replace
-          args: [" από", ""] # by
-        - name: replace
-          args: [" τον/την", ""] # him/her
-        - name: replace
-          args: ["στις ", "at "] # at
-        - name: replace
-          args: ["σήμερα", "Today"]
-        - name: replace
-          args: ["εχθές", "Yesterday"]
-        - name: replace
-          args: ["Δευτέρα", "Monday"]
-        - name: replace
-          args: ["Τρίτη", "Tuesday"]
-        - name: replace
-          args: ["Τετάρτη", "Wednesday"]
-        - name: replace
-          args: ["Πέμπτη", "Thursday"]
-        - name: replace
-          args: ["Παρασκευή", "Friday"]
-        - name: replace
-          args: ["Σάββατο", "Saturday"]
-        - name: replace
-          args: ["Κυριακή", "Sunday"]
-        - name: fuzzytime
-    date_year:
-      selector: td.torrent_name:contains("-")
-      # auto adjusted by site account profile
-      optional: true
-      remove: span, a
-      filters:
-        - name: replace
-          args: ["Uploaded ", ""]
-        - name: replace
-          args: [" by", ""]
-        - name: replace
-          args: ["at ", ""]
-        - name: replace
-          args: ["Ανέβηκε ", ""] # Uploaded
-        - name: replace
-          args: [" από", ""] # by
-        - name: replace
-          args: [" τον/την", ""] # him/her
-        - name: replace
-          args: ["στις ", ""] # at
-        - name: dateparse
-          args: "dd-MM-yyyy HH:mm"
-    date:
-      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# TSUE 2.1
--- a/src/Jackett.Common/Definitions/fearnopeer.yml
+++ b/src/Jackett.Common/Definitions/fearnopeer.yml
@@ -182,7 +182,6 @@ search:
        True: 2 # double
    uploadvolumefactor:
      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
-# Maintain global ratio above 0.7 or downloads will get disabled. No MST.
    minimumratio:
      text: 0.71
-# json UNIT3D 8.3.3
+# json UNIT3D 8.3.6
--- a/src/Jackett.Common/Definitions/file-tracker.yml
+++ b/src/Jackett.Common/Definitions/file-tracker.yml
@@ -11,14 +11,12 @@ links:
 caps:
  categorymappings:
    # Эксклюзив
-    # Exclusive
    - {id: 387, cat: Movies/DVD, desc: " |- Отечественные фильмы DVD Master's"}
    - {id: 386, cat: Movies/DVD, desc: " |- Зарубежные фильмы DVD Master's"}
    - {id: 390, cat: TV/SD, desc: " |- Сериалы DVD Master's"}
    - {id: 388, cat: Movies/DVD, desc: " |- Мультфильмы DVD Master's"}
    - {id: 601, cat: TV/Anime, desc: " |- Мультсериалы DVD Master's"}
    # Кино, видео, мультипликация и ТВ
-    # Film, video, animation and TV
    - {id: 1002, cat: Movies, desc: " |- Зарубежные фильмы , мультфильмы [HD/UHD]"}
    - {id: 987, cat: Movies, desc: " |- Зарубежные фильмы , мультфильмы [SD]"}
    - {id: 1003, cat: Movies, desc: " |- Отечественные фильмы , мультфильмы [HD/UHD]"}
@@ -178,7 +176,6 @@ caps:
    - {id: 304, cat: TV/Anime, desc: " |- Аниме (озвучка)"}
    - {id: 303, cat: TV/Anime, desc: " |- Аниме (RAW)"}
    # Игры
-    # Games
    - {id: 471, cat: Console, desc: " |- Раздачи игр от R.G. FTN Gaming RePack"}
    - {id: 19, cat: Console, desc: " |- Новинки игр"}
    - {id: 99, cat: Console, desc: " |- Demo, Alpha, Beta версии"}
@@ -215,7 +212,6 @@ caps:
    - {id: 662, cat: Console, desc: " |- Софт для консолей"}
    - {id: 116, cat: Console, desc: " |- Портативные и Консольные (Игры)"}
    # ПО для Windows
-    # Software for Windows
    - {id: 529, cat: PC/0day, desc: " |- Информация и диагностика"}
    - {id: 518, cat: PC/0day, desc: " |- Системные утилиты"}
    - {id: 516, cat: PC/0day, desc: " |- Безопасность: Защита информации. Антивирусы/файерволы"}
@@ -267,7 +263,6 @@ caps:
    - {id: 960, cat: PC/0day, desc: " |- Вспомогательный софт для релизера"}
    - {id: 961, cat: PC/0day, desc: " |- Разное"}
    # Операционные системы и программирование
-    # Operating systems and programming
    - {id: 972, cat: PC, desc: " |- Windows 10 / 11 (Оригинальные версии)"}
    - {id: 909, cat: PC, desc: " |- Windows 8 / 8.1 (Оригинальные версии)"}
    - {id: 822, cat: PC, desc: " |- Windows 7 (Оригинальные версии)"}
@@ -303,7 +298,6 @@ caps:
    - {id: 368, cat: Other, desc: " |- Компоненты для сред программирования"}
    - {id: 367, cat: Other, desc: " |- Ищу и предлагаю (Веб-разработка и программирование)"}
    # iPhone, iPod, iPod Touch, iPad, мобильные телефоны . Android и КПК
-    # iPhone, iPod, iPod Touch, iPad, mobile phones.
    - {id: 430, cat: PC/Mobile-iOS, desc: " |- База знаний"}
    - {id: 967, cat: PC/Mobile-iOS, desc: " |- Прошивки и ОС"}
    - {id: 426, cat: PC/Mobile-iOS, desc: " |- Программы"}
@@ -313,7 +307,6 @@ caps:
    - {id: 175, cat: PC/Mobile-iOS, desc: " |- Приложения"}
    - {id: 174, cat: PC/Mobile-iOS, desc: " |- Игры"}
    # Музыка
-    # Music
    - {id: 939, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
    - {id: 948, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
    - {id: 129, cat: Audio, desc: " |- Многоканальная музыка (Электронная музыка)"}
@@ -415,7 +408,6 @@ caps:
    - {id: 290, cat: Audio, desc: " |- К фильмам"}
    - {id: 291, cat: Audio, desc: " |- К сериалам"}
    # Литература и обучение
-    # Literature and learning
    - {id: 61, cat: Books, desc: " |- Художественная литература"}
    - {id: 664, cat: Books, desc: " |- Художественная литература для детей"}
    - {id: 467, cat: Books, desc: " |- Художественная литература на иностранных языках"}
@@ -435,11 +427,13 @@ caps:
    - {id: 586, cat: Books, desc: " |- Авто - Тюнинг, чиптюнинг, настройка, отделка и укращения"}
    - {id: 672, cat: Books, desc: " |- Литература по медицине"}
    - {id: 793, cat: Books, desc: "Журналы научно-прикладные и познавательно-образовательные"}
+    - {id: 708, cat: PC, desc: "ЖИнтерактивный и компьтерный материал"}
    - {id: 875, cat: PC, desc: " |- Интерактивные компьютерные диски для хобби"}
    - {id: 583, cat: PC, desc: " |- Интерактивные справочники и каталоги для авто/мото транспорт.."}
    - {id: 465, cat: PC, desc: " |- Интерактивные и компьютерные диски для обучения ин. языкам"}
    - {id: 674, cat: PC, desc: " |- Интерактивные и компьютерные диски по медицине"}
    - {id: 710, cat: PC, desc: " |- Прочие материалы для детей и родителей"}
+    - {id: 888, cat: Books, desc: "Литература разных направлений"}
    - {id: 897, cat: Books, desc: " |- Прочее"}
    - {id: 896, cat: Books, desc: " |- Автомобили"}
    - {id: 895, cat: Books, desc: " |- Домашним мастерам"}
@@ -461,10 +455,10 @@ caps:
    - {id: 816, cat: Audio/Audiobook, desc: " |- Современная литература"}
    - {id: 190, cat: Audio/Audiobook, desc: " |- Аудио книги для детей"}
    - {id: 191, cat: Audio/Audiobook, desc: " |- Обучающие аудиокниги и аудиоупражнения для детей"}
+    - {id: 749, cat: Audio, desc: "Аудио концерты, спектакли, пьесы"}
    - {id: 687, cat: Audio, desc: " |- Аудиоспектакли и литературные чтения"}
    - {id: 751, cat: Audio, desc: " |- Аудио юмористические концерты (выступления)"}
    # Эротика
-    # Erotica
    - {id: 963, cat: XXX, desc: "Эротические художественные фильмы"}
    - {id: 964, cat: XXX, desc: "Эротические документальные фильмы"}
    - {id: 178, cat: XXX, desc: "Русская эротика"}
@@ -481,7 +475,7 @@ caps:
    - {id: 813, cat: XXX, desc: " |- 3D | Иностранная эротика"}
    - {id: 820, cat: XXX, desc: "Литература"}
    # Служебный раздел
-    # Service section
+    - {id: 912, cat: Other, desc: "Нарушение правил оформления"}
    - {id: 57, cat: Other, desc: "Временный склад (TEMP)"}
    - {id: 433, cat: Other, desc: "Архив раздач"}

@@ -602,7 +596,7 @@ search:
        - name: querystring
          args: f
    title:
-      selector: a.genmed
+      selector: a.genmed, a.seedmed
      filters:
        # normalize to SXXEYY format
        - name: re_replace
@@ -668,7 +662,7 @@ search:
        - name: append
          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
    details:
-      selector: a.genmed
+      selector: a.genmed, a.seedmed
      attribute: href
    download:
      selector: a[href^="/download.php?id="]
@@ -691,5 +685,5 @@ search:
    uploadvolumefactor:
      text: 1
    description:
-      selector: a.genmed
+      selector: a.genmed, a.seedmed
 # TorrentPier
--- a/src/Jackett.Common/Definitions/freefarm.yml
+++ b/src/Jackett.Common/Definitions/freefarm.yml
@@ -10,6 +10,7 @@ links:
  - https://pt.0ff.cc/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
    - {id: 401, cat: Movies, desc: "Movies|电影", default: true}
    - {id: 402, cat: TV, desc: "TV Series|电视剧", default: true}
@@ -19,13 +20,25 @@ caps:
    - {id: 406, cat: Audio/Video, desc: "Music Videos|音乐视频", default: true}
    - {id: 407, cat: Audio/Lossless, desc: "HD Music|无损音乐", default: true}
    - {id: 408, cat: TV/Sport, desc: "Sports|体育", default: true}
+    - {id: 427, cat: Other/Misc, desc: "待定", default: true}
+    - {id: 412, cat: Other/Misc, desc: "待定", default: true}
+    - {id: 411, cat: Other/Misc, desc: "待定", default: true}
+    - {id: 410, cat: Other/Misc, desc: "待定", default: true}
+    - {id: 409, cat: Other/Misc, desc: "待定", default: true}
    - {id: 428, cat: Other, desc: "Others|其他", default: true}
-    # special
    - {id: 413, cat: Other, desc: "Education|学习教育", default: false}
    - {id: 414, cat: Other, desc: "Course|网络教程", default: false}
    - {id: 415, cat: Books, desc: "book|书籍", default: false}
    - {id: 416, cat: PC/0day, desc: "Resources|网络资源", default: false}
    - {id: 417, cat: PC/Games, desc: "Game|游戏", default: false}
+    - {id: 425, cat: Other/Misc, desc: "待定", default: false}
+    - {id: 424, cat: Other/Misc, desc: "待定", default: false}
+    - {id: 423, cat: Other/Misc, desc: "待定", default: false}
+    - {id: 422, cat: Other/Misc, desc: "待定", default: false}
+    - {id: 421, cat: Other/Misc, desc: "待定", default: false}
+    - {id: 420, cat: Other/Misc, desc: "待定", default: false}
+    - {id: 419, cat: Other/Misc, desc: "待定", default: false}
+    - {id: 418, cat: Other/Misc, desc: "待定", default: false}
    - {id: 426, cat: Other, desc: "Others|其他", default: false}

  modes:
@@ -106,9 +119,9 @@ login:
 search:
  paths:
    - path: torrents.php
-      categories: [401, 402, 403, 404, 405, 406, 407, 408, 428]
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 427, 412, 411, 410, 409, 428]
    - path: special.php
-      categories: [413, 414, 415, 416, 417, 426]
+      categories: [413, 414, 415, 416, 417, 425, 424, 423, 422, 421, 420, 419, 418, 426]
  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 }}"
@@ -218,4 +231,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.13 2024-07-23
+# NexusPHP v1.9.0 2025-02-06
--- a/src/Jackett.Common/Definitions/frozenlayer.yml
+++ b/src/Jackett.Common/Definitions/frozenlayer.yml
@@ -1,123 +0,0 @@
---
-id: frozenlayer
-name: Frozen Layer
-description: "Frozen Layer is a SPANISH Public torrent site focused on ANIME"
-language: es-ES
-type: public
-encoding: UTF-8
-requestDelay: 2
-certificates:
-  - 0e43335b4c778e95f8e4db46e20cc3d0e84e59ff  # expired 19 June 2024
-links:
-  - https://www.frozen-layer.com/
-
-settings:
-  - name: category
-    type: select
-    label: Category
-    default: todos
-    options:
-      todos: todos
-      anime: anime
-      manga: manga
-      dorama: dorama
-      videojuego: videojuego
-      BSO: BSO
-      PV: PV
-      otros: otros
-  - name: info
-    type: info
-    label: Direct Downloads
-    default: This definition filters for search results that contain .torrent and magnet only. Results for Direct Download are not supported.
-
-caps:
-  categorymappings:
-    - {id: Anime, cat: TV/Anime, desc: "anime"}
-    - {id: Manga, cat: TV/Anime, desc: "manga"}
-    - {id: Dorama, cat: TV/Anime, desc: "dorama"}
-    - {id: Videojuego, cat: TV/Anime, desc: "videojuego"}
-    - {id: Bso, cat: TV/Anime, desc: "BSO"}
-    - {id: Pv, cat: TV/Anime, desc: "PV"}
-    - {id: Otros, cat: TV/Anime, desc: "otros"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar{{ else }}descargas{{ end }}"
-    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&{{ else }}descargas?{{ end }}page=2"
-  keywordsfilters:
-    - name: re_replace # remove first season from search string
-      args: ["(?i)(S1)", ""]
-    - name: re_replace # switch second season from search string
-      args: ["(?i)(S2)", "segunda temporada"]
-    - name: re_replace # switch third season from search string
-      args: ["(?i)(S3)", "tercera temporada"]
-    - name: re_replace # remove E from episode number from search string
-      args: ["(?i)E([0-9]+)", "$1"]
-
-  rows:
-    selector: table#descargas > tbody > tr:has(td:has(a[href^="magnet:?"]))
-
-  fields:
-    category:
-      text: "{{ if eq .Config.category \"todos\" }}Anime{{ else }}{{ .Config.category }}{{ end }}"
-    title:
-      selector: td.tit a
-      filters:
-        - name: re_replace
-          args: ["\\/|\\(|\\)", " "]
-        - name: re_replace
-          args: ["([A-z]*) temporada", ""]
-        - name: re_replace
-          args: ["(?i)Sprimera|Ssegunda|Stercera", ""]
-        - name: re_replace
-          args: ["S([0-9]+) - Episodio ([0-9]+)", "$2"]
-        - name: re_replace
-          args: ["- Episodio ([0-9]*)", "$1"]
-        - name: append
-          args: " Spanish"
-    details:
-      selector: td.tit a
-      attribute: href
-    download:
-      selector: td:nth-child(1) a[href$=".torrent"]
-      attribute: href
-    magnet:
-      selector: td:nth-child(1) a[href^="magnet:?"]
-      attribute: href
-    date_day:
-      # 1d
-      # 2d 3h
-      # 3 dias
-      # 3h 14m
-      optional: true
-      selector: td.fecha:not(:contains("Jan:")):not(:contains("Feb")):not(:contains("Mar:")):not(:contains("Apr")):not(:contains("May:")):not(:contains("Jun")):not(:contains("Jul:")):not(:contains("Aug")):not(:contains("Sep:")):not(:contains("Oct")):not(:contains("Nov:")):not(:contains("Dec"))
-      filters:
-        - name: replace
-          args: ["días", "days ago"]
-        - name: timeago
-    date_year:
-      # 29 Oct 17
-      optional: true
-      selector: td.fecha:not(:contains("d")):not(:contains("h")):not(:contains("m"))
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "dd MMM yy zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/futuretorrent.yml
+++ b/src/Jackett.Common/Definitions/futuretorrent.yml
@@ -114,6 +114,16 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
+  error:
+    - selector: table:has(a[href*="login.php?error=1"])
+      message:
+        text: "ERROR: Incorrect username!"
+    - selector: table:has(a[href*="login.php?error=4"])
+      message:
+        text: "ERROR: Incorrect password!"
+    - selector: table:has(a[href*="login.php?error="])
+      message:
+        text: "ERROR: Something went wrong during login!"
  test:
    path: index.php
    selector: a[href*="/logout.php"]
--- a/src/Jackett.Common/Definitions/gamestorrents.yml
+++ b/src/Jackett.Common/Definitions/gamestorrents.yml
@@ -6,11 +6,12 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://www.gamestorrents.fm/
+  - https://www.gamestorrents.app/
 legacylinks:
  - https://www.gamestorrents.com/
  - https://www.gamestorrents.tv/
  - https://www.gamestorrents.nu/
+  - https://www.gamestorrents.fm/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/gaytorrentru.yml
+++ b/src/Jackett.Common/Definitions/gaytorrentru.yml
@@ -52,6 +52,7 @@ settings:

 caps:
  categorymappings:
+    - {id: 69, cat: XXX, desc: "AI"}
    - {id: 62, cat: XXX, desc: "Amateur"}
    - {id: 29, cat: XXX, desc: "Anal"}
    - {id: 46, cat: XXX, desc: "Anime Games"}
@@ -111,6 +112,8 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
+  error:
+    - selector: div.panel:has(h3:contains("Login failed"))
  test:
    path: browse.php
    selector: a[href$="/logout.php"]
--- a/src/Jackett.Common/Definitions/haresclub.yml
+++ b/src/Jackett.Common/Definitions/haresclub.yml
@@ -1,31 +1,29 @@
 ---
-id: haresclub
-name: Hares Club (白兔俱乐部)
-description: "Hares Club (白兔俱乐部) is a CHINESE Private site that focuses on 4K media."
+id: ggpt
+name: GGPT
+description: "GGPT is a CHINESE Private Torrent Tracker for GAMES"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://club.hares.top/
+  - https://www.gamegamept.com/

 caps:
+  # dont forget to update the path categories in the search block
  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: "Music Videos | 音乐视频"}
-    - {id: 407, cat: TV/Sport, desc: "Sports | 体育"}
-    - {id: 409, cat: Audio/Video, desc: "Concert | 演唱会"}
-    - {id: 416, cat: TV, desc: "Show LIVE | 现场LIVE"}
-    - {id: 415, cat: Other, desc: "Others | 其他"}
+    - {id: 401, cat: PC/Games, desc: "PC游戏(PC Games)", default: true}
+    - {id: 404, cat: Console/PS4, desc: "索尼主机游戏(Sony console games)", default: true}
+    - {id: 405, cat: Console/XBox, desc: "微软主机游戏(Microsoft console games)", default: true}
+    - {id: 406, cat: Console/NDS, desc: "任天堂主机游戏(Nintendo console games)", default: true}
+    - {id: 407, cat: PC/Mac, desc: "苹果游戏(Apple Games)", default: true}
+    - {id: 409, cat: PC/Mobile-Android, desc: "安卓游戏(Android Games)", default: true}
+    - {id: 410, cat: Books/Mags, desc: "游戏书藉(Game Magazines)", default: true}
+    - {id: 412, cat: XXX/Other, desc: "9KG-PC", default: false}
+    - {id: 418, cat: XXX/Other, desc: "9KG-其他", default: false}

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

 settings:
  - name: username
@@ -40,7 +38,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 Hares Club 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 GGPT Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -61,10 +59,10 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: info_tpp
+  - name: info_activity
    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.
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Extreme User and above will be retained forever</li><li>Elite User and above will not have their account deleted within 180 days after parking (in the control panel)</li><li>Users with a parked account will be deleted if they do not log in for 180 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 180 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 30 consecutive days.</li></ol>"

 login:
  path: login.php
@@ -84,66 +82,63 @@ login:
    ssl: yes
    trackerssl: yes
  error:
-    - selector: script:contains("'失败'")
+    - selector: td.embedded:has(h2:contains("失败"))
      message:
-        text: "图片代码无效！The Image code is invalid. Close the config and start again."
-    - selector: script:contains("'登录失败！'")
-      message:
-        text: "用户名或密码不正确！或者你还没有通过验证。The username or password is incorrect! Close the config and start again."
+        selector: td.text
  test:
    path: index.php
-    selector: a[href*="logout.php"]
+    selector: a[href="logout.php"]

 search:
  paths:
    - path: torrents.php
+      categories: [401, 404, 405, 406, 407, 409, 410]
+    - path: special.php
+      categories: [412, 418]
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ 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: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    search_area: 0
+    # 0 AND, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
    notnewword: 1

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

  fields:
    category:
-      selector: a[href*="?cat="]
+      selector: a[href^="?cat="]
      attribute: href
      filters:
        - name: querystring
          args: cat
    title_default:
-      selector: a[href*="details.php?id="]
+      selector: a[href^="details.php?id="]
    title:
-      selector: a[title][href*="details.php?id="]
+      selector: a[title][href^="details.php?id="]
      attribute: title
      optional: true
      default: "{{ .Result.title_default }}"
    details:
-      selector: a[href*="details.php?id="]
+      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: a[href*="download.php?id="]
+      selector: a[href^="download.php?id="]
      attribute: href
    poster:
-      selector: div.layui-torrents-Stills > a
-      attribute: rel
-      filters:
-        - name: replace
-          args: ["re.php?cache=", ""]
+      selector: img[data-src]
+      attribute: data-src
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td:nth-last-child(6) > span[title]
+      selector: td:nth-child(4) > span[title]
      attribute: title
      optional: true
      filters:
@@ -153,7 +148,7 @@ search:
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td:nth-last-child(6):not(:has(span))
+      selector: td:nth-child(4):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -163,13 +158,13 @@ search:
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
-      selector: td:nth-last-child(5)
+      selector: td:nth-child(5)
    seeders:
-      selector: td:nth-last-child(4)
+      selector: td:nth-child(6)
    leechers:
-      selector: td:nth-last-child(3)
+      selector: td:nth-child(7)
    grabs:
-      selector: td:nth-last-child(2)
+      selector: td:nth-child(8)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -184,12 +179,12 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
-    description_text:
+    minimumratio:
+      text: 2.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-    description:
-      case:
-        i.fa-check: "Verified: {{ .Result.description_text }}"
-        i.fa-question: "Unverified: {{ .Result.description_text }}"
-        i.fa-times: "Banned: {{ .Result.description_text }}"
-# NexusPHP v1.6.2 2022-03-19
+# NexusPHP v1.8.11 2024-03-27
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -8,6 +8,7 @@ encoding: UTF-8
 links:
  - https://glodls.to/
  - https://gtso.cc/
+  - https://glodls.unblockninja.com/
 legacylinks:
  - https://glodls.rocks/
  - https://gtdb.to/
@@ -15,7 +16,6 @@ legacylinks:
  - https://www.gtdb.to/
  - https://glotorrents.mrunblock.bond/
  - https://glotorrents.nocensor.cloud/
-  - https://glodls.unblockninja.com/ # blank
  - https://glodls.ninjaproxy1.com/ # blank
  - https://glotorrents.unblockit.download/

--- a/src/Jackett.Common/Definitions/haitang.yml
+++ b/src/Jackett.Common/Definitions/haitang.yml
@@ -10,6 +10,7 @@ links:
  - https://www.htpt.cc/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
    - {id: 1, cat: Audio, desc: "相声 Crosstalk", default: true}
    - {id: 4091, cat: Audio, desc: "评书 Storytelling", default: true}
--- a/src/Jackett.Common/Definitions/hd-unit3d-api.yml
+++ b/src/Jackett.Common/Definitions/hd-unit3d-api.yml
@@ -181,7 +181,10 @@ search:
        True: 2 # double
    uploadvolumefactor:
      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# json UNIT3D 8.3.2
+# json UNIT3D 8.3.6
--- a/src/Jackett.Common/Definitions/hdatmos.yml
+++ b/src/Jackett.Common/Definitions/hdatmos.yml
@@ -5,18 +5,27 @@ description: "HDAtmos is a CHINESE Private Torrent Tracker for HD MOVIES / TV /
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
  - https://hdatmos.club/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV演唱会"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
+    - {id: 401, cat: Movies, desc: "Movies/电影", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫", default: true}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧", default: true}
+    - {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: 416, cat: Audio, desc: "洗版区/音乐", default: false}
+    - {id: 415, cat: TV/Sport, desc: "洗版区/体育", default: false}
+    - {id: 414, cat: Audio/Video, desc: "洗版区/MV演唱会", default: false}
+    - {id: 413, cat: TV/Anime, desc: "洗版区/动漫", default: false}
+    - {id: 412, cat: TV, desc: "洗版区/电视剧", default: false}
+    - {id: 411, cat: TV/Documentary, desc: "洗版区/纪录片", default: false}
+    - {id: 410, cat: Movies, desc: "洗版区/电影", default: false}

  modes:
    search: [q]
@@ -66,6 +75,10 @@ settings:
    type: info
    label: Account Inactivity
    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+  - name: info_special
+    type: info
+    label: Special Categories
+    default: "Only <b>Power User</b> or above can view Special section. Searching for 洗版区 categories by users below this class will result in search errors."

 login:
  path: login.php
@@ -95,6 +108,9 @@ login:
 search:
  paths:
    - path: torrents.php
+      categories: [401, 404, 405, 402, 406, 407, 408]
+    - path: special.php
+      categories: [416, 415, 414, 413, 412, 411, 410]
  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 }}"
--- a/src/Jackett.Common/Definitions/hdclone.yml
+++ b/src/Jackett.Common/Definitions/hdclone.yml
@@ -1,31 +1,24 @@
 ---
-id: hdpt
-name: HDPT (明教)
-description: "HDPT (明教) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+id: hdclone
+name: HDClone
+description: "HDClone is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://hdpt.xyz/
+  - https://pt.hdclone.org/

 caps:
  categorymappings:
    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐 视频"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/高清音轨"}
-    - {id: 410, cat: PC, desc: "Software/软件"}
-    - {id: 411, cat: Books/EBook, desc: "E-book/电子书"}
-    - {id: 412, cat: Books/Comics, desc: "Comics/漫画"}
-    - {id: 413, cat: Other/Misc, desc: "Learning/学习资料"}
-    - {id: 414, cat: Console, desc: "Games/游戏"}
-    - {id: 415, cat: Other/Misc, desc: "gallery/图库"}
-    - {id: 416, cat: Audio, desc: "Quyi/曲艺"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫、动画"}
+    - {id: 408, cat: Audio/Video, desc: "Playlet/短剧"}
+    - {id: 410, cat: Audio/Video, desc: "MV/演唱会"}
+    - {id: 406, cat: Audio, desc: "Music/音乐"}
+    - {id: 407, cat: Other, desc: "Others/其他（慎选）"}

  modes:
    search: [q]
@@ -47,7 +40,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 CarPT 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 HDClone Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -72,6 +65,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_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li> Users with a parked account will be deleted if they do not log in for 80 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 60 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 10 consecutive days.</li></ol>"

 login:
  path: login.php
@@ -92,50 +89,52 @@ login:
    trackerssl: yes
  error:
    - selector: td.embedded:has(h2:contains("失败"))
+      message:
+        selector: td.text
  test:
    path: index.php
-    selector: a[href*="logout.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 }}"
    notnewword: 1

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

  fields:
    category:
-      selector: a[href*="?cat="]
+      selector: a[href^="?cat="]
      attribute: href
      filters:
        - name: querystring
          args: cat
    title_default:
-      selector: a[href*="details.php?id="]
+      selector: a[href^="details.php?id="]
    title:
-      selector: a[title][href*="details.php?id="]
+      selector: a[title][href^="details.php?id="]
      attribute: title
      optional: true
      default: "{{ .Result.title_default }}"
    details:
-      selector: a[href*="details.php?id="]
+      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: a[href*="download.php?id="]
+      selector: a[href^="download.php?id="]
      attribute: href
    poster:
      selector: img[data-src]
@@ -192,8 +191,11 @@ search:
        img.pro_2up: 2
        "*": 1
    minimumratio:
-      text: 1.0
+      text: 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
    description:
-      selector: td.rowfollow:nth-child(2)
+      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.6 2023-08-18
+# NexusPHP v1.8.11 2024-03-27
--- a/src/Jackett.Common/Definitions/hdforever.yml
+++ b/src/Jackett.Common/Definitions/hdforever.yml
@@ -109,7 +109,7 @@ search:
    # site does not support imdbid search or display imdb links in results

  rows:
-    selector: table#torrent_table > tbody > tr.torrent
+    selector: table#torrent_table > tbody > tr.torrent:has(a[href^="torrents.php?action=download&"])

  fields:
    category:
@@ -122,6 +122,9 @@ search:
        div.cats_série: 5
        div.cats_sérieanim: 6
        div.cats_documentaire: 7
+    details:
+      selector: a[href^="torrents.php?id="]
+      attribute: href
    download_regular:
      selector: a[href^="torrents.php?action=download&"]
      attribute: href
@@ -133,16 +136,66 @@ search:
          args: "&usetoken=1"
    download:
      text: "{{ if .Config.usetoken }}{{ .Result.download_usetoken }}{{ else }}{{ .Result.download_regular }}{{ end }}"
-    title_phase1:
-      selector: div.group_info
-      remove: span:nth-child(1), div.tags
+    _release_group:
+      selector: span.team_name
+      optional: true
+      filters:
+        - name: trim
+    poster:
+      selector: div.group_image img
+      attribute: src
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(4)
      filters:
        - name: replace
-          args: ["\n", ""]
-        - name: re_replace
-          args: ["^(.+)                                                                            (.+)", "$2-$1"]
+          args: ["Il y a ", ""]
        - name: replace
-          args: ["                         ", " "]
+          args: ["heures", "hours"]
+        - name: replace
+          args: ["heure", "hour"]
+        - name: replace
+          args: ["jours", "days"]
+        - name: replace
+          args: ["jour", "day"]
+        - name: replace
+          args: ["semaines", "weeks"]
+        - name: replace
+          args: ["semaine", "week"]
+        - name: replace
+          args: ["mois", "months"]
+        - name: replace
+          args: ["ans", "years"]
+        - name: replace
+          args: ["an", "year"]
+        - name: append
+          args: " ago"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        "div.group_info:contains(\"/ Free\")": 0
+        "div.group_info:contains(\"↓75%\")": 0.75
+        "div.group_info:contains(\"↓50%\")": 0.50
+        "div.group_info:contains(\"↓25%\")": 0.25 # for this site this is the count ratio, which is 25% of the total torrent size. (I.E. it's 75% free)
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    title_phase1:
+      selector: div.group_info
+      remove: span.team_name, span:has(a[href^="torrents.php?action=download"]), div.tags, div.vote_controls, div.stats-content, .add_bookmark, img
+      filters:
+        - name: replace
+          args: ["\n", " "]
+        - name: re_replace
+          args: ["\\s+", " "]
        - name: replace
          args: ["Blu-Ray Original", "Complete.BluRay"]
        - name: replace
@@ -236,6 +289,8 @@ search:
          args: [".VOF", ".FRENCH"]
        - name: replace
          args: [".VFQ.MULTI", ".MULTI.VFQ"]
+        - name: append
+          args: "{{ if .Result._release_group }}-{{ .Result._release_group }}{{ else }}{{ end }}"
    title_vostfr:
      text: "{{ .Result.title_phase1 }}"
      filters:
@@ -252,56 +307,6 @@ search:
      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
    description:
      selector: div.group_info
-    poster:
-      selector: div.group_image img
-      attribute: src
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: replace
-          args: ["Il y a ", ""]
-        - name: replace
-          args: ["heures", "hours"]
-        - name: replace
-          args: ["heure", "hour"]
-        - name: replace
-          args: ["jours", "days"]
-        - name: replace
-          args: ["jour", "day"]
-        - name: replace
-          args: ["semaines", "weeks"]
-        - name: replace
-          args: ["semaine", "week"]
-        - name: replace
-          args: ["mois", "months"]
-        - name: replace
-          args: ["ans", "years"]
-        - name: replace
-          args: ["an", "year"]
-        - name: append
-          args: " ago"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        "div.group_info:contains(\"/ Free\")": 0
-        "div.group_info:contains(\"↓75%\")": 0.75
-        "div.group_info:contains(\"↓50%\")": 0.50
-        "div.group_info:contains(\"↓25%\")": 0.25 # for this site this is the count ratio, which is 25% of the total torrent size. (I.E. it's 75% free)
-        "*": 1
-    uploadvolumefactor:
-      text: 1
    minimumratio:
      text: 0.6
    minimumseedtime:
--- a/src/Jackett.Common/Definitions/hdgalaktik.yml
+++ b/src/Jackett.Common/Definitions/hdgalaktik.yml
@@ -5,6 +5,8 @@ description: "HDGalaKtik is a RUSSIAN Semi-Private tracker for MOVIES / TV / GEN
 language: ru-RU
 type: semi-private
 encoding: UTF-8
+certificates:
+  - 53262db5c4e32667ae158fcc90396d5675d4ec3a   # CN=mail.trackerpmr.com
 links:
  - https://www.trackerpmr.com/
  - https://freetmd.com/
@@ -127,11 +129,12 @@ search:
        - name: querystring
          args: cat
    title:
-      selector: a.link-secondary
+      selector: a[href^="details.php?id="]
      attribute: title
      filters:
        - name: regexp
          args: \'>(.+?)</div
+        - name: htmldecode
        # normalize to SXXEYY format
        - name: re_replace
          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
@@ -190,10 +193,10 @@ search:
        - name: append
          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
    details:
-      selector: a.link-secondary
+      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: a.link-secondary
+      selector: a[href^="details.php?id="]
      attribute: href
      filters:
        - name: replace
--- a/src/Jackett.Common/Definitions/hdkylin.yml
+++ b/src/Jackett.Common/Definitions/hdkylin.yml
@@ -69,7 +69,7 @@ settings:
    default: "Retention rules:<ol><li>[Veteran User] and above will be retained forever.</li><li>[Elite User] and above will not be deleted after parking their accounts (in the Control Panel).</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days.</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days.</li><li>Users with no traffic (i.e. upload/download data are both 0) will have their accounts deleted if they do not log in for 40 consecutive days.</li></ol>"

 login:
-  # using cookie method because the form method did not work when first the indexer was created.
+  # using cookie method because the site uses Safeline WAF protection
  method: cookie
  inputs:
    cookie: "{{ .Config.cookie }}"
--- a/src/Jackett.Common/Definitions/hdonly-api.yml
+++ b/src/Jackett.Common/Definitions/hdonly-api.yml
@@ -1,6 +1,8 @@
 ---
-id: hdonly
-name: HD-Only
+id: hdonly-api
+replaces:
+  - hdonly
+name: HD-Only (API)
 description: "HD-Only (HD-O) is a FRENCH Private Torrent Tracker for HD MOVIES / TV"
 language: fr-FR
 type: private
@@ -33,19 +35,13 @@ caps:
  allowrawsearch: true

 settings:
-  - name: username
+  - name: apikey
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2fa_code
-    type: text
-    label: 2FA code
-  - name: info_2fa
+    label: API Key
+  - name: info_key
    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 HD-Only Web Site. Otherwise just leave it empty."
+    label: About your API Key
+    default: "Find or Generate a new API Key by accessing your <a href=\"https://hd-only.org/\" target=\"_blank\">HD-Only</a> account <i>Access Settings</i> tab and copy the API Key."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -93,21 +89,14 @@ settings:
      asc: asc

 login:
-  path: login.php
-  method: post
+  path: ajax.php
+  method: get
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    twofa: "{{ .Config.2fa_code }}"
-    keeplogged: 1
-  error:
-    - selector: form#loginform > span.warning
-  test:
-    path: torrents.php
-    selector: a[href^="logout.php?auth="]
+    action: browse
+    apikey: "{{ .Config.apikey }}"

 search:
-  # https://hd-only.org/torrents.php?filelist=blood+2009&freetorrent=1&order_by=time&order_way=desc&action=advanced&searchsubmit=1
+  # https://hd-only.org/ajax.php?filelist=blood+2009&action=browse&group_results=0&order_by=time&order_way=desc&freetorrent=1
  paths:
    - path: ajax.php
      response:
@@ -126,6 +115,7 @@ search:
    # 1 freeleech, 0 normal
    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
    # site does not support imdbid search or display imdb links in results
+    apikey: "{{ .Config.apikey }}"

  keywordsfilters:
    # strip season
@@ -149,7 +139,7 @@ search:
    details:
      text: "torrents.php?id={{ .Result._group_id }}&torrentid={{ .Result._torrent_id }}"
    download:
-      text: "torrents.php?action=download&id={{ .Result._torrent_id }}"
+      text: "ajax.php?action=download&id={{ .Result._torrent_id }}&apikey={{ .Config.apikey }}"
    genre:
      selector: group.tags
      filters:
@@ -227,6 +217,9 @@ search:
    _vfq:
      selector: vfq
      optional: true
+    _vf2:
+      selector: vf2
+      optional: true
    _vfi:
      selector: vfi
      optional: true
@@ -251,9 +244,11 @@ search:
        - name: append
          args: ".{{ .Result.year }}.{{ .Result._episode_info }}.{{ .Result._format }}.{{ .Result._encoding }}.{{ .Result._media }}{{ if eq .Result._hdr \"True\" }}.HDR{{ else }}{{ end }}.{{ if eq .Result._hdr10plus \"True\" }}.HDR10+{{ else }}{{ end }}.{{ if eq .Result._dovi \"True\" }}.DoVi{{ else }}{{ end }}"
        - name: append
-          args: "{{ if or (eq .Result._vff \"True\") (eq .Result._vfq \"True\") }}.MULTI{{ else }}{{ end }}{{ if or (eq .Result._vfi \"True\") (eq .Result._vf \"True\") }}.MULTI{{ else }}{{ end }}"
-        - name: replace
-          args: [".MULTI.MULTI", ".MULTI"]
+          args: "{{ if or (eq .Result._vf2 \"True\") (or (eq .Result._vff \"True\") (or (eq .Result._vfq \"True\") (or (eq .Result._vfi \"True\")  (eq .Result._vf \"True\")))) }}.MULTI{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(\\.MULTI)\\1", ".MULTI"]
+        - name: append
+          args: "{{ if and (.Config.add_version_francophone_to_title) (eq .Result._vf2 \"True\") }}.VF2{{ else }}{{ end }}"
        - name: append
          args: "{{ if and (.Config.add_version_francophone_to_title) (eq .Result._vff \"True\") }}.VFF{{ else }}{{ end }}"
        - name: append
--- a/src/Jackett.Common/Definitions/hdsky.yml
+++ b/src/Jackett.Common/Definitions/hdsky.yml
@@ -11,20 +11,21 @@ links:
 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: 410, cat: Movies, desc: "iPad/iPad影视"}
    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/剧集(分集)"}
+    - {id: 411, cat: TV, desc: "TV Series/剧集(合集)"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
    - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 410, cat: Movies, desc: "iPad/iPad影视"}
-    - {id: 411, cat: TV, desc: "TV Series/剧集(合集)"}
    - {id: 412, cat: TV, desc: "TV Series/海外剧集(分集)"}
    - {id: 413, cat: TV, desc: "TV Series/海外剧集(合集)"}
    - {id: 414, cat: TV, desc: "TV Shows/海外综艺(分集)"}
    - {id: 415, cat: TV, desc: "TV Shows/海外综艺(合集)"}
+    - {id: 416, cat: TV, desc: "Shortplay/短剧"}

  modes:
    search: [q]
@@ -69,7 +70,7 @@ search:
    incldead: 0
    # show promotions 0=all, 1=normal, 2=free, 3=2x, 4=2xfree, 5=50%, 6=2x50%, 7=30%
    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0=title, 1=descr, 3=uploader, 4=imdb url
+    # 0=title, 3=uploader, 4=imdb url
    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
    # 0=AND, 1=OR, 2=exact
    search_mode: 0
@@ -81,32 +82,38 @@ search:
      - name: andmatch

  fields:
-    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
    category:
      selector: a[href^="?cat="]
      attribute: href
      filters:
        - name: querystring
          args: cat
-    details:
-      selector: a[title][href^="details.php?id="]
-      attribute: href
    download:
      selector: form[action*="/download.php?id="]
      attribute: action
+    title_onmouseover:
+      optional: true
+      selector: a[onmouseover*="details.php?id="]
+    title_details:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      # title_onmouseover is more common but sometimes can be replaced by title_details #15849
+      text: "{{ if .Result.title_onmouseover }}{{ .Result.title_onmouseover }}{{ else }}{{ .Result.title_details }}{{ end }}"
+    _id:
+      text: "{{ .Result.download }}"
+      filters:
+        - name: querystring
+          args: id
+    details:
+      text: "details.php?id={{ .Result._id }}"
    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-    size:
-      selector: td.rowfollow:nth-child(5)
-    grabs:
-      selector: td.rowfollow:nth-child(8)
-    seeders:
-      selector: td.rowfollow:nth-child(6)
-    leechers:
-      selector: td.rowfollow:nth-child(7)
+    doubanid:
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
      selector: td.rowfollow:nth-child(4) > span[title]
@@ -128,6 +135,14 @@ search:
          args: "yyyy-MM-ddHH:mm:ss zzz"
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-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
@@ -145,4 +160,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 5
+# NexusPHP Standard v1.5 Beta 5 (custom)
--- a/src/Jackett.Common/Definitions/hdtime.yml
+++ b/src/Jackett.Common/Definitions/hdtime.yml
@@ -192,4 +192,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP vv1.8.7 2023-08-22
+# NexusPHP v1.8.15 2024-11-23
--- a/src/Jackett.Common/Definitions/hdtorrentsit.yml
+++ b/src/Jackett.Common/Definitions/hdtorrentsit.yml
@@ -1,6 +1,6 @@
 ---
 id: hdtorrentsit
-name: HDTorrents.it
+name: HDTorrents.it (API)
 description: "HDTorrents.it is an ITALIAN Private PAY2DL site for TV / MOVIES"
 language: it-IT
 type: private
@@ -188,4 +188,4 @@ search:
    uploadvolumefactor:
      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # as a pay site there is no MR or MST
-# json UNIT3D 8.3.1 (custom)
+# json UNIT3D 8.3.5 (custom)
--- a/src/Jackett.Common/Definitions/hdvideo.yml
+++ b/src/Jackett.Common/Definitions/hdvideo.yml
@@ -5,19 +5,22 @@ description: "HDVIDEO is a CHINESE Private torrent tracker for MOVIES / TV / GEN
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
  - https://hdvideo.one/

 caps:
+  # dont forget to update the path categories in the search block
  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: "Anime/动漫"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos/演唱会"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
+    - {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: "Anime/动漫", default: true}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/演唱会", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育", default: true}
+    - {id: 408, cat: Audio, desc: "HQ Audio/音乐", default: true}
+    - {id: 409, cat: PC, desc: "3D模型", default: false}

  modes:
    search: [q]
@@ -72,6 +75,9 @@ login:
 search:
  paths:
    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 408]
+    - path: special.php
+      categories: [409]
  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 }}"
@@ -172,4 +178,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.4 2023-06-18
+# NexusPHP v1.8.15 2024-12-23
--- a/src/Jackett.Common/Definitions/hellashut-api.yml
+++ b/src/Jackett.Common/Definitions/hellashut-api.yml
@@ -26,6 +26,7 @@ caps:
    - {id: 21, cat: PC, desc: "Applications Other"}
    - {id: 18, cat: PC/0day, desc: "Applications Windows"}
    - {id: 52, cat: Books, desc: "Books/Magazines All"}
+    - {id: 86, cat: Audio/Audiobook, desc: "Books/Magazines AudioBooks"}
    - {id: 9, cat: TV/Documentary, desc: "Documentaries All"}
    - {id: 53, cat: TV/Documentary, desc: "Documentaries Greek"}
    - {id: 54, cat: TV/Documentary, desc: "Documentaries HD"}
@@ -51,8 +52,6 @@ caps:
    - {id: 23, cat: Audio/Lossless, desc: "Music FLAC"}
    - {id: 22, cat: Audio/MP3, desc: "Music MP3"}
    - {id: 25, cat: Audio/Video, desc: "Music Video"}
-    - {id: 75, cat: Movies/HD, desc: "NO IN SUBS Movies HD"}
-    - {id: 76, cat: Movies/UHD, desc: "NO SUBS IN Movies 4K"}
    - {id: 35, cat: TV/Sport, desc: "Sports HD"}
    - {id: 34, cat: TV/Sport, desc: "Sports SD"}
    - {id: 80, cat: Books, desc: "Tutorials Books"}
--- a/src/Jackett.Common/Definitions/hellashut.yml
+++ b/src/Jackett.Common/Definitions/hellashut.yml
@@ -26,6 +26,7 @@ caps:
    - {id: 21, cat: PC, desc: "Applications Other"}
    - {id: 18, cat: PC/0day, desc: "Applications Windows"}
    - {id: 52, cat: Books, desc: "Books/Magazines All"}
+    - {id: 86, cat: Audio/Audiobook, desc: "Books/Magazines AudioBooks"}
    - {id: 9, cat: TV/Documentary, desc: "Documentaries All"}
    - {id: 53, cat: TV/Documentary, desc: "Documentaries Greek"}
    - {id: 54, cat: TV/Documentary, desc: "Documentaries HD"}
@@ -51,8 +52,6 @@ caps:
    - {id: 23, cat: Audio/Lossless, desc: "Music FLAC"}
    - {id: 22, cat: Audio/MP3, desc: "Music MP3"}
    - {id: 25, cat: Audio/Video, desc: "Music Video"}
-    - {id: 75, cat: Movies/HD, desc: "NO IN SUBS Movies HD"}
-    - {id: 76, cat: Movies/UHD, desc: "NO SUBS IN Movies 4K"}
    - {id: 35, cat: TV/Sport, desc: "Sports HD"}
    - {id: 34, cat: TV/Sport, desc: "Sports SD"}
    - {id: 80, cat: Books, desc: "Tutorials Books"}
--- a/src/Jackett.Common/Definitions/helltorrents.yml
+++ b/src/Jackett.Common/Definitions/helltorrents.yml
@@ -95,7 +95,7 @@ settings:
    default: POLISH
    options:
      POLISH: POLISH
-      MULTi POLISH: MULTIi POLISH
+      MULTi POLISH: MULTi POLISH
  - name: info_tpp
    type: info
    label: Results Per Page
--- a/src/Jackett.Common/Definitions/hhanclub.yml
+++ b/src/Jackett.Common/Definitions/hhanclub.yml
@@ -5,20 +5,21 @@ description: "HHanClub is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
+followredirect: true
 links:
  - https://hhanclub.top/
+  - https://hhan.club/

 caps:
  categorymappings:
-    - {id: 408, cat: Audio, desc: "HQ Audio"}
    - {id: 409, cat: Other, desc: "其他"}
    - {id: 407, cat: TV/Sport, desc: "Sports"}
-    - {id: 406, cat: Audio/Video, desc: "MV"}
    - {id: 403, cat: TV, desc: "综艺"}
    - {id: 402, cat: TV, desc: "电视剧"}
    - {id: 405, cat: TV/Anime, desc: "动漫"}
    - {id: 404, cat: TV/Documentary, desc: "纪录片"}
    - {id: 401, cat: Movies, desc: "电影"}
+    - {id: 412, cat: Audio/Video, desc: "短剧"}

  modes:
    search: [q]
@@ -78,7 +79,7 @@ login:
    selector: img[alt="CAPTCHA"]
    input: imagestring
  inputs:
-    secret: <?php echo $secret ?>
+    secret: ""
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
    two_step_code: "{{ .Config.2facode }}"
@@ -93,8 +94,10 @@ login:
 search:
  paths:
    - path: torrents.php
+      # required to bypass validation check
+      followredirect: true
  inputs:
-    $raw: "{{ range .Categories }}cat[]{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}cat[]={{.}}&{{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
@@ -108,10 +111,21 @@ search:
    type: "{{ .Config.type }}"
    notnewword: 1

+  keywordsfilters:
+    # strip episode
+    - name: re_replace
+      args: ["\\b(S\\d{2,})?(?:E\\d{2,})\\b", "$1"]
+
  rows:
    selector: div.w-full:has(a[href^="details.php?id="])

  fields:
+    _episode_number:
+      selector: div.torrent-title > div > div
+      optional: true
+      filters:
+        - name: regexp
+          args: "第(\\d+(?:-\\d+)?)集"
    category:
      selector: a[href^="?cat[]="]
      attribute: href
@@ -120,6 +134,9 @@ search:
          args: cat[]
    title:
      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["\\b(S\\d+)\\b", "{{ if .Result._episode_number }}$1E{{ .Result._episode_number }}{{ else }}$1{{ end }}"]
    details:
      selector: a[href^="details.php?id="]
      attribute: href
@@ -173,11 +190,12 @@ search:
        span.promotion-tag-free2up: 2
        span.promotion-tag-2up: 2
        "*": 1
-    minimumratio:
-      text: 1.0
+# global MR is 0.8 but torrents must be seeded for 2 days regardless of ratio
+#    minimumratio:
+#      text: 0.8
    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
    description:
      selector: div.torrent-title > div > div
 # NexusPHP v1.8.6 2023-08-15 (customised)
--- a/src/Jackett.Common/Definitions/hhd-api.yml
+++ b/src/Jackett.Common/Definitions/hhd-api.yml
@@ -0,0 +1,196 @@
+---
+id: hhd-api
+name: HHD (API)
+description: "HHD is a Private Torrent Tracker for MOVIES / TV / GAMES"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://homiehelpdesk.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: TV/Anime, desc: "Anime"}
+    - {id: 4, cat: Audio, desc: "Music"}
+    - {id: 5, cat: Console, desc: "Games"}
+    - {id: 6, cat: PC, desc: "Apps"}
+    - {id: 7, cat: Books/Technical, desc: "Books"}
+    - {id: 8, cat: Audio/Audiobook, desc: "Audiobook"}
+    - {id: 11, cat: Books/Comics, desc: "Comics"}
+    - {id: 12, cat: Books/Mags, desc: "Magazine"}
+    - {id: 9, cat: Books/Comics, desc: "Manga"}
+    - {id: 10, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://homiehelpdesk.net/\" target=\"_blank\">HHD</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "To not get disabled, you are required to login to the site at least once every 30 days or be actively seeding at least 2 torrent."
+
+login:
+  path: /api/torrents
+  method: get
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")
+
+search:
+  paths:
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title_optional:
+      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
+      # api returns False, True
+      selector: double_upload
+      case:
+        False: 1 # normal
+        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 8.3.6
--- a/src/Jackett.Common/Definitions/huntorrent.yml
+++ b/src/Jackett.Common/Definitions/huntorrent.yml
@@ -64,10 +64,10 @@ settings:
    label: Sort requested from site
    default: 4
    options:
-      1: name
      4: created
      7: seeders
      5: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
--- a/src/Jackett.Common/Definitions/ilcorsaronero.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml
@@ -96,7 +96,7 @@ search:
    cat: "{{ if .Keywords }}{{ re_replace .Config.category-id \"all\" \"\" }}{{ else }}{{ end }}"

  rows:
-    selector: table > tbody > tr
+    selector: table > tbody > tr:has(a[href^="/torrent/"])
    filters:
      - name: andmatch

--- a/src/Jackett.Common/Definitions/ildragonero.yml
+++ b/src/Jackett.Common/Definitions/ildragonero.yml
@@ -139,7 +139,7 @@ search:
    - name: re_replace
      args: ["(\\w+)", "+$1"] # prepend + to each word
  inputs:
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}*{{ end }}"
    # all, any
    terms: all
    # Search in subforums: yes 1, no 0
--- a/src/Jackett.Common/Definitions/ilolicon.yml
+++ b/src/Jackett.Common/Definitions/ilolicon.yml
@@ -5,21 +5,33 @@ description: "ilolicon PT is a CHINESE Private torrent tracker for LOLICON / MOV
 language: zh-CN
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
  - https://share.ilolicon.com/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
-    - {id: 401, cat: Movies, desc: "电影 (Movie)"}
-    - {id: 402, cat: TV, desc: 电视剧/综艺 (TV Series/TV Show)"}
-    - {id: 405, cat: TV/Anime, desc: "动画 (Animation)"}
-    - {id: 408, cat: Audio, desc: "音乐 (Music)"}
-    - {id: 410, cat: Audio/Video, desc: "舞台演出 (Stage Performance)"}
-    - {id: 404, cat: TV/Documentary, desc: "纪录片 (Documentary)"}
-    - {id: 412, cat: Console, desc: "游戏 (Game)"}
-    - {id: 413, cat: PC, desc: "软件 (Software)"}
-    - {id: 411, cat: Other, desc: "漫画/图集/绘本/写真 (Photo)"}
-    - {id: 418, cat: Other, desc: "三次元图集/写真/Cosplay套图"}
+    - {id: 401, cat: Movies, desc: "电影 (Movie)", default: true}
+    - {id: 402, cat: TV, desc: "电视剧(TV Series)", default: true}
+    - {id: 430, cat: TV, desc: "综艺(TV Show)", default: true}
+    - {id: 405, cat: TV/Anime, desc: "动画 (Animation)", default: true}
+    - {id: 408, cat: Audio, desc: "音乐 (Music)", default: true}
+    - {id: 410, cat: Audio/Video, desc: "舞台演出 (Stage Performance)", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片 (Documentary)", default: true}
+    - {id: 412, cat: Console, desc: "游戏 (Game)", default: true}
+    - {id: 413, cat: PC, desc: "软件 (Software)", default: true}
+    - {id: 411, cat: Other, desc: "漫画/CG杂图/动漫杂志 (Photo)", default: true}
+    - {id: 418, cat: XXX/ImageSet, desc: "写真 (Photography)", default: false}
+    - {id: 429, cat: XXX/Other, desc: "音声 (Audio)", default: false}
+    - {id: 428, cat: XXX/Other, desc: "H-游戏 (H-Games)", default: false}
+    - {id: 427, cat: XXX/ImageSet, desc: "H-CG杂图 (H-CG Miscellaneous Pictures)", default: false}
+    - {id: 426, cat: XXX/Other, desc: "H-3D同人动画 (H-3D Doujin Animation)", default: false}
+    - {id: 425, cat: XXX/Other, desc: "H-2D同人动画 (H-2D Doujin Animation)", default: false}
+    - {id: 424, cat: XXX/Other, desc: "H-漫画 (H-Manga)", default: false}
+    - {id: 423, cat: XXX/Other, desc: "里番 (Riban)", default: false}
+    - {id: 420, cat: XXX, desc: "AV有码 (AV Censored)", default: false}
+    - {id: 419, cat: XXX, desc: "AV无码 (AV uncensored)", default: false}

  modes:
    search: [q]
@@ -63,6 +75,7 @@ settings:
    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"

 login:
+  # using cookie method because I could not get the form method to work when I first created the indexer, some hidden security check
  method: cookie
  inputs:
    cookie: "{{ .Config.cookie }}"
@@ -73,6 +86,9 @@ login:
 search:
  paths:
    - path: torrents.php
+      categories: [401, 402, 430, 405, 408, 410, 404, 412, 413, 411]
+    - path: special.php
+      categories: [418, 429, 428, 427, 426, 425, 424, 423, 422, 420, 419]
  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 }}"
@@ -168,4 +184,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2) td:nth-child(2)
      remove: a, b, font, img
-# NexusPHP v1.8.12 2024-07-13
+# NexusPHP v1.8.15 2024-12-23
--- a/src/Jackett.Common/Definitions/infinity-api.yml
+++ b/src/Jackett.Common/Definitions/infinity-api.yml
@@ -174,6 +174,9 @@ search:
        True: 2 # double
    uploadvolumefactor:
      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# global MR is 0.6 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.6
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
--- a/src/Jackett.Common/Definitions/infire.yml
+++ b/src/Jackett.Common/Definitions/infire.yml
@@ -10,6 +10,7 @@ links:
  - https://infire.si/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
    # Filmi
    - {id: 14, cat: Movies/SD, desc: "XviD", default: true}
@@ -85,6 +86,7 @@ caps:
    - {id: 45, cat: PC/Mobile-iOS, desc: "iOS", default: true}
    - {id: 46, cat: PC/Mac, desc: "Mac", default: true}
    - {id: 47, cat: PC/ISO, desc: "Linux", default: true}
+    - {id: 102, cat: Other, desc: "3D STL", default: true}
    # Dokumentarni
    - {id: 95, cat: TV/Documentary, desc: "Dokumentarni Film", default: true}
    - {id: 96, cat: TV/Documentary, desc: "Dokumentarna Serija", default: true}
@@ -145,7 +147,7 @@ login:
 search:
  paths:
    - path: torrents.php
-      categories: [14, 15, 16, 20, 21, 49, 50, 51, 52, 55, 71, 72, 73, 74, 77, 97, 99, 100, 23, 24, 75, 76, 78, 79, 80, 81, 82, 98, 26, 56, 93, 29, 30, 31, 34, 83, 42, 43, 53, 54, 62, 37, 85, 86, 87, 88, 89, 90, 91, 38, 39, 40, 41, 44, 45, 46, 47, 95, 96]
+      categories: [14, 15, 16, 20, 21, 49, 50, 51, 52, 55, 71, 72, 73, 74, 77, 97, 99, 100, 23, 24, 75, 76, 78, 79, 80, 81, 82, 98, 26, 56, 93, 29, 30, 31, 34, 83, 42, 43, 53, 54, 62, 37, 85, 86, 87, 88, 89, 90, 91, 38, 39, 40, 41, 44, 45, 46, 47, 102, 95, 96]
    - path: xxx.php
      categories: [60, 61, 66, 67, 68, 69, 84]
  inputs:
@@ -158,6 +160,9 @@ search:
    order: "{{ .Config.sort }}"
    by: "{{ .Config.type }}"

+  headers:
+    Referer: ["{{ .Config.sitelink }}torrents.php"]
+
  rows:
    selector: table.mg-b-0 > tbody > tr:has(a[href^="download.php?id="])

--- a/src/Jackett.Common/Definitions/irishtv.yml
+++ b/src/Jackett.Common/Definitions/irishtv.yml
@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://irishtv.xyz/
+legacylinks:
  - http://irishtv.xyz/

 caps:
@@ -139,26 +141,19 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    size:
-      # Size:  &nbsp; 2.00 GB
-      selector: td:has(a[href^="download.php?id="]) p:contains("Size:")
-      filters:
-        - name: regexp
-          args: (\d.+[B]$)
+      selector: td:nth-last-child(3)
    date:
-      # AddDate: &nbsp; 12:54:01 24/10/2024
-      selector: td:has(a[href^="download.php?id="]) p:contains("AddDate:")
+      selector: td:nth-last-child(7)
      # auto adjusted by site account profile
      filters:
-        - name: regexp
-          args: (\d{2}:\d{2}:\d{2}\s\d{1,2}\/\d{2}\/\d{4})
        - name: dateparse
-          args: "HH:mm:ss d/MM/yyyy"
+          args: dd/MM/yyyy
    seeders:
-      selector: td:has(a[href^="download.php?id="]) p:contains("Seeds:") > a
+      selector: td:nth-last-child(6)
    leechers:
-      selector: td:has(a[href^="download.php?id="]) p:contains("Seeds:") > a:nth-child(2)
+      selector: td:nth-last-child(5)
    grabs:
-      selector: td:has(a[href^="download.php?id="]) p:contains("Seeds:") > a:nth-child(3)
+      selector: td:nth-last-child(4)
    downloadvolumefactor:
      case:
        img[src="images/freeleech.gif"]: 0
--- a/src/Jackett.Common/Definitions/isohunt2.yml
+++ b/src/Jackett.Common/Definitions/isohunt2.yml
@@ -6,12 +6,12 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
-  - https://isohunt.nz/
  - https://isohunt.ch/
 legacylinks:
  - https://isohunt2.net/ # redirects to torrentproject.cc
  - https://isohunt.fun/ # redirects to torrentproject.cc
  - https://isohunt.tv/ # redirects to torrentproject.cc
+  - https://isohunt.nz/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/itatorrents.yml
+++ b/src/Jackett.Common/Definitions/itatorrents.yml
@@ -65,7 +65,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Account disabled: 30 days of inactivity and no torrent seeding. Pruned Account: Has been disabled for 30 days, which is 60 days of inactivity in total."
+    default: "To not get disabled, you are required to login to the site at least once every 90 days or be actively seeding at least 1 torrent."

 login:
  path: /api/torrents
@@ -104,6 +104,8 @@ search:
  keywordsfilters:
    - name: re_replace
      args: ["\\.", " "]
+    - name: re_replace # strip season and/or ep when single keyword (needed for mixed usage of S01 and Stagione 1)
+      args: ["^([SE]\\d{1,4}){1,2}$", "{{ if or (.Query.Season) (.Query.Ep) }}{{ else }}$1{{ end }}"]
    - name: re_replace # S01 to Stagione 1
      args: ["(?i)\\bS0*(\\d+)\\b", "Stagione $1"]

@@ -167,7 +169,7 @@ search:
      selector: created_at
      filters:
        - name: append
-          args: " -03:00" # BRT
+          args: " +00:00" # GMT
        - name: dateparse
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
@@ -197,7 +199,10 @@ search:
        True: 2 # double
    uploadvolumefactor:
      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.3.2 (custom)
+# json UNIT3D 8.3.6 (custom)
--- a/src/Jackett.Common/Definitions/jav-torrent.yml
+++ b/src/Jackett.Common/Definitions/jav-torrent.yml
@@ -6,6 +6,8 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
+  - https://jav-torrent.net/
+legacylinks:
  - https://jav-torrent.org/

 caps:
--- a/src/Jackett.Common/Definitions/jme-reunit3d-api.yml
+++ b/src/Jackett.Common/Definitions/jme-reunit3d-api.yml
@@ -14,13 +14,14 @@ caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Console, desc: "Game"}
-    - {id: 5, cat: PC, desc: "Application"}
    - {id: 6, cat: XXX, desc: "XXX"}
    - {id: 7, cat: TV/Sport, desc: "Sport"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 5, cat: PC, desc: "Application"}
+    - {id: 4, cat: Console, desc: "Game"}
    - {id: 8, cat: Books, desc: "E-Books"}
    - {id: 9, cat: Audio/Audiobook, desc: "Audio-Books"}
+    - {id: 12, cat: Audio/Video, desc: "Music-Video"}

  modes:
    search: [q]
@@ -159,6 +160,6 @@ search:
        0: 1 # normal
        1: 2 # double
    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
 # json UNIT3D 6.0.4
--- a/src/Jackett.Common/Definitions/kickasstorrents-to.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrents-to.yml
@@ -41,6 +41,13 @@ caps:
    book-search: [q]

 settings:
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>Access 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>'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: sort
    type: select
    label: Sort requested from site
@@ -63,6 +70,9 @@ download:
      attribute: href

 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
  paths:
    # 20 rows per page
    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
@@ -71,6 +81,11 @@ search:
    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}4/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}5/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"

+  error:
+    - selector: h1:contains("403 Forbidden")
+      message:
+        text: "Site returned 403 Forbidden. Try updating your indexer config with a new/different user-agent."
+
  rows:
    selector: table.data tr.odd:has(a[class="cellMainLink"]), table.data tr.even:has(a[class="cellMainLink"])
    filters:
--- a/src/Jackett.Common/Definitions/kickasstorrents-ws.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrents-ws.yml
@@ -16,6 +16,9 @@ links:
  - https://kickasst.net/
  - https://kickasstorrents.id/
  - https://thekat.cc/
+  - https://kickass-kat.com/
+  - https://kickass.sh/
+
 legacylinks:
  - https://kickass.gg/
  - https://katcr.io/
@@ -26,7 +29,6 @@ legacylinks:
  - https://katcr.to/ # kickasstorrents-to proxy
  - https://kickasstorrent.cr/ # kickasstorrents-to proxy
  - https://kickasstorrents.unblockninja.com/ # currently kickasstorrents-to proxy
-  - https://kickass-kat.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/kimoji.yml
+++ b/src/Jackett.Common/Definitions/kimoji.yml
@@ -1,151 +0,0 @@
---
-id: kimoji
-name: KIMOJI
-description: "KIMOJI is a CHINESE Private Torrent Tracker for MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://kimoji.club/
-
-caps:
-  categorymappings:
-    - {id: 3, cat: Audio, desc: "Music"}
-
-  modes:
-    search: [q]
-    music-search: [q]
-
-settings:
-  - name: apikey
-    type: text
-    label: APIKey
-  - name: info_key
-    type: info
-    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://kimoji.club/\" target=\"_blank\">KIMOJI</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: /api/torrents
-  method: get
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-    - selector: :root:contains("Account is Banned")
-
-search:
-  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  headers:
-    Authorization: ["Bearer {{ .Config.apikey }}"]
-
-  inputs:
-  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
-    name: "{{ .Keywords }}"
-    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-
-  fields:
-    _id:
-      selector: ..id
-    category:
-      selector: category_id
-    title:
-      selector: name
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    infohash:
-      selector: info_hash
-    poster:
-      text: "{{ .Config.sitelink }}files/img/torrent-cover_{{ .Result._id }}.jpg"
-    genre:
-      selector: distributor
-      filters:
-        - name: re_replace
-          args: ["(?i)(Hard Rock)", "Hard_Rock"]
-        - name: re_replace
-          args: ["(?i)(World Music)", "World_Music"]
-        - name: replace
-          args: ["/", "_"]
-    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
-      selector: created_at
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "MM/dd/yyyy HH:mm:ss zzz"
-    size:
-      selector: size
-    downloadvolumefactor:
-      # api returns 0%, 25%, 50%, 75%, 100%
-      selector: freeleech
-      case:
-        0%: 1 # not free
-        25%: 0.75
-        50%: 0.5
-        75%: 0.25
-        100%: 0 # freeleech
-        "*": 0 # catch errors
-    uploadvolumefactor:
-      # api returns False, True
-      selector: double_upload
-      case:
-        False: 1 # normal
-        True: 2 # double
-# global MR is 1.0 but torrents must be seeded for 3 days regardless of ratio
-#    minimumratio:
-#      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# json UNIT3D 7.1.3 (custom)
--- a/src/Jackett.Common/Definitions/krazyzone.yml
+++ b/src/Jackett.Common/Definitions/krazyzone.yml
@@ -26,7 +26,7 @@ caps:
    - {id: 24, cat: Audio, desc: "Karaoke: All Karaoke"}
    - {id: 78, cat: Audio, desc: "Dj-Only: Dj-Music"}
    - {id: 47, cat: Movies/BluRay, desc: "Movies: Bluray-HD"}
-    - {id: 28, cat: Movies, desc: "Movies: 2024"}
+    - {id: 28, cat: Movies, desc: "Movies: 2025"}
    - {id: 25, cat: Movies/WEB-DL, desc: "Movies: Web-DL"}
    - {id: 52, cat: Movies, desc: "Classic Movies: Pre90s"}
    - {id: 48, cat: Movies/SD, desc: "Movies: AVI-XVID-Dvdrip"}
--- a/src/Jackett.Common/Definitions/kufei.yml
+++ b/src/Jackett.Common/Definitions/kufei.yml
@@ -75,7 +75,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted</li><li>Elite User or above would never be deleted if parked (at User CP)</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row</li><li>Un-parked accounts would be deleted if users have not logged in for more than 150 days in a row</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted</li><li>Elite User or above would never be deleted if parked (at User CP)</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row</li><li>Un-parked accounts would be deleted if users have not logged in for more than 150 days in a row</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 30 days in a row.</li></ol>"

 login:
  path: login.php
@@ -200,4 +200,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.14 2024-09-24
+# NexusPHP v1.8.15 2024-12-10
--- a/src/Jackett.Common/Definitions/kufirc.yml
+++ b/src/Jackett.Common/Definitions/kufirc.yml
@@ -37,6 +37,7 @@ caps:
    - {id: 11, cat: XXX, desc: "Kép"}
    - {id: 48, cat: XXX, desc: "Latina"}
    - {id: 16, cat: XXX, desc: "Lesbian"}
+    - {id: 56, cat: Books/Mags, desc: "Magazines"}
    - {id: 6, cat: XXX, desc: "Magyar"}
    - {id: 15, cat: XXX, desc: "Masturbation"}
    - {id: 14, cat: XXX, desc: "Mature"}
@@ -53,6 +54,7 @@ caps:
    - {id: 43, cat: XXX, desc: "Porn Music Videos"}
    - {id: 54, cat: XXX, desc: "Pov"}
    - {id: 45, cat: XXX, desc: "Pregnant / Preggo"}
+    - {id: 57, cat: XXX, desc: "Scat/Puke"}
    - {id: 10, cat: XXX, desc: "Shemale / TS"}
    - {id: 51, cat: XXX, desc: "Siterip"}
    - {id: 52, cat: XXX, desc: "Softcore"}
@@ -64,6 +66,7 @@ caps:

  modes:
    search: [q]
+    book-search: [q]

 settings:
  - name: username
--- a/src/Jackett.Common/Definitions/lastdigitalunderground.yml
+++ b/src/Jackett.Common/Definitions/lastdigitalunderground.yml
@@ -13,23 +13,23 @@ legacylinks:
 caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Films: General"}
+    - {id: 33, cat: Movies/Other, desc: "Films: [TMDB UnListed]"}
    - {id: 21, cat: Movies/3D, desc: "Films: 3D"}
    - {id: 25, cat: Movies/Other, desc: "Films: Musical"}
    - {id: 18, cat: Movies/Other, desc: "Films: Silent"}
    - {id: 24, cat: Movies/Other, desc: "Films: Holiday"}
    - {id: 19, cat: Movies/Other, desc: "Films: Shorts"}
+    - {id: 42, cat: Movies/Other, desc: "Films: Shorts [TMDB UnListed]"}
    - {id: 17, cat: TV/Documentary, desc: "Films: Documentary"}
    - {id: 12, cat: Movies/Other, desc: "Films: FanEdits/Restorations"}
-    - {id: 33, cat: Movies/Other, desc: "Films: [TMDB UnListed]"}
-    - {id: 42, cat: Movies/Other, desc: "Films: Shorts [TMDB UnListed]"}
-    - {id: 27, cat: Movies/Foreign, desc: "Films SP1: Dub or Vid issues"}
+    - {id: 27, cat: Movies/Foreign, desc: "Films SP1: Dubs/Cams/Vid Issues"}
    - {id: 22, cat: Movies/Foreign, desc: "Films SP2: No English"}
    - {id: 28, cat: Movies/Other, desc: "Films SP3: Other"}
    - {id: 8, cat: Movies/Other, desc: "Anime: Films"}
    - {id: 9, cat: TV/Anime, desc: "Anime: Series/OVAs"}
-    - {id: 2, cat: TV, desc: "Series/TV: General"}
+    - {id: 2, cat: TV, desc: "Series/TV: Complete Seasons"}
    - {id: 41, cat: TV, desc: "Series/TV: Single Episodes"}
-    - {id: 31, cat: TV/Foreign, desc: "Series/TV SP1: Dub"}
+    - {id: 31, cat: TV/Foreign, desc: "Series/TV SP1: video issues or Dub"}
    - {id: 29, cat: TV/Foreign, desc: "Series/TV SP2: No English"}
    - {id: 32, cat: TV/Other, desc: "Series/TV SP3: Other"}
    - {id: 38, cat: TV/Other, desc: "Series/TV [TMDB unlisted]"}
@@ -42,15 +42,16 @@ caps:
    - {id: 35, cat: TV/Sport, desc: "Culture: Sports"}
    - {id: 37, cat: TV/Other, desc: "Culture: Firearms and Freedom"}
    - {id: 36, cat: TV/Other, desc: "Culture: Roms"}
-    - {id: 6, cat: XXX, desc: "XXX: Smut [TMDB Listed]"}
-    - {id: 30, cat: XXX, desc: "XXX: Smut [TMDB UnListed]"}
-    - {id: 15, cat: XXX/Pack, desc: "XXX: MegaPacks"}
-    - {id: 10, cat: XXX, desc: "XXX: Hentai"}
-    - {id: 14, cat: XXX/Other, desc: "XXX: Creators Corner"}
-    - {id: 39, cat: XXX/Other, desc: "XXX: Pain and Violence"}
-    - {id: 13, cat: XXX/Other, desc: "XXX: Other"}
-    - {id: 11, cat: XXX/Other, desc: "XXX: Zoo"}
-    - {id: 26, cat: Other, desc: "FuckedUpShit"}
+    - {id: 6, cat: XXX, desc: "Mature: NSFW [TMDB Listed]"}
+    - {id: 45, cat: XXX, desc: "Mature: NSFW No ENG Subs"}
+    - {id: 30, cat: XXX, desc: "Mature: NSFW [UnListed]"}
+    - {id: 15, cat: XXX/Pack, desc: "Mature: NSFW MegaPacks"}
+    - {id: 10, cat: XXX, desc: "Mature: Hentai"}
+    - {id: 14, cat: XXX/Other, desc: "Mature: Creators Corner"}
+    - {id: 39, cat: XXX/Other, desc: "Mature: NSFL [Listed]"}
+    - {id: 11, cat: XXX/Other, desc: "Mature: NSFL [Unlisted]"}
+    - {id: 44, cat: XXX/Other, desc: "Mature: Audio"}
+    - {id: 43, cat: Other, desc: "Internal Testing"}
    - {id: 23, cat: Other, desc: "Other_Or_Not_Sure"}

  modes:
@@ -95,7 +96,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "You are required to log in once per month. We will be purging user accounts via automated script set at an undisclosed interval."
+    default: "You must log in once every 60 days.You must download at least 1 item within your first month."

 login:
  path: /api/torrents
--- a/Show More
+++ b/Show More