kinonavse100: prevent 0 results for keyword-less search

tellytorrent: change domain *.to
oxtorrent: change domain www.*.tv
2025-12-22 22:25:44 +01:00 · 2021-03-06 15:07:12 +13:00 · 2021-03-06 00:16:17 +00:00 · 2021-03-05 23:51:54 +00:00 · 2021-03-06 10:56:23 +13:00 · 2021-03-06 10:55:59 +13:00
741 changed files with 34963 additions and 28829 deletions
--- a/README.md
+++ b/README.md
@@ -13,47 +13,50 @@ Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) be

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

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

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

 #### Supported Systems
-* Windows 7SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/3.1/3.1-supported-os.md#linux)
+* Windows 7 SP1 or greater
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md#linux)
 * macOS 10.13 or greater

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

 * 1337x
 * 7torrents
- * AcademicTorrents
 * ACG.RIP
 * ACGsou (36DM)
 * Anidex
+ * AniLibria
+ * AnimeClipse
+ * Animedia
 * Anime Tosho
 * AniRena
 * AniSource
 * AudioBook Bay (ABB)
- * Badass Torrents
 * BigFANGroup
 * BitRu
 * BT.etree
+ * BT4G
 * BTDB
 * BTDIGG
- * BTeye
 * BTSOW
+ * Byrutor
+ * CiliPro (LIAORENCILI)
 * ConCen
- * Corsaro.red
 * cpasbien
 * cpasbienClone
 * Demonoid
 * dmhy
 * E-Hentai
- * EliteTorrent.biz
+ * emtrek
 * Epizod
 * ETTV
 * EXT Torrents
 * ExtraTorrent.cd
+ * ExtraTorrent.it
 * EZTV
 * Filebase
 * FireBit
@@ -61,28 +64,26 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * GamesTorrents
 * GkTorrent
 * GloDLS
+ * GTorrent
 * HDReactor
- * Horrible Subs
 * IBit
 * Idope
 * Il CorSaRo Blu
- * Il Corsaro Nero <!-- maintained by bonny1992 -->
+ * Il Corsaro Nero
 * Internet Archive (archive.org)
 * Isohunt2
 * iTorrent
- * KickAssTorrent (kat.li)
- * KickAssTorrent (KATcr)
+ * kickasstorrents.ws
+ * kickasstorrents.to
 * Legit Torrents
- * LePorno
- * LIAORENCILI (Cili180)
+ * LePorno.info
 * LimeTorrents
 * LinuxTracker
 * MacTorrents
 * Magnet4You
- * MagnetDL
- * MejorTorrent <!-- maintained by ivandelabeldad -->
- * Monova
- * MovCr
+ * MejorTorrent
+ * MixTapeTorrent
+ * Montorrent
 * MoviesDVDR
 * MyPornClub
 * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
@@ -92,9 +93,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * NoNaMe Club (NNM-Club)
 * Nyaa-Pantsu
 * Nyaa.si
+ * OnceSearch
 * OneJAV
 * OxTorrent
 * ParnuXi
+ * PC-torrent
 * PiratBit
 * Pirateiro
 * Pornforall
@@ -102,49 +105,62 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * PornoLive
 * PornoRip
 * PornoTor
+ * Portugas
+ * ProPorn
 * ProStyleX
 * Rapidzona
 * RARBG
 * RinTor
+ * RinTorNeT
 * Rus-media
 * RuTor
 * RuTracker.RU
 * seleZen
 * Sexy-Pics
+ * ShizaProject
 * shokweb
 * ShowRSS
- * SkyTorrentsClone
+ * SkyTorrents.to
 * Solid Torrents
 * sosulki
+ * SubsPlease
 * sukebei-Pantsu
 * sukebei.Nyaa.si
 * The Pirate Bay (TPB)
+ * Tjangto (짱토)
 * Tokyo Tosho
- * TopNow
 * Torlock
 * TOROS
- * Torrent Bomb (토렌트봄)
 * Torrent Downloads (TD)
 * Torrent Oyun indir
+ * Torrent Paradise (ML)
 * torrent-pirat
 * Torrent4You
 * Torrent9
- * Torrent9Clone
+ * Torrent9 clone
 * TorrentDownload
 * TorrentFunk
 * TorrentGalaxy (TGx)
 * TorrentKitty
+ * TorrentMafya
+ * TorrentMax (토렌트맥스)
 * TorrentParadise
+ * TorrentProject
 * TorrentProject2
- * TorrentQuest
+ * TorrentQQ (토렌트큐큐)
 * Torrents.csv
+ * TorrentSir (토렌트썰)
 * Torrentv
 * TorrentView (토렌트뷰)
+ * TorrentWhiz ( 토렌트위즈)
 * Torrentz2
 * Torrentz2k
+ * truPornolabs
 * Underverse
 * UnionDHT
- * XFSUB
+ * VSTHouse
+ * VST Torrents
+ * xxxAdultTorrent
 * xxxtor
 * xxxtorrents
 * YourBittorrent
@@ -155,14 +171,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/

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

- * AlexFilm
 * AniDUB
 * ArenaBG
 * BaibaKo
 * BookTracker
+ * BootyTape
 * CasStudioTV
- * CzTorrent
- * cool-torrent
 * Darmowe torrenty
 * Deildu
 * DimeADozen (EzTorrent)
@@ -171,19 +185,15 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Erzsebet
 * Erzsebet.pl
 * ExKinoRay
- * ExtremlymTorrents
- * FilmsClub
- * Gay-Torrents.net
- * Gay-Torrents.org
- * HD Dolby
+ * ExtremlymTorrents (XTR)
+ * Genesis-Movement
 * HamsterStudio
 * IV-Torrents
 * KinoNaVse100
- * Kaztorka
 * Kinorun
 * Kinozal
- * Korsar
 * LostFilm.tv
+ * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
 * MVGroup Forum
 * MVGroup Main
 * Marine Tracker
@@ -201,13 +211,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Sharewood
 * SkTorrent
 * SkTorrent-org
- * SoundPark
 * Toloka.to
 * Torrent-Explosiv
 * Torrents-Local
 * TribalMixes
 * Union Fansub
- * UniOtaku
 * YggTorrent (YGG)
 * Ztracker
 </details>
@@ -215,96 +223,95 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 <details> <summary> <b> Supported Private Trackers </b> </summary>

 * 0day.kiev
+ * 1ptbar
 * 2 Fast 4 You
- * 32Pages (32P)
- * 3ChangTrai (3CT)
- * 3D Torrents (3DT)
- * 3evils
+ * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
+ * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
 * 4thD (4th Dimension)
 * 52PT
 * 720pier
- * AST4u
- * Abnormal
- * Acid Lounge (A-L)
+ * Abnormal [![(invite needed)][inviteneeded]](#)
+ * ABtorrents (ABT + RNS)
+ * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
+ * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
 * Aftershock
+ * Aidoru!Online
 * Aither
 * AlphaRatio (AR)
 * AmigosShareClub
+ * anasch.cc
 * AnimeBytes (AB)
 * AnimeTorrents (AnT)
+ * AnimeWorld (AST4u) [![(invite needed)][inviteneeded]](#)
 * Anthelion
- * Araba Fenice (Phoenix)
+ * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
 * ArabP2P
- * Asgaard (AG)
 * AsianCinema
+ * Asylum Share
 * AudioNews (AN)
- * Audiobook Torrents (ABT + RNS)
 * AvistaZ (AsiaTorrents)
- * Awesome-HD (AHD)
- * BIGTorrent
- * BIT-HDTV
- * BJ-Share (BJ)
- * BRObits
- * BTGigs (TG)
- * BTNext (BTNT)
- * BTSCHOOL
+ * Borgzelle
 * Back-ups
- * BaconBits (bB)
+ * bB
 * BakaBT
 * BeiTai
 * BeyondHD (BHD)
- * BiT-TiTAN
 * Bibliotik
- * BigTower
- * Bit-City Reloaded
+ * BIGTorrent
+ * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
+ * BIT-HDTV
+ * BiT-TiTAN
 * BitHUmen
 * BitTorrentFiles
 * BiTTuRK
 * Bithorlo (BHO)
 * Bitspyder
- * BlueBird
+ * BJ-Share (BJ)
+ * BlueBird [![(invite needed)][inviteneeded]](#)
 * Blutopia (BLU)
 * Boxing Torrents
 * Brasil Tracker
- * BroadCity
+ * BroadCity [![(invite needed)][inviteneeded]](#)
 * BroadcasTheNet (BTN)
- * BrokenStones
+ * BrokenStones [![(invite needed)][inviteneeded]](#)
+ * BTNext (BTNT)
+ * BTSCHOOL
 * BWTorrents
 * CCFBits
 * CGPeers
 * CHDBits
+ * Carp-Hunter
 * Carpathians
 * CartoonChaos (CC)
- * CasaTorrent
+ * CasaTorrent [![(invite needed)][inviteneeded]](#)
 * ChannelX
 * ChileBT
 * Cinecalidad
- * CinemaMovies
+ * CinemaMovieS_ZT
 * CinemaZ (EuTorrents)
 * Cinemageddon
 * Cinematik
 * Classix
+ * Coastal-Crew
 * Concertos
 * CrazyHD
 * CrazySpirits
 * CrnaBerza
- * DXDHD
- * DanishBits (DB)
+ * DANISH BYTES
+ * Darius Tracker
 * Dark-Shadow
 * Dark Tracker
- * Das Unerwartete
+ * Das Unerwartete [![(invite needed)][inviteneeded]](#)
 * DataScene (DS)
 * DesiReleasers
 * DesiTorrents
 * Diablo Torrent
 * DICMusic
 * DigitalCore
- * DigitalHive
 * DivTeam
 * DivxTotal
- * DocumentaryTorrents (DT)
- * Downloadville
- * Dragonworld Reloaded
+ * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
+ * DXDHD
 * EbookParadijs
 * Ebooks-Shares
 * EfectoDoppler
@@ -313,12 +320,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * EpubLibre
 * eShareNet
 * eStone (XiDER, BeLoad)
- * Ethor.net (Thor's Land)
 * ExoticaZ (YourExotic)
 * ExtremeBits
- * ExtremeTorrents
+ * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
 * FANO.IN
 * Fantastic Heaven
+ * FeedUrNeed
 * Femdomcult
 * FileList (FL)
 * Film-Paleis
@@ -327,186 +334,185 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * FocusX
 * Fou-Du-Cinema
 * FreeTorrent
- * FullMixMusic
 * FunFile (FF)
- * FunkyTorrents (FT)
+ * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
+ * FunReleases [![(invite needed)][inviteneeded]](#)
 * Fuzer (FZ)
- * GAYtorrent.ru
 * GFXPeers
 * Galeriens (LaPauseTorrents)
- * GazelleGames (GGn)
+ * Gay-Torrents.net
+ * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
+ * GAYtorrent.ru
+ * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
 * Generation-Free
 * GigaTorrents
 * GimmePeers (formerly ILT)
 * GiroTorrent
+ * GreekDiamond
 * Greek Team
+ * HaiDan
+ * HD Dolby [![(invite needed)][inviteneeded]](#)
 * HD-Bits.com
 * HD-Forever (HDF)
 * HD-Olimpo
 * HD-Only (HDO)
 * HD-Space (HDS)
- * HD-Spain
+ * HD-Spain [![(invite needed)][inviteneeded]](#)
 * HD-Torrents (HDT)
- * HD4FANS
+ * HD4FANS [![(invite needed)][inviteneeded]](#)
 * HDArea (HDA)
+ * HDAtmos
 * HDBits
- * HDCenter
+ * HDCenter [![(invite needed)][inviteneeded]](#)
 * HDChina (HDWing)
 * HDC (HDCiTY)
 * HDCity
- * HDDisk (HDD)
 * HDHome (HDBigger)
 * HDME
- * HDRoute
+ * HDRoute [![(invite needed)][inviteneeded]](#)
 * HDSky
- * HDStreet
 * HDTime
 * HDTorrents.it
- * HDTurk
- * HDU
+ * HDTurk [![(invite needed)][inviteneeded]](#)
+ * HDU [![(invite needed)][inviteneeded]](#)
 * HDZone
- * HaiDan
- * HQSource (HQS)
- * HacheDe
 * Hebits
+ * HellasTZ
 * Hon3y HD
 * Horror Site
- * HuSh
- * ICE Torrent
+ * HQSource (HQS)
+ * HuSh [![(invite needed)][inviteneeded]](#)
 * IPTorrents (IPT)
 * ImmortalSeed (iS)
 * Immortuos
 * Insane Tracker
+ * IPTorrents (IPT)
 * JPopsuki
 * JPTV
- * Kapaki
 * Karagarga
 * Keep Friends
 * LastFiles
+ * LatinoP2P
 * Le Saloon
 * LeChaudron
- * LeagueHD
+ * LemonHD
 * LearnFlakes
 * LegacyHD (HD4Free)
+ * Libble
 * LibraNet (LN)
 * LinkoManija
 * LosslessClub
 * M-Team TP (MTTP)
+ * MaDs Revolution
 * Magico (Trellas)
 * Majomparádé (TurkDepo)
+ * MeseVilág (Fairytale World)
 * MicroBit (µBit)
 * Milkie
 * MMA-Torrents
- * MoeCat
- * Mononoké-BT
+ * MNV (Max-New-Vision)
+ * Mononoké-BT [![(invite needed)][inviteneeded]](#)
 * MoreThanTV (MTV)
 * MyAnonamouse (MAM)
- * myAmity
- * MySpleen
- * NBTorrents
+ * MySpleen [![(invite needed)][inviteneeded]](#)
+ * NBTorrents [![(invite needed)][inviteneeded]](#)
 * NCore
 * Nebulance (NBL) (TransmiTheNet)
 * NetCosmo
 * NetLab
- * New Real World
 * NorBits
- * NordicBits (NB)
 * notwhat.cd
 * oMg[WtF]trackr
 * OnlineSelfEducation
- * ONLYscene
 * Orpheus
 * OshenPT
 * Ourbits (HDPter)
 * P2PBG
 * P2PElite
- * PT99
- * PTFiles (PTF)
- * PThome
- * PWTorrents (PWT)
- * Partis
+ * Partis [![(invite needed)][inviteneeded]](#)
 * PassThePopcorn (PTP)
 * Peers.FM
- * PiXELHD (PxHD)
+ * Pirata Digital
 * PirateTheNet (PTN)
 * PixelCove (Ultimate Gamer)
+ * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
 * Pleasuredome
 * PolishSource (PS)
 * PolishTracker
 * PornBits (PB)
- * Pornbay
+ * Pornbay [![(invite needed)][inviteneeded]](#)
 * Pretome
 * PrivateHD (PHD)
 * ProAudioTorrents (PAT)
- * Psytorrents
 * PTerClub
+ * PTFiles (PTF)
+ * PThome
 * PTMSG
 * PTSBAO
+ * PTtime
 * PuntoTorrent
 * PuroVicio
- * R3V WTF!
- * RPTorrents
+ * Puur-Hollands
+ * PWTorrents (PWT)
+ * R3V WTF! [![(invite needed)][inviteneeded]](#)
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
- * Red Star Torrent (RST)
+ * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
 * Redacted (PassTheHeadphones)
 * RetroFlix
 * RevolutionTT
- * Romanian Metal Torrents (RMT)
- * SDBits
- * SceneFZ
+ * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
+ * RPTorrents
 * SceneHD
 * ScenePalace (SP)
 * SceneRush
 * SceneTime
+ * SDBits [![(invite needed)][inviteneeded]](#)
 * Secret Cinema
 * SeedFile (SF)
- * ShareUniversity
 * Shareisland
 * Shazbat
- * Shellife (SL)
+ * Shellife (SL) [![(invite needed)][inviteneeded]](#)
 * SiamBIT
 * SnowPT (SSPT)
- * SoulVoice
- * SpaceTorrent
+ * SoulVoice [![(invite needed)][inviteneeded]](#)
+ * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
 * SpeedCD
 * Speedmaster HD
 * SpeedTorrent Reloaded
- * Spirit of Revolution
- * SportHD
+ * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
+ * SportHD [![(invite needed)][inviteneeded]](#)
 * SportsCult
 * SpringSunday
+ * SugoiMusic
 * Superbits (SBS)
- * TEKNO3D
- * TLFBits
- * TOrrent-tuRK (TORK)
- * TTsWEB
- * TV Chaos UK (TVCUK)
- * TV-Vault
- * TVstore
- * TakeaByte
 * Tapochek
- * Tasmanit
+ * Tasmanit [![(invite needed)][inviteneeded]](#)
 * TeamHD
 * TeamOS
+ * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * TellyTorrent
- * TenYardTorrents (TYT)
+ * teracod (Movie Zone)
 * The Falling Angels (TFA)
- * The Geeks
+ * The Geeks [![(invite needed)][inviteneeded]](#)
 * The Horror Charnel (THC)
 * The New Retro
- * The Occult
- * The Place
+ * The Occult [![(invite needed)][inviteneeded]](#)
+ * The Place [![(invite needed)][inviteneeded]](#)
 * The Shinning (TsH)
- * The Show
- * The Vault
+ * The Show [![(invite needed)][inviteneeded]](#)
+ * The Vault [![(invite needed)][inviteneeded]](#)
 * TheAudioScene
- * TheEmpire (TE)
+ * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
+ * TheLeachZone
 * TJUPT
+ * TLFBits [![(invite needed)][inviteneeded]](#)
 * ToTheGlory (TTG)
 * Torrent Network (TN)
 * Torrent Sector Crew (TSC)
- * Torrent-Syndikat
+ * Torrent Surf
+ * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
+ * TOrrent-tuRK (TORK)
 * Torrent.LT
 * TorrentBD
 * TorrentBytes (TBy)
@@ -515,46 +521,48 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * TorrentDB
 * TorrentFactory
 * TorrentHR
- * TorrentHeaven
+ * TorrentHeaven [![(invite needed)][inviteneeded]](#)
 * TorrentLeech (TL)
 * TorrentLeech.pl
 * TorrentSeeds (TS)
 * Torrentech (TTH)
- * Torrenting (TT)
+ * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
 * Torrentland
 * TotallyKids (TK)
- * TorrentSeed
- * TranceTraffic
+ * Trackeros
+ * TranceTraffic [![(invite needed)][inviteneeded]](#)
 * Trezzor
+ * TTsWEB
 * TurkSeed
 * TurkTorrent (TT)
+ * TV Chaos UK (TVCUK)
+ * TV-Vault
+ * TVstore
 * Twilight Torrents
 * Twilights Zoom
- * U2 (U2分享園@動漫花園)
+ * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
 * UHDBits
- * UnionGang
+ * UnionGang [![(invite needed)][inviteneeded]](#)
 * UnlimitZ
- * VHSTAPES (The Archive / Nostalgic)
 * Vizuk
 * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
- * World-In-HD
 * Witch-Hunter (Demon-Site)
- * World-of-Tomorrow
- * x-ite.me (XM)
+ * wOOt [![(invite needed)][inviteneeded]](#)
+ * World-In-HD [![(invite needed)][inviteneeded]](#)
+ * x-ite.me (XM) [![(invite needed)][inviteneeded]](#)
 * xBytesV2
 * XSpeeds (XS)
 * XWT-Classics
 * XWTorrents (XWT)
 * Xthor
- * XtreMeZone (MYXZ)
- * XtremeFile
 * YDYPT
 * YingK
 * Zamunda.net
 * Zelka.org
+ * ZonaQ
 </details>

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

 ### Aggregate indexers

@@ -577,12 +585,13 @@ We recommend you install Jackett as a Windows service using the supplied install

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

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

 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.

@@ -666,7 +675,7 @@ Jackett is available as a beta package from [SynoCommunity](https://synocommunit


 ## Running Jackett behind a reverse proxy
-When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base Path Override" Jackett option accordingly.
+When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base path override" Jackett option accordingly.

 Example config for apache:
 ```
@@ -690,6 +699,20 @@ location /jackett {
 }
 ```

+## Search Cache
+Jackett has an internal cache to increase search speed and to reduce the number of requests to the torrent sites.
+The default values should be good for most users. If you have problems, you can reduce the TTL value in the
+configuration or even disable the cache. Keep in mind that you can be banned by the sites if you make a lot of requests.
+* **Cache TTL (seconds)**: (default 2100 / 35 minutes) It indicates how long the results can remain in the cache.
+* **Cache max results per indexer**: (default 1000) How many results are kept in cache for each indexer. This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
+
+## Configuring FlareSolverr
+Some indexers are protected by CloudFlare or similar services and Jackett is not able to solve the challenges.
+For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
+Setting up this service is optional, most indexers don't need it.
+* Install FlareSolverr service (following their instructions)
+* Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
+
 ## Configuring OMDb
 This feature is used as a fallback (when using the aggregate Indexer) to get the movie/series title if only the IMDB ID is provided in the request.
 To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/apikey.aspx) (1,000 daily requests limit) and paste the key in Jackett
@@ -715,9 +738,6 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 -   `-c, --UseClient`          Override web client selection.
                            [automatic(Default)/httpclient/httpclient2]

-   `-j, --ProxyConnection`    use proxy - e.g. 127.0.0.1:8888
-
-
 -   `-x, --ListenPublic`       Listen publicly

 -   `-z, --ListenPrivate`      Only allow local access
@@ -746,7 +766,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ## Building from source

 ### Windows
-* Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
+* Install the .NET 5 [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
 * Open PowerShell and from the `src` directory, run `dotnet restore`
 * Open the Jackett solution in Visual Studio 2019 (version 16.4 or above)
@@ -766,21 +786,21 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

 # dotnet core version
-dotnet publish Jackett.Server -f netcoreapp3.1 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp3.1/osx-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net5.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net5.0/osx-x64/jackett # run jackett
 ```

 ### Linux


 ```bash
-sudo apt install mono-complete nuget msbuild dotnet-sdk-3.1 # install build tools (Debian/ubuntu)
+sudo apt install nuget msbuild dotnet-sdk-5.0 # install build tools (Debian/ubuntu)
 git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

 # dotnet core version
-dotnet publish Jackett.Server -f netcoreapp3.1 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp3.1/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net5.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net5.0/linux-x64/jackett # run jackett
 ```

 ## Screenshots
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,12 +2,12 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
  majorVersion: 0
-  minorVersion: 16
+  minorVersion: 17
  patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
-  netCoreFramework: netcoreapp3.1
-  netCoreSdkVersion: 3.1.x
+  netCoreFramework: net5.0
+  netCoreSdkVersion: 5.0.x
  # system.debug: true

 trigger:
@@ -110,7 +110,7 @@ stages:
              projects: 'src/Jackett.Tray/Jackett.Tray.csproj'
              publishWebProjects: false
              zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'

          - task: DotNetCoreCLI@2
            displayName: Build Jackett Service (Windows only)
@@ -120,7 +120,7 @@ stages:
              projects: 'src/Jackett.Service/Jackett.Service.csproj'
              publishWebProjects: false
              zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'

          - task: CopyFiles@2
            displayName: Copy Jackett Server
@@ -165,6 +165,14 @@ stages:
              contents: JackettService*
              targetFolder: $(Build.BinariesDirectory)/Jackett

+          - task: CopyFiles@2
+            displayName: Copy Windows Specific Scripts (Windows only)
+            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+            inputs:
+              SourceFolder: $(Build.SourcesDirectory)
+              contents: jackett_launcher.bat
+              targetFolder: $(Build.BinariesDirectory)/Jackett
+
          - task: CopyFiles@2
            displayName: Copy Mono Specific Scripts
            condition: and(succeeded(), startsWith(variables['buildDescription'], 'Mono'))
@@ -293,14 +301,14 @@ stages:
              targetType: inline
              failOnStderr: true
              script: |
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/DateTimeRoutines
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Common
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Server
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Service
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Test
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Tray
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Updater
+                dotnet-format --check --verbosity diagnostic --folder ./src/DateTimeRoutines
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Common
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Server
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Service
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Test
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Tray
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Updater

      - job: Linting_YAML
        displayName: Linting YAML
@@ -360,7 +368,7 @@ stages:
              buildDescription: Linux ARM64
              imageName: ubuntu-latest
              framework: $(netCoreFramework)
-              runtime: linux-arm64
+              runtime: linux-arm
        pool:
          vmImage: $(imageName)
        displayName: ${{ variables.buildDescription }}
--- a/jackett_launcher.bat
+++ b/jackett_launcher.bat
@@ -0,0 +1,19 @@
+:: Helper script to fix
+:: https://github.com/Jackett/Jackett/issues/10068
+
+@echo off
+
+:: Wait until the updater ends
+:loop
+tasklist | find /i "JackettUpdater.exe" > nul 2>&1
+if errorlevel 1 (
+  goto continue
+) else (
+  echo JackettUpdater is still running
+  ping -n 2 127.0.0.1 > nul
+  goto loop
+)
+
+:: Start Jackett Tray
+:continue
+start "" "%0\..\JackettTray.exe" --UpdatedVersion yes
--- a/src/DateTimeRoutines/DateTimeRoutines.cs
+++ b/src/DateTimeRoutines/DateTimeRoutines.cs
@@ -7,6 +7,7 @@
 //********************************************************************************************

 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;

 // ReSharper disable NotAccessedField.Global
@@ -18,6 +19,7 @@ namespace DateTimeRoutines
    /// <summary>
    /// Miscellaneous and parsing methods for DateTime
    /// </summary>
+    [ExcludeFromCodeCoverage] // this library is not changed by Jackett team
    public static class DateTimeRoutines
    {
        #region miscellaneous methods
--- a/src/Jackett.Common/Content/custom.css
+++ b/src/Jackett.Common/Content/custom.css
@@ -134,8 +134,8 @@ hr {
    }

 .input-header {
-    font-size: 18px;
-    width: 160px;
+    font-size: 16px;
+    width: 250px;
    display: inline-block;
 }

@@ -165,7 +165,7 @@ hr {
    text-align: center;
 }

-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
+#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
    width: 25px;
 }

--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -24,8 +24,6 @@ $.fn.focusWithoutScrolling = function () {

 $(document).ready(function () {
    $.ajaxSetup({ cache: false });
-    //window.jackettIsLocal = window.location.hostname === '127.0.0.1';
-    window.jackettIsLocal = false; // reCaptcha can't be solved via 127.0.0.1 anymore. This loophold was fixed by google around 2.10.2017

    Handlebars.registerHelper('if_eq', function(a, b, opts) {
 	    if (a == b)
@@ -85,6 +83,7 @@ function loadJackettSettings() {
        $("#jackett-proxy-port").val(data.proxy_port);
        $("#jackett-proxy-username").val(data.proxy_username);
        $("#jackett-proxy-password").val(data.proxy_password);
+        proxyWarning(data.proxy_type);

        $("#jackett-basepathoverride").val(data.basepathoverride);
        basePath = data.basepathoverride;
@@ -99,6 +98,15 @@ function loadJackettSettings() {
        $("#jackett-allowupdate").attr('checked', data.updatedisabled);
        $("#jackett-prerelease").attr('checked', data.prerelease);
        $("#jackett-logging").attr('checked', data.logging);
+
+        $("#jackett-cache-enabled").attr('checked', data.cache_enabled);
+        $("#jackett-cache-ttl").val(data.cache_ttl);
+        $("#jackett-cache-max-results-per-indexer").val(data.cache_max_results_per_indexer);
+        if (!data.cache_enabled) {
+            $("#jackett-show-releases").attr("disabled", true);
+        }
+
+        $("#jackett-flaresolverrurl").val(data.flaresolverrurl);
        $("#jackett-omdbkey").val(data.omdbkey);
        $("#jackett-omdburl").val(data.omdburl);
        var password = data.password;
@@ -114,10 +122,9 @@ function loadJackettSettings() {
        $.each(data.notices, function (index, value) {
            console.log(value);
            doNotify(value, "danger", "glyphicon glyphicon-alert", false);
-        })
+        });

        reloadIndexers();
-        proxyWarning(data.proxy_url);
    });
 }

@@ -511,79 +518,13 @@ function populateConfigItems(configForm, config) {
    var $formItemContainer = configForm.find(".config-setup-form");
    $formItemContainer.empty();

-    $('.jackettrecaptcha').remove();
-
-    var hasReacaptcha = false;
-    var captchaItem = null;
-    for (var i = 0; i < config.length; i++) {
-        if (config[i].type === 'recaptcha') {
-            hasReacaptcha = true;
-            captchaItem = config[i];
-        }
-        else if (config[i].id === 'cookieheader' && hasReacaptcha) { // inject cookie into captcha item
-            captchaItem.cookieheader = config[i].value;
-            console.log(captchaItem);
-        }
-    }
-
    var setupItemTemplate = Handlebars.compile($("#setup-item").html());
-    if (hasReacaptcha && !window.jackettIsLocal && false) { // disable this for now, use inline cookie (below)
-        var setupValueTemplate = Handlebars.compile($("#setup-item-nonlocalrecaptcha").html());
-        captchaItem.value_element = setupValueTemplate(captchaItem);
-        var template = setupItemTemplate(captchaItem);
+    for (var i = 0; i < config.length; i++) {
+        var item = config[i];
+        var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html());
+        item.value_element = setupValueTemplate(item);
+        var template = setupItemTemplate(item);
        $formItemContainer.append(template);
-    } else {
-
-        for (var i = 0; i < config.length; i++) {
-            var item = config[i];
-            if ((item.id === 'username' || item.id === 'password') && hasReacaptcha) {
-                continue; // skip username/password if there's a recaptcha
-            }
-            if (item.type != 'recaptcha') {
-                var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html());
-                item.value_element = setupValueTemplate(item);
-                var template = setupItemTemplate(item);
-                $formItemContainer.append(template);
-            }
-            if (item.type === 'recaptcha') {
-                // inject cookie dialog until recaptcha can be solved again
-                var setupValueTemplate = Handlebars.compile($("#setup-item-nonlocalrecaptcha").html());
-                captchaItem.value_element = setupValueTemplate(captchaItem);
-                var template = setupItemTemplate(captchaItem);
-                $formItemContainer.append(template);
-                /*
-                var jackettrecaptcha = $('.jackettrecaptcha');
-                jackettrecaptcha.data("version", item.version);
-                switch (item.version) {
-                    case "1":
-                        // The v1 reCAPTCHA code uses document.write() calls to write the CAPTCHA to the location where the script was loaded.
-                        // As it's loaded async this doesn't work.
-                        // We use an iframe to work around this problem.
-                        var html = '<script type="text/javascript" src="https://www.google.com/recaptcha/api/challenge?k='+encodeURIComponent(item.sitekey)+'"></script>';
-                        var frame = document.createElement('iframe');
-                        frame.id = "jackettrecaptchaiframe";
-                        frame.style.height = "145px";
-                        frame.style.weight = "326px";
-                        frame.style.border = "none";
-                        frame.onload = function () {
-                            // auto resize iframe to content
-                            frame.style.height = frame.contentWindow.document.body.scrollHeight + 'px';
-                            frame.style.width = frame.contentWindow.document.body.scrollWidth + 'px';
-                        }
-                        jackettrecaptcha.append(frame);
-                        frame.contentDocument.open();
-                        frame.contentDocument.write(html);
-                        frame.contentDocument.close();
-                        break;
-                    case "2":
-                        grecaptcha.render(jackettrecaptcha[0], {
-                            'sitekey': item.sitekey
-                        });
-                        break;
-                }
-                */
-            }
-        }
    }
 }

@@ -631,24 +572,6 @@ function getConfigModalJson(configForm) {
            case "inputselect":
                itemEntry.value = $el.find(".setup-item-inputselect select").val();
                break;
-            case "recaptcha":
-                if (window.jackettIsLocal) {
-                    var version = $el.find('.jackettrecaptcha').data("version");
-                    switch (version) {
-                        case "1":
-                            var frameDoc = $("#jackettrecaptchaiframe")[0].contentDocument;
-                            itemEntry.version = version;
-                            itemEntry.challenge = $("#recaptcha_challenge_field", frameDoc).val()
-                            itemEntry.value = $("#recaptcha_response_field", frameDoc).val()
-                            break;
-                        case "2":
-                            itemEntry.value = $('.g-recaptcha-response').val();
-                            break;
-                    }
-                } else {
-                    itemEntry.cookie = $el.find(".setup-item-recaptcha input").val();
-                }
-                break;
        }
        configJson.push(itemEntry)
    });
@@ -737,14 +660,14 @@ function updateReleasesRow(row)
    var labels = $(row).find("span.release-labels");
    var TitleLink = $(row).find("td.Title > a");
    var IMDBId = $(row).data("imdb");
-    var Banner = $(row).data("banner");
+    var Poster = $(row).data("poster");
    var Description = $(row).data("description");
    var DownloadVolumeFactor = parseFloat($(row).find("td.DownloadVolumeFactor").html());
    var UploadVolumeFactor = parseFloat($(row).find("td.UploadVolumeFactor").html());

    var TitleTooltip = "";
-    if (Banner)
-        TitleTooltip += "<img src='" + Banner + "' /><br />";
+    if (Poster)
+        TitleTooltip += "<img src='" + Poster + "' /><br />";
    if (Description)
        TitleTooltip += Description;

@@ -1212,6 +1135,10 @@ function bindUIButtons() {
        var jackett_update = $("#jackett-allowupdate").is(':checked');
        var jackett_prerelease = $("#jackett-prerelease").is(':checked');
        var jackett_logging = $("#jackett-logging").is(':checked');
+        var jackett_cache_enabled = $("#jackett-cache-enabled").is(':checked');
+        var jackett_cache_ttl = $("#jackett-cache-ttl").val();
+        var jackett_cache_max_results_per_indexer = $("#jackett-cache-max-results-per-indexer").val();
+        var jackett_flaresolverr_url = $("#jackett-flaresolverrurl").val();
        var jackett_omdb_key = $("#jackett-omdbkey").val();
        var jackett_omdb_url = $("#jackett-omdburl").val();

@@ -1229,6 +1156,11 @@ function bindUIButtons() {
            blackholedir: $("#jackett-savedir").val(),
            logging: jackett_logging,
            basepathoverride: jackett_basepathoverride,
+            logging: jackett_logging,
+            cache_enabled: jackett_cache_enabled,
+            cache_ttl: jackett_cache_ttl,
+            cache_max_results_per_indexer: jackett_cache_max_results_per_indexer,
+            flaresolverrurl: jackett_flaresolverr_url,
            omdbkey: jackett_omdb_key,
            omdburl: jackett_omdb_url,
            proxy_type: jackett_proxy_type,
@@ -1241,7 +1173,7 @@ function bindUIButtons() {
            doNotify("Redirecting you to complete configuration update..", "success", "glyphicon glyphicon-ok");
            window.setTimeout(function () {
                window.location.reload(true);
-            }, 3000);
+            }, 5000);
        }).fail(function (data) {
            if (data.responseJSON !== undefined && data.responseJSON.result == "error") {
                doNotify("Error: " + data.responseJSON.error, "danger", "glyphicon glyphicon-alert");
@@ -1284,13 +1216,13 @@ function bindUIButtons() {
        });
    });

-    $('#jackett-proxy-url').on('input', function () {
+    $('#jackett-proxy-type').on('input', function () {
        proxyWarning($(this).val());
    });
 }

 function proxyWarning(input) {
-    if (input != null && input.trim() !== "") {
+    if (input != null && input.toString().trim() !== "-1") { // disabled = -1
        $('#proxy-warning').show();
    }
    else
--- a/src/Jackett.Common/Content/custom_mobile.css
+++ b/src/Jackett.Common/Content/custom_mobile.css
@@ -126,8 +126,8 @@ hr {
    }

 .input-header {
-    font-size: 18px;
-    width: 160px;
+    font-size: 16px;
+    width: 250px;
    display: inline-block;
 }

@@ -157,7 +157,7 @@ hr {
    text-align: center;
 }

-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
+#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
    width: 25px;
 }

--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -7,7 +7,7 @@
    <meta name="mobile-web-app-capable" content="yes" />
    <meta name="apple-mobile-web-app-capable" content="yes" />
    <meta charset="utf-8" />
-    <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party ressources (E.g. Empornium banner images won't load) -->
+    <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party resources (E.g. Empornium poster images won't load) -->
    <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
    <link rel="apple-touch-icon" sizes="57x57" href="../apple-touch-icon-57x57.png" />
    <link rel="apple-touch-icon" sizes="72x72" href="../apple-touch-icon-72x72.png" />
@@ -25,17 +25,16 @@
    <script type="text/javascript" src="../libs/jquery.dataTables.min.js?changed=2017083001" charset="utf8"></script>
    <script type="text/javascript" src="../libs/handlebars.min.js?changed=2017083001"></script>
    <script type="text/javascript" src="../libs/moment.min.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=20210117"></script>
    <script type="text/javascript" src="../libs/handlebarsextend.js?changed=2017083001"></script>
    <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
    <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>
    <script type="text/javascript" src="../libs/bootstrap-multiselect.js?changed=2017083001"></script>
-    <!--<script type="text/javascript" src="https://www.google.com/recaptcha/api.js?render=explicit" async defer></script>-->

    <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20200223" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20200223" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20201208" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20201208" media="only screen and (max-device-width: 480px)">
    <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
    <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
@@ -128,7 +127,7 @@
            </a>
        </div>
        <div class="input-area">
-            <span class="input-header">Base Path Override: </span>
+            <span class="input-header">Base path override: </span>
            <input id="jackett-basepathoverride" class="form-control input-right" type="text" value="" placeholder="/jackett">
        </div>
        <div class="input-area">
@@ -136,16 +135,17 @@
            <input id="jackett-port" class="form-control input-right" type="text" value="" placeholder="9117">
        </div>
        <div class="input-area">
-            <span class="input-header">Manual download blackhole directory: </span>
+            <span class="input-header">Blackhole directory: </span>
            <input id="jackett-savedir" class="form-control input-right" type="text" value="" placeholder="c:\torrents\">
        </div>

        <div class="input-area">
            <span class="input-header">Proxy type: </span>
            <select id="jackett-proxy-type" class="form-control input-right">
-                <option value="0">http</option>
-                <option value="1">socks4</option>
-                <option value="2">socks5</option>
+                <option value="-1">Disabled</option>
+                <option value="0">HTTP</option>
+                <option value="1">SOCKS4</option>
+                <option value="2">SOCKS5</option>
            </select>
        </div>
        <div id="proxy-warning" hidden>
@@ -154,8 +154,8 @@
            </span>
        </div>
        <div class="input-area">
-            <span class="input-header">Proxy url: </span>
-            <input id="jackett-proxy-url" class="form-control input-right" type="text" value="" placeholder="Blank to disable">
+            <span class="input-header">Proxy URL: </span>
+            <input id="jackett-proxy-url" class="form-control input-right" type="text" value="" placeholder="">
        </div>
        <div class="input-area">
            <span class="input-header">Proxy port: </span>
@@ -188,6 +188,22 @@
            <span class="input-header">Enhanced logging: </span>
            <input id="jackett-logging" class="form-control input-right" type="checkbox" />
        </div>
+        <div class="input-area">
+            <span class="input-header">Cache enabled (recommended): </span>
+            <input id="jackett-cache-enabled" class="form-control input-right" type="checkbox" />
+        </div>
+        <div class="input-area">
+            <span class="input-header">Cache TTL (seconds): </span>
+            <input id="jackett-cache-ttl" class="form-control input-right" type="text" value="" placeholder="">
+        </div>
+        <div class="input-area">
+            <span class="input-header">Cache max results per indexer: </span>
+            <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="">
+        </div>
+        <div class="input-area">
+          <span class="input-header">FlareSolverr API URL: </span>
+          <input id="jackett-flaresolverrurl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
+        </div>
        <div class="input-area">
            <span class="input-header">OMDB API key: </span>
            <input id="jackett-omdbkey" class="form-control input-right" type="text" value="" placeholder="">
@@ -204,13 +220,6 @@

    <div id="modals"></div>

-    <script id="setup-item-nonlocalrecaptcha" type="text/x-handlebars-template">
-        <div class="setup-item-recaptcha">
-            <p>This site requires you to solve a ReCaptcha. It's no longer possible to solve the captcha in Jackett. Please enter the cookie for the site manually. <a href="https://github.com/Jackett/Jackett/wiki/Finding-cookies" target="_blank">See here</a> on how get the cookies.</p>
-            <div class="setup-item-label">Full cookie header</div>
-            <input class="form-control" type="text" value="{{cookieheader}}" />
-        </div>
-    </script>
    <script id="setup-item" type="text/x-handlebars-template">
        <div class="setup-item form-group" data-id="{{id}}" data-value="{{value}}" data-type="{{type}}">
            <div class="setup-item-label">{{name}}</div>
@@ -261,10 +270,6 @@
            </select>
        </div>
    </script>
-    <script id="setup-item-recaptcha" type="text/x-handlebars-template">
-        <div class="jackettrecaptcha">
-        </div>
-    </script>
    <script id="setup-item-displayimage" type="text/x-handlebars-template">
        <img class="setup-item-displayimage" src="{{{value}}}" alt="No image available" />
    </script>
@@ -413,13 +418,13 @@
                            </thead>
                            <tbody>
                                {{#each releases}}
-                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-banner="{{BannerUrl}}" data-description="{{Description}}">
+                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-poster="{{Poster}}" data-description="{{Description}}">
                                    <td class="fit">{{PublishDate}}</td>
                                    <td class="fit">{{FirstSeen}}</td>
                                    <td class="fit">{{jacketTimespan PublishDate}}</td>
                                    <td class="fit">{{jacketTimespan FirstSeen}}</td>
                                    <td class="fit">{{Tracker}}</td>
-                                    <td class="Title"><a href="{{Comments}}">{{Title}}</a> <span class="release-labels"></span></td>
+                                    <td class="Title"><a href="{{Details}}">{{Title}}</a> <span class="release-labels"></span></td>
                                    <td class="fit">{{Size}}</td>
                                    <td class="fit">{{jacketSize Size}}</td>
                                    <td class="fit">{{Files}}</td>
@@ -536,11 +541,11 @@
            </thead>
            <tbody>
                {{#each Results}}
-                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-banner="{{BannerUrl}}" data-description="{{Description}}">
+                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-poster="{{Poster}}" data-description="{{Description}}">
                    <td>{{PublishDate}}</td>
                    <td>{{jacketTimespan PublishDate}}</td>
                    <td>{{Tracker}}</td>
-                    <td class="Title"><a href="{{Comments}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
+                    <td class="Title"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
                    <td>{{Size}}</td>
                    <td class="fit">{{jacketSize Size}}</td>
                    <td>{{Files}}</td>
@@ -691,6 +696,6 @@
    </script>

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

 Handlebars.registerHelper('jacketSize', function (context, block) {
-    return filesize(context, { round: 1 });
+    return filesize(context, { round: 2 });
 });
--- a/src/Jackett.Common/Converters/StringToLongConverter.cs
+++ b/src/Jackett.Common/Converters/StringToLongConverter.cs
@@ -0,0 +1,33 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Jackett.Common.Converters
+{
+    /// <summary>
+    /// converts a string value to a long and vice-versa.
+    /// </summary>
+    public sealed class StringToLongConverter : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            => writer.WriteValue(value.ToString());
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.Value == null)
+            {
+                return null;
+            }
+
+            if (reader.Value is long)
+            {
+                return reader.Value;
+            }
+
+            return long.TryParse((string)reader.Value, out var foo)
+                ? foo
+                : (long?) null;
+        }
+
+        public override bool CanConvert(Type objectType) => objectType == typeof(string);
+    }
+}
--- a/src/Jackett.Common/Definitions/0daykiev.yml
+++ b/src/Jackett.Common/Definitions/0daykiev.yml
@@ -23,7 +23,7 @@ caps:
    - {id: 41, cat: Movies/3D, desc: "HD / 3D видео (HD / 3D video)"}
    - {id: 47, cat: Movies, desc: "HDv 0day Team"}
    - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"}
-    - {id: 25, cat: Console/Xbox 360, desc: "Игры / XBOX360 (Games / XBOX360)"}
+    - {id: 25, cat: Console/XBox 360, desc: "Игры / XBOX360 (Games / XBOX360)"}
    - {id: 33, cat: Console/PSP, desc: "Игры / PSP - PS2 (Games / PSP - PS2)"}
    - {id: 37, cat: Console/PS3, desc: "Игры / PS3 (Games / PS3)"}
    - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"}
@@ -51,22 +51,26 @@ settings:
    type: checkbox
    label: Strip Russian Letters
    default: true
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "4"
+    default: 4
    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: takelogin.php
@@ -95,11 +99,11 @@ search:
    - name: re_replace # S01E01 to Сезон 1 Серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver
-    incldead: 1
-    # 0 title 1 title and descr
+    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 title, 1 title and descr
    where: 0
    sort: "{{ .Config.sort}}"
    type: "{{ .Config.type}}"
@@ -144,8 +148,10 @@ search:
    date:
      selector: td:nth-child(2) i
      filters:
+        - name: append
+          args: " +03:00" # MSK
        - name: dateparse
-          args: "2006-01-02 15:04:05"
+          args: "2006-01-02 15:04:05 -07:00"
    size:
      selector: td:nth-child(4)
      filters:
@@ -183,4 +189,6 @@ search:
        "*": 1
    uploadvolumefactor:
      text: 1
+    minimumratio:
+      text: 0.2
 # engine n/a
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -14,11 +14,8 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337.root.yt/
-  - https://1337x.unblockit.win/
-  - https://1337x.unblocked.bar/
-  - https://1337x.proxyportal.pw/
-  - https://1337x.uk-unblock.pro/
+  - https://1337x.unblockit.link/
+  - https://1337x.unblocked.monster/
 legacylinks:
  - https://1337x.unblocked.earth/
  - https://1337x.unblockit.pro/
@@ -32,6 +29,17 @@ legacylinks:
  - https://1337x.unblockit.me/
  - https://1337x.unblockit.pw/
  - https://1337x.unblockit.id/
+  - https://1337x.unblockit.win/
+  - https://1337x.unblocked.bar/
+  - https://1337x.proxyportal.pw/
+  - https://1337x.uk-unblock.pro/
+  - https://1337x.unblockit.top/
+  - https://1337x.unblockit.lat/
+  - https://1337x.unblockit.app/
+  - https://1337.root.yt/
+  - https://1337x.unblocked.rest/
+  - https://1337x.unblockit.dev/
+  - https://1337x.unblockit.ltd/

 caps:
  categorymappings:
@@ -41,7 +49,6 @@ caps:
    - {id: 79, cat: TV/Anime, desc: "Anime/Dubbed"}
    - {id: 80, cat: TV/Anime, desc: "Anime/Subbed"}
    - {id: 81, cat: TV/Anime, desc: "Anime/Raw"}
-
    # Audio
    - {id: 22, cat: Audio/MP3, desc: "Music/MP3"}
    - {id: 23, cat: Audio/Lossless, desc: "Music/Lossless"}
@@ -55,7 +62,6 @@ caps:
    - {id: 60, cat: Audio, desc: "Music/Single"}
    - {id: 68, cat: Audio, desc: "Music/Concerts"}
    - {id: 69, cat: Audio, desc: "Music/AAC"}
-
    # Movies
    - {id: 1, cat: Movies/DVD, desc: "Movies/DVD"}
    - {id: 2, cat: Movies/SD, desc: "Movies/Divx/Xvid"}
@@ -68,7 +74,6 @@ caps:
    - {id: 70, cat: Movies/HD, desc: "Movies/HEVC/x265"}
    - {id: 73, cat: Movies, desc: "Movies/Bollywood"}
    - {id: 76, cat: Movies/UHD, desc: "Movies/UHD"}
-
    # TV
    - {id: 5, cat: TV, desc: "TV/DVD"}
    - {id: 6, cat: TV, desc: "TV/Divx/Xvid"}
@@ -78,44 +83,40 @@ caps:
    - {id: 74, cat: TV, desc: "TV/Cartoons"}
    - {id: 75, cat: TV/SD, desc: "TV/SD"}
    - {id: 9, cat: TV/Documentary, desc: "TV/Documentary"}
-
    # Apps
    - {id: 18, cat: PC, desc: "Apps/PC Software"}
    - {id: 19, cat: PC/Mac, desc: "Apps/Mac"}
    - {id: 20, cat: PC, desc: "Apps/Linux"}
    - {id: 21, cat: PC, desc: "Apps/Other"}
-    - {id: 56, cat: PC/Phone-Android, desc: "Apps/Android"}
-    - {id: 57, cat: PC/Phone-IOS, desc: "Apps/iOS"}
-
+    - {id: 56, cat: PC/Mobile-Android, desc: "Apps/Android"}
+    - {id: 57, cat: PC/Mobile-iOS, desc: "Apps/iOS"}
    # Games
    - {id: 10, cat: PC/Games, desc: "Games/PC Game"}
-    - {id: 11, cat: Console/Other, desc: "Games/PS2"}
+    - {id: 11, cat: Console/PS3, desc: "Games/PS2"}
    - {id: 12, cat: Console/PSP, desc: "Games/PSP"}
-    - {id: 13, cat: Console/Xbox, desc: "Games/Xbox"}
-    - {id: 14, cat: Console/Xbox 360, desc: "Games/Xbox360"}
-    - {id: 15, cat: Console/Other, desc: "Games/PS1"}
+    - {id: 13, cat: Console/XBox, desc: "Games/Xbox"}
+    - {id: 14, cat: Console/XBox 360, desc: "Games/Xbox360"}
+    - {id: 15, cat: Console/PS3, desc: "Games/PS1"}
    - {id: 16, cat: Console/Other, desc: "Games/Dreamcast"}
-    - {id: 17, cat: PC/Phone-Other, desc: "Games/Other"}
+    - {id: 17, cat: PC/Mobile-Other, desc: "Games/Other"}
    - {id: 43, cat: Console/PS3, desc: "Games/PS3"}
    - {id: 44, cat: Console/Wii, desc: "Games/Wii"}
    - {id: 45, cat: Console/NDS, desc: "Games/DS"}
-    - {id: 46, cat: Console, desc: "Games/GameCube"}
+    - {id: 46, cat: Console/Other, desc: "Games/GameCube"}
    - {id: 72, cat: Console/3DS, desc: "Games/3DS"}
    - {id: 77, cat: Console/PS4, desc: "Games/PS4"}
    - {id: 82, cat: Console/Other, desc: "Games/Switch"}
-
    # XXX
    - {id: 48, cat: XXX/DVD, desc: "XXX/Video"}
-    - {id: 49, cat: XXX/Imageset, desc: "XXX/Picture"}
+    - {id: 49, cat: XXX/ImageSet, desc: "XXX/Picture"}
    - {id: 50, cat: XXX, desc: "XXX/Magazine"}
    - {id: 51, cat: XXX, desc: "XXX/Hentai"}
    - {id: 67, cat: XXX, desc: "XXX/Games"}
-
    # Other
    - {id: 33, cat: Other, desc: "Other/Emulation"}
    - {id: 34, cat: Books, desc: "Other/Tutorial"}
    - {id: 35, cat: Other, desc: "Other/Sounds"}
-    - {id: 36, cat: Books/Ebook, desc: "Other/E-books"}
+    - {id: 36, cat: Books/EBook, desc: "Other/E-books"}
    - {id: 37, cat: Other, desc: "Other/Images"}
    - {id: 38, cat: Other, desc: "Other/Mobile Phone"}
    - {id: 39, cat: Books/Comics, desc: "Other/Comics"}
@@ -127,7 +128,8 @@ caps:
    search: [q]
    tv-search: [q, season, ep]
    movie-search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, album, artist]
+    book-search: [q]

 settings:
  - name: downloadlink
@@ -135,25 +137,23 @@ settings:
    label: Download link
    default: "magnet:"
    options:
-      "http://itorrents.org/": "iTorrents.org"
-      "http://torrage.info/": "Torrage.info"
-      "http://btcache.me/": "BTcache.me"
-      "magnet:": "magnet"
+      "http://itorrents.org/": iTorrents.org
+      "magnet:": magnet
  - name: sort
    type: select
    label: Sort requested from site
-    default: "time"
+    default: time
    options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
+      time: created
+      seeders: seeders
+      size: size
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 download:
  # the .torrent url is on the on the details page
@@ -163,9 +163,9 @@ download:
 search:
  paths:
    # present first page of movies tv and music results if there are no search parms supplied (20 hits per page)
-    - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Movies{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/1/"
-    - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/TV{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}2{{else}}1{{end}}/"
-    - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Music{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}3{{else}}1{{end}}/"
+    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Movies{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/1/"
+    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/TV{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}2{{ else }}1{{ end }}/"
+    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
  keywordsfilters:
    - name: replace # use this as a workaround till #893 is implemented
      args: ["Greys Anatomy", "Grey's Anatomy"]
@@ -217,14 +217,8 @@ search:
      optional: true
      selector: td[class^="coll-date"]:not(:contains(":")):not(:contains("'"))
      filters:
-        - name: replace
-          args: ["st", ""]
-        - name: replace
-          args: ["nd", ""]
-        - name: replace
-          args: ["rd", ""]
-        - name: replace
-          args: ["th", ""]
+        - name: re_replace
+          args: ["st|nd|rd|th", ""]
        - name: dateparse
          args: "3pm Jan. 2"
    date:
@@ -234,14 +228,8 @@ search:
      filters:
        - name: replace
          args: ["'", ""]
-        - name: replace
-          args: ["st", ""]
-        - name: replace
-          args: ["nd", ""]
-        - name: replace
-          args: ["rd", ""]
-        - name: replace
-          args: ["th", ""]
+        - name: re_replace
+          args: ["st|nd|rd|th", ""]
        - name: dateparse
          args: "Jan. 2 06"
    date:
--- a/src/Jackett.Common/Definitions/brobits.yml
+++ b/src/Jackett.Common/Definitions/brobits.yml
@@ -1,23 +1,31 @@
 ---
-id: brobits
-name: BRObits
-description: "BRObits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: 1ptbar
+name: 1ptbar
+description: "1ptbar is a CHINESE Private Torrent Tracker for Movies, TV, and e-Learning"
 language: zh-cn
 type: private
 encoding: UTF-8
 links:
-  - https://brobits.cc/
+  - https://1ptba.com/

 caps:
  categorymappings:
    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 410, cat: TV, desc: "TV Series/剧集"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 403, cat: TV, desc: "TV Show/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐视频"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
+    - {id: 409, cat: Other, desc: "Other/其它"}
+    - {id: 412, cat: Other, desc: "Education/教育"}

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

 settings:
  - name: cookie
@@ -27,48 +35,51 @@ settings:
    type: info
    label: How to get the Cookie
    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: "4"
-    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
-  - name: type
-    type: select
-    label: Order requested from site
-    default: "desc"
-    options:
-      "desc": "desc"
-      "asc": "asc"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: info_tpp
    type: info
    label: Results Per Page
    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc

 login:
  method: cookie
  inputs:
    cookie: "{{ .Config.cookie }}"
  test:
-    path: index.php
+    path: torrents.php

 search:
  paths:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
    incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploader 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -77,18 +88,18 @@ search:
    selector: table.torrents > tbody > tr:has(table.torrentname)

  fields:
-    title:
-      selector: a[href^="details.php?id="]
-    title:
-      optional: true
-      selector: a[title][href^="details.php?id="]
-      attribute: title
    category:
      selector: a[href^="?cat="]
      attribute: href
      filters:
        - name: querystring
          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    title:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
    details:
      selector: a[href^="details.php?id="]
      attribute: href
@@ -96,12 +107,11 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
-      selector: div.imdb_100 > a
+      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    date:
      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-last-of-type(7) > span[title]
      attribute: title
      optional: true
      filters:
@@ -111,21 +121,21 @@ search:
          args: "2006-01-02 15:04:05 -07:00"
    date:
      # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-last-of-type(7):not(:has(span))
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-last-of-type(6)
    seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-last-of-type(5)
    leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-last-of-type(4)
    grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-last-of-type(3)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -143,4 +153,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, img
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP Standard v1.5 Beta 5
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/src/Jackett.Common/Definitions/2fast4you.yml
@@ -18,7 +18,7 @@ caps:
    - {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/Phone-Android, desc: "Applications: Android"}
+    - {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"}
@@ -35,7 +35,7 @@ caps:
    - {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/WEBDL, desc: "Films: WEB-DL"}
+    - {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"}
@@ -82,6 +82,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: username
@@ -90,22 +91,45 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: FRENCH
+    options:
+      FRENCH: "FRENCH"
+      MULTI.FRENCH: "MULTI.FRENCH"
+      ENGLISH: "ENGLISH"
+      MULTI.ENGLISH: "MULTI.ENGLISH"
+      VOSTFR: "VOSTFR"
+      MULTI.VOSTFR: "MULTI.VOSTFR"
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "id"
+    default: id
    options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
  - name: order
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: account-login.php
@@ -125,13 +149,13 @@ search:
  paths:
    - path: torrents-search.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead
+    # 0 active, 1 incldead, 2 onlydead
    incldead: 1
-    # 0 all 1 notfree 2 onlyfree
-    freeleech: 0
-    # 0 any 1 French 2 English 3 Multi 4-8 32-41
+    # 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}}"
@@ -149,25 +173,43 @@ search:
      filters:
        - name: querystring
          args: cat
+    title_phase1:
+      selector: a[href^="torrents-details.php?id="]
+      filters:
+        - name: replace
+          args: [" - (Nouveau!)", ""]
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+        - name: re_replace
+          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
    download:
      selector: a[href^="torrents-details.php?id="]
      attribute: href
      filters:
        - name: replace
          args: ["torrents-details.php", "download.php"]
-    title:
-      selector: a[href^="torrents-details.php?id="]
-      filters:
-        - name: replace
-          args: [" - (Nouveau!)", ""]
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    banner:
+    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:
@@ -181,4 +223,6 @@ search:
    uploadvolumefactor:
      case:
        "*": 1
+    minimumratio:
+      text: 0.75
 # engine n/a
--- a/src/Jackett.Common/Definitions/32pages.yml
+++ b/src/Jackett.Common/Definitions/32pages.yml
@@ -1,148 +0,0 @@
-# Because API is broken we use screen scraping instead of the generic Gazelle based approach
---
-id: 32pages
-name: 32Pages
-description: "32Pages (32P) is a Private Torrent Tracker for comic books/graphic novels"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - https://32pag.es/
-
-caps:
-  categories:
-    "Comics": Books/Comics
-
-  modes:
-    search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2facode
-    type: text
-    label: 2FA code
-  - name: info_2fa
-    type: info
-    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 32Pages Web Site. Otherwise just leave it empty."
-  - name: lockip
-    type: select
-    label: "Lock session to my IP address"
-    default: "1"
-    options:
-      "1": "yes"
-      "0": "no"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: "time"
-    options:
-      "time": "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
-    type: info
-    label: Results Per Page
-    default: For best results, your search query has to be <b>as specific as possible</b> (only <b>first 100</b> torrents will be displayed).
-
-login:
-  path: login
-  method: post
-  path: login.php
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    twostep_pub: "{{ .Config.2facode }}"
-    keeplogged: 1
-    lockip: "{{ .Config.lockip }}"
-  error:
-    - selector: "#formerror"
-  test:
-    path: torrents.php
-    selector: "#nav_userinfo"
-
-search:
-  paths:
-    - path: torrents.php
-    # site displays just 25 results per page, no profile options found to change this, so we attempt to fetch 4 pages
-    - path: torrents.php
-      inputs:
-        page: 2
-    - path: torrents.php
-      inputs:
-        page: 3
-    - path: torrents.php
-      inputs:
-        page: 4
-  inputs:
-    searchstr: "{{ .Keywords }}"
-    order_by: "{{ .Config.sort}}"
-    order_way: "{{ .Config.type}}"
-    disablegrouping: 1
-
-  rows:
-    selector: table#torrent_table > tbody > tr[class^="torrent"]
-
-  fields:
-    _grouptitle:
-      selector: a[href^="torrents.php?id="]
-    _language:
-      selector: img[class^="flag"]
-      attribute: alt
-      optional: true
-    title:
-      selector: a[title="View Torrent"]
-      filters:
-        - name: prepend
-          args: "{{.Result._grouptitle}} - "
-        - name: replace
-          args: ["/  /", "/"] # removes slash left after freeleech images
-        - name: append
-          args: "{{if .Result._language}} [{{.Result._language}}]{{else}}{{end}}"
-    category:
-      text: Comics
-    details:
-      selector: a[title="View Torrent"]
-      attribute: href
-    download:
-      selector: a[title="Download"]
-      attribute: href
-    size:
-      selector: td[headers="browse_size"]
-    files:
-      selector: td[headers="browse_files"]
-    grabs:
-      selector: td[headers="browse_snatches"]
-    seeders:
-      selector: td[headers="browse_seeders"]
-    leechers:
-      selector: td[headers="browse_leechers"]
-    date:
-      selector: td[headers="browse_time"] > span[title]
-      attribute: title
-      filters:
-        - name: dateparse
-          args: "Apr 04 2020, 16:24"
-    downloadvolumefactor:
-      case:
-        img.fl-diamond: 0
-        img.fl-sapphire: 0
-        img.fl-emerald: 0
-        img.fl-ruby: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# gazelle
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -23,10 +23,11 @@ caps:
    - {id: 412, cat: PC/Games, desc: "Games"}

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

 settings:
  - name: username
@@ -35,22 +36,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "4"
+    default: 4
    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -83,14 +88,14 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
    incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploader 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -125,7 +130,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +07:00"
+          args: " +07:00" # ICT
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -134,7 +139,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +07:00"
+          args: " +07:00" # ICT
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/3dtorrents.yml
+++ b/src/Jackett.Common/Definitions/3dtorrents.yml
@@ -100,13 +100,15 @@ search:
      selector: td:nth-last-child(4)
    seeders:
      selector: td:nth-last-child(3)
-    # leechers:
-    #   selector: td:nth-last-child(2)
+    leechers:
+      text: 0
    date:
      selector: td:nth-last-child(5)
      filters:
+        - name: append
+          args: " -07:00" # PDT
        - name: dateparse
-          args: "02/01/2006"
+          args: "02/01/2006 -07:00"
    downloadvolumefactor:
      case:
        img[title^="You get 50% off download count on this torrent"]: 0.5
--- a/src/Jackett.Common/Definitions/3evils.yml
+++ b/src/Jackett.Common/Definitions/3evils.yml
@@ -1,155 +0,0 @@
---
-id: 3evils
-name: 3evils
-description: "3evils is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en
-type: private
-encoding: UTF-8
-links:
-  - https://www.3evils.com/
-
-caps:
-  categorymappings:
-    - {id: 65, cat: Books, desc: "Books"}
-    - {id: 11, cat: Movies/UHD, desc: "Movies/Encodes 2160p"}
-    - {id: 12, cat: Movies/UHD, desc: "Movies/Remux 2160p"}
-    - {id: 13, cat: Movies/HD, desc: "Movies/Remux 1080p"}
-    - {id: 14, cat: Movies, desc: "Movies/Packs"}
-    - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
-    - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
-    - {id: 33, cat: Audio, desc: "Music/Audio"}
-    - {id: 32, cat: Audio, desc: "Music/Packs"}
-    - {id: 6, cat: TV, desc: "TV/Packs"}
-    - {id: 3, cat: TV/HD, desc: "TV/x264"}
-    - {id: 4, cat: TV/HD, desc: "TV/x265"}
-    - {id: 8, cat: TV/SD, desc: "TV/Xvid"}
-    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
-    - {id: 42, cat: PC/Phone-Android, desc: "Appz/Android"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: "4"
-    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
-  - name: type
-    type: select
-    label: Order requested from site
-    default: "desc"
-    options:
-      "desc": "desc"
-      "asc": "asc"
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    submitme: "X"
-  error:
-    - selector: div.callout:contains("Login failed!")
-  test:
-    path: /
-    selector: a[href*="/logout.php?hash_please="]
-
-search:
-  paths:
-    # https://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
-    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=1
-    - path: browse.php
-  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{.Keywords}}"
-    # title descr genre all
-    searchin: title
-    # 0 active 1 incldead 2 onlydead
-    incldead: 1
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.responsive-card-table tr:has(td[data-label])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td[data-label="Type"] a
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td[data-label="Name"] a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.*?)</b>"
-    details:
-      selector: td[data-label="Name"] a
-      attribute: href
-    download:
-      selector: td[data-label="Download"] a
-      attribute: href
-    banner:
-      selector: td[data-label="Name"] a[onmouseover]
-      attribute: onmouseover
-      optional: true
-      filters:
-        #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
-        # <img src=\'./pic/noposter.png\'
-        - name: regexp
-          args: "src=\\\\'(.+?)\\\\'"
-        - name: replace
-          args: ["./pic/noposter.png", ""]
-    size:
-      selector: td[data-label="Size"]
-    files:
-      selector: td[data-label="Files"]
-    grabs:
-      selector: td[data-label="Snatched"]
-      filters:
-        - name: regexp
-          args: (\d+)
-    # 2 flavours of dates
-    date:
-      # Today<br> 10:20 AM
-      # Yesterday<br> 08:03 PM
-      optional: true
-      selector: td[data-label="Added"]:contains("day")
-    date:
-      # Feb 14 2019<br> 10:20 AM
-      optional: true
-      selector: td[data-label="Added"]:not(:contains("day"))
-      filters:
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM"
-    seeders:
-      selector: td[data-label="Seeders"]
-    leechers:
-      selector: td[data-label="Leechers"]
-    downloadvolumefactor:
-      case:
-        img[src="./pic/freedownload.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "*": 1
-# U-232 V5
--- a/src/Jackett.Common/Definitions/4thd.yml
+++ b/src/Jackett.Common/Definitions/4thd.yml
@@ -17,7 +17,8 @@ caps:
    - {id: 27, cat: Movies/HD, desc: "MoviesHD"}
    - {id: 29, cat: Movies/SD, desc: "Movies/SD"}
    - {id: 26, cat: Movies/SD, desc: "Movies/XviD"}
-    - {id: 41, cat: TV/FOREIGN, desc: "Foreign tv"}
+    - {id: 45, cat: Movies, desc: "Movies/Kids"}
+    - {id: 41, cat: TV/Foreign, desc: "Foreign tv"}
    - {id: 40, cat: TV, desc: "Mini-Series"}
    - {id: 43, cat: TV/HD, desc: "TV H265"}
    - {id: 42, cat: TV, desc: "TV Movie"}
@@ -32,13 +33,14 @@ caps:
    - {id: 37, cat: Audio, desc: "Radio"}
    - {id: 9, cat: PC/0day, desc: "Apps/PC"}
    - {id: 34, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 25, cat: Books/Ebook, desc: "eBooks"}
+    - {id: 25, cat: Books/EBook, desc: "eBooks"}

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

 settings:
  - name: username
@@ -47,21 +49,25 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "time"
+    default: time
    options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
+      time: created
+      seeders: seeders
+      size: size
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login.php
@@ -85,8 +91,8 @@ search:
    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    order_by: "{{ .Config.sort }}"
    order_way: "{{ .Config.type }}"
-    # 0 all 1 onlyfree
-    filter_freeleech: 0
+    # 0 all, 1 onlyfree
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
    title: "{{ .Keywords }}"
    search_type: 1
    taglist: ""
@@ -112,9 +118,8 @@ search:
      attribute: href
    description:
      selector: div.tags
-    banner:
+    poster:
      selector: td:nth-child(2) script
-      optional: true
      filters:
        - name: regexp
          args: "src=(.*?)>"
@@ -140,6 +145,5 @@ search:
        img[src$="/freedownload.gif"]: 0
        "*": 1
    uploadvolumefactor:
-      case:
-        "*": 1
+      text: 1
 # Engine n/a
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -20,75 +20,71 @@ caps:
    - {id: 409, cat: Other, desc: "Misc/其他"}
    - {id: 410, cat: Other, desc: "Opera/戏曲 曲艺"}
    - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
+    - {id: 411, cat: XXX, desc: "Erotic/情色"}

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

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: sort
    type: select
    label: Sort requested from site
-    default: "4"
+    default: 4
    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
  - name: info_tpp
    type: info
    label: Results Per Page
    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.

 login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[alt="CAPTCHA"]
-    input: imagestring
+  method: cookie
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
-    selector: a[href*="logout.php"]

 search:
  paths:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
    incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -116,7 +112,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: div.imdb_100 > a
      attribute: href
    date:
@@ -126,7 +121,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -135,7 +130,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
@@ -163,4 +158,9 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, img
+    minimumratio:
+      text: 1
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
 # NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/7torrents.yml
+++ b/src/Jackett.Common/Definitions/7torrents.yml
@@ -10,32 +10,39 @@ links:

 caps:
  categories:
-    1: Other
+    Other: Other

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

 settings:
-  - name: info
-    type: info
-    default: 7torrents does not use categories. In your software Indexer settings, set the category to 7000.
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created"
+    default: created
    options:
-      "created": "created"
-      "length": "size"
-      "seeders": "seeders"
+      created: created
+      length: size
+      seeders: seeders
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
+  - name: info_8000
+    type: info
+    label: About 7torrents Categories
+    default: 7torrents does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).

 search:
  # https://www.7torrents.cc/search?query=2020&sort=created
  paths:
    - path: search
  inputs:
-    query: "{{ if .Keywords }}{{ .Keywords }}{{else}} {{end}}"
+    query: "{{ if .Keywords }}{{ .Keywords }}{{ else }} {{ end }}"
    sort: "{{ .Config.sort }}"

  rows:
@@ -43,16 +50,17 @@ search:

  fields:
    category:
-      text: 1
+      text: Other
    title:
      selector: div.media
      attribute: data-name
    details:
      selector: div.media h5 a
      attribute: href
-    download:
-      selector: div.media-right a[href*="/torrent/"]
-      attribute: href
+# #7966
+#    download:
+#      selector: div.media-right a[href*="/torrent/"]
+#      attribute: href
    magnet:
      selector: a[href^="magnet:?xt="]
      attribute: href
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -23,7 +23,6 @@ caps:
    - {id: 49, cat: Movies/Foreign, desc: "Movie International"}
    - {id: 78, cat: Movies/UHD, desc: "Movie UHD"}
    - {id: 85, cat: Movies/HD, desc: "Movie x265"}
-
    # Serien
    - {id: 79, cat: TV/HD, desc: "Staffeln HD"}
    - {id: 56, cat: TV/SD, desc: "Staffeln SD"}
@@ -33,24 +32,21 @@ caps:
    - {id: 80, cat: TV/HD, desc: "Folgen HD/BD"}
    - {id: 7, cat: TV/SD, desc: "Folgen SD"}
    - {id: 55, cat: TV/Foreign, desc: "Folgen International"}
-
    # Doku
    - {id: 91, cat: TV/Documentary, desc: "Doku UHD"}
    - {id: 64, cat: TV/Documentary, desc: "Doku HD"}
    - {id: 36, cat: TV/Documentary, desc: "Doku SD"}
    - {id: 81, cat: TV/Documentary, desc: "Doku 3D"}
    - {id: 82, cat: TV/Documentary, desc: "Doku Packs"}
-
    # Spiele
    - {id: 4, cat: PC/Games, desc: "Spiele Windows"}
    - {id: 92, cat: PC/Mac, desc: "Spiele Mac"}
    - {id: 93, cat: PC, desc: "Spiele Linux"}
    - {id: 97, cat: Console/XBox, desc: "Spiele XBOX"}
-    - {id: 94, cat: PC/Phone-Other, desc: "Spiele Mobile"}
+    - {id: 94, cat: PC/Mobile-Other, desc: "Spiele Mobile"}
    - {id: 95, cat: Console/NDS, desc: "Spiele Nintendo"}
    - {id: 96, cat: Console/PSP, desc: "Spiele Playstation"}
    - {id: 42, cat: Console/Other, desc: "Spiele Andere"}
-
    # Musik
    - {id: 66, cat: Audio, desc: "Musik Alben"}
    - {id: 75, cat: Audio, desc: "Musik Singles"}
@@ -63,43 +59,40 @@ caps:
    - {id: 6, cat: Audio, desc: "Musik Misc"}
    - {id: 51, cat: Audio, desc: "Musik OST"}
    - {id: 67, cat: Audio, desc: "Musik Sampler"}
-
    # App
    - {id: 98, cat: PC/0day, desc: "App Windows"}
    - {id: 62, cat: PC/Mac, desc: "App Mac OS"}
    - {id: 63, cat: PC/0day, desc: "App Linux"}
    - {id: 34, cat: PC, desc: "App Andere"}
-
    # Sport
    - {id: 74, cat: TV/Sport, desc: "Sport HD"}
    - {id: 39, cat: TV/Sport, desc: "Sport SD"}
-
    # Sonstiges
    - {id: 41, cat: Books/Comics, desc: "Sonstiges A-Book"}
    - {id: 33, cat: TV/Anime, desc: "Sonstiges Anime"}
-    - {id: 35, cat: Books/Ebook, desc: "Sonstiges e-Book-DE"}
-    - {id: 90, cat: Books/Ebook, desc: "Sonstiges e-Book-INT"}
+    - {id: 35, cat: Books/EBook, desc: "Sonstiges e-Book-DE"}
+    - {id: 90, cat: Books/EBook, desc: "Sonstiges e-Book-INT"}
    - {id: 65, cat: Other, desc: "Sonstiges E-Learning"}
    - {id: 37, cat: PC, desc: "Sonstiges Mobile"}
-    - {id: 87, cat: Books/Magazines, desc: "Sonstiges E-Paper"}
+    - {id: 87, cat: Books/Mags, desc: "Sonstiges E-Paper"}
    - {id: 38, cat: Other, desc: "Sonstiges Kids"}
    - {id: 47, cat: Other, desc: "Sonstiges Line"}
    - {id: 9, cat: Other, desc: "Sonstiges Andere"}
-
    # XXX
    - {id: 58, cat: Books/Comics, desc: "XXX HD"}
    - {id: 46, cat: XXX, desc: "XXX Hentai"}
    - {id: 35, cat: XXX/Other, desc: "XXX Andere"}
-    - {id: 59, cat: XXX/Packs, desc: "XXX Pack"}
+    - {id: 59, cat: XXX/Pack, desc: "XXX Pack"}
    - {id: 27, cat: XXX, desc: "XXX SD"}
    - {id: 76, cat: XXX, desc: "XXX Andere"}


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

 settings:
  - name: user
@@ -108,22 +101,34 @@ settings:
  - name: pass
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "added"
+    default: added
    options:
-      "added": "created"
-      "seeds": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeds: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
+  - name: info_account
+    type: info
+    label: Account Settings
+    default: In order to see the correct date and size in the torrent rows, change the <b>Torrentliste:</b> setting to <b>Modern</b> on your account profile.
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.

 login:
  path: signin.php
@@ -141,11 +146,11 @@ search:
  path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0=title 1=descr 2=nfo 3=all
-    search_where: "{{ if .Query.IMDBID }}3{{else}}0{{end}}"
-    # 0=active 1=all 2=dead 4=upload 5=doubleup 6=halfdown 7=highlight =request
-    status: 1
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=title, 1=descr, 2=nfo, 3=all, 4=imdb
+    search_where: "{{ if .Query.IMDBID }}3{{ else }}0{{ end }}"
+    # 0=active, 1=all, 2=onlydead, 4=only upload, 5=doubleup, 6=halfdown, 7=highlight, 8=request
+    status: "{{ if .Config.freeleech }}4{{ else }}1{{ end }}"
    orderby: "{{ .Config.sort }}"
    sort: "{{ .Config.type }}"

@@ -208,6 +213,8 @@ search:
          args: ["Heute", "Today"]
        - name: replace
          args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
    date:
      # 30.02.2018 23:12:50
      selector: td:nth-child(10):contains("."):contains(":")
@@ -215,8 +222,10 @@ search:
      filters:
        - name: split
          args: ["b", 0]
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
-          args: "02.01.2006 15:04:05"
+          args: "02.01.2006 15:04:05 -07:00"
    downloadvolumefactor:
      case:
        img[alt="OU"]: 0
@@ -227,4 +236,9 @@ search:
      case:
        img[alt="2xU"]: 2
        "*": 1
+    minimumratio:
+      text: 0.8
+    minimumseedtime:
+      # 60 hours (as seconds = 60 x 60 x 60)
+      text: 216000
 # engine n/a
--- a/src/Jackett.Common/Definitions/DasUnerwartete.yml
+++ b/src/Jackett.Common/Definitions/DasUnerwartete.yml
@@ -32,26 +32,27 @@ caps:
    - {id: 109, cat: Console/PSP, desc: "Games/PSP"}
    - {id: 113, cat: Console/Wii, desc: "Games/Wii"}
    - {id: 86, cat: PC/Games, desc: "Games/Windows"}
-    - {id: 104, cat: Console/XBox360, desc: "Games/Xbox360"}
+    - {id: 104, cat: Console/XBox 360, desc: "Games/Xbox360"}
    - {id: 116, cat: PC/Games, desc: "Linux/Spiele"}
-    - {id: 53, cat: PC/Phone-Android, desc: "Android/Appz/Games/Navi"}
+    - {id: 53, cat: PC/Mobile-Android, desc: "Android/Appz/Games/Navi"}
    - {id: 126, cat: PC, desc: "Win/Mac/linux"}
    - {id: 129, cat: TV/HD, desc: "Serien/Folgen HD"}
    - {id: 61, cat: TV/SD, desc: "Serien/Folgen SD"}
    - {id: 131, cat: TV/HD, desc: "Serien/Staffeln HD"}
    - {id: 130, cat: TV/SD, desc: "Serien/Staffeln SD"}
-    - {id: 94, cat: Books/Ebook, desc: "Ebooks"}
+    - {id: 94, cat: Books/EBook, desc: "Ebooks"}
    - {id: 96, cat: TV/Anime, desc: "Anime / Hentai"}
    - {id: 9, cat: Other/Misc, desc: "Sonstiges"}
    - {id: 115, cat: TV/Sport, desc: "Sport"}
    - {id: 69, cat: XXX, desc: "XXX"}
-    - {id: 122, cat: Books/Magazines, desc: "Zeitschriften/Zeitungen"}
+    - {id: 122, cat: Books/Mags, desc: "Zeitschriften/Zeitungen"}

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

 settings:
  - name: username
@@ -60,6 +61,9 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: pin
+    type: text
+    label: Pin

 login:
  path: login.php
@@ -68,20 +72,22 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
  error:
-    - selector: .tablea:contains("Benutzername oder Passwort ungültig")
+    - selector: .tablea:contains("Benutzername, Passwort oder Pin ungültig")
  test:
    path: browse.php

 search:
  path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: "1"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    incldead: 1

  rows:
    selector: table.tableinborder > tbody > tr:has(a[href^="download.php"])
+
  fields:
    title:
      selector: a[href^="details.php"]
@@ -117,8 +123,8 @@ search:
      selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(3) font
    downloadvolumefactor:
      case:
-        img[src="pic/oupic.gif"]: "0"
-        "*": "1"
+        img[src="pic/oupic.gif"]: 0
+        "*": 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/audiobooktorrents.yml
+++ b/src/Jackett.Common/Definitions/audiobooktorrents.yml
@@ -1,7 +1,7 @@
---
-id: audiobooktorrents
-name: Audiobook Torrents
-description: "Audiobook Torrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
+---
+id: abtorrents
+name: ABtorrents
+description: "ABtorrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
 language: en-us
 type: private
 encoding: UTF-8
@@ -40,68 +40,64 @@ caps:
    - {id: 260, cat: Audio/Audiobook, desc: "Thriller and Suspense"}
    - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy"}
    - {id: 300, cat: Audio/Audiobook, desc: "Western"}
-    - {id: 400, cat: Books/Ebook, desc: "[E] Action/Adventure"}
-    - {id: 410, cat: Books/Ebook, desc: "[E] Adult / Erotica"}
-    - {id: 420, cat: Books/Ebook, desc: "[E] Arts &amp; Crafts (Hobbies)"}
-    - {id: 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: 570, cat: Books/Ebook, desc: "[E] Magazines - all"}
-    - {id: 580, cat: Books/Ebook, desc: "[E] Non-Fiction"}
-    - {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"}
-    - {id: 620, cat: Books/Ebook, desc: "[E] Romance"}
-    - {id: 630, cat: Books/Ebook, desc: "[E] Sci-Fi"}
-    - {id: 640, cat: Books/Ebook, desc: "[E] Sci-Fi/Apocalyptic"}
-    - {id: 650, cat: Books/Ebook, desc: "[E] Self-Help"}
-    - {id: 660, cat: Books/Ebook, desc: "[E] Sports/Fitness"}
-    - {id: 670, cat: Books/Ebook, desc: "[E] Travel"}
-    - {id: 680, cat: Books/Ebook, desc: "[E] Unsorted"}
-    - {id: 690, cat: Books/Ebook, desc: "[E] Urban Fantasy/Paranormal"}
-    - {id: 700, cat: Books/Ebook, desc: "[E] Western"}
-    - {id: 710, cat: Books/Ebook, desc: "[E] Young Adult"}
-    - {id: 720, cat: Books/Ebook, desc: "[E] Young Children"}
+    - {id: 400, cat: Books/EBook, desc: "[E] Action/Adventure"}
+    - {id: 410, cat: Books/EBook, desc: "[E] Adult / Erotica"}
+    - {id: 420, cat: Books/EBook, desc: "[E] Arts &amp; Crafts (Hobbies)"}
+    - {id: 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: 570, cat: Books/EBook, desc: "[E] Magazines - all"}
+    - {id: 580, cat: Books/EBook, desc: "[E] Non-Fiction"}
+    - {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"}
+    - {id: 620, cat: Books/EBook, desc: "[E] Romance"}
+    - {id: 630, cat: Books/EBook, desc: "[E] Sci-Fi"}
+    - {id: 640, cat: Books/EBook, desc: "[E] Sci-Fi/Apocalyptic"}
+    - {id: 650, cat: Books/EBook, desc: "[E] Self-Help"}
+    - {id: 660, cat: Books/EBook, desc: "[E] Sports/Fitness"}
+    - {id: 670, cat: Books/EBook, desc: "[E] Travel"}
+    - {id: 680, cat: Books/EBook, desc: "[E] Unsorted"}
+    - {id: 690, cat: Books/EBook, desc: "[E] Urban Fantasy/Paranormal"}
+    - {id: 700, cat: Books/EBook, desc: "[E] Western"}
+    - {id: 710, cat: Books/EBook, desc: "[E] Young Adult"}
+    - {id: 720, cat: Books/EBook, desc: "[E] Young Children"}

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

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: info_results
    type: info
    label: Search results
    default: "If you are getting the error <b>Login Failed, got redirected</b> then access the site with your browser and <b>mark as read</b> all PMs."

 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: 1
-    submitme: X
-  error:
-    - selector: td.embedded:has(h2:contains("Oops"))
-    - selector: td.embedded:has(h2:contains("failed"))
+  method: cookie
  test:
    path: browse.php

@@ -109,10 +105,14 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
+    # title, descr
    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
    incldead: 1
+    # 1 onlyfree, null all
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
    selector: table.table-striped > tbody > tr:has(a[href^="download.php?torrent="])
@@ -132,13 +132,19 @@ search:
    download:
      selector: a[href^="download.php?torrent="]
      attribute: href
-    banner:
+    poster:
      selector: img[src*="/img.php?"]
      attribute: src
    files:
      selector: td:nth-last-child(8)
    date:
+      # Sep 20 2020<br/>07:25 PM
      selector: td:nth-last-child(7)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -07:00"
    size:
      selector: td:nth-last-child(6)
    grabs:
@@ -152,7 +158,7 @@ search:
      selector: td:nth-last-child(3)
    downloadvolumefactor:
      case:
-        "a.info > b:contains(\"[FREE]\")": 0
+        tr.freeleech_color: 0
        "*": 1
    uploadvolumefactor:
      text: 1
--- a/src/Jackett.Common/Definitions/academictorrents.yml
+++ b/src/Jackett.Common/Definitions/academictorrents.yml
@@ -1,100 +0,0 @@
---
-id: academictorrents
-name: AcademicTorrents
-description: "AcademicTorrents is a Public Community-Maintained Distributed Repository for datasets and scientific knowledge."
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://academictorrents.com/
-
-caps:
-  categorymappings:
-    - {id: 5, cat: Books, desc: "Paper"}
-    - {id: 6, cat: Other, desc: "Dataset"}
-    - {id: 7, cat: TV/Documentary, desc: "Course"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: "added"
-    options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
-  - name: type
-    type: select
-    label: Order requested from site
-    default: "DESC"
-    options:
-      "DESC": "desc"
-      "ASC": "asc"
-
-search:
-  # https://academictorrents.com/browse.php?search=&c5=1&c6=1&c7=1&sort_field=added&sort_dir=DESC
-  paths:
-    - path: browse.php
-    - path: browse.php
-      inputs:
-        page: 1
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    sort_field: "{{ .Config.sort }}"
-    sort_dir: "{{ .Config.type }}"
-
-  rows:
-    selector: table.table> tbody > tr:has(a[href^="/browse.php?cat="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="/browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="/details/"]
-    details:
-      selector: a[href^="/details/"]
-      attribute: href
-    download:
-      # /download/08078e0894099530913e9335bdbc804f42f6e872.torrent"
-      selector: a[href^="/details/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["/details/", "/download/"]
-        - name: append
-          args: ".torrent"
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: dateparse
-          args: "2006-01-02"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      text: 0
-    seeders:
-      selector: td:nth-child(7):not(:empty)
-      optional: true
-      filters:
-        - name: replace
-          args: ["+", ""]
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/acgrip.yml
+++ b/src/Jackett.Common/Definitions/acgrip.yml
@@ -8,8 +8,6 @@ followredirect: true
 encoding: UTF-8
 links:
  - https://acg.rip/
-certificates:
-  - bfd88de41aeeda5c9d98d5e081e8c4ec40204b6b # expired 4 jan 20

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/acgsou.yml
+++ b/src/Jackett.Common/Definitions/acgsou.yml
@@ -44,6 +44,9 @@ caps:

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

 settings: []

@@ -55,30 +58,12 @@ search:
  paths:
    # https://www.acgsou.com/1.html
    # https://www.acgsou.com/search.php?keyword=test
-    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{else}}1.html{{end}}"
+    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}1.html{{ end }}"

  rows:
    selector: table tbody tr[class^="alt"]:has(td:nth-child(3) a)

  fields:
-    date:
-      selector: td:nth-child(1):contains("昨天")
-      optional: true
-      filters:
-        - name: replace
-          args: ["昨天", "Yesterday"]
-    date:
-      selector: td:nth-child(1):contains(":"):not(:contains("昨天"))
-      optional: true
-      filters:
-        - name: dateparse
-          args: "01/02 15:04"
-    date:
-      selector: td:nth-child(1):not(:contains(":"))
-      optional: true
-      filters:
-        - name: dateparse
-          args: "2006/01/02"
    category:
      selector: td:nth-child(2) a
      attribute: href
@@ -93,6 +78,28 @@ search:
    download:
      selector: td:nth-child(3) a
      attribute: href
+    date:
+      selector: td:nth-child(1):contains("昨天")
+      optional: true
+      filters:
+        - name: replace
+          args: ["昨天", "Yesterday"]
+    date:
+      selector: td:nth-child(1):contains(":"):not(:contains("昨天"))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "01/02 15:04 -07:00"
+    date:
+      selector: td:nth-child(1):not(:contains(":"))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006/01/02 -07:00"
    size:
      selector: td:nth-child(4)
    seeders:
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/src/Jackett.Common/Definitions/acidlounge.yml
@@ -10,7 +10,7 @@ links:

 caps:
  categorymappings:
-    - {id: 79, cat: PC/Phone-Android, desc: "Android"}
+    - {id: 79, cat: PC/Mobile-Android, desc: "Android"}
    - {id: 61, cat: TV/Anime, desc: "Anime"}
    - {id: 55, cat: PC/0day, desc: "Appz/0-Day"}
    - {id: 59, cat: PC/Mac, desc: "Appz/Mac"}
@@ -26,9 +26,9 @@ caps:
    - {id: 4, cat: PC/Games, desc: "Games/PC"}
    - {id: 42, cat: Console/PS3, desc: "Games/PS3"}
    - {id: 56, cat: Console/Wii, desc: "Games/Wii"}
-    - {id: 36, cat: Console/Xbox360, desc: "Games/xbox360"}
+    - {id: 36, cat: Console/XBox 360, desc: "Games/xbox360"}
    - {id: 69, cat: Other, desc: "Halloween"}
-    - {id: 80, cat: PC/Phone-IOS, desc: "iPhone / iPad"}
+    - {id: 80, cat: PC/Mobile-iOS, desc: "iPhone / iPad"}
    - {id: 46, cat: Other, desc: "Kids"}
    - {id: 63, cat: PC, desc: "Linux"}
    - {id: 49, cat: Other, desc: "Misc"}
@@ -59,6 +59,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 login:
  path: Main/?act=Login
@@ -80,11 +81,13 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
    search: "{{ .Keywords }}"
-    search_type: "title"
+    search_type: title
+
  rows:
    selector: table#browse_torrents_table > tbody > tr[id^="torrent_row_"]
+
  fields:
    title:
      selector: a.torrent_name
@@ -118,15 +121,15 @@ search:
          args: ([\d\.]+)
    downloadvolumefactor:
      case:
-        ":root div#notice_ratioBoostingMadness": "0"
-        "*": "1"
+        ":root div#notice_ratioBoostingMadness": 0
+        "*": 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    date:
      selector: td.torrent_table_dateAdded
      filters:
        - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
+# engine tbd
--- a/src/Jackett.Common/Definitions/acrossthetasman.yml
+++ b/src/Jackett.Common/Definitions/acrossthetasman.yml
@@ -0,0 +1,83 @@
+---
+id: acrossthetasman
+name: Across The Tasman
+description: "ATT is a torrent site for Rugby and other sports played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://acrossthetasman.com/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    default: date
+    options:
+      date: created
+      filename: title
+      size: size
+      seeders: seeders
+  - name: order
+    type: select
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: post
+  path: login.php
+  inputs:
+    vb_login_username: "{{ .Config.username }}"
+    vb_login_password: "{{ .Config.password }}"
+    cookieuser: 1
+    do: login
+  test:
+    path: torrents.php
+
+search:
+  paths:
+    - path: "torrents.php?sort={{ .Config.sort }}&order={{ .Config.order}}&query={{ .Keywords }}"
+
+  rows:
+    selector: table[width='100%'][align='center']:not([class]) > tbody > tr
+
+  fields:
+    category:
+      text: 1
+    date:
+      # Feb 12, 2021
+      selector: td:nth-child(1)
+      filters:
+        - name: dateparse
+          args: "Jan 02, 2006"
+    title:
+      selector: td:nth-child(4) > span:nth-child(1)
+      filters:
+        - name: re_replace
+          args: ["[\\s]+Uploaded.*", ""]
+    download:
+      selector: a[href*="attachment.php?attachmentid="]
+      attribute: href
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    size:
+      selector: td:nth-child(10)
+# engine n/a
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -18,7 +18,7 @@ caps:
    - {id: 191, cat: Movies/DVD, desc: "DVD-9Hun"}
    - {id: 1, cat: Movies/DVD, desc: "DVDEng"}
    - {id: 4, cat: Movies/DVD, desc: "DVDHun"}
-    - {id: 23, cat: Books/Ebook, desc: "E-Book"}
+    - {id: 23, cat: Books/EBook, desc: "E-Book"}
    - {id: 3, cat: Movies, desc: "Film Pack"}
    - {id: 185, cat: Audio/Lossless, desc: "FLACeng"}
    - {id: 188, cat: Audio/Lossless, desc: "FLAChu"}
@@ -30,14 +30,14 @@ caps:
    - {id: 130, cat: Console, desc: "JátékKonzol"}
    - {id: 38, cat: Console/PSP, desc: "JátékPS2"}
    - {id: 44, cat: Console, desc: "Jatekrip"}
-    - {id: 131, cat: Console/Xbox, desc: "JátékX-box"}
+    - {id: 131, cat: Console/XBox, desc: "JátékX-box"}
    - {id: 140, cat: Other, desc: "Képek"}
    - {id: 141, cat: Other, desc: "Klipek"}
    - {id: 154, cat: Other, desc: "MeseEng"}
    - {id: 155, cat: Other, desc: "MeseHun"}
    - {id: 176, cat: Other, desc: "Mikro HDEng"}
    - {id: 174, cat: Other, desc: "Mikro HDHun"}
-    - {id: 37, cat: PC/Phone-Other, desc: "MobilPDA"}
+    - {id: 37, cat: PC/Mobile-Other, desc: "MobilPDA"}
    - {id: 35, cat: PC, desc: "ProgramEgyéb"}
    - {id: 170, cat: PC/ISO, desc: "ProgramIso"}
    - {id: 24, cat: TV, desc: "Sorozat Eng"}
@@ -45,7 +45,7 @@ caps:
    - {id: 167, cat: Movies/SD, desc: "Xvid CamEng"}
    - {id: 166, cat: Movies/SD, desc: "Xvid CamHun"}
    - {id: 9, cat: Movies/SD, desc: "XvidHun"}
-    - {id: 169, cat: XXX/Imageset, desc: "XXX Képek"}
+    - {id: 169, cat: XXX/ImageSet, desc: "XXX Képek"}
    - {id: 39, cat: XXX, desc: "XXXFilm"}
    - {id: 28, cat: Audio, desc: "ZeneEng"}
    - {id: 29, cat: Audio, desc: "ZeneHun"}
@@ -55,6 +55,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: username
@@ -63,22 +64,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "0"
+    default: 0
    options:
-      "0": "created"
-      "6": "seeders"
-      "4": "size"
-      "1": "title"
+      0: created
+      6: seeders
+      4: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: takelogin.php
@@ -94,20 +99,14 @@ login:
    path: /
    selector: a[href="/logout.php"]

-ratio:
-  path: /
-  selector: p.sajatadatok font
-  filters:
-    - name: replace
-      args: [",", ""]
-
 search:
  paths:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
-    incldead: 1
+    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 4 2x, 5 server
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"

@@ -138,15 +137,14 @@ search:
      attribute: href
      filters:
        - name: urldecode
-    banner:
+    poster:
      selector: a[onmouseover]
      attribute: onmouseover
      filters:
        - name: regexp
          args: "src=(.*?) width="
    imdb:
-      optional: true
-      selector: a[href^="https://www.imdb.com/title"]
+      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
      selector: td:nth-last-child(6)
@@ -163,8 +161,10 @@ search:
      filters:
        - name: re_replace
          args: ["\\s", " "]
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
-          args: "2006-01-02 15:04:05"
+          args: "2006-01-02 15:04:05 -07:00"
    downloadvolumefactor:
      case:
        span.icon_gift: 0
@@ -173,4 +173,6 @@ search:
      case:
        span.icon_upload: 2
        "*": 1
+    minimumratio:
+      text: 0.31
 # XBT v3
--- a/src/Jackett.Common/Definitions/aidoruonline.yml
+++ b/src/Jackett.Common/Definitions/aidoruonline.yml
@@ -0,0 +1,146 @@
+---
+id: aidoruonline
+name: Aidoru!Online
+description: "Aidoru!Online is a Private Torrent Tracker for Female Japanese Idol related files"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://aidoru-online.me/
+legacylinks:
+  - https://aidoru-online.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "BD/DVDISO"}
+    - {id: 2, cat: Movies, desc: "BD/DVD-RIP"}
+    - {id: 3, cat: TV, desc: "TV"}
+    - {id: 4, cat: TV, desc: "Perf"}
+    - {id: 5, cat: TV, desc: "PV"}
+    - {id: 6, cat: TV, desc: "Webstream"}
+    - {id: 7, cat: Other, desc: "Image"}
+    - {id: 8, cat: Audio, desc: "Audio"}
+    - {id: 9, cat: Audio, desc: "Album"}
+    - {id: 10, cat: Audio, desc: "Single"}
+    - {id: 11, cat: Audio, desc: "Radio"}
+    - {id: 12, cat: Other, desc: "Misc"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+  test:
+    path: /
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    # https://aidoru-online.me/get_ttable.php?pcat=Show+All&scat=3%2C4%2C5%2C6&subbed=&fl=&resd=&p=0&searchstr=peace&deadlive=0&sortcol=id&sortorder=desc&startdt=&enddt=
+    - path: get_ttable.php
+  inputs:
+    pcat: "Show+All"
+    $raw: "scat={{ range .Categories }}{{.}},{{end}}&"
+    subbed: ""
+    fl: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    resd: ""
+    p: 0
+    searchstr: "{{ .Keywords }}"
+    deadlive: 1
+    sortcol: "{{ .Config.sort }}"
+    sortorder: "{{ .Config.type }}"
+    startdt: ""
+    enddt: ""
+    # does not support imdbid search and does not return imdb link in results
+
+  rows:
+    selector: table.ttable_headinner tr.t-row:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a.category-link
+      case:
+        ":contains(\"DVDISO\")": 1
+        ":contains(\"DVD-RIP\")": 2
+        ":contains(\"TV\")": 3
+        ":contains(\"Perf\")": 4
+        ":contains(\"PV\")": 5
+        ":contains(\"Webstream\")": 6
+        ":contains(\"Image\")": 7
+        ":contains(\"Audio\")": 8
+        ":contains(\"Album\")": 9
+        ":contains(\"Single\")": 10
+        ":contains(\"Radio\")": 11
+        ":contains(\"Misc\")": 12
+    title:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    size:
+      selector: td.ttable_size
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    grabs:
+      selector: td:nth-last-child(2)
+    date:
+      selector: td:last-child
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "060102 15:04:05 -07:00"
+    downloadvolumefactor:
+      case:
+        img[src="images/freeleech.png"]: 0 # dl not counted
+        img[src="images/freeleech2.png"]: 0 # dl not counted & upload 2x
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src="images/freeleech2.png"]: 2
+        "*": 1
+    minimumratio:
+      text: 0.8
+# TorrentTrader v2-svn
--- a/src/Jackett.Common/Definitions/aither.yml
+++ b/src/Jackett.Common/Definitions/aither.yml
@@ -10,26 +10,23 @@ links:

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 15, cat: Movies, desc: "Movie Packs"}
-    - {id: 7, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 9, cat: TV/Sport, desc: "Sports"}
-    - {id: 12, cat: TV/Anime, desc: "Anime Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 9, cat: TV/Sport, desc: "Sport"}
    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 13, cat: TV/Anime, desc: "Anime TV"}
    - {id: 3, cat: Audio, desc: "Music"}
    - {id: 4, cat: Console, desc: "Games"}
-    - {id: 10, cat: PC, desc: "Apps"}
+    - {id: 10, cat: PC, desc: "Software & Apps"}
    - {id: 11, cat: Books, desc: "Ebooks & Magazines"}
    - {id: 14, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 8, cat: Other, desc: "Unrated"}
+    - {id: 15, cat: Other, desc: "Education"}
    - {id: 6, cat: XXX, desc: "XXX"}
-    - {id: 5, cat: Other, desc: "Test"}

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

 settings:
  - name: username
@@ -38,22 +35,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login
@@ -73,19 +74,12 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]

-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
  paths:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
@@ -93,10 +87,14 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
    selector: table > tbody > tr
@@ -116,16 +114,14 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: div.torrent-poster img
      attribute: src
      filters:
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -138,43 +134,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # 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|преди|前)", " ago"]
+          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)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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)", "hours"]
+          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|小时|時間)", " hour"]
+          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)", "days"]
+          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)", "weeks"]
+          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|седмица|周|週間)", " week"]
+          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)", "months"]
+          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|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
@@ -191,7 +194,9 @@ search:
        i[class*="fa-globe text-green"]: 2 # Global Double Upload
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
+    minimumratio:
+      text: 0.4
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# UNIT3D 2.7.0
+# UNIT3D 5.1.0
--- a/src/Jackett.Common/Definitions/alexfilm.yml
+++ b/src/Jackett.Common/Definitions/alexfilm.yml
@@ -1,156 +0,0 @@
---
-id: alexfilm
-name: AlexFilm
-description: "AlexFilm is a RUSSIAN Semi-Private Torrent Tracker for TV"
-language: ru-ru
-type: semi-private
-encoding: UTF-8
-links:
-  - https://alexfilm.org/
-legacylinks:
-  - https://alexfilm.cc/
-certificates:
-  - 9200e15406272061df1f609a0f40d76282f54295 # expired 30 nov '19
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV, desc: "TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: "1"
-    options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
-  - name: type
-    type: select
-    label: Order requested from site
-    default: "1"
-    options:
-      "2": "desc"
-      "1": "asc"
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    "login_username": "{{ .Config.username }}"
-    "login_password": "{{ .Config.password }}"
-    autologin: 1
-    login: "Log in"
-  error:
-    - selector: div.bg-danger
-  test:
-    path: tracker.php
-    selector: a[href="./login.php?logout=1"]
-
-search:
-  paths:
-    - path: tracker.php
-      method: post
-  inputs:
-    prev_allw: 1
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    prev_tor_type: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
-    o: "{{ .Config.sort }}"
-    # 1=asc 2=desc
-    s: "{{ .Config.type }}"
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # despite the all words flag the search engine returns anywords matching.
-    allw: 1
-
-  rows:
-    selector: tr[id^="tor_"]
-
-  fields:
-    title:
-      selector: td a.tLink
-      filters:
-        - name: re_replace
-          args: ["[\\/]+", ""]
-        - name: replace
-          args: ["-Rip", "Rip"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBRip", "WEBDL"]
-        - name: re_replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+)\\s+[CСcс]ери[ия]\\s+(\\d+)[\\-](\\d+)\\s+\\((\\d+)\\)(.*)", "$1 S$2E$3-$4 rus $6"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-    details:
-      selector: td a.tLink
-      attribute: href
-    download:
-      selector: li a
-      attribute: href
-    category:
-      text: 1
-    seeders:
-      selector: td:nth-child(3) u
-    leechers:
-      selector: td:nth-child(4) u
-    size:
-      selector: td:nth-child(5) u
-    date:
-      selector: td:nth-child(6) u
-    grabs:
-      selector: td:nth-child(6) span:nth-last-child(1)
-    downloadvolumefactor:
-      case:
-        img[src="./styles/images/tor_gold.gif"]: 0
-        img[src="./styles/images/tor_silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -11,34 +11,6 @@ legacylinks:
  - http://amigos-share.club/
  - https://amigos-share.club/

-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: info_results
-    type: info
-    label: "Search results"
-    default: "Set <b>Exibição De Torrents</b> to <b>Lista</b> in your <b>Minhas Configurações</b>.<br />Using <b>Capas</b> is not supported and will return 0 results."
-  - 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"
-
 caps:
  categorymappings:
    - {id: 107, cat: XXX, desc: "Adultos: Gay"}
@@ -48,10 +20,10 @@ caps:
    - {id: 69, cat: TV/Anime, desc: "Anime: Anime"}
    - {id: 116, cat: TV/Anime, desc: "Anime: Filmes"}
    - {id: 118, cat: TV/Anime, desc: "Anime: Séries"}
-    - {id: 23, cat: PC/Phone-Android, desc: "Aplicativos: Android"}
-    - {id: 27, cat: PC/Phone-IOS, desc: "Aplicativos: iPad"}
-    - {id: 26, cat: PC/Phone-IOS, desc: "Aplicativos: iPhone"}
-    - {id: 28, cat: PC/Phone-IOS, desc: "Aplicativos: iPod"}
+    - {id: 23, cat: PC/Mobile-Android, desc: "Aplicativos: Android"}
+    - {id: 27, cat: PC/Mobile-iOS, desc: "Aplicativos: iPad"}
+    - {id: 26, cat: PC/Mobile-iOS, desc: "Aplicativos: iPhone"}
+    - {id: 28, cat: PC/Mobile-iOS, desc: "Aplicativos: iPod"}
    - {id: 25, cat: PC, desc: "Aplicativos: Linux"}
    - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"}
    - {id: 21, cat: PC/0day, desc: "Aplicativos: Windows"}
@@ -77,14 +49,15 @@ caps:
    - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"}
    - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"}
    - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"}
-    - {id: 54, cat: Console/Xbox 360, desc: "Jogos: Xbox360"}
-    - {id: 56, cat: Console/Xbox, desc: "Jogos: Xbox"}
-    - {id: 78, cat: Console/Xbox One, desc: "Jogos: Xbox One"}
+    - {id: 54, cat: Console/XBox 360, desc: "Jogos: Xbox360"}
+    - {id: 56, cat: Console/XBox, desc: "Jogos: Xbox"}
+    - {id: 78, cat: Console/XBox One, desc: "Jogos: Xbox One"}
    - {id: 29, cat: Audio, desc: "Musica: Axé"}
    - {id: 38, cat: Audio, desc: "Musica: Blues"}
    - {id: 39, cat: Audio, desc: "Musica: Dance"}
    - {id: 40, cat: Audio, desc: "Musica: Discografia"}
    - {id: 43, cat: Audio, desc: "Musica: Dubstep"}
+    - {id: 30, cat: Audio, desc: "Musica: Eletronica"}
    - {id: 41, cat: Audio, desc: "Musica: Erudita"}
    - {id: 42, cat: Audio, desc: "Musica: Forró"}
    - {id: 31, cat: Audio, desc: "Musica: Funk"}
@@ -107,13 +80,53 @@ caps:
    - {id: 62, cat: TV/Sport, desc: "Tv: Esportes"}
    - {id: 64, cat: TV, desc: "Tv: Fechada"}
    - {id: 73, cat: TV, desc: "Video Aula: Video Aula"}
-    - {id: 999, cat: Other, desc: "Error Cat not Found"}
+    - {id: 127, cat: Other, desc: "Outros: Add-ons"}
+    - {id: 126, cat: Other, desc: "Outros: Extensões"}
+    - {id: 129, cat: Other, desc: "Outros: Fonts"}
+    - {id: 130, cat: Other, desc: "Outros: MOD"}
+    - {id: 125, cat: Other, desc: "Outros: Pack de Imagens"}
+    - {id: 122, cat: Other, desc: "Outros: Plug-ins"}
+    - {id: 128, cat: Other, desc: "Outros: Scripts"}
+    - {id: 124, cat: Other, desc: "Outros: Vetores"}

  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: info_results
+    type: info
+    label: "Search results"
+    default: "Set <b>Exibição De Torrents</b> to <b>Lista</b> in your <b>Minhas Configurações</b>.<br />Using <b>Capas</b> is not supported and will return 0 results."
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc

 login:
  path: account-login.php
@@ -128,15 +141,11 @@ login:
    path: torrents-search.php
    selector: a[href="account-logout.php"]

-ratio:
-  path: torrents-search.php
-  selector: li:contains("Ratio:") a b
-
 search:
  paths:
-    # http://amigos-share.club/torrents-search.php?search=&c1=1&c19=1&c36=1&incldead=0&freeleech=0&lang=0sort=id&order=desc&page=1
+    # http://amigos-share.club/torrents-search.php?search=&sort=id&order=desc&page=1
    - path: torrents-search.php
-    # site displays just 9 results, no profile options found to change this, so we attempt to fetch 5 pages
+    # site displays just 20 results, no profile options found to change this, so we attempt to fetch 5 pages
    - path: torrents-search.php
      inputs:
        page: 1
@@ -150,19 +159,19 @@ search:
      inputs:
        page: 4
  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    # note: site does not support multi cat search.
+    # replace spaces with wildcard (percent symbol) as site's default search is exact string.
    search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
-    incldead: 1
-    freeleech: 0
-    lang: 0
    sort: "{{ .Config.sort }}"
    order: "{{ .Config.type }}"
+  # torrents-search.php does not support imdbid search or return imdb links.
  keywordsfilters:
+    # drop the year from searches since site titles do not include year
    - name: re_replace
-      args: ["([12][0-9]{3})", ""]
+      args: ["(19|20[0-9]{2})", ""]

  rows:
-    selector: div#fancy-list-group ul.list-group li.list-group-item
+    selector: "div#fancy-list-group ul.list-group li.list-group-item{{ if .Config.freeleech }}:has(span.badge-success:contains(\"FREE\")){{ else }}{{ end }}"

  fields:
    _quality:
@@ -178,42 +187,44 @@ search:
      selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#b6249d;"]
      optional: true
    title:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href*="torrents-details.php?id="], a[href*="details-misc.php?id="]
      filters:
        # strip out the non-english title [to the left of the brackets] and drop the brackets enclosing the english title
        - name: re_replace
          args: ["^(.*?)[\\(](.*?)[\\)](.*?)$", "$2$3"]
        # add the year to the title
        - name: append
-          args: "{{if .Result._year}} {{.Result._year}}{{else}}{{end}}"
+          args: "{{ if .Result._year }} {{ .Result._year }}{{ else }}{{ end }}"
        # add the quality to the title
        - name: append
-          args: "{{if .Result._quality}} {{.Result._quality}}{{else}}{{end}}"
+          args: "{{ if .Result._quality }} {{ .Result._quality }}{{ else }}{{ end }}"
        # add the type to the title
        - name: append
-          args: "{{if .Result._type}} {{.Result._type}}{{else}}{{end}}"
+          args: "{{ if .Result._type }} {{ .Result._type }}{{ else }}{{ end }}"
        # add audio to the title
        - name: append
-          args: "{{if .Result._language}} {{.Result._language}}{{else}}{{end}}"
+          args: "{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
        - name: re_replace
          args: ["(Dual-Audio|Dublado)", "Brazilian $1"]
    details:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href*="torrents-details.php?id="], a[href*="details-misc.php?id="]
      attribute: href
    download:
-      selector: a[href^="download.php?id="]
+      selector: a[href*="download.php?id="]
      attribute: href
    category:
      selector: div.list-group-item-addon img
      attribute: src
      case:
-        # unfortunately the site does not have category numbers on the results page, just a .png which can apply to both movies and tv.
-        # therefore I've order the list to favour movies,
-        # also, not all .png have been verified as the site has many empty categories. their image names have been extrapolated from the cat desc.
-        "[src$=\"/XXXZ.png\"]": 74
+        # unfortunately the site does not have category numbers on the results page, just a image which can apply to both movies and tv.
+        # therefore I've order the list to favour movies.
+        # also, not all images have been verified as the site has many empty categories. their image names have been extrapolated from the cat desc.
+        "[src$=\"/Adultos.fw.png\"]": 74
+        "[src$=\"/Gay.jpeg\"]": 107
+        "[src$=\"/Trans.jpeg\"]": 108
        "[src$=\"/Hentai.png\"]": 75
-        "[src$=\"/Anime.png\"]": 69
-        "[src$=\"/Windows.png\"]": 21
+        "[src$=\"/Anime2.fw.png\"]": 69
+        "[src$=\"/aplicativos.fw.png\"]": 21
        "[src$=\"/Mac.png\"]": 22
        "[src$=\"/Android.png\"]": 23
        "[src$=\"/Linux.png\"]": 25
@@ -225,7 +236,7 @@ search:
        "[src$=\"/E-books.png\"]": 67
        "[src$=\"/Revista.png\"]": 68
        "[src$=\"/HQ.png\"]": 112
-        "[src$=\"/Filmes.png\"]": 119
+        "[src$=\"/filmes2.fw.png\"]": 119
        "[src$=\"/Revistas-XXX.png\"]": 70
        "[src$=\"/PS4.png\"]": 79
        "[src$=\"/Jogos-PC.png\"]": 47
@@ -241,10 +252,11 @@ search:
        "[src$=\"/Jogos-Wii.png\"]": 55
        "[src$=\"/Jogos-DS.png\"]": 58
        "[src$=\"/jogosandroid.png\"]": 57
-        "[src$=\"/Jogos-PSP.png\"]": 82
+        "[src$=\"/PSP.png\"]": 82
        "[src$=\"/Jogos-NS.png\"]": 110
        "[src$=\"/Jogos-XboxOne.png\"]": 78
        "[src$=\"/Axe.png\"]": 29
+        "[src$=\"/Eletronica.png\"]": 30
        "[src$=\"/Funk.png\"]": 31
        "[src$=\"/Pagode.png\"]": 32
        "[src$=\"/HIP_HOP.png\"]": 33
@@ -265,13 +277,21 @@ search:
        "[src$=\"/POP.png\"]": 115
        "[src$=\"/MPB.png\"]": 114
        "[src$=\"/OST.png\"]": 84
-        "[src$=\"/Seriados.png\"]": 120
-        "[src$=\"/Shows.png\"]": 65
+        "[src$=\"/seriados.fw.png\"]": 120
+        "[src$=\"/show.fw.png\"]": 65
        "[src$=\"/Aberta.png\"]": 63
        "[src$=\"/Esporte.png\"]": 62
        "[src$=\"/Fechada.png\"]": 64
-        "[src$=\"/Videoaula.png\"]": 73
-        "*": 999
+        "[src$=\"/video aula4.fw.png\"]": 73
+        "[src$=\"/Add-ons.png\"]": 127
+        "[src$=\"/Extensões.png\"]": 126
+        "[src$=\"/Fonts.png\"]": 129
+        "[src$=\"/MOD.png\"]": 130
+        "[src$=\"/Imagens.png\"]": 125
+        "[src$=\"/Plug-ins.png\"]": 122
+        "[src$=\"/Scripts.png\"]": 128
+        "[src$=\"/Vetores.png\"]": 124
+        "[src$=\"/outros2.png\"]": 130
    date:
      text: now
    date:
@@ -282,8 +302,10 @@ search:
          args: "Lançado: (.+?)$"
        - name: re_replace
          args: [" (\\d:)", " 0$1"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
-          args: "02/01/06 15:04:05"
+          args: "02/01/06 15:04:05 -07:00"
    size:
      selector: div.list-group-item-content p.m-0 span.badge-info
    seeders:
@@ -298,4 +320,6 @@ search:
        "*": 1
    uploadvolumefactor:
      text: 1
+    minimumratio:
+      text: 1.0
 # engine n/a
--- a/src/Jackett.Common/Definitions/anaschcc.yml
+++ b/src/Jackett.Common/Definitions/anaschcc.yml
@@ -0,0 +1,158 @@
+---
+id: anaschcc
+name: anasch.cc
+description: "anasch.cc is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://anasch.cc/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: Movies}
+    - {id: 2, cat: TV, desc: TV}
+    - {id: 3, cat: TV, desc: Animation}
+    - {id: 5, cat: Audio, desc: Music}
+    - {id: 12, cat: XXX, desc: Porn}
+    - {id: 29, cat: TV/Sport, desc: Sports}
+    - {id: 37, cat: PC, desc: Software}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+
+login:
+  path: index.php?page=login
+  method: form
+  form: form[action^="index.php?page=login"]
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: div[data-validate^="Valid"]
+      message:
+        selector: div[data-validate^="Valid"]
+        attribute: data-validate
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    page: torrents
+    active: 0
+    search: "{{ .Keywords }}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
+    # 1 freeleech, 2 2x upload, 3 featured
+    discount[]: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: "table.lista tbody tr:has(a[href^=\"index.php?page=torrent-details\"])"
+
+  fields:
+    category:
+      selector: td a[href^="index.php?page=torrents&category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: td a[href^="index.php?page=torrent-details"]
+    details:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: td a[href^="download.php"]
+      attribute: href
+    imdb:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: replace
+          args: ["javascript:ShowImage('/images/imdb/", "tt"]
+        - name: replace
+          args: [".jpg')", ""]
+        - name: replace
+          args: ["tt0000000", ""]
+    poster:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: replace
+          args: ["javascript:ShowImage('", ""]
+        - name: replace
+          args: ["')", ""]
+        - name: replace
+          args: ["/images/imdb/0000000.jpg", ""]
+    size:
+      selector: td:nth-child(5)
+    date:
+      # 22/01/2021 01:28
+      selector: td:nth-child(6)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile - doesn't adjust for DST
+        - name: dateparse
+          args: "02/01/2006 15:04 -07:00"
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(9)
+      filters:
+        - name: replace
+          args: ["---", "0"]
+    downloadvolumefactor:
+      case:
+        img[src*="freeleech.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src*="x2u.png"]: 2
+        "*": 1
+    minimumratio:
+      text: 3.0
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# xbtit
--- a/src/Jackett.Common/Definitions/animeclipse.yml
+++ b/src/Jackett.Common/Definitions/animeclipse.yml
@@ -0,0 +1,90 @@
+---
+id: animeclipse
+name: AnimeClipse
+description: "AnimeClipse is a Public site for Hellenic Fansubs Anime."
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - http://www.animeclipse.com/ # does not support https ERR_CONNECTION_REFUSED
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: DESC
+    options:
+      DESC: desc
+      ASC: asc
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "Anime"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+search:
+  paths:
+    # http://www.animeclipse.com/index.php?ind=btitracker&search=sword&category=0&active=0&tor_page=10
+    - path: index.php
+  inputs:
+    ind: btitracker
+    # replace spaces with wildcard (percent symbol) as site's default search is exact string.
+    search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
+    # does not support multi cats searching so defaulting to all.
+    category: 0
+    # 0 all, 1 active, 2 dead
+    active: 0
+    tor_page: 100
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: tr.torrentRow
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: a[href*="/download/"]
+      filters:
+        # move group to the end
+        - name: re_replace
+          args: ["^(\\[.+?\\])(.+?)$", "$2 $1"]
+        - name: re_replace
+          args: ["(_|\\[|\\])", " "]
+    details:
+      text: "{{ .Config.sitelink }}"
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    size:
+      selector: td:contains("[size:") > span.torrentInfoData
+    date:
+      selector: td:contains("[Added:") > span.torrentInfoData
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "02/01/2006 15:04:05 -07:00"
+    grabs:
+      selector: td:contains("[Completed:") > span.torrentInfoData
+    seeders:
+      selector: td:contains("Seeders") > span.torrentInfoData
+    leechers:
+      selector: td:contains("Leechers") > span.torrentInfoData
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# btitracker
--- a/src/Jackett.Common/Definitions/animeworld.yml
+++ b/src/Jackett.Common/Definitions/animeworld.yml
@@ -1,11 +1,13 @@
 ---
-id: ast4u
-name: AST4u
-description: "AST4u is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
+id: animeworld
+name: AnimeWorld
+description: "AnimeWorld (AST4u) is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
 language: de-de
 type: private
 encoding: iso-8859-1
 links:
+  - https://animeworld.cx/
+legacylinks:
  - https://www.ast4u.me/

 caps:
@@ -41,6 +43,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: username
@@ -52,7 +55,7 @@ settings:
  - name: info
    type: info
    label: Results Per Page
-    default: For best results, change the 'Torrentliste' setting to "Platzsparendes Layout mit PopUp für zusätzliche Informationen" in your profile.
+    default: For best results, change the <b>Torrentliste</b> setting to <i>Platzsparendes Layout mit PopUp für zusätzliche Informationen</i> in your profile.

 login:
  path: takelogin.php
@@ -68,14 +71,15 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: "0"
-    orderby: "added"
-    sort: "desc"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    incldead: 0
+    orderby: added
+    sort: desc

  rows:
    selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
+
  fields: # note: two alternative layouts available
    title:
      selector: a[href^="details.php"]
@@ -116,15 +120,15 @@ search:
        - name: replace
          args: [" ", ""]
        - name: append
-          args: " +2:00"
+          args: " +2:00" # EET
        - name: replace
          args: ["\xA0", ""]
        - name: dateparse
          args: "02.01.200615:04:05 -07:00"
    downloadvolumefactor:
      case:
-        img[src="/pic/free.gif"]: "0"
-        "*": "1"
+        img[src="/pic/free.gif"]: 0
+        "*": 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/anirena.yml
+++ b/src/Jackett.Common/Definitions/anirena.yml
@@ -8,7 +8,11 @@ encoding: UTF-8
 links:
  - https://www.anirena.com/

-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.

 caps:
  categorymappings:
@@ -32,10 +36,12 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep]
+    music-search: [q]
+    book-search: [q]

 search:
  paths:
-    - path: "{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
+    - path: "{{ if .Keywords }}?s={{ .Keywords}}{{ else }}{{ end }}"

  rows:
    selector: table tbody tr:has(td.torrents_small_type_data1)
--- a/src/Jackett.Common/Definitions/anisource.yml
+++ b/src/Jackett.Common/Definitions/anisource.yml
@@ -65,7 +65,7 @@ search:
        - name: replace
          args: [" at ", " "]
        - name: append
-          args: " -09:00"
+          args: " -09:00" # CUS
        - name: dateparse
          args: "2006-01-02 15:04 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/arabafenice.yml
+++ b/src/Jackett.Common/Definitions/arabafenice.yml
@@ -19,7 +19,6 @@ caps:
    - {id: 36, cat: Movies/SD, desc: "DVDRip HRS"}
    - {id: 41, cat: Movies/SD, desc: "BDRip 576p HRS"}
    - {id: 39, cat: Movies/HD, desc: "1080p HRS x265 HEVC"}
-
    # VIDEO
    - {id: 1, cat: Movies, desc: "News Cinema"}
    - {id: 2, cat: Movies/SD, desc: "BD-DVDRip"}
@@ -41,34 +40,31 @@ caps:
    - {id: 40, cat: TV/UHD, desc: "2160p 4K UltraHD"}
    - {id: 38, cat: XXX, desc: "xXx"}
    - {id: 43, cat: Other, desc: "Arabic for social"}
-
    # MUSICA
    - {id: 17, cat: Audio, desc: "Italian music"}
    - {id: 45, cat: Audio, desc: "Discography"}
    - {id: 18, cat: Audio, desc: "MusicaInternazionale"}
    - {id: 19, cat: Audio, desc: "Compilation"}
-
    # PDF
    - {id: 21, cat: Books, desc: "Ebook"}
    - {id: 22, cat: Books/Comics, desc: "Comics"}
    - {id: 23, cat: Books, desc: "Newsstand"}
-
    # GAMES
    - {id: 25, cat: Console/PS4, desc: "Sony Games"}
-    - {id: 26, cat: Console/Xbox, desc: "XboX Games"}
+    - {id: 26, cat: Console/XBox, desc: "XboX Games"}
    - {id: 27, cat: Console/Other, desc: "Nintendo Games"}
    - {id: 28, cat: PC/Games, desc: "PC Games"}
-
    # SOFTWARE
    - {id: 30, cat: PC/ISO, desc: "Windows APP"}
-    - {id: 31, cat: PC/Phone-IOS, desc: "Apple APP"}
-    - {id: 32, cat: PC/Phone-Android, desc: "Android APP"}
+    - {id: 31, cat: PC/Mobile-iOS, desc: "Apple APP"}
+    - {id: 32, cat: PC/Mobile-Android, desc: "Android APP"}

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

 settings:
  - name: username
@@ -80,19 +76,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "3"
+    default: 3
    options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
  - name: type
    type: select
    label: Order requested from site
-    default: "2"
+    default: 2
    options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
  - name: info
    type: info
    label: Results Per Page
@@ -139,10 +135,10 @@ search:
    - name: re_replace # S01E01 to 1 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
  inputs:
-    search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ .Keywords }}{{ end }}"
    page: torrents
    category: "{{ range .Categories }}{{.}};{{end}}"
-    options: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+    options: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
    active: 0
    order: "{{ .Config.sort }}"
    by: "{{ .Config.type }}"
@@ -171,7 +167,7 @@ search:
          args: ["(?i)\\b(?:[\\/\\|]?Episodio\\s?(\\d+)|Puntata\\s?(\\d+))", "E$1$2"]
        - name: re_replace # Episodi 4 5 to E04-05
          args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
-    banner:
+    poster:
      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
      attribute: onmouseover
      filters:
@@ -192,7 +188,7 @@ search:
      selector: td:nth-last-child(9)
      filters:
        - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "02/01/2006 -07:00"
    grabs:
--- a/src/Jackett.Common/Definitions/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
  - https://www.arabp2p.com/
+legacylinks:
+  - http://www.arabp2p.com/

 settings:
  - name: username
@@ -18,19 +20,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "3"
+    default: 3
    options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
  - name: type
    type: select
    label: Order requested from site
-    default: "2"
+    default: 2
    options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc

 caps:
  categorymappings:
@@ -47,10 +49,10 @@ caps:
    - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
    - {id: 109, cat: TV, desc: "رمضان 2020 (Ramadan 2020)"}
    # المرئيات الاجنبية Foreign Movies
-    - {id: 92, cat: TV/FOREIGN, desc: "تعليمي (Educational)"}
+    - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
    - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
-    - {id: 45, cat: TV/FOREIGN, desc: "مسلسلات وبرامج اجنبيه (Serials)"}
-    - {id: 57, cat: TV/FOREIGN, desc: "مسلسلات آسيوية (Asian Series)"}
+    - {id: 45, cat: TV/Foreign, desc: "مسلسلات وبرامج اجنبيه (Serials)"}
+    - {id: 57, cat: TV/Foreign, desc: "مسلسلات آسيوية (Asian Series)"}
    - {id: 42, cat: Movies/Foreign, desc: "افلام اجنبيه (Foreign)"}
    - {id: 76, cat: Movies/3D, desc: "&ثلاثي الابعاد 3D (3D)"}
    - {id: 74, cat: Movies/HD, desc: "جودة عالية HD"}
@@ -72,14 +74,14 @@ caps:
    # برامج  Software
    - {id: 22, cat: PC, desc: "برامج عربية (Arabic Software)"}
    - {id: 23, cat: PC, desc: "برامج عامه (Public Software)"}
-    - {id: 78, cat: PC/Phone-IOS, desc: "iPad/iPhone"}
-    - {id: 79, cat: PC/Phone-Android, desc: "android"}
+    - {id: 78, cat: PC/Mobile-iOS, desc: "iPad/iPhone"}
+    - {id: 79, cat: PC/Mobile-Android, desc: "android"}
    # العاب  Games
    - {id: 30, cat: PC/Games, desc: "PC"}
    - {id: 31, cat: Console/PS3, desc: "PS2"}
    - {id: 53, cat: Console/Wii, desc: "wii"}
    - {id: 55, cat: Console/PSP, desc: "PSP"}
-    - {id: 63, cat: Console/Xbox, desc: "XBOX"}
+    - {id: 63, cat: Console/XBox, desc: "XBOX"}
    - {id: 64, cat: Console/PS3, desc: "PS3"}
    # اخرى Other
    - {id: 17, cat: Books, desc: "كتب (Books)"}
@@ -92,6 +94,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 login:
  path: index.php?page=login
@@ -113,7 +116,7 @@ search:
  inputs:
    page: torrents
    search: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
    # 0 all 1 activeonly 2 deadonly
    active: 0
    # 0 all 1 internal 2 external
@@ -145,7 +148,7 @@ search:
      attribute: title
      filters:
        - name: append
-          args: " +03:00" # (AST)
+          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    seeders:
--- a/src/Jackett.Common/Definitions/arenabg.yml
+++ b/src/Jackett.Common/Definitions/arenabg.yml
@@ -6,71 +6,77 @@ language: bg-BG
 type: semi-private
 encoding: UTF-8
 links:
-  - https://arenabg.ch/
-legacylinks:
  - https://arenabg.com/
+legacylinks:
+  - https://arenabg.ch/

 caps:
  categorymappings:
-    - {id: "movies", cat: Movies, desc: "Movies"}
-    - {id: "arenabgtv", cat: Movies, desc: "Movies / ArenaBG.TV"}
-    - {id: "xvid", cat: Movies/SD, desc: "Movies / XviD"}
-    - {id: "dvd-r", cat: Movies/DVD, desc: "Movies / DVD-R"}
-    - {id: "x264", cat: Movies/HD, desc: "Movies / x264"}
-    - {id: "animemanga", cat: TV/Anime, desc: "Movies / Anime & Manga"}
-    - {id: "documentaries", cat: TV/Documentary, desc: "Movies / Documentaries"}
-    - {id: "blu-ray", cat: Movies/BluRay, desc: "Movies / Blu-ray"}
-    - {id: "boxset", cat: Movies, desc: "Movies / Boxset"}
-    - {id: "x264boxset", cat: Movies/HD, desc: "Movies / x264 Boxset"}
-    - {id: "tvepisodeshd", cat: Movies/HD, desc: "Movies / HDTV"}
-    - {id: "3d", cat: Movies/3D, desc: "Movies / 3D"}
-    - {id: "movies-hd", cat: Movies/HD, desc: "Movies / Movies HD"}
-    - {id: "x265", cat: Movies/HD, desc: "Movies / x265"}
-    - {id: "4k", cat: Movies/UHD, desc: "Movies / 4K"}
-    - {id: "series", cat: TV, desc: "Series"}
-    - {id: "hdtv", cat: TV/HD, desc: "Series / TV Episodes HD"}
-    - {id: "tvepisodes", cat: TV, desc: "Series / TV Episodes"}
-    - {id: "tvboxset", cat: TV, desc: "Series / TV Boxset"}
-    - {id: "tvboxsethd", cat: TV/HD, desc: "Series / TV Boxset HD"}
-    - {id: "music", cat: Audio, desc: "Music"}
-    - {id: "mp3", cat: Audio/MP3, desc: "Music / MP3"}
-    - {id: "music-video", cat: Audio/Video, desc: "Music / Video"}
-    - {id: "flac", cat: Audio/Lossless, desc: "Music / FLAC"}
-    - {id: "music-dvd", cat: Audio, desc: "Music / DVD"}
-    - {id: "music-ape", cat: Audio/Lossless, desc: "Music / APE"}
-    - {id: "music-dts", cat: Audio, desc: "Music / DTS"}
-    - {id: "musicwavpack", cat: Audio, desc: "Music / WavePack"}
-    - {id: "musicost", cat: Audio, desc: "Music / OST"}
-    - {id: "games", cat: PC/Games, desc: "Games"}
-    - {id: "games-iso", cat: PC/Games, desc: "Games / PC ISO"}
-    - {id: "pc-rip", cat: PC, desc: "Games / PC RIP"}
-    - {id: "ps2", cat: Console, desc: "Games / PS2"}
-    - {id: "psp", cat: Console/PSP, desc: "Games / PSP"}
-    - {id: "xbox", cat: Console/Xbox, desc: "Games / XBOX"}
-    - {id: "xbox-360", cat: Console/Xbox 360, desc: "Games / XBOX-360"}
-    - {id: "ps3", cat: Console/PS3, desc: "Games / PS3"}
-    - {id: "wii", cat: Console/Wii, desc: "Games / WII"}
-    - {id: "PS4", cat: Console/PS4, desc: "Games / PS4"}
-    - {id: "software", cat: PC, desc: "Software"}
-    - {id: "pc-iso", cat: PC/ISO, desc: "Software / PC ISO"}
-    - {id: "pdasmartphone", cat: PC/Phone-Other, desc: "Software / Smartphone"}
-    - {id: "tutorial", cat: PC, desc: "Software / Tutorial"}
-    - {id: "android", cat: PC/Phone-Android, desc: "Software / Android"}
-    - {id: "ios", cat: PC/Phone-IOS, desc: "Software / iOS"}
-    - {id: "misc", cat: Other/Misc, desc: "Misc"}
-    - {id: "other", cat: Other, desc: "Misc / Other"}
-    - {id: "e-books", cat: Books/Ebook, desc: "Misc / e-Books"}
-    - {id: "sports", cat: TV/Sport, desc: "Misc / Sports"}
-    - {id: "0-day", cat: PC/0day, desc: "Misc / 0-Day"}
-    - {id: "xxx", cat: XXX, desc: "XXX"}
-    - {id: "porn", cat: XXX, desc: "XXX / Porn"}
-    - {id: "xxx-hd", cat: XXX, desc: "XXX / XXX HD"}
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 8, cat: Movies, desc: "Movies / ArenaBG.TV"}
+    - {id: 9, cat: Movies/SD, desc: "Movies / XviD"}
+    - {id: 10, cat: Movies/DVD, desc: "Movies / DVD-R"}
+    - {id: 11, cat: Movies/HD, desc: "Movies / x264"}
+    - {id: 12, cat: TV/Anime, desc: "Movies / Anime & Manga"}
+    - {id: 13, cat: TV/Documentary, desc: "Movies / Documentaries"}
+    - {id: 14, cat: Movies/BluRay, desc: "Movies / Blu-ray"}
+    - {id: 15, cat: Movies, desc: "Movies / Weekend"}
+    - {id: 16, cat: Movies, desc: "Movies / Boxset"}
+    - {id: 17, cat: Movies/HD, desc: "Movies / x264 Boxset"}
+    - {id: 18, cat: Movies/HD, desc: "Movies / HDTV"}
+    - {id: 19, cat: Movies/3D, desc: "Movies / 3D"}
+    - {id: 20, cat: Movies/HD, desc: "Movies / Movies HD"}
+    - {id: 21, cat: Movies/HD, desc: "Movies / x265"}
+    - {id: 22, cat: Movies/UHD, desc: "Movies / 4K"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 23, cat: TV/HD, desc: "Series / TV Episodes HD"}
+    - {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: 3, cat: Audio, desc: "Music"}
+    - {id: 27, cat: Audio/MP3, desc: "Music / MP3"}
+    - {id: 28, cat: Audio/Video, desc: "Music / Video"}
+    - {id: 29, cat: Audio/Lossless, desc: "Music / FLAC"}
+    - {id: 30, cat: Audio, desc: "Music / DVD"}
+    - {id: 31, cat: Audio/Lossless, desc: "Music / APE"}
+    - {id: 32, cat: Audio, desc: "Music / DTS"}
+    - {id: 33, cat: Audio, desc: "Music / WavePack"}
+    - {id: 34, cat: Audio, desc: "Music / OST"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 35, cat: PC/Games, desc: "Games / PC ISO"}
+    - {id: 36, cat: PC, desc: "Games / PC RIP"}
+    - {id: 37, cat: Console, desc: "Games / PS2"}
+    - {id: 38, cat: Console/PSP, desc: "Games / PSP"}
+    - {id: 39, cat: Console/XBox, desc: "Games / XBOX"}
+    - {id: 40, cat: Console/XBox 360, desc: "Games / XBOX-360"}
+    - {id: 41, cat: Console/PS3, desc: "Games / PS3"}
+    - {id: 42, cat: Console/Wii, desc: "Games / WII"}
+    - {id: 43, cat: Console/NDS, desc: "Games / NDS"}
+    - {id: 44, cat: Console/PS4, desc: "Games / PS4"}
+    - {id: 5, cat: PC, desc: "Software"}
+    - {id: 45, cat: PC/ISO, desc: "Software / PC ISO"}
+    - {id: 46, cat: PC/Mobile-Other, desc: "Software / Smartphone"}
+    - {id: 47, cat: PC, desc: "Software / Tutorial"}
+    - {id: 48, cat: PC/Mac, desc: "Software / MAC"}
+    - {id: 49, cat: PC/Mobile-Android, desc: "Software / Android"}
+    - {id: 50, cat: PC/Mobile-iOS, desc: "Software / iOS"}
+    - {id: 51, cat: PC/Mobile-Other, desc: "Software / WM7"}
+    - {id: 6, cat: XXX, desc: "XXX"}
+    - {id: 52, cat: XXX, desc: "XXX / Porn"}
+    - {id: 53, cat: XXX, desc: "XXX / XXX HD"}
+    - {id: 7, cat: Other, desc: "Misc"}
+    - {id: 54, cat: Other/Misc, desc: "Misc / Other"}
+    - {id: 55, cat: Books/EBook, desc: "Misc / e-Books"}
+    - {id: 56, cat: Other, desc: "Misc / Banned"}
+    - {id: 57, cat: TV/Sport, desc: "Misc / Sports"}
+    - {id: 58, cat: PC/0day, desc: "Misc / 0-Day"}

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

 settings:
  - name: username
@@ -84,100 +90,94 @@ settings:
    label: Download link
    default: "magnet:?xt="
    options:
-      "/get/key:": ".torrent"
+      "/en/torrents/download/?key=": ".torrent"
      "magnet:?xt=": "magnet"

 login:
-  path: /
+  path: en/users/signin/
  method: form
-  form: form[action="/users/"]
+  form: form[action="/en/users/signin/"]
  inputs:
-    email: "{{ .Config.username }}"
+    username_or_email: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    action: login
+  captcha:
+    type: image
+    selector: img[src="/captcha.php"]
+    input: captcha
  error:
-    - selector: div.row div div.alert i.fa-warning
-      message:
-        selector: div.row div div.alert
+    - selector: div.row div#container div.alert
  test:
-    path: /
-    selector: a[href="/users/logout/"]
+    path: en/
+    selector: a[href="/en/users/logout/"]

 download:
-  selector: a[href*="{{ .Config.downloadlink }}"]
+  selector: a[href^="{{ .Config.downloadlink }}"]
  attribute: href

 search:
  paths:
-    - path: torrents/
-      method: post
-      followredirect: true
+    # https://arenabg.com/en/torrents/?text=ice+s01e01
+    - path: en/torrents/
  inputs:
-    text: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
-    "text_mobile": ""
-    type: 0
-    audio: 0
-    subtitles: 0
-    action: search
+    text: "{{ .Keywords }}"
+    subtitles: ""
+    audio: ""
+    # does not support multi-cats so defaulting to all
+    category: ""

  rows:
-    selector: tr:has(td.category)
+    selector: tr:has(a[href^="/en/torrents/?category="])

  fields:
-    title:
-      # use the second div for full title
-      selector: td.filename div:nth-child(2) a
-    details:
-      selector: td.filename div a
-      attribute: href
    category:
-      selector: td.category a
+      selector: td.category a[href^="/en/torrents/?category="]:last-of-type
      attribute: href
      filters:
-        - name: re_replace
-          args: ["/torrents/type:(.+?)/", "$1"]
+        - name: querystring
+          args: category
+    english:
+      selector: span[title="English"]
+      attribute: title
+      optional: true
+    bulgarian:
+      selector: span[title="Bulgarian"]
+      attribute: title
+      optional: true
+    title:
+      selector: td.filename a[href^="/en/torrents/"]
+      filters:
+        - name: append
+          args: "{{ if .Result.bulgarian }} {{ .Result.bulgarian }}{{ else }}{{ end }}{{ if .Result.english }} {{ .Result.english }}{{ else }}{{ end }}"
+    details:
+      selector: td.filename a[href^="/en/torrents/"]
+      attribute: href
    download:
-      selector: td.filename div a
+      selector: td.filename a[href^="/en/torrents/"]
      attribute: href
-    size:
-      selector: td:nth-child(4)
-    date:
-      # 08:49:09
-      selector: td:nth-child(3):contains(":")
-      optional: true
-      filters:
-        - name: dateparse
-          args: "15:04:05"
-    date:
-      # 2018-10-19
-      selector: td:nth-child(3):contains("-")
-      optional: true
-      filters:
-        - name: dateparse
-          args: "2006-01-02"
-    seeders:
-      selector: td:nth-child(6)
-      filters:
-        - name: replace
-          args: ["-", "0"]
-        - name: replace
-          args: ["DHT", "0"] # torrent can only be downloaded via DHT
-    leechers:
-      selector: td:nth-child(7)
-      filters:
-        - name: replace
-          args: ["-", "0"]
-    grabs:
-      selector: td:nth-child(8)
-      filters:
-        - name: replace
-          args: ["-", "0"]
-    banner:
-      selector: td.filename div:nth-child(2) a
+    poster:
+      selector: td.filename a[href^="/en/torrents/"]
      attribute: onmouseover
      filters:
        - name: regexp
-          args: src=\\'([^\s\\]+)
+          args: "\"(.+?)\""
+        - name: replace
+          args: ["\\", ""]
+    date:
+      # 2 January 2021, Saturday @ 20:46
+      selector: small
+      filters:
+        - name: regexp
+          args: "(.+?, .+? @ [0-9]{2}:[0-9]{2})"
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "2 January 2006, Monday @ 15:04 -07:00"
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: td:nth-child(4)
+    leechers:
+      selector: td:nth-child(5)
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/asgaard.yml
+++ b/src/Jackett.Common/Definitions/asgaard.yml
@@ -1,196 +0,0 @@
---
-id: asgaard
-name: Asgaard
-description: "Asgaard (AG) is a NORDIC Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en
-type: private
-encoding: UTF-8
-links:
-  - https://asgrd.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV, desc: "Kidz"}
-    - {id: 2, cat: Movies, desc: "Movies"}
-    - {id: 3, cat: TV, desc: "TV"}
-    - {id: 4, cat: Audio, desc: "Music"}
-    - {id: 5, cat: PC, desc: "Apps"}
-    - {id: 6, cat: PC/Games, desc: "Games"}
-    - {id: 7, cat: Books, desc: "Books"}
-    - {id: 8, cat: Movies, desc: "Kidz Movies"}
-    - {id: 9, cat: TV, desc: "Kidz TV"}
-    - {id: 10, cat: TV, desc: "Kidz Boxset"}
-    - {id: 54, cat: Movies/SD, desc: "Movies SD"}
-    - {id: 55, cat: Movies/DVD, desc: "Movies DVDR"}
-    - {id: 14, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
-    - {id: 17, cat: Movies/BluRay, desc: "Movies BD"}
-    - {id: 73, cat: Movies, desc: "Movies Boxset"}
-    - {id: 51, cat: Movies, desc: "Movies No Nordic Subs"}
-    - {id: 52, cat: TV/SD, desc: "TV SD"}
-    - {id: 58, cat: TV/SD, desc: "TV DVDR"}
-    - {id: 18, cat: TV/HD, desc: "TV HD"}
-    - {id: 19, cat: TV/UHD, desc: "TV 4K"}
-    - {id: 60, cat: TV/HD, desc: "TV BD"}
-    - {id: 20, cat: TV, desc: "TV Boxset"}
-    - {id: 50, cat: TV, desc: "TV No Nordic Subs"}
-    - {id: 49, cat: Audio/Video, desc: "Music Video"}
-    - {id: 23, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"}
-    - {id: 24, cat: Audio/Lossless, desc: "Music Flac"}
-    - {id: 62, cat: Audio/Lossless, desc: "Music Flac Boxset"}
-    - {id: 28, cat: PC/Phone-Android, desc: "Apps Android"}
-    - {id: 29, cat: PC/Phone-IOS, desc: "Apps iOS"}
-    - {id: 25, cat: PC/0day, desc: "Apps Windows"}
-    - {id: 26, cat: PC, desc: "Apps Linux"}
-    - {id: 27, cat: PC/Mac, desc: "Apps MacOS"}
-    - {id: 30, cat: PC/Games, desc: "Games Windows"}
-    - {id: 31, cat: PC, desc: "Games Linux"}
-    - {id: 32, cat: PC/Mac, desc: "Games MacOS"}
-    - {id: 33, cat: PC/Phone-Android, desc: "Games Android"}
-    - {id: 34, cat: PC/Phone-IOS, desc: "Games iOS"}
-    - {id: 35, cat: Console/NDS, desc: "Games Nintendo"}
-    - {id: 38, cat: Console/PSP, desc: "Games Playstation"}
-    - {id: 39, cat: Console/Xbox, desc: "Games XBox"}
-    - {id: 41, cat: Books/Ebook, desc: "Books E-Book"}
-    - {id: 42, cat: Audio/Audiobook, desc: "Books Audiobook"}
-    - {id: 43, cat: Books/Technical, desc: "Books Education"}
-
-  modes:
-    search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-settings:
-  - name: info
-    type: info
-    label: "About the Username field"
-    default: "Enter your <b>Email address</b> in the username field."
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: "2"
-    options:
-      "2": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
-  - name: type
-    type: select
-    label: Order requested from site
-    default: "desc"
-    options:
-      "desc": "desc"
-      "asc": "asc"
-
-login:
-  path: login.php
-  method: post
-  form: form
-  inputs:
-    email: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: 1
-  error:
-    - selector: h2:contains("Error")
-      message:
-        selector: p
-  test:
-    path: /
-    selector: a[href$="/logout.php"]
-
-search:
-  paths:
-    # https://asgrd.org/browse.php?sns=&sna=&spf=&sr=&sg=&sys=&sye=&srs=&sre=&si=tt2401090&ss=&incldead=0&only_free=0&sort=4&type=desc
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}cats[]={{.}}&{{end}}"
-    sns: ""
-    sna: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    spf: ""
-    sr: ""
-    sg: ""
-    sys: ""
-    sye: ""
-    srs: ""
-    sre: ""
-    si: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{end}}"
-    ss: ""
-    # 0 active 1 incldead 2 onlydead
-    incldead: 0
-    # 0 incl non-free 1 incl only-free
-    only_free: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.table-striped > tbody > tr:has(a[href*="details.php?id="])
-    filters:
-      - name: andmatch
-
-  fields:
-    title:
-      selector: div.torrent-name
-      filters:
-        # need to remove the tooltip text
-        - name: regexp
-          args: "(.+?)\\n"
-    details:
-      selector: a[href*="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href*="browse.php?"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: cats\[\]=(\d+)$
-    banner:
-      optional: true
-      selector: img.tooltip-poster
-      attribute: src
-    download:
-      selector: a[href*="download.php?torrent="]
-      attribute: href
-    files:
-      # remember #5754 advanced users have additional last TD so dont go using nth-last-child ;-)
-      selector: td:nth-child(5)
-    size:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    seeders:
-      selector: td:nth-child(9)
-    leechers:
-      selector: td:nth-child(10)
-    date:
-      # 26 May 20 14:05:06
-      selector: td:nth-child(2) > div > div:last-of-type:not(:contains("day"))
-      optional: true
-      # drop New!
-      remove: span
-      filters:
-        - name: dateparse
-          args: "2 Jan 2006 15:04:05"
-    date:
-      # Today, 20:26:23
-      # Yesterday, 13:50:05
-      selector: td:nth-child(2) > div > div:last-of-type:contains("day")
-      optional: true
-      # drop New!
-      remove: span
-      filters:
-        - name: fuzzytime
-    downloadvolumefactor:
-      case:
-        img[src="./images/gold.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# Midgaard
--- a/src/Jackett.Common/Definitions/asiancinema.yml
+++ b/src/Jackett.Common/Definitions/asiancinema.yml
@@ -15,9 +15,9 @@ caps:
    - {id: 3, cat: Audio, desc: "Music"}

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

 settings:
@@ -27,22 +27,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login
@@ -62,30 +66,25 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]

-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
  paths:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
    selector: table > tbody > tr
@@ -105,16 +104,16 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -127,9 +126,11 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
@@ -151,7 +152,9 @@ search:
        i[class*="fa-globe text-green"]: 2 # Global Double Upload
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
+    minimumratio:
+      text: 0.4
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# UNIT3D 2.2.7
+# UNIT3D 3.0.0
--- a/src/Jackett.Common/Definitions/asylumshare.yml
+++ b/src/Jackett.Common/Definitions/asylumshare.yml
@@ -0,0 +1,228 @@
+---
+id: asylumshare
+name: Asylum Share
+description: "Asylum Share is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: pt-br
+type: private
+encoding: UTF-8
+links:
+  - https://asylumshare.net/
+
+caps:
+  categorymappings:
+    - {id: 104, cat: XXX, desc: "Adultos: Fotos +18"}
+    - {id: 120, cat: TV/Anime, desc: "Anime: Anime"}
+    - {id: 122, cat: PC/Mobile-Android, desc: "Aplicativos: Android"}
+    - {id: 115, cat: PC/Mobile-Other, desc: "Aplicativos: Celular"}
+    - {id: 129, cat: PC, desc: "Aplicativos: Linux"}
+    - {id: 19, cat: PC/Mac, desc: "Aplicativos: Mac"}
+    - {id: 18, cat: PC, desc: "Aplicativos: PC"}
+    - {id: 123, cat: PC/Mobile-Other, desc: "Aplicativos: Symbian"}
+    - {id: 94, cat: PC/0day, desc: "Aplicativos: Windows"}
+    - {id: 9, cat: Other, desc: "Cursos: Apostilas"}
+    - {id: 113, cat: Other, desc: "Cursos: Curso"}
+    - {id: 111, cat: Other, desc: "Cursos: Video-Aula"}
+    - {id: 4, cat: Movies, desc: "Filmes: Ação"}
+    - {id: 47, cat: XXX, desc: "Filmes: Adulto +18"}
+    - {id: 114, cat: Movies, desc: "Filmes: Animação"}
+    - {id: 23, cat: Movies, desc: "Filmes: Aventura"}
+    - {id: 24, cat: Movies, desc: "Filmes: Biografia"}
+    - {id: 25, cat: Movies, desc: "Filmes: Clássico"}
+    - {id: 26, cat: Movies, desc: "Filmes: Comédia "}
+    - {id: 27, cat: TV/Documentary, desc: "Filmes: Documentário"}
+    - {id: 33, cat: Movies, desc: "Filmes: Drama"}
+    - {id: 117, cat: Movies, desc: "Filmes: Épico"}
+    - {id: 34, cat: Movies, desc: "Filmes: Esporte"}
+    - {id: 35, cat: Movies, desc: "Filmes: Ficção "}
+    - {id: 36, cat: Movies, desc: "Filmes: Guerra "}
+    - {id: 37, cat: Movies, desc: "Filmes: Infantil "}
+    - {id: 124, cat: Movies, desc: "Filmes: Músical"}
+    - {id: 42, cat: Movies, desc: "Filmes: Nacionais"}
+    - {id: 7, cat: Movies, desc: "Filmes : Ocidental"}
+    - {id: 39, cat: Movies, desc: "Filmes: Policial"}
+    - {id: 5, cat: Movies, desc: "Filmes : Religioso"}
+    - {id: 41, cat: Movies, desc: "Filmes : Romance "}
+    - {id: 40, cat: Movies, desc: "Filmes : Suspense"}
+    - {id: 6, cat: Movies, desc: "Filmes : Terror"}
+    - {id: 93, cat: Other, desc: "Fotos: Fotos"}
+    - {id: 121, cat: Console, desc: "Jogos: Celular"}
+    - {id: 16, cat: Console, desc: "Jogos: Dreamcast"}
+    - {id: 102, cat: Console, desc: "Jogos: Emuladores e Roms"}
+    - {id: 105, cat: Console, desc: "Jogos: Game-Cube"}
+    - {id: 116, cat: Console, desc: "Jogos: Nintendo DS"}
+    - {id: 10, cat: PC/Games, desc: "Jogos: PC"}
+    - {id: 15, cat: Console, desc: "Jogos: PS1"}
+    - {id: 11, cat: Console, desc: "Jogos: PS2"}
+    - {id: 43, cat: Console, desc: "Jogos: PS3"}
+    - {id: 128, cat: Console, desc: "Jogos: PS4"}
+    - {id: 12, cat: Console, desc: "Jogos: PSP"}
+    - {id: 44, cat: Console, desc: "Jogos: Wii"}
+    - {id: 13, cat: Console, desc: "Jogos: Xbox"}
+    - {id: 14, cat: Console, desc: "Jogos: Xbox 360"}
+    - {id: 127, cat: Books, desc: "Leitura: HQs e Mangás"}
+    - {id: 119, cat: Books, desc: "Leitura: Quadrinhos"}
+    - {id: 109, cat: Books, desc: "Leitura: Revistas e E-Books"}
+    - {id: 85, cat: Audio, desc: "Músicas: Alma"}
+    - {id: 72, cat: Audio, desc: "Músicas: Antigas"}
+    - {id: 51, cat: Audio, desc: "Músicas: Axé"}
+    - {id: 52, cat: Audio, desc: "Músicas: Blues"}
+    - {id: 53, cat: Audio, desc: "Músicas: Coletânea"}
+    - {id: 54, cat: Audio, desc: "Músicas: Country"}
+    - {id: 55, cat: Audio, desc: "Músicas: Dance"}
+    - {id: 56, cat: Audio, desc: "Músicas: Discografia"}
+    - {id: 57, cat: Audio, desc: "Músicas: Eletrônica"}
+    - {id: 58, cat: Audio, desc: "Músicas: Enka"}
+    - {id: 59, cat: Audio, desc: "Músicas: Erudita"}
+    - {id: 60, cat: Audio, desc: "Músicas: Forró"}
+    - {id: 61, cat: Audio, desc: "Músicas: Funk"}
+    - {id: 62, cat: Audio, desc: "Músicas: Gospel"}
+    - {id: 64, cat: Audio, desc: "Músicas: Hard Rock"}
+    - {id: 65, cat: Audio, desc: "Músicas: Heavy Metal"}
+    - {id: 66, cat: Audio, desc: "Músicas: Hip Hop"}
+    - {id: 67, cat: Audio, desc: "Músicas: House"}
+    - {id: 68, cat: Audio, desc: "Músicas: Infantil"}
+    - {id: 107, cat: Audio, desc: "Músicas: Instrumental"}
+    - {id: 69, cat: Audio, desc: "Músicas: Jazz"}
+    - {id: 118, cat: Audio, desc: "Músicas: Mixados"}
+    - {id: 70, cat: Audio, desc: "Músicas: MPB"}
+    - {id: 71, cat: Audio, desc: "Músicas: Nova Era"}
+    - {id: 73, cat: Audio, desc: "Músicas: Pagode"}
+    - {id: 74, cat: Audio, desc: "Músicas: Pop"}
+    - {id: 75, cat: Audio, desc: "Músicas: Psicodélico"}
+    - {id: 76, cat: Audio, desc: "Músicas: Punk Rock"}
+    - {id: 78, cat: Audio, desc: "Músicas: Rap"}
+    - {id: 79, cat: Audio, desc: "Músicas: Reggae"}
+    - {id: 80, cat: Audio, desc: "Músicas: Regionais"}
+    - {id: 82, cat: Audio, desc: "Músicas: Rock"}
+    - {id: 83, cat: Audio, desc: "Músicas: Samba"}
+    - {id: 84, cat: Audio, desc: "Músicas: Sertanejo"}
+    - {id: 86, cat: Audio, desc: "Músicas: Surf"}
+    - {id: 87, cat: Audio, desc: "Músicas: Techno"}
+    - {id: 88, cat: Audio, desc: "Músicas: Trance"}
+    - {id: 89, cat: Audio, desc: "Músicas: Trilha Sonora"}
+    - {id: 90, cat: Audio, desc: "Músicas: Vocal"}
+    - {id: 91, cat: Audio, desc: "Músicas: World Music"}
+    - {id: 108, cat: Other, desc: "Outros: Outros"}
+    - {id: 95, cat: TV, desc: "Séries: Seriados"}
+    - {id: 110, cat: TV, desc: "Shows: Shows"}
+    - {id: 49, cat: TV, desc: "Televisão: TV"}
+    - {id: 112, cat: Audio/Video, desc: "Video Clipe: Video Clipe"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: p#msgError
+  test:
+    path: index.php
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    # https://asylumshare.net/torrents-search.php?c108=1&c95=1&c110=1&c49=1&search=&cat=0&incldead=1&freeleech=2&filmeQualidade=0
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all, 1 3D, 2 4K, 3 FHD, 4 HD
+    filmeQualidade: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # site does not support imdbid search or return imdb links.
+  keywordsfilters:
+    # drop the year from searches since site titles do not include year
+    - name: re_replace
+      args: ["(19|20[0-9]{2})", ""]
+    # prepend + to each word
+    - name: re_replace
+      args: ["(\\w+)", "+$1"]
+
+  rows:
+    selector: tr.t-row:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: td a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: td a[href^="torrents-details.php?id="]
+      filters:
+        - name: replace
+          args: ["[FREE]", ""]
+    details:
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: td a[href^="download.php?id="]
+      attribute: href
+    date:
+      selector: a[title]
+      attribute: title
+      filters:
+        - name: regexp
+          args: "(\\d{2}\\/\\d{2}\\/\\d{2} \\d{2}:\\d{2}:\\d{2})"
+        - name: append
+          args: " -03:00" # BRT
+        - name: dateparse
+          args: "02/01/06 15:04:05 -07:00"
+    size:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        "span.color-green:contains(\"FREE\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1
+# engine n/a, likely customised TT3.0
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -7,13 +7,19 @@ type: public
 encoding: UTF-8
 links:
  - http://audiobookbay.nl/ # site forces http, does not support https
+  - http://audiobookbay.net/
+  - http://audiobookbayabb.com/
+  - https://audiobookbay.unblockit.link/
 legacylinks:
  - https://audiobookbay.la/
+  - https://audiobookbay.unblockit.lat/
+  - https://audiobookbay.unblockit.app/
+  - https://audiobookbay.unblockit.dev/
+  - https://audiobookbay.unblockit.ltd/

 caps:
  categorymappings:
    - {id: "(Post)apocalyptic", cat: Audio/Audiobook, desc: "(Post)apocalyptic"}
-    - {id: "True", cat: Audio/Audiobook, desc: "True Crime"}
    - {id: Action, cat: Audio/Audiobook, desc: "Action"}
    - {id: Adults, cat: Audio/Audiobook, desc: "Adults"}
    - {id: Adventure, cat: Audio/Audiobook, desc: "Adventure"}
@@ -39,12 +45,12 @@ caps:
    - {id: History, cat: Audio/Audiobook, desc: "History"}
    - {id: Horror, cat: Audio/Audiobook, desc: "Horror"}
    - {id: Humor, cat: Audio/Audiobook, desc: "Humor"}
-    - {id: LGBT, cat: Audio/Audiobook, desc: "LGBT"}
    - {id: Lecture, cat: Audio/Audiobook, desc: "Lecture"}
    - {id: Lesbian, cat: Audio/Audiobook, desc: "Lesbian"}
+    - {id: LGBT, cat: Audio/Audiobook, desc: "LGBT"}
    - {id: Libertarian, cat: Audio/Audiobook, desc: "Libertarian"}
-    - {id: LitRPG, cat: Audio/Audiobook, desc: "LitRPG"}
    - {id: Literature, cat: Audio/Audiobook, desc: "Literature"}
+    - {id: LitRPG, cat: Audio/Audiobook, desc: "LitRPG"}
    - {id: Military, cat: Audio/Audiobook, desc: "Military"}
    - {id: Misc., cat: Audio/Audiobook, desc: "Misc. Non-fiction"}
    - {id: Mystery, cat: Audio/Audiobook, desc: "Mystery"}
@@ -67,12 +73,14 @@ caps:
    - {id: Teen, cat: Audio/Audiobook, desc: "Teen & Young Adult"}
    - {id: The, cat: Audio/Audiobook, desc: "The Undead"}
    - {id: Thriller, cat: Audio/Audiobook, desc: "Thriller"}
+    - {id: "True", cat: Audio/Audiobook, desc: "True Crime"}
    - {id: Tutorial, cat: Audio/Audiobook, desc: "Tutorial"}
    - {id: Violence, cat: Audio/Audiobook, desc: "Violence"}
    - {id: Westerns, cat: Audio/Audiobook, desc: "Westerns"}

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

 settings: []

@@ -99,6 +107,11 @@ search:
    selector: div.post:has(div[class="postTitle"])

  fields:
+    category:
+      selector: div.postInfo
+      filters:
+        - name: regexp
+          args: "Category: (.+?)\\s"
    title:
      selector: div.postTitle
    details:
@@ -107,15 +120,9 @@ search:
    download:
      selector: div.postTitle h2 a
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: img
      attribute: src
-    category:
-      selector: div.postInfo
-      filters:
-        - name: regexp
-          args: "Category: (.+?)\\s"
    _date:
      selector: div.postContent
      filters:
--- a/src/Jackett.Common/Definitions/audionews.yml
+++ b/src/Jackett.Common/Definitions/audionews.yml
@@ -10,9 +10,9 @@ links:

 caps:
  categorymappings:
-    - {id: 106, cat: PC/Phone-Other, desc: "Mobile Apps"}
-    - {id: 161, cat: PC/Phone-IOS, desc: "Mobile Apps iOS"}
-    - {id: 160, cat: PC/Phone-Android, desc: "Mobile Apps Android"}
+    - {id: 106, cat: PC/Mobile-Other, desc: "Mobile Apps"}
+    - {id: 161, cat: PC/Mobile-iOS, desc: "Mobile Apps iOS"}
+    - {id: 160, cat: PC/Mobile-Android, desc: "Mobile Apps Android"}
    - {id: 12, cat: PC, desc: "AUDIOAPPS"}
    - {id: 32, cat: PC, desc: "AUDIOAPPS DAW Apps"}
    - {id: 175, cat: PC, desc: "AUDIOAPPS Ableton"}
@@ -163,14 +163,18 @@ caps:
    - {id: 168, cat: Audio/Other, desc: "PRESETS Toontrack"}
    - {id: 21, cat: Other, desc: "UPDATE"}
    - {id: 222, cat: Other, desc: "GFXNEWS 3D"}
+    - {id: 235, cat: Other, desc: "GFXNEWS APPS ANDROID & IOS"}
    - {id: 207, cat: Other, desc: "GFXNEWS APPS WIN"}
    - {id: 215, cat: Other, desc: "GFXNEWS APPS LINUX"}
    - {id: 214, cat: Other, desc: "GFXNEWS APPS MAC"}
    - {id: 211, cat: Other, desc: "GFXNEWS BOOKS"}
    - {id: 224, cat: Other, desc: "GFXNEWS CAD/CAM"}
+    - {id: 237, cat: Other, desc: "GFXNEWS DAZ3D"}
    - {id: 212, cat: Other, desc: "GFXNEWS FONTS"}
    - {id: 213, cat: Other, desc: "GFXNEWS FOOTAGE"}
+    - {id: 233, cat: Other, desc: "GFXNEWS GAME DEVELOPMENT"}
    - {id: 226, cat: Other, desc: "GFXNEWS MAGAZINE"}
+    - {id: 234, cat: Other, desc: "GFXNEWS MATERIAL"}
    - {id: 216, cat: Other, desc: "GFXNEWS PHOTOSTOCK"}
    - {id: 220, cat: Other, desc: "GFXNEWS PHOTOGRAPHY - ART"}
    - {id: 227, cat: Other, desc: "GFXNEWS PHOTOSHOP"}
@@ -181,14 +185,17 @@ caps:
    - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
    - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
    - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
+    - {id: 236, cat: Other, desc: "GFXNEWS POSER"}
    - {id: 217, cat: Other, desc: "GFXNEWS SCRIPTS - WEB PROGRAMMING"}
    - {id: 218, cat: Other, desc: "GFXNEWS TEMPLATES"}
    - {id: 232, cat: Other, desc: "GFXNEWS TEXTURES"}
    - {id: 219, cat: Other, desc: "GFXNEWS TUTORIALS"}
+    - {id: 238, cat: Other, desc: "GFXNEWS VECTOR GRAPHICS"}
    - {id: 221, cat: Other, desc: "GFXNEWS VIDEO PRODUCTION"}

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

 settings:
  - name: username
@@ -200,19 +207,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "1"
+    default: 1
    options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
  - name: type
    type: select
    label: Order requested from site
-    default: "2"
+    default: 2
    options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc

 login:
  path: login.php
@@ -236,7 +243,7 @@ search:
    - path: tracker.php
      method: post
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_allw: 1
    prev_a: 0
    prev_dla: 0
@@ -267,8 +274,10 @@ search:
    dateheaders:
      selector: td[colspan="20"] > strong
      filters:
+        - name: append
+          args: " -07:00" # PDT
        - name: dateparse
-          args: "01-02-2006"
+          args: "01-02-2006 -07:00"

  fields:
    title:
@@ -318,4 +327,6 @@ search:
      text: 1
    uploadvolumefactor:
      text: 1
+    minimumratio:
+      text: 0.8
 # engine n/a
--- a/src/Jackett.Common/Definitions/backups.yml
+++ b/src/Jackett.Common/Definitions/backups.yml
@@ -43,6 +43,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 login:
  path: takelogin.php
@@ -64,17 +65,25 @@ search:
    - name: re_replace
      args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
  inputs:
-    do: "search"
+    do: search
    keywords: "{{ .Keywords }}"
-    search_type: "t_name"
-    category: "0" # multi cat search not supported
-    include_dead_torrents: "yes"
+    search_type: t_name
+    category: 0 # multi cat search not supported
+    include_dead_torrents: yes
+
  rows:
    selector: table#sortabletable > tbody > tr:has(a[href*="/details.php?id="])
    filters:
      - name: andmatch
        args: 66
+
  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
    title:
      selector: a[href*="/details.php?id="]
    title:
@@ -89,12 +98,6 @@ search:
    magnet:
      selector: a[href^="magnet:?xt="]
      attribute: href
-    category:
-      selector: a[href*="/browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
    size:
      selector: td:nth-child(5)
    grabs:
@@ -108,18 +111,18 @@ search:
      remove: span
      filters:
        - name: append
-          args: " +00:00"
+          args: " +00:00" # GMT
        - name: dateparse
          args: "02-01-2006 15:04 -07:00"
-    banner:
+    poster:
      optional: true
      selector: div.tooltip-content > img
      attribute: src
    downloadvolumefactor:
      case:
-        img[alt^="Free Torrent "]: "0"
-        img[alt^="Silver Torrent "]: "0.5"
-        "*": "1"
+        img[alt^="Free Torrent "]: 0
+        img[alt^="Silver Torrent "]: 0.5
+        "*": 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -1,74 +0,0 @@
---
-id: badasstorrents
-name: Badass Torrents
-description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL"
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://badasstorrents.com/
-
-caps:
-  categories:
-    "Anime": TV/Anime
-    "apps": PC
-    "Books": Books
-    "Games": PC/Games
-    "Movies": Movies
-    "Music": Audio
-    "Other": Other
-    "TV": TV
-    "XXX": XXX
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: downloadlink
-    type: select
-    label: Download link
-    default: "magnet:?xt="
-    options:
-      "/download/": ".torrent"
-      "magnet:?xt=": "magnet"
-
-download:
-  selector: a[href*="{{ .Config.downloadlink }}"]
-  attribute: href
-
-search:
-  paths:
-    - path: "torrents/search/{{ .Keywords }}"
-
-  rows:
-    selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])
-
-  fields:
-    category:
-      selector: a[href*="/cat/"]
-    title:
-      selector: a[href*="/torrent/"]
-    details:
-      selector: a[href*="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href*="/torrent/"]
-      attribute: href
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: timeago
-    size:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -6,9 +6,10 @@ language: ru-ru
 type: semi-private
 encoding: windows-1251
 links:
-  - https://baibako.tv/
+  - http://bko.baibako.tv/ # https is unsupported ERR_CONNECTION_REFUSED
 legacylinks:
  - http://baibako.tv/
+  - https://baibako.tv/

 caps:
  categorymappings:
@@ -29,22 +30,26 @@ settings:
    type: checkbox
    label: Strip Russian Letters
    default: false
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "4"
+    default: 4
    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: takelogin.php
@@ -63,8 +68,8 @@ search:
    - path: browse.php
  inputs:
    search: "{{.Keywords }}"
-    # 0 active 1 incldead 2 onlydead 3 gold 4 seedfree
-    incldead: 1
+    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 seedfree
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
  keywordsfilters:
@@ -75,6 +80,8 @@ search:
    selector: table > tbody > tr:has(a[href^="details.php?id="])

  fields:
+    category:
+      text: 1
    title:
      selector: a[href^="details.php?id="]
      filters:
@@ -105,9 +112,7 @@ search:
    details:
      selector: a[href^="details.php?id="]
      attribute: href
-    category:
-      text: 1
-    banner:
+    poster:
      selector: img[src^="/posters/"]
      attribute: src
    download:
@@ -144,8 +149,10 @@ search:
          args: ["ноября", "November"]
        - name: replace
          args: ["декабря", "December"]
+        - name: append
+          args: " +03:00" # MSK
        - name: dateparse
-          args: "2 January 2006 15:04:05"
+          args: "2 January 2006 15:04:05 -07:00"
    files:
      selector: td:nth-last-child(5)
    size:
@@ -167,6 +174,7 @@ search:
        "a[href^=\"details.php?id=\"]:contains(\"(Золото)\")": 0
        "*": 1
    uploadvolumefactor:
-      case:
-        "*": 1
+      text: 1
+    minimumratio:
+      text: 0.3
 # engine n/a
--- a/src/Jackett.Common/Definitions/beitai.yml
+++ b/src/Jackett.Common/Definitions/beitai.yml
@@ -21,7 +21,7 @@ caps:
    - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}

  modes:
-    search: [q, imdbid]
+    search: [q]
    tv-search: [q, season, ep, imdbid]
    movie-search: [q, imdbid]
    music-search: [q]
@@ -33,22 +33,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "4"
+    default: 4
    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -75,14 +79,14 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
    incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl (searching imdburl does not work with tt1234567, but descr is good)
-    search_area: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 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 (searching imdburl does not work with tt1234567, but descr is good)
+    search_area: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -110,7 +114,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: div.imdb_100 > a
      attribute: href
    date:
@@ -120,7 +123,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -129,7 +132,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
@@ -1,7 +1,7 @@
 ---
 id: beyond-hd-oneurl
 name: Beyond-HD (OneURL)
-description: "Without BeyondHD, your HDTV is just a TV"
+description: "This is BeyondHD using OneURL (for those that have enabled 2FA)"
 language: en-us
 type: private
 encoding: UTF-8
@@ -14,30 +14,34 @@ caps:
    - {id: 2, cat: TV, desc: "TV"}

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

 settings:
  - name: oneurl
    type: text
    label: OneURL
+  - name: info_oid
+    type: info
+    label: "About One-URL"
+    default: "<li>OneURL is found by accessing your Beyond-HD web site,</li><li>hovering over the <b>user icon</b></li><li>and going to <b>My Security</b></li><li>then going to the <b>One URL (OID)</b> tab,</li><li>and if it's not already active, you need to hit <b>Reset One URL</b> to activate it.</li><li>Then use that link here.</li>"
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  method: oneurl
@@ -51,17 +55,16 @@ search:
    - path: torrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: ""
+    tmdb: "{{ .Query.TMDBID }}"
    sorting: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100

  rows:
-    selector: div.table-torrents > table > tbody > tr
-    after: 1
+    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]

  fields:
    _category:
@@ -75,19 +78,12 @@ search:
      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
    title:
      selector: a.torrent-name
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
    details:
      selector: a.torrent-name
      attribute: href
-    banner:
-      optional: true
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/img/person.png", ""]
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
    date:
      selector: td:not(a[href$="/history"]) span.text-orange
      filters:
@@ -101,9 +97,11 @@ search:
    grabs:
      selector: a[href$="/history"]
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    downloadvolumefactor:
      case:
        i[data-original-title="100% Free"]: 0
--- a/src/Jackett.Common/Definitions/beyond-hd.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd.yml
@@ -14,11 +14,15 @@ caps:
    - {id: 2, cat: TV, desc: "TV"}

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

 settings:
+  - name: info_oid
+    type: info
+    label: "About 2FA"
+    default: "If you want to enable 2FA then use the Beyond-HD (OneURL) indexer instead."
  - name: username
    type: text
    label: Username
@@ -28,19 +32,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login
@@ -71,17 +75,16 @@ search:
    - path: torrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: ""
+    tmdb: "{{ .Query.TMDBID }}"
    sorting: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100

  rows:
-    selector: div.table-torrents > table > tbody > tr
-    after: 1
+    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]

  fields:
    _category:
@@ -95,19 +98,12 @@ search:
      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
    title:
      selector: a.torrent-name
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
    details:
      selector: a.torrent-name
      attribute: href
-    banner:
-      optional: true
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/img/person.png", ""]
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
    date:
      selector: td:not(a[href$="/history"]) span.text-orange
      filters:
@@ -121,9 +117,11 @@ search:
    grabs:
      selector: a[href$="/history"]
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    downloadvolumefactor:
      case:
        i[data-original-title="100% Free"]: 0
--- a/src/Jackett.Common/Definitions/bibliotik.yml
+++ b/src/Jackett.Common/Definitions/bibliotik.yml
@@ -13,12 +13,12 @@ caps:
    - {id: 1, cat: PC, desc: "Applications"}
    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
    - {id: 4, cat: Books/Comics, desc: "Comics"}
-    - {id: 5, cat: Books/Ebook, desc: "eBooks"}
-    - {id: 7, cat: Books/Magazines, desc: "Magazines"}
+    - {id: 5, cat: Books/EBook, desc: "eBooks"}
+    - {id: 7, cat: Books/Mags, desc: "Magazines"}

  modes:
    search: [q]
-    book-search: [q, author, title]
+    book-search: [q, title, author]

 settings:
  - name: username
@@ -30,25 +30,20 @@ settings:
  - name: orderby
    type: select
    label: Sort requested from site
-    default: "relevance"
+    default: added
    options:
-      "relevance": "relevance"
-      "year": "year"
-      "size": "size"
-      "duration": "duration"
-      "added": "added"
-      "leechers": "leechers"
-      "seeders": "seeders"
-      "snatches": "snatches"
-      "comments": "comments"
-      "files": "files"
+      "@relevance": relevance
+      title: title
+      size: size
+      added: added
+      seeders: seeders
  - name: order
    type: select
    label: Order requested from site
-    default: "desc"
+    default: DESC
    options:
-      "desc": "desc"
-      "asc": "asc"
+      DESC: desc
+      ASC: asc

 login:
  path: /
@@ -68,7 +63,7 @@ search:
  paths:
    - path: torrents/
  inputs:
-    search: "{{ if .Query.Author }} @authors {{ .Query.Author }}{{else}}{{end}}{{ if .Query.Title }} @title {{ .Query.Title }}{{else}}{{end}}{{ .Keywords }}"
+    search: "{{ if .Query.Author }} @authors {{ .Query.Author }}{{ else }}{{ end }}{{ if .Query.Title }} @title {{ .Query.Title }}{{ else }}{{ end }}{{ .Keywords }}"
    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
    orderby: "{{ .Config.orderby }}"
    order: "{{ .Config.order }}"
@@ -105,10 +100,10 @@ search:
    booktitle:
      selector: .title a
    title:
-      text: "{{.Result.booktitle}}"
+      text: "{{ .Result.booktitle }}"
      filters:
        - name: append
-          args: "{{ if .Result.author }} by {{ .Result.author }}{{else}}{{end}}{{ if .Result._year }} {{ .Result._year }}{{else}}{{end}}{{ if .Result._filetype }} {{ .Result._filetype }}{{else}}{{end}}{{ if .Result._retail }} {{ .Result._retail }}{{else}}{{end}}"
+          args: "{{ if .Result.author }} by {{ .Result.author }}{{ else }}{{ end }}{{ if .Result._year }} {{ .Result._year }}{{ else }}{{ end }}{{ if .Result._filetype }} {{ .Result._filetype }}{{ else }}{{ end }}{{ if .Result._retail }} {{ .Result._retail }}{{ else }}{{ end }}"
    details:
      selector: .title a
      attribute: href
@@ -143,9 +138,7 @@ search:
      optional: true
      selector: .snatches
    downloadvolumefactor:
-      case:
-        "*": 1
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": 1
-# engine tbc
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/bigfangroup.yml
+++ b/src/Jackett.Common/Definitions/bigfangroup.yml
@@ -11,60 +11,56 @@ links:

 caps:
  categorymappings:
-    # Movies
+    - {id: 51, cat: Movies/3D, desc: "3D"}
+    - {id: 12, cat: TV, desc: "Анимация"}
+    - {id: 35, cat: Audio/Audiobook, desc: "Аудио-книги"}
    - {id: 13, cat: Movies, desc: "Боевик"}
-    - {id: 18, cat: Movies, desc: "Катастрофа"}
-    - {id: 19, cat: Movies, desc: "Мелодрама"}
-    - {id: 21, cat: Movies, desc: "Драма"}
-    - {id: 22, cat: Movies, desc: "Триллер"}
-    - {id: 23, cat: Movies, desc: "Фантастика"}
-    - {id: 24, cat: Movies, desc: "Комедия"}
-    - {id: 26, cat: Movies, desc: "Ужасы"}
-    - {id: 27, cat: Movies, desc: "Приключения"}
-    - {id: 28, cat: Movies, desc: "Исторический"}
-    - {id: 29, cat: Movies/Foreign, desc: "Наше кино"}
-    - {id: 30, cat: Movies, desc: "Фэнтази"}
-    - {id: 31, cat: Movies, desc: "Мистика"}
-    - {id: 33, cat: Movies, desc: "Военный"}
-    - {id: 36, cat: Movies, desc: "Криминал"}
-    - {id: 39, cat: Movies, desc: "Детектив"}
-    - {id: 47, cat: Movies, desc: "Сказки"}
-    - {id: 48, cat: Movies, desc: "Вестерн"}
    - {id: 52, cat: Movies, desc: "Биография"}
+    - {id: 33, cat: Movies, desc: "Военный"}
+    - {id: 45, cat: Audio/Video, desc: "Видеоклипы"}
+    - {id: 48, cat: Movies, desc: "Вестерн"}
+    - {id: 21, cat: Movies, desc: "Драма"}
+    - {id: 32, cat: TV/Documentary, desc: "Документальный"}
+    - {id: 39, cat: Movies, desc: "Детектив"}
+    - {id: 44, cat: Audio, desc: "Зарубежная музыка"}
+    - {id: 5, cat: PC/Games, desc: "Игры"}
+    - {id: 28, cat: Movies, desc: "Исторический"}
+    - {id: 18, cat: Movies, desc: "Катастрофа"}
+    - {id: 24, cat: Movies, desc: "Комедия"}
+    - {id: 36, cat: Movies, desc: "Криминал"}
+    - {id: 38, cat: Books, desc: "Книги и журналы"}
    - {id: 53, cat: Movies, desc: "Классика"}
+    - {id: 54, cat: Audio, desc: "Классическая музыка"}
+    - {id: 19, cat: Movies, desc: "Мелодрама"}
+    - {id: 20, cat: Movies, desc: "Мультфильм"}
+    - {id: 31, cat: Movies, desc: "Мистика"}
+    - {id: 46, cat: Audio, desc: "Муз. сборники"}
+    - {id: 29, cat: Movies/Foreign, desc: "Наше кино"}
+    - {id: 49, cat: TV, desc: "Научно-популярное"}
+    - {id: 50, cat: TV, desc: "Новости"}
+    - {id: 27, cat: Movies, desc: "Приключения"}
+    - {id: 9, cat: Other, desc: "Разное"}
+    - {id: 43, cat: Audio/Foreign, desc: "Русская музыка"}
+    - {id: 1, cat: PC, desc: "Софт"}
+    - {id: 11, cat: TV, desc: "Сериалы"}
+    - {id: 37, cat: TV/Sport, desc: "Спорт"}
+    - {id: 47, cat: Movies, desc: "Сказки"}
+    - {id: 55, cat: Audio, desc: "Саундтрек"}
+    - {id: 25, cat: TV, desc: "ТВ-шоу"}
+    - {id: 22, cat: Movies, desc: "Триллер"}
+    - {id: 26, cat: Movies, desc: "Ужасы"}
+    - {id: 23, cat: Movies, desc: "Фантастика"}
+    - {id: 30, cat: Movies, desc: "Фэнтази"}
+    - {id: 42, cat: XXX, desc: "Эротика"}
    - {id: 14, cat: Movies/HD, desc: "HDTV"}
    - {id: 15, cat: Movies/DVD, desc: "DVD"}
-    - {id: 51, cat: Movies/3D, desc: "3D"}
-    - {id: 20, cat: Movies, desc: "Мультфильм"}
-    # Audio
-    - {id: 35, cat: Audio/Audiobook, desc: "Аудио-книги"}
-    - {id: 43, cat: Audio/Foreign, desc: "Русская музыка"}
-    - {id: 44, cat: Audio, desc: "Зарубежная музыка"}
-    - {id: 45, cat: Audio/Video, desc: "Видеоклипы"}
-    - {id: 46, cat: Audio, desc: "Муз. сборники"}
-    - {id: 54, cat: Audio, desc: "Классическая музыка"}
-    - {id: 55, cat: Audio, desc: "Саундтрек"}
-    # TV
-    - {id: 11, cat: TV, desc: "Сериалы"}
-    - {id: 25, cat: TV, desc: "ТВ-шоу"}
-    - {id: 37, cat: TV/Sport, desc: "Спорт"}
-    - {id: 50, cat: TV, desc: "Новости"}
-    - {id: 49, cat: TV, desc: "Научно-популярное"}
-    - {id: 32, cat: TV/Documentary, desc: "Документальный"}
-    - {id: 12, cat: TV, desc: "Анимация"}
-    # PC
-    - {id: 1, cat: PC, desc: "Софт"}
-    - {id: 5, cat: PC/Games, desc: "Игры"}
-    # Other
-    - {id: 38, cat: Books, desc: "Книги и журналы"}
-    - {id: 42, cat: XXX, desc: "Эротика"}
-    - {id: 9, cat: Other, desc: "Разное"}

  modes:
    search: [q]
    tv-search: [q]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: striprussian
@@ -74,19 +70,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "added"
+    default: added
    options:
-      "added": "created"
-      "seed": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seed: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 search:
  # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
@@ -95,7 +91,7 @@ search:
  inputs:
    search: "{{ .Keywords }}"
    cat: 0
-    # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver 7 BFG
+    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver, 7 BFG
    incldead: 1
    ajax: 1
    year: 0
@@ -182,8 +178,10 @@ search:
          args: ["ноября", "November"]
        - name: replace
          args: ["декабря", "December"]
+        - name: append
+          args: " +03:00" # MSK
        - name: dateparse
-          args: "2 January 2006 15:04:05"
+          args: "2 January 2006 15:04:05 -07:00"
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/bigtorrent.yml
+++ b/src/Jackett.Common/Definitions/bigtorrent.yml
@@ -25,11 +25,11 @@ caps:
    - {id: 24534, cat: Audio/Audiobook, desc: "Audiobooks"}
    - {id: 65, cat: Other, desc: "Picture"}
    - {id: 64, cat: Other, desc: "Video"}
-    - {id: 68, cat: Console/Xbox360, desc: "Video Game Console"}
+    - {id: 68, cat: Console/XBox 360, desc: "Video Game Console"}
    - {id: 63, cat: Books, desc: "English Books"}
    - {id: 62, cat: Books, desc: "Hungarian Books"}
    - {id: 74, cat: Audio/Lossless, desc: "Lossless"}
-    - {id: 56, cat: PC/Phone-Other, desc: "Mobile"}
+    - {id: 56, cat: PC/Mobile-Other, desc: "Mobile"}
    - {id: 57, cat: PC, desc: "Programs"}
    - {id: 24545, cat: TV/HD, desc: "English HD Series"}
    - {id: 24544, cat: TV/HD, desc: "Hungarian HD Series"}
@@ -44,6 +44,7 @@ caps:
    tv-search: [q]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 login:
  path: login.php
@@ -51,8 +52,8 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    sent: "yes"
-    returnto: "/"
+    sent: yes
+    returnto: /
  error:
    - selector: div.error
  test:
@@ -66,10 +67,12 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{if .Keywords}}{{ .Keywords }}{{else}}  {{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}  {{ end }}"
+
  rows:
    selector: table#torrent_table > tbody > tr:has(a[href^="browse.php?cat="])
+
  fields:
    category:
      selector: a[href^="browse.php?cat="]
@@ -97,8 +100,7 @@ search:
    date:
      selector: td:nth-child(4)
    downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/bigtower.yml
+++ b/src/Jackett.Common/Definitions/bigtower.yml
@@ -1,153 +0,0 @@
---
-id: bigtower
-name: BigTower
-description: "Big Tower is an ITALIAN Private site for TV / MOVIES / GENERAL"
-language: it-it
-type: private
-encoding: UTF-8
-links:
-  - http://bigtower.info/ # site does not support https NET::ERR_CERT_DATE_INVALID
-legacylinks:
-  - https://bigtower.info/
-
-caps:
-  categorymappings:
-
-    # Movies
-    - {id: 11, cat: Movies/HD, desc: "DSS"}
-    - {id: 1, cat: Movies, desc: "Screener"}
-    - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
-    - {id: 3, cat: Movies/BluRay, desc: "Bluray 1080p & 720p"}
-    - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
-    - {id: 6, cat: TV, desc: "Serie TV"}
-    - {id: 4, cat: TV/Anime, desc: "Cartoni"}
-
-    # GAMES
-    - {id: 7, cat: PC/Games, desc: "Giochi"}
-
-    # MUSIC
-    - {id: 8, cat: Audio, desc: "Musica"}
-
-    # SOFTWARE
-    - {id: 9, cat: PC/0day, desc: "Software"}
-
-    # PHONE
-    - {id: 12, cat: PC/Phone-Other, desc: "Applicazioni"}
-
-    # OTHER
-    - {id: 14, cat: Other, desc: "Varie & Altro"}
-
-    # EBOOK
-    - {id: 13, cat: Books, desc: "Libri & Edicola"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: donor
-    type: checkbox
-    label: Show donor torrent? (Enable if you're a donor)
-    default: false
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: span:contains("Nome Utente non corretto")
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    search: "{{ .Keywords }}"
-    page: torrents
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    options: 0
-    active: 0
-
-  rows:
-    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]){{if .Config.donor }}{{else}}:not(:has(img[src*="keditbookmarks.png"])){{end}}
-
-  fields:
-    download:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["index.php?page=torrent-details&id=", "download.php?id="]
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      filters:
-        - name: re_replace # rimozioni varie
-          args: ["(?i)(\\[Richiesta\\])", ""]
-    banner:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    size:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(8)
-      filters:
-        - name: append
-          args: " +01:00"
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    grabs:
-      selector: td:nth-last-child(5)
-      filters:
-        - name: replace
-          args: ["---", "0"]
-    seeders:
-      selector: td:nth-last-child(7)
-    leechers:
-      selector: td:nth-last-child(6)
-    downloadvolumefactor:
-      case:
-        img[alt="Gold 100% Free"]: 0
-        img[alt="Silver 50% Free"]: 0.5
-        img[alt="Bronze 25% Free"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[alt="2x Upload Multiplier"]: 2
-        img[alt="3x Upload Multiplier"]: 3
-        img[alt="4x Upload Multiplier"]: 4
-        img[alt="5x Upload Multiplier"]: 5
-        img[alt="6x Upload Multiplier"]: 6
-        img[alt="7x Upload Multiplier"]: 7
-        img[alt="8x Upload Multiplier"]: 8
-        img[alt="9x Upload Multiplier"]: 9
-        img[alt="10x Upload Multiplier"]: 10
-        "*": 1
-#  xbtitFM v3.0.00
--- a/src/Jackett.Common/Definitions/bit-titan.yml
+++ b/src/Jackett.Common/Definitions/bit-titan.yml
@@ -31,7 +31,7 @@ caps:
    - {id: 2060, cat: TV/SD, desc: "TV XviD"}
    - {id: 2070, cat: TV/HD, desc: "TV HD Packs"}
    - {id: 2080, cat: TV/SD, desc: "TV SD Packs"}
-    - {id: 2090, cat: TV/FOREIGN, desc: "TV International"}
+    - {id: 2090, cat: TV/Foreign, desc: "TV International"}
    - {id: 3010, cat: TV/Documentary, desc: "Docu 2160p"}
    - {id: 3020, cat: TV/Documentary, desc: "Docu 1080p"}
    - {id: 3030, cat: TV/Documentary, desc: "Docu 720p"}
@@ -59,15 +59,15 @@ caps:
    - {id: 6010, cat: PC/Games, desc: "Games Windows"}
    - {id: 6020, cat: Console, desc: "Games Linux"}
    - {id: 6030, cat: PC/Mac, desc: "Games MacOS"}
-    - {id: 6040, cat: PC/Phone-Android, desc: "Games Android"}
-    - {id: 6050, cat: Console/Xbox, desc: "Games Xbox"}
+    - {id: 6040, cat: PC/Mobile-Android, desc: "Games Android"}
+    - {id: 6050, cat: Console/XBox, desc: "Games Xbox"}
    - {id: 6060, cat: Console/PSP, desc: "Games PlayStation"}
    - {id: 6070, cat: Console/NDS, desc: "Games Nintendo"}
    - {id: 6080, cat: Console, desc: "Games Sonstige"}
    - {id: 7010, cat: PC/0day, desc: "Software Windows"}
    - {id: 7020, cat: PC, desc: "Software Linux"}
    - {id: 7030, cat: PC/Mac, desc: "Software MacOS"}
-    - {id: 7040, cat: PC/Phone-Android, desc: "Software Android"}
+    - {id: 7040, cat: PC/Mobile-Android, desc: "Software Android"}
    - {id: 8010, cat: Audio/MP3, desc: "Music MP3-Album"}
    - {id: 8020, cat: Audio/MP3, desc: "Music MP3-Charts"}
    - {id: 8030, cat: Audio/MP3, desc: "Music MP3-Sampler"}
@@ -78,10 +78,9 @@ caps:
    - {id: 8080, cat: Audio/Lossless, desc: "Music FLAC-Single"}
    - {id: 8090, cat: Audio/Video, desc: "Music Video"}
    - {id: 9010, cat: Audio/Audiobook, desc: "Books A-Book"}
-    - {id: 9020, cat: Books/Ebook, desc: "Books E-Book"}
+    - {id: 9020, cat: Books/EBook, desc: "Books E-Book"}
    - {id: 9030, cat: Books, desc: "Books E-Paper"}
    - {id: 9040, cat: Books, desc: "Books E-Learning"}
-    - {id: 9050, cat: TV, desc: "TV Kids"}
    - {id: 9060, cat: TV/Anime, desc: "Anime HD"}
    - {id: 9070, cat: TV/Anime, desc: "Anime SD"}
    - {id: 9080, cat: TV/Anime, desc: "Anime Pack"}
@@ -92,6 +91,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: username
@@ -100,22 +100,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "1"
+    default: 1
    options:
-      "1": "created"
-      "8": "seeders"
-      "6": "size"
-      "2": "title"
+      1: created
+      2: seeders
+      5: size
+      9: title
  - name: type
    type: select
    label: Order requested from site
-    default: "1"
+    default: 1
    options:
-      "1": "desc"
-      "2": "asc"
+      1: desc
+      2: asc

 login:
  path: login.php
@@ -132,99 +136,110 @@ login:
  error:
    - selector: div#login_error
  test:
-    path: browse.php
-    selector: a[href="logout.php"]
-
-ratio:
-  path: browse.php
-  selector: div#tom-b-t8
-  filters:
-    - name: replace
-      args: [".", ""]
-    - name: replace
-      args: [",", "."]
+    path: index.php
+#    selector: a[href="logout.php"] # ajax does not return a full page so cant test this.

 search:
  paths:
-    - path: browse.php
+    - path: ajax_browse.php
+      method: post
  inputs:
-    suchfeld: 2
-    alleanzeigen: 1
-    $raw: "{{ range .Categories }}kategorie[]={{.}}&{{end}}"
-    suche: "{{ .Keywords }}"
-    # searchin 1 name 2 descr 3 both
-    durchsuche: 1
-    # includedead 1 active 2 all 3 dead 4 highlight 5 bookmark 6 onlyups 7 freeleech 8 multi2 9 multi5 10 multi10 11 25%dl 12 50%dl 13 75%dl
-    suchein: 2
-    # cat 1 all 1000 film 2000 tv 3000 docs 4000 sport 5000 xxx 6000 games 7000 apps 8000 music 9000 other
-    sucheaus: 1
-    sortierenach: "{{ .Config.sort }}"
-    sortierung: "{{ .Config.type }}"
+    # allCats=1000&categories[]=1010&categories[]=1020&search=&limit=1&searchIn=0&orderBy=1&order=1
+    $raw: "{{ if .Categories }}{{ range .Categories }}categories[]={{.}}&{{end}}{{ else }}{{ end }}"
+    # cat: (empty) all, 1000 film, 2000 tv, 3000 docs, 4000 sport, 5000 xxx, 6000 games, 7000 apps, 8000 music, 9000 other
+    allCats: ""
+    search: "{{ .Keywords }}"
+    # 1 25, 2 50, 3 75, 4 100
+    limit: 1
+    # searchin: 0 all, 1 active, 2 dead, 3 highlights, 4 bookmarks, 5 uploads, 10 bots, 11 onlyupload, 12 multiplier, 13 %download, 14 freeleech
+    # note: freeleech on this site means download and upload is not counted, whereas OU means download is free and upload is counted
+    # 14 yields no freeleech, but 11 returns results
+    searchin: "{{ if .Config.freeleech }}11{{ else }}0{{ end }}"
+    orderBy: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+  headers:
+    x-requested-with: ["XMLHttpRequest"]

  rows:
-    selector: table.tableinborder[border="0"][cellspacing="0"][cellpadding="0"] tr
+    selector: table.tableinborder tr:has(.catPic)

  fields:
    category:
-      selector: a.bt-cat
-      attribute: href
+      selector: td.catPic > img
+      attribute: src
      filters:
        - name: regexp
-          args: (\d+)$
+          args: (\d+).png$
    title:
-      selector: a.tor-name
+      selector: a[href^="details.php?id="]
    details:
-      selector: a.tor-name
+      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: div.tor-metadl a
-      attribute: href
-    banner:
-      selector: div[id^="details-"] img
-      attribute: src
+      # a[onlick="downloadTorrent(383718);"] --> a[href="download.php?torrent=383559"]
+      selector: td.tdl > a
+      attribute: onclick
+      filters:
+        - name: regexp
+          args: (\d+)
+        - name: prepend
+          args: "download.php?torrent="
    seeders:
-      selector: div.tor-seeder
+      selector: td.peers:has(i[title="Seeders"])
    leechers:
-      selector: div.tor-leecher
+      selector: td.peers:has(i[title="Leechers"])
    grabs:
-      selector: div.tor-snatcher
+      selector: td.peers:has(i[title="Snatchers"])
      # 2 flavours of dates
    date:
-      # Heute 13:30:04
-      # Gestern 09:10:10
-      selector: div.tor-date:not(:contains("."))
-      optional: true
-      filters:
-        - name: replace
-          args: ["Heute", "Today"]
-        - name: replace
-          args: ["Gestern", "Yesterday"]
-    date:
-      # &nbsp;&nbsp;27.05.2019 <b>12:52:11</b>
-      selector: div.tor-date:contains(".")
+      # &nbsp;Heute 13:30:04
+      # &nbsp;Gestern 22:44:23
+      selector: td.added:not(:contains("."))
      optional: true
      filters:
        - name: replace
          args: ["\u00a0", ""]
-        - name: dateparse
-          args: "02.01.2006 15:04:05"
-    size:
-      selector: div.tor-size
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
+        - name: fuzzytime
+    date:
+      # &nbsp;24.05.2019 20:15:38
+      selector: td.added:contains(".")
+      optional: true
      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    size:
+      selector: td.size
+      filters:
+        - name: replace
+          args: ["\u00a0", ""]
        - name: replace
          args: [".", ""]
        - name: replace
          args: [",", "."]
    downloadvolumefactor:
      case:
-        font.ou: 0 # only upload is counted
-        font.fl: 0 # freeleech neither dl or ul is counted
+        "span:contains(\"OU\")": 0 # only upload is counted
+        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted (identity unconfirmed)
+        "span:contains(\"%25\")": .25 # 75% free
+        "span:contains(\"%50\")": .5 # 50% free
+        "span:contains(\"%75\")": .75 # 25% free
        "*": 1
    uploadvolumefactor:
      case:
-        "font.mu:contains(\"2x\")": 2
-        "font.mu:contains(\"5x\")": 5
-        "font.mu:contains(\"10x\")": 10
-        font.fl: 0 # freeleech neither dl or ul is counted
+        "span:contains(\"2x\")": 2
+        "span:contains(\"5x\")": 5
+        "span:contains(\"10x\")": 10
+        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted
        "*": 1
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # engine n/a
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -13,12 +13,10 @@ caps:
    # E-book
    - {id: 40, cat: Books, desc: "E-book/Eng"}
    - {id: 19, cat: Books, desc: "E-book/Hun"}
-
    # Játék
    - {id: 38, cat: Console, desc: "Játék/Consol"}
    - {id: 15, cat: PC/Games, desc: "Játék/ISO"}
    - {id: 37, cat: PC/Games, desc: "Játék/Rip"}
-
    # Filmek
    - {id: 51, cat: Movies/SD, desc: "Cam/Eng"}
    - {id: 50, cat: Movies/SD, desc: "Cam/Hun"}
@@ -32,19 +30,15 @@ caps:
    - {id: 5, cat: TV, desc: "Sorozat/Hun"}
    - {id: 4, cat: Movies/SD, desc: "Xvid/Eng"}
    - {id: 3, cat: Movies/SD, desc: "Xvid/Hun"}
-
    # Zene
    - {id: 12, cat: Audio, desc: "Zene/Eng"}
    - {id: 13, cat: Audio, desc: "Zene/Hun"}
-
    # Egyéb
    - {id: 20, cat: Other, desc: "Képek"}
-    - {id: 21, cat: PC/Phone-Other, desc: "Mobil"}
-
+    - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"}
    # Program
    - {id: 22, cat: PC/0day, desc: "Win/Program/ISO"}
    - {id: 23, cat: PC/0day, desc: "Win/Program/Rip"}
-
    # Felnőtt tartalom
    - {id: 9, cat: XXX, desc: "XXX/Film"}
    - {id: 10, cat: XXX, desc: "XXX/Kép"}
@@ -55,6 +49,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: info_alert
@@ -68,23 +63,26 @@ settings:
    type: info
    label: How to get the Cookie
    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "4"
+    default: 4
    options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  method: cookie
@@ -97,6 +95,8 @@ search:
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 freeleech
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"

@@ -120,8 +120,7 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: a[href^="torrent.php?id="][onmouseover]
      attribute: onmouseover
      filters:
@@ -137,6 +136,11 @@ search:
      selector: td:nth-child(7)
    date:
      selector: "a[style=\"font-size: 8pt;cursor: pointer;\"][title]"
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
    downloadvolumefactor:
      case:
        img[title="Ingyenes letöltés"]: 0
@@ -146,4 +150,5 @@ search:
      filters:
        - name: replace
          args: ["Feltöltési szorzó × ", ""]
+# minimumseedtime: there is no mandatory seed time
 # engine n/a
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@@ -38,14 +38,15 @@ caps:
    - {id: 38, cat: Audio/Lossless, desc: "Lossless/Eng"}
    - {id: 22, cat: PC, desc: "Programok/egyéb"}
    - {id: 21, cat: PC, desc: "Játékok/Rip/Dox"}
-    - {id: 32, cat: Console/Xbox360, desc: "Játékok/Xbox360"}
+    - {id: 32, cat: Console/XBox 360, desc: "Játékok/Xbox360"}
    - {id: 27, cat: Other, desc: "Klipek"}

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

 login:
  path: takelogin.php
@@ -63,7 +64,7 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    incldead: 1

  rows:
@@ -96,7 +97,7 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-    banner:
+    poster:
      selector: a[onmouseover^="bithumen.UI.images.coverShow"]
      attribute: onmouseover
      filters:
@@ -122,7 +123,7 @@ search:
    size:
      selector: td:nth-child(6) > u
    downloadvolumefactor:
-      text: "1"
+      text: 1
    downloadvolumefactor:
      optional: true
      selector: td:nth-child(6) > nobr > font:contains(" × ")
@@ -130,7 +131,7 @@ search:
        - name: replace
          args: ["×", ""]
    uploadvolumefactor:
-      text: "1"
+      text: 1
    uploadvolumefactor:
      optional: true
      selector: td:nth-child(5) > nobr > font:contains(" × ")
--- a/src/Jackett.Common/Definitions/bitru.yml
+++ b/src/Jackett.Common/Definitions/bitru.yml
@@ -6,50 +6,51 @@ language: ru-ru
 type: public
 encoding: UTF-8
 links:
-  - http://bitru.org/ # site forces http, https is not supported
+  - https://bitru.org/
+legacylinks:
+  - http://bitru.org/ # site forces https

 caps:
-  categories:
-    "movie": Movies
-    "serial": TV
-    "music": Audio
-    "game": PC/Games
-    "soft": PC
-    "literature": Books
-    "audiobook": Audio/Audiobook
-    "video": Movies
-    "image": Other
-    "xxx": XXX
+  categorymappings:
+    - {id: movie, cat: Movies, desc: Movie}
+    - {id: serial, cat: TV, desc: Serial}
+    - {id: music, cat: Audio, desc: Music}
+    - {id: game, cat: PC/Games, desc: Game}
+    - {id: soft, cat: PC, desc: Software}
+    - {id: literature, cat: Books, desc: Literature}
+    - {id: audiobook, cat: Audio/Audiobook, desc: Audiobook}
+    - {id: video, cat: Movies, desc: Movies}
+    - {id: image, cat: Other, desc: Image}
+    - {id: xxx, cat: XXX, desc: xxx}

  modes:
    search: [q]
+    tv-search: [q]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: adverts
-    type: select
+    type: checkbox
    label: Include Advertising
-    default: "_"
-    options:
-      "_": "yes"
-      "no": "no"
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
-    default: "_"
+    default: _
    options:
-      "_": "created"
-      "seeders": "seeders"
-      "size": "size"
+      _: created
+      seeders: seeders
+      size: size

 search:
  paths:
    - path: browse.php
  inputs:
    s: "{{ .Keywords }}"
-    rek: "{{ re_replace .Config.adverts \"_\" \"\" }}"
    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
+    $raw: "{{ if .Config.adverts }}{{ else }}&rek=no{{ end}}"

  rows:
    selector: table.browse-list > tbody > tr
@@ -79,7 +80,7 @@ search:
      filters:
        - name: replace
          args: ["Присутствует реклама", "Contains Adverts"]
-    banner:
+    poster:
      selector: a[href^="details.php?id="]
      attribute: onmouseover
      filters:
@@ -130,8 +131,10 @@ search:
          args: ["ноября", "November"]
        - name: replace
          args: ["декабря", "December"]
+        - name: append
+          args: " +03:00" # MSK
        - name: dateparse
-          args: "02 January 2006 15:04"
+          args: "02 January 2006 15:04 -07:00"
    size:
      selector: td:nth-child(3)
      filters:
--- a/src/Jackett.Common/Definitions/bitspyder.yml
+++ b/src/Jackett.Common/Definitions/bitspyder.yml
@@ -23,14 +23,14 @@ caps:
    - {id: 63, cat: Books, desc: "College"}
    - {id: 53, cat: Books, desc: "Cooking"}
    - {id: 42, cat: Books, desc: "Documentary"}
-    - {id: 37, cat: Books/Ebook, desc: "e-Books"}
+    - {id: 37, cat: Books/EBook, desc: "e-Books"}
    - {id: 65, cat: Books, desc: "Engineering"}
    - {id: 54, cat: Books, desc: "Health-Fitness"}
    - {id: 64, cat: Books, desc: "Kids"}
    - {id: 47, cat: Books, desc: "Languages"}
    - {id: 49, cat: Books, desc: "Linux CBTs"}
    - {id: 43, cat: Books, desc: "Lynda.com"}
-    - {id: 57, cat: Books/Magazines, desc: "Magazines"}
+    - {id: 57, cat: Books/Mags, desc: "Magazines"}
    - {id: 71, cat: Books, desc: "Pluralsight"}
    - {id: 60, cat: Books, desc: "Medical"}
    - {id: 44, cat: Books, desc: "Misc Learning"}
@@ -45,9 +45,9 @@ caps:
    - {id: 45, cat: Books, desc: "Ethical hacking"}
    - {id: 59, cat: Books, desc: "WEB | SocialMedia"}

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

 settings:
  - name: username
@@ -59,19 +59,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "8"
+    default: 8
    options:
-      "8": "created"
-      "6": "seeders"
-      "4": "size"
-      "1": "title"
+      8: created
+      6: seeders
+      4: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
  - name: info
    type: info
    label: Results Per Page
@@ -94,9 +94,9 @@ search:
    - path: browse.php
  inputs:
    search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead
+    # 0 active, 1 incldead, 2 onlydead
    incldead: 1
-    # 0 title 1 default
+    # 0 title, 1 default
    scope: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -149,7 +149,7 @@ search:
        - name: replace
          args: ["\xA0", " "]
        - name: append
-          args: " +00:00"
+          args: " +00:00" # GMT
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -159,17 +159,19 @@ search:
      filters:
        - name: replace
          args: ["Upploaded at - ", ""]
+        - name: replace
+          args: ["\xA0", " "]
        - name: append
-          args: " +00:00"
+          args: " +00:00" # GMT
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    description:
      optional: true
      selector: font[color="#990000"]
+    minimumratio:
+      text: 1.0
 # custom v4
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -12,7 +12,6 @@ legacylinks:

 caps:
  categorymappings:
-    - {id: 69, cat: Movies, desc: "BiTTuRK Altın"}
    - {id: 56, cat: Movies, desc: "BTRG"}
    - {id: 57, cat: Movies, desc: "Yerli Dizi"}
    - {id: 62, cat: Movies, desc: "Yab@ncı Dizi"}
@@ -21,12 +20,15 @@ caps:
    - {id: 66, cat: Movies/HD, desc: "x265"}
    - {id: 67, cat: XXX, desc: "XxX"}
    - {id: 68, cat: Movies, desc: "Dual (TR-~)"}
+    - {id: 71, cat: Movies, desc: "NFLIX"}
    - {id: 58, cat: Movies, desc: "Film"}
    - {id: 72, cat: Movies, desc: "Belgesel"}
    - {id: 60, cat: Movies/3D, desc: "3D"}
-    - {id: 45, cat: Movies, desc: "Eğitim / Prog "}
+    - {id: 76, cat: Movies/UHD, desc: "4K UHD"}
+    - {id: 45, cat: Movies, desc: "Eğitim / Prog"}
    - {id: 1, cat: Movies, desc: "Filmler"}
    - {id: 14, cat: Movies/3D, desc: "3D Film"}
+    - {id: 77, cat: Movies/UHD, desc: "4K UHD"}
    - {id: 16, cat: Movies, desc: "Animasyon"}
    - {id: 17, cat: TV/Anime, desc: "Anime"}
    - {id: 31, cat: Movies, desc: "Belgesel"}
@@ -42,13 +44,15 @@ caps:
    - {id: 41, cat: Movies, desc: "ViP"}
    - {id: 42, cat: Movies/SD, desc: "XviD"}
    - {id: 43, cat: Movies/SD, desc: "XviD BoX"}
-    - {id: 55, cat: Movies/WEBDL, desc: "WEB-DL"}
+    - {id: 55, cat: Movies/WEB-DL, desc: "WEB-DL"}
    - {id: 7, cat: Audio, desc: "Müzik"}
    - {id: 20, cat: Audio, desc: "Türkçe MüziK"}
    - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
    - {id: 21, cat: Audio/Video, desc: "Video Klipler"}
    - {id: 2, cat: Console, desc: "Oyun"}
-    - {id: 6, cat: PC, desc: "Program / Misc "}
+    - {id: 74, cat: PC, desc: "PC"}
+    - {id: 73, cat: Console, desc: "SONY-PS"}
+    - {id: 6, cat: PC, desc: "Program"}
    - {id: 47, cat: Other, desc: "Resimler"}
    - {id: 48, cat: TV, desc: "Televizyon"}
    - {id: 49, cat: TV/HD, desc: "Tv HD"}
@@ -61,6 +65,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: username
@@ -69,6 +74,10 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
  - name: info
    type: info
    label: Layout
@@ -76,18 +85,18 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "added"
+    default: added
    options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
+      added: created
+      seeders: seeders
+      size: size
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: ?p=home&pid=1
@@ -122,6 +131,7 @@ search:
    pid: 32
    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
    keywords: "{{ .Keywords }}"
+    # name, description, both, uploader
    search_type: name
    searchin: title
    "sortOptions[sortBy]": "{{ .Config.sort }}"
@@ -130,7 +140,7 @@ search:
    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))

  rows:
-    selector: table#torrents_table_classic tr:has(td.torrent_name)
+    selector: "table#torrents_table_classic tr:has(td.torrent_name){{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"

  fields:
    title:
@@ -154,8 +164,10 @@ search:
      filters:
        - name: regexp
          args: "Uploaded (.+?) by"
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
-          args: "02-01-2006 15:04"
+          args: "02-01-2006 15:04 -07:00"
    date:
      optional: true
      # Uploaded Friday at 05:11 by
@@ -167,6 +179,8 @@ search:
          args: "Uploaded (.+?) by"
        - name: replace
          args: [" at ", " "]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
    size:
      selector: a[rel="torrent_size"]
    seeders:
@@ -175,16 +189,21 @@ search:
      selector: a[rel="torrent_leechers"]
    grabs:
      selector: a[rel="times_completed"]
-    banner:
+    poster:
      selector: a[rel="fancybox"]
-      optional: true
      attribute: href
    downloadvolumefactor:
      case:
-        "img[src$=\"/torrent_free.png\"]": 0.5
+        "img[src$=\"/silver.gif\"]": 0.5
+        "img[src$=\"/torrent_free.png\"]": 0
        "*": 1
    uploadvolumefactor:
      case:
        "img[src$=\"/torrent_multiple_upload.png\"]": 2
        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 day (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # TSUE 2.2
--- a/src/Jackett.Common/Definitions/bluebird.yml
+++ b/src/Jackett.Common/Definitions/bluebird.yml
@@ -80,7 +80,7 @@ search:
      selector: td:nth-child(5)
    leechers:
      selector: td:nth-child(6)
-    banner:
+    poster:
      selector: a.tname
      attribute: onmouseover
      filters:
--- a/src/Jackett.Common/Definitions/blutopia.yml
+++ b/src/Jackett.Common/Definitions/blutopia.yml
@@ -12,12 +12,11 @@ caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Movies, desc: "FANRES"}
-    - {id: 6, cat: TV/Anime, desc: "Anime"}
-    - {id: 7, cat: Movies/Other, desc: "Trailer"}
+    - {id: 3, cat: Movies/Other, desc: "FANRES"}
+    - {id: 5, cat: Movies/Other, desc: "Trailer"}

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

@@ -28,22 +27,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login
@@ -63,30 +66,31 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]

-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
  paths:
+    # https://blutopia.xyz/torrents/filter?
+    # search=&description=&keywords=&uploader=&imdb=&tvdb=&view=list&tmdb=&mal=&igdb=
+    # &start_year=&end_year=&categories%5B%5D=3&sorting=seeders&direction=asc&page=0&qty=25
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
+    keywords: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
    tvdb: "{{ .Query.TVDBID }}"
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
    selector: table > tbody > tr
@@ -99,23 +103,21 @@ search:
        - name: regexp
          args: "/categories/(\\d+)"
    title:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
    download:
      selector: a[href*="/download/"]
      attribute: href
    details:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: div.torrent-poster img
      attribute: src
      filters:
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -128,47 +130,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
-      optional: true
      selector: a[href*="themoviedb.org/movie/"]
      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # 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|преди|前)", " ago"]
+          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)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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)", "hours"]
+          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|小时|時間)", " hour"]
+          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)", "days"]
+          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)", "weeks"]
+          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|седмица|周|週間)", " week"]
+          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)", "months"]
+          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|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
@@ -188,4 +193,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# UNIT3D 2.7.0b
+# UNIT3D 5.1.0b
--- a/src/Jackett.Common/Definitions/booktracker.yml
+++ b/src/Jackett.Common/Definitions/booktracker.yml
@@ -10,10 +10,11 @@ links:

 caps:
  categorymappings:
-    - {id: 1, cat: Books/Ebook, desc: "Ebooks"}
+    - {id: 1, cat: Books/EBook, desc: "Ebooks"}

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

 settings:
  - name: username
@@ -25,19 +26,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "1"
+    default: 1
    options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login.php
@@ -70,8 +71,12 @@ search:

  rows:
    selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
+    filters:
+      - name: andmatch

  fields:
+    category:
+      text: 1
    title:
      selector: a.tLink
    details:
@@ -80,8 +85,6 @@ search:
    download:
      selector: a[href^="./download.php?id="]
      attribute: href
-    category:
-      text: 1
    size:
      selector: td:nth-child(6) > u
    seeders:
--- a/src/Jackett.Common/Definitions/bootytape.yml
+++ b/src/Jackett.Common/Definitions/bootytape.yml
@@ -0,0 +1,136 @@
+---
+id: bootytape
+name: BootyTape
+language: en-us
+description: "BootyTape is a Semi-Private site for 3X"
+type: semi-private
+encoding: UTF-8
+links:
+  - https://ssl.bootytape.com/
+
+caps:
+  categorymappings:
+    - {id: 70, cat: XXX, desc: "Animation"}
+    - {id: 22, cat: XXX, desc: "Girl on Girl"}
+    - {id: 43, cat: XXX, desc: "Images"}
+    - {id: 52, cat: XXX, desc: "Straight"}
+    - {id: 82, cat: XXX, desc: "X Play Hard"}
+    - {id: 92, cat: XXX, desc: "X Play Soft"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    take_login: 1
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.mainouter2:has(h1:contains("Failed"))
+  test:
+    path: my.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://ssl.bootytape.com/torrents.php?search=onlyfans&tagsearch=&cat=0&tags=1
+    - path: torrents.php
+  inputs:
+    search: "{{ .Keywords }}"
+    tagsearch: ""
+    # 0 all
+    cat: 0
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # tags search mode: 1 AND, 2 OR
+    tags: 1
+    # incldead=2 for search unseeded
+    # descr=1 for search description
+    # double=1 for search double seed bonus
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.red > tbody > tr:not(:has(th))
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    description:
+      selector: div.specg
+    poster:
+      selector: img[src*="/thbx/imgx/"]
+      attribute: src
+    files:
+      text: 1
+    files:
+      selector: a[href$="filelist=1"]
+      optional: true
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      text: 0
+    seeders:
+      selector: a[href$="toseeders=1"]
+      optional: true
+    leechers:
+      text: 0
+    leechers:
+      selector: a[href$="todlers=1"]
+      optional: true
+    date:
+      text: now
+    downloadvolumefactor:
+      case:
+        "img[src$=\"pic/freedownload.gif\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "img[src$=\"pic/double-upload.gif\"]": 2
+        "*": 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/borgzelle.yml
+++ b/src/Jackett.Common/Definitions/borgzelle.yml
@@ -0,0 +1,216 @@
+---
+id: borgzelle
+name: Borgzelle
+description: "Borgzelle is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-de
+type: private
+encoding: UTF-8
+links:
+  - https://borgzelle.borg/
+certificates:
+  - a3f8822c97fbfe5bd00760cf8e6b75c4284f657d # self signed
+
+caps:
+  categorymappings:
+    - {id: 17, cat: TV/Sport, desc: "Sport"}
+    - {id: 32, cat: TV, desc: "Serien-Pakete"}
+    - {id: 12, cat: TV, desc: "Serien"}
+    - {id: 14, cat: Audio/Video, desc: "Musikvideo"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku"}
+    - {id: 16, cat: TV/Other, desc: "Comedy"}
+    - {id: 18, cat: TV/Anime, desc: "Anime"}
+    - {id: 6, cat: Movies/SD, desc: "Movie XviD/DivX"}
+    - {id: 34, cat: Movies/UHD, desc: "Movie UHD"}
+    - {id: 13, cat: Movies, desc: "Movie Kinder"}
+    - {id: 11, cat: Movies/HD, desc: "Movie HD2DVD"}
+    - {id: 9, cat: Movies/HD, desc: "Movie HD"}
+    - {id: 33, cat: Movies/HD, desc: "Movie h265"}
+    - {id: 7, cat: Movies/HD, desc: "Movie h264"}
+    - {id: 10, cat: Movies/DVD, desc: "Movie DVD"}
+    - {id: 28, cat: PC/Games, desc: "Spiele PDA/Handy"}
+    - {id: 25, cat: PC/Games, desc: "Spiele PC"}
+    - {id: 27, cat: PC/Games, desc: "Spiele MAC"}
+    - {id: 26, cat: Console, desc: "Spiele Konsolen"}
+    - {id: 30, cat: Other, desc: "Diverse Wallpaper"}
+    - {id: 31, cat: Other, desc: "Sonstiges"}
+    - {id: 29, cat: Books/EBook, desc: "E-Book"}
+    - {id: 19, cat: Audio, desc: "Musik"}
+    - {id: 20, cat: Audio/Audiobook, desc: "Hörbuch"}
+    - {id: 21, cat: PC/0day, desc: "Software Windows"}
+    - {id: 23, cat: PC/Mobile-Other, desc: "Software PDA/Handy"}
+    - {id: 22, cat: PC/Mac, desc: "Software MAC"}
+    - {id: 24, cat: PC, desc: "Software Linux"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_sitelink
+    type: info
+    label: About Site Link
+    default: If the Site Link domain returns a DNS error then you have not yet been assimilated.
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    keeplogged: 1
+  error:
+    - selector: font[color="red"]
+  test:
+    path: index.php
+    selector: a[href^="logout.php?auth="]
+
+search:
+  paths:
+    # https://borgzelle.borg/browse.php?action=browse&showsearch=1&c34=1&c9=1&search=&incldead=0&orderby=added&sort=desc
+    - path: browse.php
+  inputs:
+    action: browse
+    showsearch: 1
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 all, 1 active, 2 dead
+    incldead: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # the site does not support imdbid searching or present imdb links in results
+
+  rows:
+    selector: "table[style=\"width: 100%;\"] > tbody > tr{{ if .Config.freeleech }}:has(span:contains(\"[OnlyUpload]\")){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents.php?torrentid="]
+    details:
+      selector: a[href^="torrents.php?torrentid="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents.php?torrentid="] span img
+      attribute: src
+    date:
+      # 17.10. 18:34 (vor 2 Stunden und 57 Minuten)
+      selector: td:nth-child(2) > table > tbody > tr > td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "\\((.+?)\\)"
+        # 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
+    size:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) b
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    files:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) a span
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) a span
+      filters:
+        - name: regexp
+          args: (\d+)
+    leechers:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) a span:nth-child(2)
+      filters:
+        - name: regexp
+          args: (\d+)
+    grabs:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) a span
+      filters:
+        - name: regexp
+          args: (\d+)
+    downloadvolumefactor:
+      case:
+        "span:contains(\"[OnlyUpload]\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.7
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# Gazelle
--- a/src/Jackett.Common/Definitions/boxingtorrents.yml
+++ b/src/Jackett.Common/Definitions/boxingtorrents.yml
@@ -10,6 +10,7 @@ links:

 caps:
  categorymappings:
+    - {id: 17, cat: TV/Sport, desc: "4K"}
    - {id: 15, cat: TV/Sport, desc: "3D"}
    - {id: 9, cat: TV/Sport, desc: "Amateur - Full"}
    - {id: 16, cat: TV/Sport, desc: "Blu-ray"}
@@ -38,22 +39,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "added"
+    default: added
    options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "DESC"
+    default: DESC
    options:
-      "DESC": "desc"
-      "ASC": "asc"
+      DESC: desc
+      ASC: asc
  - name: info_download
    type: info
    label: "Download Restrictions"
@@ -81,9 +86,11 @@ search:
    # https://tc-boxing.com/browse.php?search=tyson&cat=0&incldead=1
    - path: browse.php
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
-    # 0 active 1 incldead 2 onlydead
+    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
+    # 1 incldead, null active
    incldead: 1
+    # 1 freeleech only, null all
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
    search: "{{ .Keywords }}"
    sort: "{{ .Config.sort }}"
    d: "{{ .Config.type }}"
@@ -111,8 +118,10 @@ search:
    date:
      selector: td:nth-last-child(6)
      filters:
+        - name: append
+          args: " -07:00" # PDT
        - name: dateparse
-          args: "2006-01-0215:04:05"
+          args: "2006-01-0215:04:05 -07:00"
    size:
      selector: td:nth-last-child(5)
    grabs:
@@ -130,4 +139,9 @@ search:
        "*": 1
    uploadvolumefactor:
      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 day (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # engine n/a
--- a/src/Jackett.Common/Definitions/brasiltracker.yml
+++ b/src/Jackett.Common/Definitions/brasiltracker.yml
@@ -2,20 +2,20 @@
 id: brasiltracker
 name: BrasilTracker
 description: "BrasilTracker is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-us
+language: pt-br
 encoding: UTF-8
 type: private
 links:
  - https://brasiltracker.org/

 caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Filmes/Series/Música"}
+  categories:
+    Other: Other

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

 settings:
  - name: username
@@ -24,29 +24,33 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: info_8000
+    type: info
+    label: About BrasilTracker Categories
+    default: BrasilTracker does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "time"
+    default: time
    options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
+      time: created
+      seeders: seeders
+      size: size
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
  - name: info_results
    type: info
    label: "Search results"
    default: "This indexer does not support <b>Torrent Groups</b><br />Un-tick the <b>Torrent grouping</b><i> (Habilitar Grupo de Torrents)</i> checkbox in your <b>Configurações</b>."
-  - name: info_categories
-    type: info
-    label: "About categories"
-    default: "BrasilTracker does not show <b>Categories</b> in its Search Results.<br />To use this indexer with Sonarr/Radarr set your indexer category to <b>7000</b>."

 login:
  path: login.php
@@ -64,13 +68,16 @@ login:

 search:
  paths:
-    # torrents.php?searchstr=mandalorain&order_by=size&order_way=desc&action=basic&searchsubmit=1
+    # https://brasiltracker.org/torrents.php?order_by=time&order_way=desc&freetorrent=1&filter_cat[6]=1&filter_cat[3]=1&action=basic&searchsubmit=1
+    # https://brasiltracker.org/torrents.php?searchstr=mandalorain&order_by=size&order_way=desc&action=basic&searchsubmit=1
+    # https://brasiltracker.org/torrents.php?searchstr=tt8179024&order_by=time&order_way=desc&action=basic&searchsubmit=1
    - path: torrents.php
  inputs:
-    searchstr: "{{ .Keywords }}"
+    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    order_by: "{{ .Config.sort }}"
    order_way: "{{ .Config.type }}"
    action: basic
+    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
    searchsubmit: 1

  rows:
@@ -78,9 +85,7 @@ search:

  fields:
    category:
-      text: 1
-    title:
-      selector: a[href^="torrents.php?id="]
+      text: Other
    details:
      selector: a[href^="torrents.php?id="]
      attribute: href
@@ -89,17 +94,22 @@ search:
      attribute: href
    description:
      selector: div.tags
-    banner:
+    poster:
      selector: img[alt="Cover"]
      attribute: src
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
    files:
      selector: td:nth-child(3)
    date:
      selector: span.time
      attribute: title
      filters:
+        - name: append
+          args: " -03:00" # BRT
        - name: dateparse
-          args: "Jan 2 2006, 15:04"
+          args: "Jan 2 2006, 15:04 -07:00"
    size:
      selector: td:nth-child(5)
    grabs:
@@ -113,6 +123,18 @@ search:
        strong.tl_free: 0
        "*": 1
    uploadvolumefactor:
-      case:
-        "*": 1
-# engine n/a
+      text: 1
+    title_details:
+      selector: div.torrent_info
+      remove: strong
+    title:
+      selector: a[href^="torrents.php?id="]
+      filters:
+        - name: append
+          args: " {{ .Result.title_details }}"
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# Project Gazelle
--- a/src/Jackett.Common/Definitions/broadcity.yml
+++ b/src/Jackett.Common/Definitions/broadcity.yml
@@ -6,9 +6,9 @@ language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - http://broadcity.in/ # site is forcing to http
+  - https://broadcity.in/ # site is forcing to https
 legacylinks:
-  - https://broadcity.in/
+  - http://broadcity.in/

 caps:
  categorymappings:
@@ -58,13 +58,6 @@ login:
    path: index.php
    selector: a[href*="/logout.php?logouthash="]

-ratio:
-  path: index.php
-  selector: div#top div:nth-child(2) span:nth-child(2)
-  filters:
-    - name: regexp
-      args: "Ratio: (.+?) Bonus:"
-
 search:
  paths:
    - path: browse.php
@@ -83,6 +76,12 @@ search:
    selector: table#sortabletable tbody tr:has(div[id^="port-target-"])

  fields:
+    category:
+      selector: a[href*="browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
    title:
      selector: div[id^="port-target-"] a
      filters:
@@ -91,13 +90,10 @@ search:
    details:
      selector: div[id^="port-target-"] a
      attribute: href
-    category:
-      selector: a[href*="browse.php?category="]
+    download:
+      selector: a[href*="download.php?id="]
      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    banner:
+    poster:
      selector: div[id^="port-content-"] img
      attribute: src
    date:
@@ -106,14 +102,10 @@ search:
        - name: regexp
          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
      filters:
+        - name: append
+          args: " +03:00" # TRT
        - name: dateparse
-          args: "02-01-2006 15:04"
-    download:
-      selector: a[href*="download.php?id="]
-      attribute: href
-    comments:
-      selector: td:nth-child(4) a
-      attribute: href
+          args: "02-01-2006 15:04 -07:00"
    size:
      selector: td:nth-child(5)
    grabs:
--- a/src/Jackett.Common/Definitions/bt4g.yml
+++ b/src/Jackett.Common/Definitions/bt4g.yml
@@ -0,0 +1,77 @@
+---
+id: bt4g
+name: BT4G
+description: "BT4G is a Public metadata crawler for magnets"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://bt4g.org/
+
+caps:
+  categories:
+    Application: PC
+    Archive file: Other
+    Audio: Audio
+    Doc: Books
+    Other: Other
+    Video: Movies
+    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://bt4g.org/search/2021
+    # site does not support cat search
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.row > div.col > div:has(h5)
+
+  fields:
+    title:
+      selector: a
+    category:
+      selector: span.cpill
+    category:
+      # add tv to video
+      optional: true
+      selector: span.cpill
+      filters:
+        - name: replace
+          args: ["Video", "TV"]
+    details:
+      selector: a
+      attribute: href
+    infohash:
+      selector: a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/magnet/", ""]
+    date:
+      selector: span:nth-last-child(5) b
+      filters:
+        - name: dateparse
+          args: "2006-01-02"
+    files:
+      selector: span:nth-last-child(4) b
+    size:
+      selector: span:nth-last-child(3) b
+    seeders:
+      selector: span:nth-last-child(2) b
+    leechers:
+      selector: span:nth-last-child(1) b
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -7,11 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
+  # update poster placeholder link too
  - https://btdb.eu/
-  - https://btdb.unblocked.bar/
-  - https://btdb.proxyportal.pw/
-  - https://btdb.uk-unblock.pro/
-  - https://btdb.unblockit.win/
+  - https://btdb.unblockit.link/
 legacylinks:
  - https://btdb.to/
  - https://btdb.unblocked.app/
@@ -26,44 +24,59 @@ legacylinks:
  - https://btdb.unblockit.me/
  - https://btdb.unblockit.pw/
  - https://btdb.unblockit.id/
+  - https://btdb.unblockit.win/
+  - https://btdb.unblocked.bar/
+  - https://btdb.proxyportal.pw/
+  - https://btdb.uk-unblock.pro/
+  - https://btdb.unblockit.top/
+  - https://btdb.unblockit.lat/
+  - https://btdb.unblockit.app/
+  - https://btdb.unblockit.dev/
+  - https://btdb.unblockit.ltd/

 caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Other"}
+  categories:
+    Other: Other

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

 settings:
-  - name: info
+  - name: flaresolverr
    type: info
-    label: Category for Sonarr and Radarr
-    default: BTDB does not use categories. In your Sonarr or Radarr Torznab Indexer settings, set the category to 100001.
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
+  - name: info_8000
+    type: info
+    label: About BTDB Categories
+    default: BTDB does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
  - name: sort
    type: select
    label: Sort requested from site
-    default: "time"
+    default: time
    options:
-      "time": "created"
-      "length": "size"
-      "seeders": "seeders"
+      time: created
+      length: size
+      seeders: seeders

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=2"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=3"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=4"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=5"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=2"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=3"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=4"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=5"

  rows:
    selector: div.media

  fields:
    category:
-      text: 1
+      text: Other
    title:
      selector: a[href*="/torrent/"]
      attribute: title
@@ -78,12 +91,16 @@ search:
    magnet:
      selector: a[href^="magnet:?xt="]
      attribute: href
-    banner:
+    poster:
      selector: a.img-thumbnail img
      attribute: src
      filters:
        - name: replace
-          args: ["https://btdb.io/assets/img/placeholder.png", ""]
+          args: ["https://btdb.eu/assets/img/placeholder.png", ""]
+    date:
+      selector: small:nth-of-type(5) strong
+      filters:
+        - name: timeago
    size:
      selector: small:nth-of-type(1) strong
    files:
@@ -98,10 +115,6 @@ search:
      filters:
        - name: replace
          args: [",", ""]
-    date:
-      selector: small:nth-of-type(5) strong
-      filters:
-        - name: timeago
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/btdigg.yml
+++ b/src/Jackett.Common/Definitions/btdigg.yml
@@ -10,24 +10,28 @@ links:

 caps:
  categories:
-    1: Other
+    Other: Other

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

 settings:
-  - name: info
+  - name: info_8000
    type: info
-    default: BTDigg does not use categories. In your software Indexer settings, set the category to 7000.
+    label: About BTDigg Categories
+    default: BTDigg does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
  - name: sort
    type: select
    label: Sort requested from site
-    default: "2"
+    default: 0
    options:
-      "2": "created"
-      "3": "size"
+      0: relevance
+      2: created
+      3: size

 search:
  # https://btdig.com/search?q=test&order=2
@@ -35,7 +39,7 @@ search:
  paths:
    - path: search
  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{else}}test{{end}}"
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}test{{ end }}"
    # 0 relevance 2 age 3 size 4 files
    order: "{{ .Config.sort }}"

@@ -45,10 +49,10 @@ search:
      - name: andmatch

  fields:
+    category:
+      text: Other
    title:
      selector: div.torrent_name a
-    category:
-      text: 1
    details:
      selector: div.torrent_name a
      attribute: href
--- a/src/Jackett.Common/Definitions/btetree.yml
+++ b/src/Jackett.Common/Definitions/btetree.yml
@@ -12,28 +12,28 @@ legacylinks:

 caps:
  categories:
-    "Music": Audio/Lossless
+    Music: Audio/Lossless

  modes:
    search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]

 settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "added"
+    default: added
    options:
-      "added": "created"
-      "seeders": "seeders"
-      "name": "title"
+      added: created
+      seeders: seeders
+      name: title

 search:
  paths:
    # http://bt.etree.org/?searchzzzz=&cat=0
    - path: /
  inputs:
-    searchzzzz: "{{ if .Query.Artist }}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+    searchzzzz: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
    cat: 0
    sort: "{{ .Config.sort }}"

@@ -44,7 +44,7 @@ search:

  fields:
    category:
-      text: "Music"
+      text: Music
    title:
      selector: a.details_link
    details:
@@ -55,9 +55,6 @@ search:
      attribute: href
    files:
      selector: td:nth-child(4)
-    comments:
-      selector: td:nth-child(5) a
-      attribute: href
    date:
      selector: td:nth-child(6)
      filters:
--- a/src/Jackett.Common/Definitions/bteye.yml
+++ b/src/Jackett.Common/Definitions/bteye.yml
@@ -1,68 +0,0 @@
---
-id: bteye
-name: BTeye
-description: "BTeye is a Public BitTorrent DHT search engine."
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://www.bteye.org/
-
-caps:
-  categories:
-    1: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info
-    type: info
-    default: BTeye does not use categories. In your software Indexer settings, set the category to 7000.
-
-download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
-
-search:
-  # https://www.bteye.org/q/2020
-  paths:
-    - path: "q/{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
-
-  rows:
-    selector: div.plist
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: div.pname a
-      attribute: title
-    details:
-      selector: div.pname a
-      attribute: href
-    download:
-      selector: div.pname a
-      attribute: href
-    date:
-      selector: div.plink b:nth-of-type(3)
-      filters:
-        - name: dateparse
-          args: "2006-01-02"
-    files:
-      selector: div.plink b:nth-of-type(2)
-    size:
-      selector: div.plink b:nth-of-type(1)
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/btgigs.yml
+++ b/src/Jackett.Common/Definitions/btgigs.yml
@@ -1,143 +0,0 @@
---
-id: btgigs
-name: BTGigs
-description: "BTGigs (TG) is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-pl
-type: private
-encoding: ISO-8859-2
-links:
-  - https://btgigs.info/
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: lang
-    type: checkbox
-    label: Add POLISH to title if is in polish category
-    default: false
-
-caps:
-  categorymappings:
-    - {id: 36, cat: Audio/Audiobook, desc: "aBooki"}
-    - {id: 27, cat: TV/Anime, desc: "Anime"}
-    - {id: 1, cat: PC, desc: "Aplikacje PC"}
-    - {id: 10, cat: Books/EBook, desc: "eBooki"}
-    - {id: 34, cat: Movies/BluRay, desc: "Filmy/BR"}
-    - {id: 4, cat: Movies/SD, desc: "Filmy/DVD-R"}
-    - {id: 31, cat: Movies/HD, desc: "Filmy/HD Rip"}
-    - {id: 17, cat: Movies/Other, desc: "Filmy/Inne"}
-    - {id: 35, cat: Movies/UHD, desc: "Filmy/UHD"}
-    - {id: 20, cat: Movies/SD, desc: "Filmy/XviD"}
-    - {id: 21, cat: Console, desc: "Gry/konsole"}
-    - {id: 7, cat: PC/Games, desc: "Gry/PC ISO"}
-    - {id: 12, cat: PC/Games, desc: "Gry/PC Rips"}
-    - {id: 28, cat: Other, desc: "GSM/PDA"}
-    - {id: 19, cat: Audio/Video, desc: "Koncerty/Teledyski"}
-    - {id: 32, cat: Audio/Lossless, desc: "musicDVD/DTS/FLAC"}
-    - {id: 5, cat: Audio/MP3, desc: "Muzyka/MP3"}
-    - {id: 26, cat: Other, desc: "Rozne"}
-    - {id: 30, cat: TV/Sport, desc: "Sport"}
-    - {id: 6, cat: TV, desc: "TV/Seriale"}
-    - {id: 37, cat: TV/UHD, desc: "TV/UHD"}
-    - {id: 29, cat: PC, desc: "Witaminki"}
-    - {id: 9, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-login:
-  path: takelogin_action.php
-  method: post
-  inputs:
-    username_dupa: "{{ .Config.username }}"
-    password__dupa: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.embedded:has(h2:contains("Error"))
-  test:
-    selector: a[href^="logout.php"]
-    path: index.php?news=1
-
-search:
-  paths:
-    - path: browse.php
-  error:
-    - selector: a.altlink
-  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: 1
-    tyt: 0
-    lang: 0
-    subcat: 0
-  rows:
-    selector: table[border="1"][cellpadding=5] > tbody > tr:has(a[href^="details.php?id="])
-  fields:
-    is_polish:
-      optional: true
-      selector: img[src*="cat_pl"]
-      attribute: src
-    title_phase1:
-      selector: a[href^="details.php?id="]
-    title_polish:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: append
-          args: " POLISH"
-    title:
-      text: "{{ if and (.Config.lang) (.Result.is_polish) }}{{ .Result.title_polish }}{{else}}{{ .Result.title_phase1 }}{{end}}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    download:
-      selector: a[href^="download.php/"]
-      attribute: href
-    description:
-      optional: true
-      selector: img[src^="/pic/cat_pl/"]
-      attribute: src
-      filters:
-        - name: append
-          args: "Language: polish\n<br>"
-        - name: prepend
-          args: "{{ .Result.description }}"
-    imdb:
-      optional: true
-      selector: a[href*="imdb.com/title/tt"]
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +00:00"
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    grabs:
-      selector: td:nth-child(7)
-      filters:
-        - name: regexp
-          args: (\d+)
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      case:
-        "img[src=\"pic/ico_disk1.png\"]": 0
-        "img[src=\"pic/ico_disk2.png\"]": 1
-        "*": 1
-    uploadvolumefactor:
-      text: "1"
--- a/src/Jackett.Common/Definitions/btnext.yml
+++ b/src/Jackett.Common/Definitions/btnext.yml
@@ -28,7 +28,7 @@ caps:
    - {id: 91, cat: Movies/Other, desc: "Movies Kids Inglês"}
    - {id: 113, cat: Movies/Other, desc: "Movies Kids PT-BR"}
    - {id: 114, cat: Movies/Other, desc: "Movies Kids PT-PT"}
-    - {id: 77, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
+    - {id: 77, cat: Movies/WEB-DL, desc: "Movies WEB-DL"}
    - {id: 85, cat: Movies/DVD, desc: "Movies Custom-DVDR"}
    - {id: 14, cat: Movies/SD, desc: "Movies DVDRip/XViD"}
    - {id: 98, cat: Movies/Other, desc: "Movies Juvenil"}
@@ -64,24 +64,24 @@ caps:
    - {id: 81, cat: Console/PS3, desc: "Games PS3"}
    - {id: 82, cat: Console/PS4, desc: "Games PS4"}
    - {id: 83, cat: Console/PSP, desc: "Games PSP"}
-    - {id: 95, cat: Console/PSVita, desc: "Games PSVITA"}
+    - {id: 95, cat: Console/PS Vita, desc: "Games PSVITA"}
    - {id: 4, cat: Console/Wii, desc: "Games Wii"}
-    - {id: 26, cat: Console/Xbox360, desc: "Games XBOX360"}
-    - {id: 84, cat: Console/Xbox, desc: "Games XONE"}
+    - {id: 26, cat: Console/XBox 360, desc: "Games XBOX360"}
+    - {id: 84, cat: Console/XBox, desc: "Games XONE"}
    - {id: 6, cat: PC, desc: "Applications"}
    - {id: 18, cat: PC/ISO, desc: "Applications PC"}
    - {id: 19, cat: PC/Mac, desc: "Applications Macintosh"}
    - {id: 34, cat: PC/ISO, desc: "Applications Linux"}
    - {id: 44, cat: Other, desc: "Miscellaneous"}
    - {id: 54, cat: Audio/Audiobook, desc: "Books Audiobook"}
-    - {id: 57, cat: Books/Ebook, desc: "Books E-Books"}
+    - {id: 57, cat: Books/EBook, desc: "Books E-Books"}
    - {id: 58, cat: Books/Comics, desc: "Books Comics"}
    - {id: 59, cat: Books, desc: "Books Educational"}
-    - {id: 60, cat: Books/Magazines, desc: "Books Magazines/Journals"}
+    - {id: 60, cat: Books/Mags, desc: "Books Magazines/Journals"}
    - {id: 61, cat: Other, desc: "Pics/Wallpapers"}
-    - {id: 62, cat: PC/Phone-Android, desc: "Android"}
-    - {id: 63, cat: PC/Phone-IOS, desc: "iOS"}
-    - {id: 66, cat: PC/Phone-Other, desc: "WindowsPhone"}
+    - {id: 62, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 63, cat: PC/Mobile-iOS, desc: "iOS"}
+    - {id: 66, cat: PC/Mobile-Other, desc: "WindowsPhone"}
    - {id: 90, cat: Other, desc: "GPS"}
    - {id: 68, cat: Other, desc: "Others"}
    - {id: 100, cat: Other, desc: "Revistas"}
@@ -92,14 +92,15 @@ caps:
    - {id: 41, cat: XXX, desc: "XXX"}
    - {id: 64, cat: XXX, desc: "XXX-Magazines"}
    - {id: 65, cat: XXX, desc: "XXX-Movies"}
-    - {id: 67, cat: XXX/Packs, desc: "XXX-Packs"}
-    - {id: 69, cat: XXX/Imageset, desc: "XXX-Pics/Wallpapers"}
+    - {id: 67, cat: XXX/Pack, desc: "XXX-Packs"}
+    - {id: 69, cat: XXX/ImageSet, desc: "XXX-Pics/Wallpapers"}

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

 settings:
  - name: username
@@ -115,18 +116,18 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "added"
+    default: added
    options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
+      added: created
+      seeders: seeders
+      size: size
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
  - name: info_results
    type: info
    label: Search results
@@ -164,9 +165,9 @@ search:
    p: torrents
    pid: 32
    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    # name, description, both, uploader
-    search_type: "{{ if .Query.IMDBID }}description{{else}}name{{end}}"
+    search_type: "{{ if .Query.IMDBID }}description{{ else }}name{{ end }}"
    "sortOptions[sortBy]": "{{ .Config.sort }}"
    "sortOptions[sortOrder]": "{{ .Config.type }}"
  error:
@@ -176,14 +177,14 @@ search:
    selector: table#torrents_table_classic > tbody > tr:has(td.torrent_name)

  fields:
-    title:
-      selector: a[href*="?p=torrents&pid=10&action=details"]
    category:
      selector: div.category_image > a
      attribute: href
      filters:
        - name: querystring
          args: cid
+    title:
+      selector: a[href*="?p=torrents&pid=10&action=details"]
    details:
      selector: a[href*="?p=torrents&pid=10&action=details"]
      attribute: href
@@ -198,13 +199,11 @@ search:
      selector: a[rel="torrent_leechers"]
    grabs:
      selector: a[rel="times_completed"]
-    banner:
+    poster:
      selector: a[rel="fancybox"]
-      optional: true
      attribute: href
    imdb:
      # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg"
-      optional: true
      selector: a[href*="/imdb/tt"]
      attribute: href
      filters:
@@ -239,8 +238,10 @@ search:
          args: ["às ", ""] # at
        - name: replace
          args: ["at ", ""]
+        - name: append
+          args: " +00:00" # WET
        - name: dateparse
-          args: "02-01-2006 15:04"
+          args: "02-01-2006 15:04 -07:00"
    date:
      selector: td.torrent_name:not(:has(abbr.timeago)):contains("day"), td.torrent_name:not(:has(abbr.timeago)):contains("Domingo"), td.torrent_name:not(:has(abbr.timeago)):contains("Sábado"), td.torrent_name:not(:has(abbr.timeago)):contains("Quinta"), td.torrent_name:not(:has(abbr.timeago)):contains("Sexta"), td.torrent_name:not(:has(abbr.timeago)):contains("Quarta"), td.torrent_name:not(:has(abbr.timeago)):contains("Terça"), td.torrent_name:not(:has(abbr.timeago)):contains("Segunda"), td.torrent_name:not(:has(abbr.timeago)):contains("ontem"), td.torrent_name:not(:has(abbr.timeago)):contains("Hoje")
      optional: true
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -23,7 +23,7 @@ caps:
    - {id: 415, cat: Other, desc: "其他/Other"}

  modes:
-    search: [q, imdbid]
+    search: [q]
    tv-search: [q, season, ep, imdbid]
    movie-search: [q, imdbid]
    music-search: [q]
@@ -36,7 +36,14 @@ settings:
    type: info
    label: How to get the Cookie
    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -55,16 +62,14 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 justdead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 justdead
    incldead: 0
-    # promotion: 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x 50% 7 30%
-    spstate: 0
-    # 0 all 1 bookmarked 2 not
-    inclbookmarked: 0
-    # 0 title 1 descr 3 uploaded 4 imdb
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 and 1 or 2 exact
+    # promotion: 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x 50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdb
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
    search_mode: 0
    sort: 4
    type: desc
@@ -93,7 +98,7 @@ search:
      attribute: title
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    size:
@@ -118,6 +123,8 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumratio:
+      text: 1.0
    description:
      selector: td:nth-child(2)
      remove: a, img
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.monster/
+  - https://btsow.cam/
 legacylinks:
  - https://btos.pw/
  - https://btio.pw/
@@ -16,17 +16,30 @@ legacylinks:
  - https://btsow.space/
  - https://btsow.site/
  - https://btsow.cyou/
+  - https://btsow.monster/
+  - https://btsow.casa/
+  - https://btsow.website/
+  - https://btsow.online/
+  - https://btsow.work/
+  - https://btsow.store/
+  - https://btsow.surf/

 caps:
  categories:
-    "other": Other
+    Other: Other

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

-settings: []
+settings:
+  - name: info_8000
+    type: info
+    label: About BTSOW Categories
+    default: BTSOW does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).

 download:
  selector: a#magnetOpen
@@ -34,12 +47,14 @@ download:

 search:
  paths:
-    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
  rows:
    selector: div.row:has(a[href*="/detail/hash/"])
+
  fields:
    category:
-      text: other
+      text: Other
    title:
      selector: a[href*="/detail/hash/"]
      attribute: title
@@ -52,8 +67,10 @@ search:
    date:
      selector: div.date
      filters:
+        - name: append
+          args: " -00:00" # GMT
        - name: dateparse
-          args: "2006-01-02"
+          args: "2006-01-02 -07:00"
    size:
      selector: div.size
    seeders:
--- a/src/Jackett.Common/Definitions/bwtorrents.yml
+++ b/src/Jackett.Common/Definitions/bwtorrents.yml
@@ -18,27 +18,31 @@ caps:
    - {id: 116, cat: Movies/HD, desc: "Bollywood-1080p BluRay Rips"}
    - {id: 117, cat: Movies/HD, desc: "Bollywood-720p BluRay Rips"}
    - {id: 118, cat: Movies, desc: "Bollywood-Remuxes BluRay"}
-    - {id: 119, cat: Movies/WEBDL, desc: "Bollywood-Untouched WEB-DLs"}
-    - {id: 120, cat: Movies/WEBDL, desc: "Bollywood-WEB-Rips"}
+    - {id: 119, cat: Movies/WEB-DL, desc: "Bollywood-Untouched WEB-DLs"}
+    - {id: 120, cat: Movies/WEB-DL, desc: "Bollywood-1080p WEB-Rips"}
+    - {id: 188, cat: Movies/WEB-DL, desc: "Bollywood-720p WEB-Rips"}
    - {id: 121, cat: Movies/DVD, desc: "Bollywood-Untouched DVDs"}
-    - {id: 122, cat: Movies/WEBDL, desc: "Bollywood-Upscaled DVDRips"}
-    - {id: 123, cat: Movies/WEBDL, desc: "Bollywood-DVDRips"}
+    - {id: 189, cat: Movies/DVD, desc: "Bollywood-Encoded DVDs"}
+    - {id: 122, cat: Movies/WEB-DL, desc: "Bollywood-DVDRips 1080p/720p"}
+    - {id: 123, cat: Movies/WEB-DL, desc: "Bollywood-SDRips WEB/DVD"}
    - {id: 124, cat: Movies/3D, desc: "Bollywood-3D-Movies"}
-    - {id: 125, cat: Movies/WEBDL, desc: "Bollywood-WEB Series"}
+    - {id: 190, cat: Movies, desc: "Bollywood-Movies packs"}
+    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-WEB Originals"}
    - {id: 126, cat: Movies/UHD, desc: "Hollywood-4K Ultra HD / Upscaled"}
    - {id: 127, cat: Movies/BluRay, desc: "Hollywood-Untouched BluRay"}
    - {id: 128, cat: Movies/HD, desc: "Hollywood-1080p BluRay Rips"}
    - {id: 129, cat: Movies/HD, desc: "Hollywood-720p BluRay Rips"}
    - {id: 130, cat: Movies, desc: "Hollywood-BluRay Remuxes"}
-    - {id: 131, cat: Movies/WEBDL, desc: "Hollywood-Untouched WEB-DLs"}
+    - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"}
    - {id: 132, cat: Movies, desc: "Hollywood-WEB-Rips"}
    - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"}
-    - {id: 134, cat: Movies/WEBDL, desc: "Hollywood-DVDRips"}
+    - {id: 191, cat: Movies/WEB-DL, desc: "Hollywood-Encoded DVDs"}
+    - {id: 134, cat: Movies/WEB-DL, desc: "Hollywood-DVDRips 1080p/720p"}
+    - {id: 193, cat: Movies/SD, desc: "Hollywood-SDRips - WEB/DVD"}
    - {id: 135, cat: Movies/3D, desc: "Hollywood-3D-Movies"}
    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
+    - {id: 194, cat: Movies, desc: "Hollywood-Movies packs"}
    - {id: 137, cat: Movies, desc: "Malayalam-Movies"}
-    - {id: 138, cat: Movies, desc: "Telugu-Movies"}
-    - {id: 139, cat: Movies, desc: "Tamil-Movies"}
    - {id: 140, cat: Movies, desc: "Punjabi-Movies"}
    - {id: 141, cat: Movies, desc: "Kannada-Movies"}
    - {id: 142, cat: Movies, desc: "Lollywood-Movies"}
@@ -48,6 +52,8 @@ caps:
    - {id: 185, cat: Movies, desc: "Gujarati-Movies"}
    - {id: 184, cat: Movies, desc: "Bollywood-South Hindi Dubbed"}
    - {id: 183, cat: Movies, desc: "Hindi Dubbed Movies"}
+    - {id: 197, cat: Movies, desc: "Turkish Hindi Dubbed"}
+    - {id: 198, cat: Movies, desc: "TV-MTV"}
    - {id: 182, cat: Movies, desc: "Other Movies"}
    - {id: 146, cat: TV, desc: "TV-Colors"}
    - {id: 147, cat: TV, desc: "TV-TV"}
@@ -62,6 +68,7 @@ caps:
    - {id: 156, cat: TV/Documentary, desc: "TV-Documentary"}
    - {id: 157, cat: TV, desc: "TV-Hollywood"}
    - {id: 158, cat: TV, desc: "TV-Others"}
+    - {id: 195, cat: TV, desc: "TV-Packs"}
    - {id: 159, cat: TV, desc: "Religion &Spirituality "}
    - {id: 160, cat: Audio, desc: "Music-Classical"}
    - {id: 161, cat: Audio/Lossless, desc: "Music-Flacs"}
@@ -78,19 +85,54 @@ caps:
    - {id: 172, cat: Audio, desc: "Music-Remix"}
    - {id: 173, cat: Audio, desc: "Music-Tamil"}
    - {id: 174, cat: Audio, desc: "Music-Telugu"}
-    - {id: 175, cat: Books/Ebook, desc: "EBooks"}
+    - {id: 196, cat: Audio, desc: "Music-Packs"}
+    - {id: 175, cat: Books/EBook, desc: "EBooks"}
    - {id: 176, cat: PC/Games, desc: "Games PC"}
    - {id: 177, cat: Console, desc: "Games Console"}
    - {id: 178, cat: TV/Anime, desc: "Anime"}
    - {id: 179, cat: PC, desc: "Appz"}
-    - {id: 180, cat: PC/Phone-Other, desc: "Mobile Stuff"}
+    - {id: 180, cat: PC/Mobile-Other, desc: "Mobile Stuff"}
    - {id: 181, cat: Other, desc: "Pics/Wallpapers"}
+    - {id: 187, cat: XXX, desc: "Adult XXX 18+"}
+    # Telugu-Movies
+    - {id: 199, cat: Movies, desc: "Telgu-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 200, cat: Movies, desc: "Telgu-Movies | Untouched WEB-DLs"}
+    - {id: 201, cat: Movies, desc: "Telgu-Movies | 1080p/720p WEBRips"}
+    - {id: 202, cat: Movies, desc: "Telgu-Movies | Untouched BluRay"}
+    - {id: 208, cat: Movies, desc: "Telgu-Movies | Remuxes BluRay"}
+    - {id: 207, cat: Movies, desc: "Telgu-Movies | BluRay Rips"}
+    - {id: 203, cat: Movies, desc: "Telgu-Movies | Untouched DVDs"}
+    - {id: 204, cat: Movies, desc: "Telgu-Movies | SD-WEBRips / DVDRips"}
+    - {id: 205, cat: Movies, desc: "Telgu-Movies | Movie Packs"}
+    # Tamil-Movies
+    - {id: 209, cat: Movies, desc: "Tamil-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 210, cat: Movies, desc: "Tamil-Movies | Untouched WEB-DLs"}
+    - {id: 211, cat: Movies, desc: "Tamil-Movies | 1080p/720p WEBRips"}
+    - {id: 212, cat: Movies, desc: "Tamil-Movies | Untouched BluRay"}
+    - {id: 217, cat: Movies, desc: "Tamil-Movies | Remuxes BluRay"}
+    - {id: 216, cat: Movies, desc: "Tamil-Movies | BluRay Rips"}
+    - {id: 213, cat: Movies, desc: "Tamil-Movies | Untouched DVDs"}
+    - {id: 214, cat: Movies, desc: "Tamil-Movies | SD-WEBRips / DVDRips"}
+    - {id: 215, cat: Movies, desc: "Tamil-Movies | Movie Packs"}

  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

 login:
  path: takelogin.php
@@ -112,7 +154,7 @@ search:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # 1 all, 2 onlydead, 3 free
-    incldead: 1
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
    # 0 name, 1 descr, 2 both
    blah: 0
    # does not support imdbid searches and does not have imdb links in results.
@@ -137,8 +179,10 @@ search:
    date:
      selector: td:nth-child(5)
      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
-          args: "02-01-200615:04:05"
+          args: "02-01-200615:04:05 -07:00"
    size:
      selector: td:nth-child(6)
    download:
@@ -152,10 +196,15 @@ search:
      selector: td:nth-child(9)
    downloadvolumefactor:
      case:
-        font:contains("FreeLeech"): 0
+        "font:contains(\"FreeLeech\")": 0
        "*": 1
    uploadvolumefactor:
      case:
        img[src="pic/double_upload.png"]: 2
        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 day (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # AEON
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -0,0 +1,337 @@
+---
+id: byrutor
+name: Byrutor
+description: "Byrutor is a RUSSIAN Public Torrent Tracker for GAMES"
+language: ru-ru
+type: public
+encoding: UTF-8
+links:
+  - https://byrutor.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC/Games, desc: "Экшены"}
+    - {id: 2, cat: PC/Games, desc: "Приключения"}
+    - {id: 3, cat: PC/Games, desc: "Гонки"}
+    - {id: 4, cat: PC/Games, desc: "RPG"}
+    - {id: 5, cat: PC/Games, desc: "Головоломка"}
+    - {id: 6, cat: PC/Games, desc: "Инди"}
+    - {id: 7, cat: PC/Games, desc: "Стратегии"}
+    - {id: 8, cat: PC/Games, desc: "Выживание"}
+    - {id: 9, cat: PC/Games, desc: "Шутеры"}
+    - {id: 10, cat: PC/Games, desc: "Симуляторы"}
+    - {id: 11, cat: PC/Games, desc: "Спортивные"}
+    - {id: 12, cat: PC/Games, desc: "Аркады"}
+    - {id: 13, cat: PC/Games, desc: "Файтинги"}
+    - {id: 14, cat: PC/Games, desc: "Хорроры"}
+    - {id: 15, cat: PC/Games, desc: "Открытый мир"}
+    - {id: 16, cat: PC/Games, desc: "Аниме"}
+    - {id: 17, cat: PC/Games, desc: "Repack от Механики"}
+    - {id: 18, cat: PC/Games, desc: "Repack от Xatab"}
+    - {id: 19, cat: PC/Games, desc: "Repack от Catalyst"}
+    - {id: 20, cat: PC/Games, desc: "RePack от FitGirl"}
+    - {id: 21, cat: PC/Games, desc: "RePack от qoob"}
+    - {id: 232, cat: PC/Games, desc: "RePack от SpaceX"}
+    - {id: 233, cat: PC/Games, desc: "RePack от Pioneer"}
+    - {id: 22, cat: PC/Games, desc: "Русская озвучка"}
+    - {id: 24, cat: PC/Games, desc: "Новинки игр"}
+    - {id: 25, cat: PC/Games, desc: "Старые игры"}
+    - {id: 26, cat: PC/Games, desc: "Игры с геймпадом"}
+    - {id: 27, cat: PC/Games, desc: "Мультиплеер"}
+    - {id: 28, cat: PC/Games, desc: "На двоих"}
+    - {id: 29, cat: PC/Games, desc: "Рогалик"}
+    - {id: 30, cat: PC/Games, desc: "Слэшер"}
+    - {id: 31, cat: PC/Games, desc: "Стелс"}
+    - {id: 32, cat: PC/Games, desc: "Фэнтези"}
+    - {id: 33, cat: PC/Games, desc: "Платформер"}
+    - {id: 34, cat: PC/Games, desc: "Песочница"}
+    - {id: 35, cat: PC/Games, desc: "Игры в 2D"}
+    - {id: 36, cat: PC/Games, desc: "Казуальная"}
+    - {id: 37, cat: PC/Games, desc: "Point and click"}
+    - {id: 38, cat: PC/Games, desc: "Вид сбоку"}
+    - {id: 39, cat: PC/Games, desc: "Вид сверху"}
+    - {id: 40, cat: PC/Games, desc: "Tower Defense"}
+    - {id: 41, cat: PC/Games, desc: "Экономика"}
+    - {id: 42, cat: PC/Games, desc: "Тактика"}
+    - {id: 43, cat: PC/Games, desc: "Пошаговые стратегии (TBS)"}
+    - {id: 44, cat: PC/Games, desc: "Глобальные стратегии"}
+    - {id: 45, cat: PC/Games, desc: "Стратегии в реальном времени"}
+    - {id: 46, cat: PC/Games, desc: "ММО"}
+    - {id: 47, cat: PC/Games, desc: "MMORPG"}
+    - {id: 48, cat: PC/Games, desc: "Для взрослых"}
+    - {id: 49, cat: PC/Games, desc: "От первого лица"}
+    - {id: 50, cat: PC/Games, desc: "От третьего лица"}
+    - {id: 51, cat: PC/Games, desc: "Шутер от первого лица"}
+    - {id: 52, cat: PC/Games, desc: "Шутер от третьего лица"}
+    - {id: 53, cat: PC/Games, desc: "Игры для слабых ПК"}
+    - {id: 54, cat: PC/Games, desc: "Игры для очень слабых ПК"}
+    - {id: 55, cat: PC/Games, desc: "Новинки игр для слабых ПК"}
+    - {id: 56, cat: PC/Games, desc: "Игры для 64 битной системы"}
+    - {id: 57, cat: PC/Games, desc: "Игры для 32 битной системы"}
+    - {id: 58, cat: PC/Games, desc: "Психологический хоррор"}
+    - {id: 59, cat: PC/Games, desc: "Хоррор на выживание"}
+    - {id: 60, cat: PC/Games, desc: "Ролевой экшен"}
+    - {id: 61, cat: PC/Games, desc: "Приключенческий экшен"}
+    - {id: 63, cat: PC/Games, desc: "Головоломка-платформер"}
+    - {id: 64, cat: PC/Games, desc: "Скролл-шутер"}
+    - {id: 65, cat: PC/Games, desc: "Шутер с видом сверху"}
+    - {id: 66, cat: PC/Games, desc: "Градостроительный симулятор"}
+    - {id: 67, cat: PC/Games, desc: "Космический симулятор"}
+    - {id: 68, cat: PC/Games, desc: "Научная фантастика"}
+    - {id: 69, cat: PC/Games, desc: "Ролевая стратегия"}
+    - {id: 70, cat: PC/Games, desc: "Тактическая ролевая игра"}
+    - {id: 71, cat: PC/Games, desc: "Тактика в реальном времени"}
+    - {id: 72, cat: PC/Games, desc: "Японская ролевая игра"}
+    - {id: 73, cat: PC/Games, desc: "Тёмное фэнтези"}
+    - {id: 74, cat: PC/Games, desc: "Сложная"}
+    - {id: 75, cat: PC/Games, desc: "Атмосфера"}
+    - {id: 76, cat: PC/Games, desc: "Смешная"}
+    - {id: 77, cat: PC/Games, desc: "Пиксельная графика"}
+    - {id: 78, cat: PC/Games, desc: "Юмор"}
+    - {id: 79, cat: PC/Games, desc: "Классика"}
+    - {id: 80, cat: PC/Games, desc: "Космос"}
+    - {id: 81, cat: PC/Games, desc: "Зомби"}
+    - {id: 82, cat: PC/Games, desc: "Мрачная"}
+    - {id: 83, cat: PC/Games, desc: "Тайна"}
+    - {id: 84, cat: PC/Games, desc: "Физика"}
+    - {id: 85, cat: PC/Games, desc: "Реализм"}
+    - {id: 86, cat: PC/Games, desc: "Короткая"}
+    - {id: 87, cat: PC/Games, desc: "Строительство"}
+    - {id: 88, cat: PC/Games, desc: "Война"}
+    - {id: 89, cat: PC/Games, desc: "Крафтинг"}
+    - {id: 90, cat: PC/Games, desc: "Будущее"}
+    - {id: 91, cat: PC/Games, desc: "Средневековье"}
+    - {id: 92, cat: PC/Games, desc: "Затягивающая"}
+    - {id: 93, cat: PC/Games, desc: "Строительство базы"}
+    - {id: 94, cat: PC/Games, desc: "Управление ресурсами"}
+    - {id: 95, cat: PC/Games, desc: "Насилие"}
+    - {id: 96, cat: PC/Games, desc: "Для всей семьи"}
+    - {id: 97, cat: PC/Games, desc: "Исследование"}
+    - {id: 98, cat: PC/Games, desc: "Расслабляющая"}
+    - {id: 99, cat: PC/Games, desc: "Реиграбельность"}
+    - {id: 100, cat: PC/Games, desc: "Поиск предметов"}
+    - {id: 101, cat: PC/Games, desc: "Пост-апокалипсис"}
+    - {id: 102, cat: PC/Games, desc: "Вторая мировая война"}
+    - {id: 103, cat: PC/Games, desc: "Военные действия"}
+    - {id: 105, cat: PC/Games, desc: "Вождение"}
+    - {id: 189, cat: PC/Games, desc: "Пошаговая"}
+    - {id: 106, cat: PC/Games, desc: "Пошаговая тактика"}
+    - {id: 107, cat: PC/Games, desc: "3D-платформер"}
+    - {id: 108, cat: PC/Games, desc: "Одна жизнь"}
+    - {id: 109, cat: PC/Games, desc: "Паркур"}
+    - {id: 110, cat: PC/Games, desc: "Детектив"}
+    - {id: 111, cat: PC/Games, desc: "Криминал"}
+    - {id: 112, cat: PC/Games, desc: "Разрушения"}
+    - {id: 113, cat: PC/Games, desc: "90-е"}
+    - {id: 114, cat: PC/Games, desc: "80-е"}
+    - {id: 115, cat: PC/Games, desc: "Разделение экрана"}
+    - {id: 116, cat: PC/Games, desc: "Военные конфликты"}
+    - {id: 117, cat: PC/Games, desc: "Драконы"}
+    - {id: 118, cat: PC/Games, desc: "Пираты"}
+    - {id: 119, cat: PC/Games, desc: "Ниндзя"}
+    - {id: 120, cat: PC/Games, desc: "Поезда"}
+    - {id: 121, cat: PC/Games, desc: "Динозавры"}
+    - {id: 122, cat: PC/Games, desc: "Раннер"}
+    - {id: 123, cat: PC/Games, desc: "Супергерои"}
+    - {id: 124, cat: PC/Games, desc: "По комиксу"}
+    - {id: 125, cat: PC/Games, desc: "Хакерство"}
+    - {id: 126, cat: PC/Games, desc: "Эмоциональная"}
+    - {id: 127, cat: PC/Games, desc: "Футбол"}
+    - {id: 128, cat: PC/Games, desc: "Рыбалка"}
+    - {id: 129, cat: PC/Games, desc: "Бездорожье"}
+    - {id: 130, cat: PC/Games, desc: "Программирование"}
+    - {id: 131, cat: PC/Games, desc: "Вампиры"}
+    - {id: 132, cat: PC/Games, desc: "Снайпер"}
+    - {id: 133, cat: PC/Games, desc: "Ремейк"}
+    - {id: 134, cat: PC/Games, desc: "Отличный саундтрек"}
+    - {id: 135, cat: PC/Games, desc: "Глубокий сюжет"}
+    - {id: 136, cat: PC/Games, desc: "Женщина-протагонист"}
+    - {id: 137, cat: PC/Games, desc: "Кровь"}
+    - {id: 138, cat: PC/Games, desc: "Киберпанк"}
+    - {id: 139, cat: PC/Games, desc: "Эпичная"}
+    - {id: 140, cat: PC/Games, desc: "Мясо"}
+    - {id: 141, cat: PC/Games, desc: "Нагота"}
+    - {id: 142, cat: PC/Games, desc: "Цветастая"}
+    - {id: 143, cat: PC/Games, desc: "Education"}
+    - {id: 144, cat: PC/Games, desc: "Менеджмент"}
+    - {id: 145, cat: PC/Games, desc: "Упрощённый рогалик"}
+    - {id: 146, cat: PC/Games, desc: "Музыка"}
+    - {id: 147, cat: PC/Games, desc: "Кастомизация персонажа"}
+    - {id: 148, cat: PC/Games, desc: "История"}
+    - {id: 149, cat: PC/Games, desc: "Охота"}
+    - {id: 150, cat: PC/Games, desc: "По мотивам книги"}
+    - {id: 151, cat: PC/Games, desc: "Первая мировая война"}
+    - {id: 152, cat: PC/Games, desc: "Тайм-менеджмент"}
+    - {id: 153, cat: PC/Games, desc: "Психоделия"}
+    - {id: 154, cat: PC/Games, desc: "Наука"}
+    - {id: 155, cat: PC/Games, desc: "Морские бои"}
+    - {id: 156, cat: PC/Games, desc: "Сельское хозяйство"}
+    - {id: 157, cat: PC/Games, desc: "Кинематографичная"}
+    - {id: 158, cat: PC/Games, desc: "Вестерн"}
+    - {id: 159, cat: PC/Games, desc: "Три в ряд"}
+    - {id: 160, cat: PC/Games, desc: "Стимпанк"}
+    - {id: 161, cat: PC/Games, desc: "Редактор уровней"}
+    - {id: 162, cat: PC/Games, desc: "Культовая классика"}
+    - {id: 163, cat: PC/Games, desc: "Минимализм"}
+    - {id: 164, cat: PC/Games, desc: "Shoot &#039;em up"}
+    - {id: 165, cat: PC/Games, desc: "Решения с последствиями"}
+    - {id: 166, cat: PC/Games, desc: "Процедурная генерация"}
+    - {id: 167, cat: PC/Games, desc: "Мультипликация"}
+    - {id: 168, cat: PC/Games, desc: "Мультфильм"}
+    - {id: 169, cat: PC/Games, desc: "Пошаговые сражения"}
+    - {id: 170, cat: PC/Games, desc: "Магия"}
+    - {id: 171, cat: PC/Games, desc: "Изометрия"}
+    - {id: 172, cat: PC/Games, desc: "Карточная игра"}
+    - {id: 173, cat: PC/Games, desc: "Чёрный юмор"}
+    - {id: 174, cat: PC/Games, desc: "Beat &#039;em up"}
+    - {id: 175, cat: PC/Games, desc: "Свобода выбора"}
+    - {id: 176, cat: PC/Games, desc: "Рисованная графика"}
+    - {id: 177, cat: PC/Games, desc: "Инопланетяне"}
+    - {id: 178, cat: PC/Games, desc: "Твин-стик шутер"}
+    - {id: 179, cat: PC/Games, desc: "Настольная игра"}
+    - {id: 180, cat: PC/Games, desc: "Полёты"}
+    - {id: 181, cat: PC/Games, desc: "Лут"}
+    - {id: 182, cat: PC/Games, desc: "В реальном времени"}
+    - {id: 183, cat: PC/Games, desc: "MOBA"}
+    - {id: 184, cat: PC/Games, desc: "Демоны"}
+    - {id: 185, cat: PC/Games, desc: "Расследование"}
+    - {id: 186, cat: PC/Games, desc: "Мифология"}
+    - {id: 187, cat: PC/Games, desc: "VR"}
+    - {id: 190, cat: PC/Games, desc: "Dungeon Crawler"}
+    - {id: 191, cat: PC/Games, desc: "Психологическая"}
+    - {id: 192, cat: PC/Games, desc: "Нелинейная"}
+    - {id: 193, cat: PC/Games, desc: "Подземелье"}
+    - {id: 194, cat: PC/Games, desc: "Игры по сети"}
+    - {id: 195, cat: PC/Games, desc: "Для нескольких игроков"}
+    - {id: 196, cat: PC/Games, desc: "Шедевр"}
+    - {id: 197, cat: PC/Games, desc: "Ретро"}
+    - {id: 198, cat: PC/Games, desc: "Олдскул"}
+    - {id: 237, cat: PC/Games, desc: "Игры 2023 года"}
+    - {id: 238, cat: PC/Games, desc: "Игры 2024 года"}
+    - {id: 236, cat: PC/Games, desc: "Игры 2022 года"}
+    - {id: 235, cat: PC/Games, desc: "Игры 2021 года"}
+    - {id: 199, cat: PC/Games, desc: "Игры 2020 года"}
+    - {id: 200, cat: PC/Games, desc: "Игры 2019 года"}
+    - {id: 201, cat: PC/Games, desc: "Игры 2018 года"}
+    - {id: 202, cat: PC/Games, desc: "Игры 2017 года"}
+    - {id: 203, cat: PC/Games, desc: "Игры 2016 года"}
+    - {id: 204, cat: PC/Games, desc: "Игры 2015 года"}
+    - {id: 205, cat: PC/Games, desc: "Игры 2014 года"}
+    - {id: 206, cat: PC/Games, desc: "Игры 2013 года"}
+    - {id: 207, cat: PC/Games, desc: "Игры 2012 года"}
+    - {id: 208, cat: PC/Games, desc: "Игры 2011 года"}
+    - {id: 209, cat: PC/Games, desc: "Игры 2010 года"}
+    - {id: 210, cat: PC/Games, desc: "Игры 2009 года"}
+    - {id: 211, cat: PC/Games, desc: "Игры 2008 года"}
+    - {id: 212, cat: PC/Games, desc: "Игры 2007 года"}
+    - {id: 213, cat: PC/Games, desc: "Игры 2006 года"}
+    - {id: 214, cat: PC/Games, desc: "Игры 2005 года"}
+    - {id: 215, cat: PC/Games, desc: "Игры 2004 года"}
+    - {id: 216, cat: PC/Games, desc: "Игры 2003 года"}
+    - {id: 217, cat: PC/Games, desc: "Игры 2002 года"}
+    - {id: 218, cat: PC/Games, desc: "Игры 2001 года"}
+    - {id: 219, cat: PC/Games, desc: "Игры 2000 года"}
+    - {id: 220, cat: PC/Games, desc: "Игры 1999 года"}
+    - {id: 221, cat: PC/Games, desc: "Игры 1998 года"}
+    - {id: 222, cat: PC/Games, desc: "Игры 1997 года"}
+    - {id: 223, cat: PC/Games, desc: "Игры 1996 года"}
+    - {id: 224, cat: PC/Games, desc: "Игры 1995 года"}
+    - {id: 225, cat: PC/Games, desc: "Игры 1994 года"}
+    - {id: 226, cat: PC/Games, desc: "Игры 1993 года"}
+    - {id: 227, cat: PC/Games, desc: "Игры 1992 года"}
+    - {id: 228, cat: PC/Games, desc: "Игры 1991 года"}
+    - {id: 229, cat: PC/Games, desc: "Игры 1990 года"}
+    - {id: 230, cat: PC/Games, desc: "Все Топ игры"}
+    - {id: 231, cat: PC/Games, desc: "Дополнения"}
+    - {id: 23, cat: PC/Games, desc: "Ранний Доступ"}
+    - {id: 239, cat: PC/Games, desc: "Ubisoft"}
+    - {id: 240, cat: PC/Games, desc: "Bethesda"}
+    - {id: 241, cat: PC/Games, desc: "2K"}
+    - {id: 242, cat: PC/Games, desc: "CD Projekt RED"}
+    - {id: 243, cat: PC/Games, desc: "Telltale Games"}
+    - {id: 244, cat: PC/Games, desc: "Capcom"}
+    - {id: 245, cat: PC/Games, desc: "Square Enix"}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selector: a.itemtop_game
+  attribute: href
+
+search:
+  # keywords (any age posts, article titles only search)
+  # do=search&subaction=search&story=five+freddy&titleonly=3&searchdate=0&sortby=date&resorder=desc&catlist[]=1&catlist[]=2&catlist[]=3
+  # keywordless (1 day old posts or newer + article body search) query=game
+  # do=search&subaction=search&story=game&titleonly=0&searchdate=1&sortby=date&resorder=desc&catlist[]=0
+  paths:
+    - path: index.php
+  inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    showposts: 1
+    # 0 article, 1 comments, 2 static pages, 3 article titles
+    titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
+    searchdate: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}game{{ end }}"
+    sortby: date
+    resorder: desc
+
+  rows:
+    selector: div.short_search:has(div.shor_subtitles span:nth-child(2):contains("Б"))
+
+  fields:
+    category:
+      text: 1
+    year:
+      selector: div.shor_subtitles span
+      filters:
+        - name: regexp
+          args: (\d+)
+    title:
+      selector: div.short_titles > a
+      filters:
+        - name: append
+          args: " [{{ .Result.year }}]"
+    details:
+      selector: div.short_titles > a
+      attribute: href
+    download:
+      selector: div.short_titles > a
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    description:
+      selector: div.shor_desc
+      optional: true
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    grabs:
+      selector: li:has(img[alt="Скачиваний"])
+    size:
+      selector: div.shor_subtitles span:nth-child(2)
+      filters:
+        - name: replace
+          args: ["ТБ", "TB"]
+        - name: replace
+          args: ["ГБ", "GB"]
+        - name: replace
+          args: ["МБ", "MB"]
+        - name: replace
+          args: ["КБ", "KB"]
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -11,37 +11,36 @@ links:
 caps:
  categorymappings:
    - {id: 186, cat: Books, desc: "E-book"}
-    - {id: 194, cat: Movies/SD, desc: "Film/CAM/Hun"}
+    - {id: 199, cat: Movies/SD, desc: "Film/Bluray/Hun"}
+    - {id: 194, cat: Movies/SD, desc: "Film/CAM"}
    - {id: 60, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
    - {id: 10, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
    - {id: 20, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
    - {id: 181, cat: Movies/HD, desc: "Film/HD/Eng"}
    - {id: 183, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 200, cat: Movies/HD, desc: "Film/UHD/Hun"}
    - {id: 192, cat: Movies/HD, desc: "Film/x264/Eng"}
    - {id: 190, cat: Movies/HD, desc: "Film/x264/Hun"}
    - {id: 70, cat: Movies/SD, desc: "Film/XviD/Eng"}
    - {id: 30, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 140, cat: PC/Games, desc: "Játék/DOX"}
-    - {id: 130, cat: PC/Games, desc: "Játék/PCiso"}
-    - {id: 160, cat: Console/PS3, desc: "Játék/PS2-PS3"}
-    - {id: 189, cat: Console/PSP, desc: "Játék/PSP"}
-    - {id: 184, cat: Console/Wii, desc: "Játék/Wii"}
-    - {id: 150, cat: Console/Xbox, desc: "Játék/XBOX (XBOX360)"}
+    - {id: 150, cat: Console, desc: "Játék/Konzol"}
+    - {id: 130, cat: PC/Games, desc: "Játék/PC"}
    - {id: 182, cat: Audio/Lossless, desc: "Lossless"}
    - {id: 90, cat: Audio/MP3, desc: "Mp3/Eng"}
    - {id: 50, cat: Audio/MP3, desc: "Mp3/Hun"}
    - {id: 100, cat: Audio/Video, desc: "Music-Video"}
-    - {id: 180, cat: PC/Phone-Other, desc: "Program/Mobil"}
+    - {id: 180, cat: PC/Mobile-Other, desc: "Program/Mobil"}
    - {id: 170, cat: PC/0day, desc: "Program/PC"}
    - {id: 80, cat: TV, desc: "Sorozat/Eng"}
    - {id: 40, cat: TV, desc: "Sorozat/Hun"}
    - {id: 110, cat: XXX, desc: "XXX"}

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

 settings:
  - name: username
@@ -53,19 +52,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "5"
+    default: 5
    options:
-      "5": "created"
-      "8": "seeders"
-      "6": "size"
-      "2": "title"
+      5: created
+      8: seeders
+      6: size
+      2: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: takelogin.php
@@ -81,8 +80,8 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 both 1 only active 2 only dead
+    search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 both, 1 only active, 2 only dead
    incldead: 0
    onlyname: 1
    onlyname2: true
@@ -115,11 +114,9 @@ search:
      attribute: href
    imdb:
      selector: a[href*="imdb.com/title/tt"]
-      optional: true
      attribute: href
-    banner:
+    poster:
      selector: a[rel^="prettyPhoto["]
-      optional: true
      attribute: href
    files:
      selector: td:nth-child(4)
@@ -159,4 +156,9 @@ search:
        img[src="pic/double.png"]: 2
        img[src="pic/doubledouble2.png"]: 4
        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TBDev & XBTT
--- a/src/Jackett.Common/Definitions/carphunter.yml
+++ b/src/Jackett.Common/Definitions/carphunter.yml
@@ -0,0 +1,178 @@
+---
+id: carphunter
+name: Carp-Hunter
+description: "Carp-Hunter is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: hu-hu
+type: private
+encoding: UTF-8
+links:
+  - https://carp-hunter.hu/
+
+caps:
+  categorymappings:
+    - {id: 5, cat: Movies/BluRay, desc: "Film/BDRip/Eng"}
+    - {id: 6, cat: Movies/BluRay, desc: "Film/BDRip/Hun"}
+    - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng"}
+    - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun"}
+    - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng"}
+    - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"}
+    - {id: 10, cat: Movies/DVD, desc: "Film/DVD5/Eng"}
+    - {id: 9, cat: Movies/DVD, desc: "Film/DVD5/Hun"}
+    - {id: 12, cat: Movies/DVD, desc: "Film/DVD9/Eng"}
+    - {id: 11, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
+    - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng"}
+    - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun"}
+    - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng"}
+    - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun"}
+    - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng"}
+    - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun"}
+    - {id: 4, cat: Movies/SD, desc: "Film/Xvid/Eng"}
+    - {id: 3, cat: Movies/SD, desc: "Film/Xvid/Hun"}
+    - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny"}
+    - {id: 19, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 20, cat: PC/Games, desc: "Játék/RIP"}
+    - {id: 24, cat: Other, desc: "Képek"}
+    - {id: 21, cat: Books, desc: "Könyv/Eng"}
+    - {id: 22, cat: Books, desc: "Könyv/Hun"}
+    - {id: 35, cat: TV/Anime, desc: "Mese/Eng"}
+    - {id: 36, cat: TV/Anime, desc: "Mese/Hun"}
+    - {id: 25, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 30, cat: PC/ISO, desc: "Programok/ISO"}
+    - {id: 31, cat: PC/0day, desc: "Programok/RIP"}
+    - {id: 33, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 32, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
+    - {id: 39, cat: XXX, desc: "XXX/Képek"}
+    - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng"}
+    - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun"}
+    - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng"}
+    - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: /
+  error:
+    - selector: td.embedded:contains("Sikertelen bejelentkezés!")
+  test:
+    path: letoltes.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: letoltes.php
+  keywordsfilters:
+    # the site uses % for wildcard
+    - name: re_replace
+      args: ["[^a-zA-Z0-9]+", "%"]
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 both, 2 onlydead, 3 onlyfree, 4 x2 torrents, 6 mytorrents
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: table[width="800"] > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="letoltes.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="/details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="/details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/details", "/download"]
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) width"
+    date:
+      selector: small
+      remove: font
+      filters:
+        - name: replace
+          args: ["\u00a0", " "]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    files:
+      selector: td:nth-last-child(7)
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        font:contains("x0"): 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        font:contains("x2"): 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -15,6 +15,10 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
  - name: info_results
    type: info
    label: "Search results"
@@ -22,19 +26,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "3"
+    default: 3
    options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
  - name: type
    type: select
    label: Order requested from site
-    default: "2"
+    default: 2
    options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc

 caps:
  categorymappings:
@@ -51,12 +55,12 @@ caps:
    - {id: 43, cat: Audio/Other, desc: "Misc Audio"}
    - {id: 14, cat: TV, desc: "Banned"}
    - {id: 29, cat: TV, desc: "Public Domain"}
-    - {id: 42, cat: TV/FOREIGN, desc: "Foreign Language"}
+    - {id: 42, cat: TV/Foreign, desc: "Foreign Language"}
    - {id: 28, cat: TV, desc: "Animated Adverts"}
    - {id: 45, cat: TV/Documentary, desc: "Documentaries"}

  modes:
-    search: [q, imdbid]
+    search: [q]
    tv-search: [q, season, ep, imdbid]
    movie-search: [q, imdbid]
    music-search: [q]
@@ -80,35 +84,34 @@ search:
    - path: index.php
  inputs:
    page: torrents
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
    # 0=title, 1=title&descr, 2=descr
-    options: "{{ if .Query.IMDBID }}2{{else}}0{{end}}"
-    # 0 all 1 activeonly 2 deadonly
+    options: "{{ if .Query.IMDBID }}2{{ else }}0{{ end }}"
+    # 0 all, 1 activeonly, 2 deadonly
    active: 0
    order: "{{ .Config.sort }}"
    by: "{{ .Config.type }}"

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

  fields:
-    title:
-      selector: td a[href^="index.php?page=torrent-details"]
-    details:
-      selector: td a[href^="index.php?page=torrent-details"]
-      attribute: href
    category:
      selector: td a[href^="index.php?page=torrents&category="]
      attribute: href
      filters:
        - name: querystring
          args: category
+    title:
+      selector: td a[href^="index.php?page=torrent-details"]
+    details:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: href
    download:
      selector: td a[href^="download.php"]
      attribute: href
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
      filters:
@@ -117,7 +120,7 @@ search:
          args: [" http://anonym.to?javascript:popdetails('", ""]
        - name: replace
          args: ["');", ""]
-    banner:
+    poster:
      selector: td a[href^="index.php?page=torrent-details"]
      attribute: onmouseover
      filters:
@@ -135,6 +138,8 @@ search:
      filters:
        - name: re_replace
          args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
    date:
      # February 09, 2019, 06:35:08 AM
      selector: td:nth-child(5):not(:contains("day"))
@@ -142,8 +147,10 @@ search:
      filters:
        - name: re_replace
          args: ["[,]|[\\s+]|[//\xa0],\\/g", " "]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
-          args: "January 02  2006  03:04:05 PM"
+          args: "January 02  2006  03:04:05 PM -07:00"
    seeders:
      selector: td:nth-child(6)
    leechers:
@@ -156,4 +163,9 @@ search:
        "*": 1
    uploadvolumefactor:
      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # xbtit 2.0.0
--- a/src/Jackett.Common/Definitions/casatorrent.yml
+++ b/src/Jackett.Common/Definitions/casatorrent.yml
@@ -15,9 +15,9 @@ legacylinks:
 caps:
  categorymappings:
    - {id: 65, cat: Movies/HD, desc: "BD: BD"}
-    - {id: 68, cat: Books/Magazines, desc: "Ebooks:  Presse"}
+    - {id: 68, cat: Books/Mags, desc: "Ebooks:  Presse"}
    - {id: 90, cat: Audio/Audiobook, desc: "Ebooks: Audio books"}
-    - {id: 56, cat: Books/Ebook, desc: "Ebooks: Ebooks"}
+    - {id: 56, cat: Books/EBook, desc: "Ebooks: Ebooks"}
    - {id: 95, cat: Books/Comics, desc: "Ebooks: Mangas"}
    - {id: 84, cat: XXX, desc: "Ebooks: XXX"}
    - {id: 54, cat: Movies/3D, desc: "Films: 3D"}
@@ -41,8 +41,8 @@ caps:
    - {id: 98, cat: Movies, desc: "Films: VFSTFR"}
    - {id: 89, cat: Movies, desc: "Films: VO"}
    - {id: 55, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 58, cat: Movies/WEBDL, desc: "Films: Web - DL"}
-    - {id: 57, cat: Movies/WEBDL, desc: "Films: WebRip"}
+    - {id: 58, cat: Movies/WEB-DL, desc: "Films: Web - DL"}
+    - {id: 57, cat: Movies/WEB-DL, desc: "Films: WebRip"}
    - {id: 72, cat: Movies/HD, desc: "Films: x265"}
    - {id: 1, cat: XXX, desc: "Films: XXX"}
    - {id: 97, cat: Console, desc: "Jeux : Android"}
@@ -69,6 +69,7 @@ caps:
    search: [q]
    tv-search: [q, season, ep]
    movie-search: [q]
+    book-search: [q]

 settings:
  - name: username
@@ -77,22 +78,45 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "id"
+    default: id
    options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: account-login.php
@@ -106,10 +130,6 @@ login:
    path: torrents-search.php
    selector: a[href="account-logout.php"]

-ratio:
-  path: torrents-search.php
-  selector: div#infobar b
-
 search:
  paths:
    - path: torrents-search.php
@@ -117,7 +137,7 @@ search:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    incldead: 1
-    freeleech: 0
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
    lang: 0
    sort: "{{ .Config.sort }}"
    order: "{{ .Config.type }}"
@@ -129,21 +149,37 @@ search:
    selector: table.ttable_headinner > tbody > tr.t-row

  fields:
-    title:
-      selector: a[href^="torrents-details.php?id="] b
    category:
      selector: a[href^="torrents.php?cat="]
      attribute: href
      filters:
        - name: querystring
          args: cat
+    title_phase1:
+      selector: a[href^="torrents-details.php?id="] b
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+        - name: re_replace
+          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
    details:
      selector: a[href^="torrents-details.php?id="]
      attribute: href
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    banner:
+    poster:
      selector: img[src*="/uploads/images/"]
      attribute: src
    grabs:
@@ -164,13 +200,14 @@ search:
      filters:
        - name: regexp
          args: "le: </b>(.*?)<br"
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
-          args: "02-01-2006"
+          args: "02-01-2006 -07:00"
    downloadvolumefactor:
      case:
        img[src="images/free.gif"]: 0
        "*": 1
    uploadvolumefactor:
-      case:
-        "*": 1
+      text: 1
 # engine n/a
--- a/src/Jackett.Common/Definitions/casstudiotv.yml
+++ b/src/Jackett.Common/Definitions/casstudiotv.yml
@@ -9,6 +9,8 @@ links:
  - https://casstudio.tk/
 legacylinks:
  - https://casstudio.tv/
+certificates:
+  - 71fe2295b57e6287ce36a39823bee752cbbd9d42 # expired 01 November 2020

 caps:
  categorymappings:
@@ -48,7 +50,6 @@ caps:
    - {id: 231, cat: TV, desc: "Моцарт в джунглях / Mozart in the Jungle"}
    - {id: 280, cat: TV, desc: "Тик / The Tick"}
    - {id: 328, cat: TV, desc: "AMC"}
-    - {id: 103, cat: TV, desc: "Ад На Колёсах / Hell On Wheels"}
    - {id: 122, cat: TV, desc: "Безумцы / Mad Men"}
    - {id: 208, cat: TV, desc: "Бойтесь ходячих мертвецов / Fear the Walking Dead"}
    - {id: 219, cat: TV, desc: "В пустыне смерти / Into the Badlands"}
@@ -144,7 +145,6 @@ caps:
    - {id: 294, cat: TV, desc: "Лемони Сникет: 33 несчастья / A Series of Unfortunate Events"}
    - {id: 275, cat: TV, desc: "Оранжевый - хит сезона / Orange is the New Black"}
    - {id: 194, cat: TV, desc: "Сорвиголова / Daredevil"}
-    - {id: 115, cat: TV, desc: "Чёрное зеркало / Black Mirror"}
    - {id: 333, cat: TV, desc: "Showtime"}
    - {id: 154, cat: TV, desc: "Блудливая Калифорния / Californication"}
    - {id: 118, cat: TV, desc: "Веб терапия / Web Therapy"}
@@ -186,14 +186,11 @@ caps:
    - {id: 134, cat: TV, desc: "Белый воротничок / White Collar"}
    - {id: 230, cat: TV, desc: "Колония / Colony"}
    - {id: 291, cat: TV, desc: "Королева Юга / Queen of the South"}
-    - {id: 200, cat: TV, desc: "Мистер робот / Mr. Robot"}
    - {id: 236, cat: TV, desc: "Полицейские на велосипедах / Pacific Blue"}
    - {id: 168, cat: TV, desc: "Форс-мажоры / Костюмы / Suits"}
    - {id: 352, cat: TV, desc: "YouTube"}
    - {id: 370, cat: TV, desc: "Британские сериалы"}
    - {id: 69, cat: TV, desc: "Мушкетеры / The Musketeers"}
-    - {id: 139, cat: TV, desc: "Острые козырьки / Peaky Blinders"}
-    - {id: 165, cat: TV, desc: "Лютер / Luther"}
    - {id: 272, cat: TV, desc: "Поворот / TURN"}
    - {id: 373, cat: TV, desc: "Датские и Шведские сериалы"}
    - {id: 381, cat: TV, desc: "Ирландские сериалы"}
@@ -224,6 +221,8 @@ caps:
    - {id: 265, cat: TV, desc: "V8 supercars"}
    - {id: 31, cat: TV, desc: "Пользователи"}
    - {id: 188, cat: TV, desc: "Поздравления"}
+    - {id: 24, cat: TV, desc: "Чат"}
+    - {id: 23, cat: TV, desc: "Общий"}

  modes:
    search: [q]
@@ -240,19 +239,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "t"
+    default: t
    options:
-      "t": "created"
-      "ts": "seeders"
-      "sz": "size"
-      "i": "title"
+      t: created
+      ts: seeders
+      sz: size
+      i: title
  - name: type
    type: select
    label: Order requested from site
-    default: "d"
+    default: d
    options:
-      "d": "desc"
-      "a": "asc"
+      d: desc
+      a: asc

 login:
  path: ucp.php?mode=login
@@ -273,7 +272,7 @@ search:
    - path: search.php
  inputs:
    tracker_search: torrent
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
+    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
    terms: all
    author: ""
    sc: 1
@@ -330,6 +329,8 @@ search:
          args: "(Вчера, \\d{2}:\\d{2})"
        - name: replace
          args: ["Вчера", "Today"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
        - name: fuzzytime
    date:
      # Сегодня, 17:54
@@ -340,6 +341,8 @@ search:
          args: "(Сегодня, \\d{2}:\\d{2})"
        - name: replace
          args: ["Сегодня", "Today"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
        - name: fuzzytime
    date:
      # 12 янв 2019, 11:26
@@ -372,8 +375,10 @@ search:
          args: ["ноя", "Nov"]
        - name: replace
          args: ["дек", "Dec"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
-          args: "02 Jan 2006, 15:04"
+          args: "02 Jan 2006, 15:04 -07:00"
    downloadvolumefactor:
      text: 1
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/src/Jackett.Common/Definitions/ccfbits.yml
@@ -15,25 +15,21 @@ caps:
    - {id: 40, cat: Movies/BluRay, desc: "Blu-ray原盘"}
    - {id: 30, cat: Movies/HD, desc: "高清电影1080p"}
    - {id: 2, cat: Movies/HD, desc: "高清电影720p"}
-
    # 高清电视剧
    - {id: 7, cat: TV/HD, desc: "高清欧美剧"}
    - {id: 32, cat: TV/HD, desc: "高清国产剧"}
    - {id: 34, cat: TV/HD, desc: "高清港台剧"}
    - {id: 36, cat: TV/HD, desc: "高清日韩剧"}
-
    # 其他高清视频
    - {id: 12, cat: TV/Documentary, desc: "高清纪录片"}
    - {id: 11, cat: TV/Sport, desc: "高清体育"}
    - {id: 23, cat: TV/Anime, desc: "高清动漫"}
    - {id: 4, cat: Audio/Video, desc: "高清MV/综艺"}
-
    # 电视剧集包
    - {id: 38, cat: TV/HD, desc: "欧美剧包"}
    - {id: 33, cat: TV/HD, desc: "国产剧包"}
    - {id: 35, cat: TV/HD, desc: "港台剧包"}
    - {id: 37, cat: TV/HD, desc: "日韩剧包"}
-
    # 非高清和其他
    - {id: 43, cat: TV/SD, desc: "HR_HDTV"}
    - {id: 20, cat: Movies/DVD, desc: "DVD"}
@@ -42,7 +38,7 @@ caps:
    - {id: 22, cat: Other, desc: "杂项"}

  modes:
-    search: [q, imdbid]
+    search: [q]
    tv-search: [q, season, ep, imdbid]
    movie-search: [q, imdbid]
    music-search: [q]
@@ -57,19 +53,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "added"
+    default: added
    options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "DESC"
+    default: DESC
    options:
-      "DESC": "desc"
-      "ASC": "asc"
+      DESC: desc
+      ASC: asc

 login:
  path: takelogin.php
@@ -87,10 +83,10 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    # 0 active 1 incldead 2 deadonly
    incldead: 1
-    fullsearch: "{{ if .Query.IMDBID }}1{{else}}{{end}}"
+    fullsearch: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}"
    sort: "{{ .Config.sort }}"
    d: "{{ .Config.sort }}"

@@ -117,7 +113,6 @@ search:
      selector: a[href^="download.php/"]
      attribute: href
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
@@ -138,7 +133,7 @@ search:
      selector: td:nth-child(5)
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    downloadvolumefactor:
--- a/src/Jackett.Common/Definitions/channelx.yml
+++ b/src/Jackett.Common/Definitions/channelx.yml
@@ -18,7 +18,7 @@ caps:
    - {id: 4, cat: TV/Sport, desc: "Sports"}

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

@@ -29,22 +29,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login
@@ -64,19 +68,12 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]

-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
  paths:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
@@ -84,10 +81,14 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
    selector: table > tbody > tr
@@ -107,16 +108,16 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -129,43 +130,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # 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|преди|前)", " ago"]
+          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)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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)", "hours"]
+          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|小时|時間)", " hour"]
+          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)", "days"]
+          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)", "weeks"]
+          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|седмица|周|週間)", " week"]
+          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)", "months"]
+          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|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
@@ -182,4 +190,9 @@ search:
        i[class*="fa-globe text-green"]: 2 # Global Double Upload
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
+    minimumratio:
+      text: 0.4
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D 2.7.0
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -25,6 +25,7 @@ caps:
    tv-search: [q, season, ep]
    movie-search: [q]
    music-search: [q]
+    book-search: [q]

 settings:
  - name: username
@@ -33,10 +34,30 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: info_tpp
    type: info
    label: Results Per Page
    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc

 login:
  path: takelogin.php
@@ -54,13 +75,6 @@ login:
  test:
    path: torrents.php

-ratio:
-  path: torrents.php
-  selector: table#info_block
-  filters:
-    - name: regexp
-      args: "Ratio:\\s(.*?)\\s\\s"
-
 search:
  paths:
    - path: torrents.php
@@ -68,6 +82,14 @@ search:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    incldead: 1
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"

  rows:
    selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -104,7 +126,7 @@ search:
      attribute: title
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    downloadvolumefactor:
--- a/src/Jackett.Common/Definitions/chilebt.yml
+++ b/src/Jackett.Common/Definitions/chilebt.yml
@@ -23,10 +23,11 @@ caps:
    - {id: 13, cat: XXX, desc: "XXX"}

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

 settings:
  - name: username
@@ -35,22 +36,26 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login
@@ -72,29 +77,24 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]

-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
  paths:
    - path: filterTorrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
    selector: table > tbody > tr
@@ -114,16 +114,16 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -136,43 +136,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # 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|преди|前)", " ago"]
+          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)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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)", "hours"]
+          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|小时|時間)", " hour"]
+          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)", "days"]
+          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)", "weeks"]
+          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|седмица|周|週間)", " week"]
+          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)", "months"]
+          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|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
--- a/src/Jackett.Common/Definitions/liaorencili.yml
+++ b/src/Jackett.Common/Definitions/liaorencili.yml
@@ -1,11 +1,52 @@
 ---
-id: liaorencili
-name: LIAORENCILI
-description: "LIAORENCILI (Cili180) is a Public BitTorrent DHT search engine."
+id: cilipro
+name: CiliPro
+description: "CiliPro (LIAORENCILI) is a Public BitTorrent DHT search engine."
 language: en-us
 type: public
 encoding: UTF-8
 links:
+  - http://www.cilipro1.xyz/
+  - http://www.cilipro2.xyz/
+  - http://www.cilipro3.xyz/
+  - http://www.cilipro4.xyz/
+  - http://www.cilipro5.xyz/
+  - http://www.cilipro6.xyz/
+  - http://www.cilipro7.xyz/
+  - http://www.cilipro8.xyz/
+  - http://www.cilipro9.xyz/
+  - http://www.cilipro10.xyz/
+  - http://www.cilinb1.xyz/
+  - http://www.cilinb2.xyz/
+  - http://www.cilinb3.xyz/
+  - http://www.cilinb4.xyz/
+  - http://www.cilinb5.xyz/
+  - http://www.cilinb6.xyz/
+  - http://www.cilinb7.xyz/
+  - http://www.cilinb8.xyz/
+  - http://www.cilinb9.xyz/
+  - http://www.cilinb10.xyz/
+  - http://www.kmsoso1.xyz/
+  - http://www.kmsoso3.xyz/
+  - http://www.kmsoso5.xyz/
+  - http://www.kmsoso7.xyz/
+  - http://www.kmsoso9.xyz/
+  - http://www.kuaimaso1.xyz/
+  - http://www.kuaimaso3.xyz/
+  - http://www.kuaimaso5.xyz/
+  - http://www.kuaimaso9.xyz/
+legacylinks:
+  - http://www.cili180.com/
+  - https://www.cilijj.xyz/
+  - https://www.liaorenso.xyz/
+  - https://www.liaorenso11.xyz/
+  - https://www.liaorenso12.xyz/
+  - https://www.liaorenso19.xyz/
+  - http://lrcili.xyz/ # proxy list only
+  - http://www.lrcili.xyz/ # proxy list only
+  - https://www.lrcili1.xyz/ # ERR_CONNECTION_TIMED_OUT
+  - https://www.lrcili2.xyz/ # ERR_CONNECTION_TIMED_OUT
+  - https://www.lrcili7.xyz/ # 404 Not Found
  - https://www.lrcili3.xyz/
  - https://www.lrcili4.xyz/
  - https://www.lrcili5.xyz/
@@ -38,29 +79,7 @@ links:
  - http://www.lrsoso8.xyz/
  - http://www.lrsoso9.xyz/
  - http://www.lrsoso10.xyz/
-  - http://www.cilinb1.xyz/
-  - http://www.cilinb2.xyz/
-  - http://www.cilinb3.xyz/
-  - http://www.cilinb4.xyz/
-  - http://www.cilinb5.xyz/
-  - http://www.cilinb6.xyz/
-  - http://www.cilinb7.xyz/
-  - http://www.cilinb8.xyz/
-  - http://www.cilinb9.xyz/
-  - http://www.cilinb10.xyz/
  - http://www.cilijj.xyz/
-legacylinks:
-  - http://www.cili180.com/
-  - https://www.cilijj.xyz/
-  - https://www.liaorenso.xyz/
-  - https://www.liaorenso11.xyz/
-  - https://www.liaorenso12.xyz/
-  - https://www.liaorenso19.xyz/
-  - http://lrcili.xyz/ # proxy list only
-  - http://www.lrcili.xyz/ # proxy list only
-  - https://www.lrcili1.xyz/ # ERR_CONNECTION_TIMED_OUT
-  - https://www.lrcili2.xyz/ # ERR_CONNECTION_TIMED_OUT
-  - https://www.lrcili7.xyz/ # 404 Not Found

 caps:
  categories:
@@ -70,6 +89,8 @@ caps:
    search: [q]
    tv-search: [q, season, ep]
    movie-search: [q]
+    music-search: [q]
+    book-search: [q]

 settings: []

@@ -79,7 +100,7 @@ search:
      method: post
      followredirect: true
  inputs:
-    keyword: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
+    keyword: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"

  rows:
    selector: div.list-area > dl.item
@@ -100,8 +121,10 @@ search:
    date:
      selector: dd.attr span:nth-child(1) b
      filters:
+        - name: append
+          args: " +08:00" # CST
        - name: dateparse
-          args: "2006-01-02"
+          args: "2006-01-02 -07:00"
    size:
      selector: dd.attr span:nth-child(2) b
    seeders:
--- a/src/Jackett.Common/Definitions/cinemageddon.yml
+++ b/src/Jackett.Common/Definitions/cinemageddon.yml
@@ -35,7 +35,7 @@ caps:
    - {id: 22, cat: Movies, desc: "Trailers"}

  modes:
-    search: [q, imdbid]
+    search: [q]
    movie-search: [q, imdbid]

 login:
@@ -55,7 +55,7 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"

  rows:
    selector: table.torrenttable > tbody > tr:has(a[href*="browse.php?cat="])
@@ -76,14 +76,15 @@ search:
      selector: a[href*="download.php?id="]
      attribute: href
    imdb:
-      optional: true
-      selector: a[href*="www.imdb.com/title/"]
+      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    date:
      selector: td:nth-child(4)
      filters:
+        - name: append
+          args: " -07:00" # PDT
        - name: dateparse
-          args: "2006-01-0215:04:05"
+          args: "2006-01-0215:04:05 -07:00"
    size:
      selector: td:nth-child(5)
      filters:
--- a/src/Jackett.Common/Definitions/cinemamovies.yml
+++ b/src/Jackett.Common/Definitions/cinemamovies.yml
@@ -1,7 +1,7 @@
 ---
 id: cinemamovies
-name: CinemaMovies
-description: "CinemaMovies is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+name: CinemaMovieS_ZT
+description: "CinemaMovieS_ZT is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: pl-pl
 type: private
 encoding: ISO-8859-2
@@ -18,23 +18,24 @@ caps:
    - {id: 12, cat: Movies/Other, desc: "Filmy Inne"}
    - {id: 32, cat: Movies/UHD, desc: "Filmy UHD"}
    - {id: 2, cat: TV/Anime, desc: "Anime"}
-    - {id: 2, cat: TV/Documentary, desc: "TV Dokumentalne"}
+    - {id: 10, cat: TV/Documentary, desc: "TV Dokumentalne"}
    - {id: 20, cat: TV, desc: "TV Paczki"}
    - {id: 22, cat: TV/Sport, desc: "TV Sport"}
    - {id: 24, cat: TV/HD, desc: "TV HD"}
    - {id: 25, cat: TV/SD, desc: "TV SD"}
    - {id: 1, cat: PC, desc: "Aplikacje"}
    - {id: 15, cat: PC/Games, desc: "Gry"}
-    - {id: 16, cat: PC/Phone-Other, desc: "Mobile"}
+    - {id: 16, cat: PC/Mobile-Other, desc: "Mobile"}
    - {id: 17, cat: Other, desc: "Inne"}
    - {id: 19, cat: Audio, desc: "Muzyka"}
    - {id: 21, cat: Books, desc: "Book"}

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

 settings:
  - name: cookie
@@ -44,7 +45,10 @@ settings:
    type: info
    label: How to get the Cookie
    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: drop_polish_prefix
    type: checkbox
    label: Drop the Polish title prefix
@@ -52,19 +56,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "2"
+    default: 2
    options:
-      "2": "created"
-      "5": "seeders"
-      "3": "size"
-      "1": "title"
+      2: created
+      5: seeders
+      3: size
+      1: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  method: cookie
@@ -79,11 +83,11 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 onlyactive 1 all 4 requests 5 onlydead 6 polish 8 free 10 doubleup 11 premier 13 VOD
-    incldead: 1
-    # 0 title 1 descr
-    blah: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 all, 4 requests, 5 onlydead, 6 polish, 8 free, 10 doubleup, 11 premier, 13 VOD
+    incldead: "{{ if .Config.freeleech }}8{{ else }}1{{ end }}"
+    # 0 title, 1 descr
+    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
    gatunek: 0
    quality: none
    sort: "{{ .Config.sort }}"
@@ -114,14 +118,13 @@ search:
    download:
      selector: a[href^="download.php/"]
      attribute: href
-    banner:
+    poster:
      selector: a[href^="details.php?id="]
      attribute: onmouseover
      filters:
        - name: regexp
          args: "src=(.+?) "
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    description:
@@ -135,7 +138,7 @@ search:
      selector: td[width="66%"] > span > span
      filters:
        - name: append
-          args: " +00:00"
+          args: " +02:00" # EET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    size:
@@ -154,4 +157,9 @@ search:
      case:
        img[src="pic/double.png"]: 2
        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # engine n/a
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -74,7 +74,7 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Query.Keywords }}"
    incldead: "{{ .Config.incldead }}"
    srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"
--- a/src/Jackett.Common/Definitions/classix.yml
+++ b/src/Jackett.Common/Definitions/classix.yml
@@ -35,10 +35,12 @@ search:
  paths:
    - path: torrents-search.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{if .Keywords}}\"{{.Keywords}}\"{{else}}{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
+
  rows:
    selector: table > tbody > tr:has(a[href^="torrents.php?cat="])
+
  fields:
    category:
      text: 1
@@ -60,8 +62,7 @@ search:
    leechers:
      selector: td:nth-child(9)
    downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/coastalcrew.yml
+++ b/src/Jackett.Common/Definitions/coastalcrew.yml
@@ -0,0 +1,236 @@
+---
+id: coastalcrew
+name: Coastal-Crew
+description: "Coastal-Crew is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-de
+type: private
+encoding: UTF-8
+links:
+  - https://coastal-crew.bounceme.net/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 28, cat: Movies/SD, desc: "Movie - Xvid/x264"}
+    - {id: 32, cat: Movies/HD, desc: "Movie - 720p/1080p"}
+    - {id: 130, cat: Movies, desc: "Movie - Pack"}
+    - {id: 155, cat: Movies/DVD, desc: "Movie - DVD"}
+    - {id: 154, cat: Movies/UHD, desc: "Movie - UHD/4K"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "Serien - Xvid/x264"}
+    - {id: 157, cat: TV/HD, desc: "Serien - 720p/1080p"}
+    - {id: 57, cat: TV/SD, desc: "Serien - Pack/SD"}
+    - {id: 59, cat: TV/HD, desc: "Serien - Pack/720p"}
+    - {id: 156, cat: TV/HD, desc: "Serien - Pack/1080p"}
+    - {id: 158, cat: TV/UHD, desc: "Serien - UHD/4K"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "Doku - Xvid/x264"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku - 720p/1080p"}
+    - {id: 13, cat: TV/Documentary, desc: "Doku - Pack"}
+    # App
+    - {id: 12, cat: PC/0day, desc: "App - Win"}
+    - {id: 11, cat: PC, desc: "App - Other"}
+    - {id: 10, cat: PC/Mac, desc: "App - Mac"}
+    - {id: 9, cat: PC/Mobile-Android, desc: "App - Linux/Android"}
+    # Game
+    - {id: 131, cat: Console, desc: "Game - Nintendo"}
+    - {id: 17, cat: PC/Games, desc: "Game - PC"}
+    - {id: 18, cat: Console, desc: "Game - PS"}
+    - {id: 24, cat: Console/Other, desc: "Game - Wimmelbild"}
+    # Music
+    - {id: 48, cat: Audio/MP3, desc: "Music - mp3"}
+    - {id: 53, cat: Audio/Lossless, desc: "Music - Flac"}
+    - {id: 52, cat: Audio, desc: "Music - Pack"}
+    - {id: 109, cat: Audio/Video, desc: "Music - Video-HD/SD"}
+    # Sport
+    - {id: 62, cat: TV/Sport, desc: "Sport - Alles"}
+    # Sonstiges
+    - {id: 64, cat: Books/Comics, desc: "Sonstiges - Anime"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges - A-Book"}
+    - {id: 96, cat: Books/EBook, desc: "Sonstiges - E-Book"}
+    - {id: 69, cat: Books, desc: "Sonstiges - Tutorial"}
+    - {id: 71, cat: Books/Other, desc: "Sonstiges - Other"}
+    # Kinder
+    - {id: 102, cat: Movies, desc: "Kinder - Alles"}
+    # XXX
+    - {id: 113, cat: XXX/DVD, desc: "XXX - DVD"}
+    - {id: 76, cat: XXX, desc: "XXX - HD-SD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX - Pack"}
+    # Request
+    - {id: 151, cat: Other, desc: "Request - spritti01"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: pin
+    type: text
+    label: Pin
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
+    loggiin: "einloggen"
+  error:
+    - selector: div#login_error
+  test:
+    path: selection.php
+
+download:
+  before:
+    path: ajax_det_poll.php
+    method: post
+    inputs:
+      set_thanks: thanks
+      det_id: "{{ .DownloadUri.Query.torrent }}"
+      ajax: yes
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    search: "{{ .Keywords }}"
+    blah: "0"
+    orderby: "added"
+    sort: "desc"
+  rows:
+    selector: div.selection_wrap
+  fields:
+    title:
+      selector: a.selection_a
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a.selection_a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
+    category:
+      selector: div.kat_cat_pic
+      case:
+        # Movie
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "28"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "32"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "130"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "155"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "154"
+        # Serien
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "60"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "157"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/SD\"))": "57"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/720p\"))": "59"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/1080p\"))": "156"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "158"
+        # Doku
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "15"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "14"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "13"
+        # App
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "11"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "10"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Linux/Android\"))": "9"
+        # Game
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo\"))": "131"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PS\"))": "18"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "24"
+        # Music
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": "48"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "53"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Video-HD/SD\"))": "109"
+        # Sport
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "62"
+        # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": "63"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Tutorial\"))": "69"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "71"
+        # Kinder
+        ":has(div.kat_cat_pic_name:contains(\"Kinder\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "102"
+        # XXX
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "113"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD-SD\"))": "76"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
+        # Request
+        ":has(div.kat_cat_pic_name:contains(\"Request\")):has(div.kat_cat_pic_name_b:contains(\"spritti01\"))": "151"
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ag
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    grabs:
+      text: 0
+    seeders:
+      selector: div.selection_unter_aa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    leechers:
+      selector: div.selection_unter_aaa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    date:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+    date:
+      # 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: "02.01.2006 15:04:05 -07:00"
+    description:
+      selector: selection_unter_af
+      optional: true
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine tbd
--- a/src/Jackett.Common/Definitions/concen.yml
+++ b/src/Jackett.Common/Definitions/concen.yml
@@ -19,19 +19,19 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created"
+    default: created
    options:
-      "created": "created"
-      "seeds": "seeders"
-      "size": "size"
-      "title": "title"
+      created: created
+      seeds: seeders
+      size: size
+      title: title
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 search:
  paths:
@@ -64,6 +64,7 @@ search:
      selector: td.views-field-name a
      attribute: href
    date:
+      # 3 hours 27 min
      selector: td.views-field-created
    size:
      selector: td.views-field-size
--- a/src/Jackett.Common/Definitions/concertos.yml
+++ b/src/Jackett.Common/Definitions/concertos.yml
@@ -19,7 +19,7 @@ caps:
    - {id: 9, cat: Audio, desc: "Podcast"}

  modes:
-    search: [q, imdbid]
+    search: [q]
    tv-search: [q, imdbid]
    movie-search: [q, imdbid]
    music-search: [q]
@@ -31,21 +31,25 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
+      created_at: created
+      seeders: seeders
+      size: size
  - name: type
    type: select
    label: Order requested from site
-    default: "desc"
+    default: desc
    options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc

 login:
  path: login
@@ -65,20 +69,14 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]

-ratio:
-  path: /
-  selector: span:has(i.fa-percent)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
  paths:
    - path: torrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    title: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    title: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    imdb: "{{ .Query.IMDBIDShort }}"
+    freeleech: "{{ if .Config.freeleech }}on{{ else }}{{ end }}"
    order_by: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"

@@ -114,7 +112,6 @@ search:
    grabs:
      selector: td:nth-last-child(1)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    downloadvolumefactor:
@@ -127,4 +124,9 @@ search:
        i.fa-certificate: 2 # Featured
        i.fa-gem: 2 # Double Upload
        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D
--- a/src/Jackett.Common/Definitions/cooltorrent.yml
+++ b/src/Jackett.Common/Definitions/cooltorrent.yml
@@ -1,136 +0,0 @@
---
-id: cooltorrent
-name: cool-torrent
-description: "cool-torrent is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-pl
-type: semi-private
-encoding: UTF-8
-links:
-  - http://cool-torrent.pl/
-legacylinks:
-  - https://cool-torrent.pl/ # NET::ERR_CERT_COMMON_NAME_INVALID
-
-caps:
-  categorymappings:
-    - {id: "Filmy XviD", cat: Movies/SD, desc: "Filmy XviD/DivX"}
-    - {id: "BluRay", cat: Movies/HD, desc: "BluRay/x264 720p"}
-    - {id: "Filmy x264", cat: Movies/HD, desc: "Filmy x264/h264"}
-    - {id: "Filmy HD 1080p AVC", cat: Movies/HD, desc: "Filmy HD 1080p AVC"}
-    - {id: "Filmy x265", cat: Movies/HD, desc: "Filmy x265/h265"}
-    - {id: "Filmy 4K UHD", cat: Movies/UHD, desc: "Filmy 4K UHD"}
-    - {id: "Filmy DVD", cat: Movies/DVD, desc: "Filmy DVD"}
-    - {id: "Filmy 3D", cat: Movies/3D, desc: "Filmy 3D"}
-    - {id: "Filmy RMVB", cat: Movies, desc: "Filmy RMVB"}
-    - {id: "Filmy IVO", cat: Movies, desc: "Filmy IVO"}
-    - {id: "Filmy TS", cat: Movies/SD, desc: "Filmy TS/CAM"}
-    - {id: "TV", cat: TV, desc: "TV/Seriale"}
-    - {id: "Erotyka", cat: XXX, desc: "Erotyka"}
-    - {id: "Muzyka", cat: Audio, desc: "Muzyka"}
-    - {id: "Programy", cat: PC, desc: "Programy"}
-    - {id: "GSM", cat: PC/Phone-Other, desc: "GSM/PDA"}
-    - {id: "Konsole", cat: Console, desc: "Konsole"}
-    - {id: "Gry PC", cat: PC/Games, desc: "Gry PC"}
-    - {id: "Dla Dzieci", cat: Movies, desc: "Dla Dzieci"}
-    - {id: "Książki", cat: Books, desc: "Książki"}
-    - {id: "Linux", cat: PC, desc: "Linux"}
-    - {id: "Mac", cat: PC/Mac, desc: "Mac"}
-    - {id: "Sport", cat: TV/Sport, desc: "Sport"}
-    - {id: "Inne", cat: Other, desc: "Inne"}
-    - {id: "Anime", cat: TV/Anime, desc: "Anime"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: /
-  error:
-    - selector: table[class="main-2"][cellpadding="10"]:has(b:contains("Błąd"))
-  test:
-    path: /
-    selector: a[href$="logout.php"]
-
-search:
-  paths:
-    # http://cool-torrent.pl/szukaj.php?form-display-time=1&search=&cat=0
-    - path: szukaj.php
-  inputs:
-    form-display-time: 1
-    # does not support multi cat search
-    cat: 0
-    search: "{{ .Keywords }}"
-    # does not support imdbid searching and does not display imdb links in results
-
-  rows:
-    selector: table.test5 > tbody > tr > td > div[id]:has(a[href*="/download/"])
-
-  fields:
-    category:
-      selector: a[href^="files/"]
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 1]
-    title:
-      selector: a[href^="/torrent/"]
-      attribute: title
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    banner:
-      optional: true
-      selector: img.browse_poster
-      attribute: src
-    date:
-      selector: td.descr3
-      remove: br
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
-        - name: append
-          args: " +00:00"
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: (\d{1,4}\.\d{2}\s[K|M|G][B])
-    seeders:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Seedów: (\\d+)"
-    leechers:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Peerów: (\\d+)"
-    grabs:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Pobrano: (\\d+)"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/Show More
+++ b/Show More