thesceneplace: fix freeleech row selector. resolves #11691

also add 2x > 10x uploadvolumefactor cases
xthor-api: massive improvements (#11690 )
2025-09-12 15:04:13 +02:00 · 2021-05-08 06:32:20 +01:00 · 2021-05-07 21:32:07 +02:00 · 2021-05-07 07:41:14 +01:00 · 2021-05-05 23:39:51 +01:00 · 2021-05-06 07:06:09 +12:00
719 changed files with 23259 additions and 18845 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,8 @@
+### Read and complete in full with information about your setup and issue before submitting.
+### Do not delete the template.
+
 **Please use the search bar** at the top of the page and make sure you are not creating an already submitted issue.
-Check closed issues as well, because your issue may have already been fixed.
+Check closed issues as well, because your issue may have already been fixed. Also check our [Troubleshooting](https://github.com/Jackett/Jackett/wiki/Troubleshooting) for steps to resolve common issues.

 Please read our [Contributing Guidelines](https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md) before submitting your issue to ensure a prompt response to your bug.

--- a/README.md
+++ b/README.md
@@ -13,13 +13,13 @@ 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 [Newznab](https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories) 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>
@@ -30,6 +30,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * ACGsou (36DM)
 * Anidex
 * AniLibria
+ * AnimeClipse
 * Animedia
 * Anime Tosho
 * AniRena
@@ -38,22 +39,26 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BigFANGroup
 * BitRu
 * BT.etree
+ * BT4G
 * BTDB
 * BTDIGG
 * BTSOW
 * Byrutor
 * CiliPro (LIAORENCILI)
+ * comicat
 * ConCen
- * Corsaro.red
 * cpasbien
 * cpasbienClone
 * Demonoid
 * dmhy
 * E-Hentai
+ * emtrek
 * Epizod
+ * Erai-Raws
 * ETTV
 * EXT Torrents
 * ExtraTorrent.cd
+ * ExtraTorrent.it
 * EZTV
 * Filebase
 * FireBit
@@ -62,16 +67,16 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * GkTorrent
 * GloDLS
 * GTorrent
- * HDReactor
+ * GTorrent.pro
+ * HDhouse (HDReactor)
 * IBit
 * Idope
 * Il CorSaRo Blu
- * Il Corsaro Nero <!-- maintained by bonny1992 -->
+ * Il Corsaro Nero
 * Internet Archive (archive.org)
 * Isohunt2
 * iTorrent
- * KickAssTorrent (KATcr)
- * kickasstorrents (kickass.ws)
+ * kickasstorrents.ws
 * kickasstorrents.to
 * Legit Torrents
 * LePorno.info
@@ -79,11 +84,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * LinuxTracker
 * MacTorrents
 * Magnet4You
- * MagnetDL
- * MejorTorrent <!-- maintained by ivandelabeldad -->
- * Monova
- * MovCr
+ * MejorTorrent
+ * MixTapeTorrent
+ * Montorrent
 * MoviesDVDR
+ * MovieTorrent
 * MyPornClub
 * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
 * Newstudio
@@ -92,6 +97,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * NoNaMe Club (NNM-Club)
 * Nyaa-Pantsu
 * Nyaa.si
+ * OnceSearch
 * OneJAV
 * OxTorrent
 * ParnuXi
@@ -103,6 +109,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * PornoLive
 * PornoRip
 * PornoTor
+ * Portugas
 * ProPorn
 * ProStyleX
 * Rapidzona
@@ -117,41 +124,44 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * ShizaProject
 * shokweb
 * ShowRSS
- * SkyTorrentsClone
+ * SkyTorrents.to
 * Solid Torrents
 * sosulki
+ * SubsPlease
 * sukebei-Pantsu
 * sukebei.Nyaa.si
 * The Pirate Bay (TPB)
+ * TNTfork
 * Tokyo Tosho
 * 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 (토렌트뷰)
- * Torrentz2
- * Torrentz2k
+ * TorrentWhiz ( 토렌트위즈)
 * truPornolabs
 * Underverse
 * UnionDHT
 * VSTHouse
 * VST Torrents
- * XFSUB
 * xxxAdultTorrent
 * xxxtor
 * xxxtorrents
@@ -164,12 +174,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>

 * AniDUB
+ * Anime-Free
 * ArenaBG
 * BaibaKo
 * BookTracker
 * BootyTape
 * CasStudioTV
- * cool-torrent
+ * Catorrent
 * Darmowe torrenty
 * Deildu
 * DimeADozen (EzTorrent)
@@ -178,14 +189,15 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Erzsebet
 * Erzsebet.pl
 * ExKinoRay
- * ExtremlymTorrents (XTR)
+ * Genesis-Movement
 * HamsterStudio
+ * HunTorrent
 * IV-Torrents
 * KinoNaVse100
 * Kinorun
 * Kinozal
- * Korsar
 * LostFilm.tv
+ * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
 * MVGroup Forum
 * MVGroup Main
 * Marine Tracker
@@ -203,6 +215,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Sharewood
 * SkTorrent
 * SkTorrent-org
+ * themixingbowl (TMB)
 * Toloka.to
 * Torrent-Explosiv
 * Torrents-Local
@@ -217,33 +230,32 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * 0day.kiev
 * 1ptbar
 * 2 Fast 4 You
- * 32Pages (32P)
 * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
 * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
- * 3evils
 * 4thD (4th Dimension)
 * 52PT
 * 720pier
 * 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) [![(invite needed)][inviteneeded]](#)
 * ArabP2P
- * Asgaard (AG)
 * AsianCinema
- * AST4u [![(invite needed)][inviteneeded]](#)
 * Asylum Share
 * AudioNews (AN)
- * Audiobook Torrents (ABT + RNS)
+ * Aussierul.es [![(invite needed)][inviteneeded]](#)
 * AvistaZ (AsiaTorrents)
- * Awesome-HD (AHD)
 * Borgzelle
 * Back-ups
 * bB
@@ -252,7 +264,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BeyondHD (BHD)
 * Bibliotik
 * BIGTorrent
- * BigTower
 * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
 * BIT-HDTV
 * BiT-TiTAN
@@ -269,7 +280,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BroadCity [![(invite needed)][inviteneeded]](#)
 * BroadcasTheNet (BTN)
 * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BTGigs (TG) [![(invite needed)][inviteneeded]](#)
 * BTNext (BTNT)
 * BTSCHOOL
 * BWTorrents
@@ -280,18 +290,19 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Carpathians
 * CartoonChaos (CC)
 * CasaTorrent [![(invite needed)][inviteneeded]](#)
- * ChannelX
 * ChileBT
 * Cinecalidad
- * CinemaMovies
+ * CinemaMovieS_ZT
 * CinemaZ (EuTorrents)
 * Cinemageddon
 * Cinematik
 * Classix
+ * Coastal-Crew
 * Concertos
 * CrazyHD
 * CrazySpirits
 * CrnaBerza
+ * DANISH BYTES
 * Darius Tracker
 * Dark-Shadow
 * Dark Tracker
@@ -304,23 +315,20 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * DigitalCore
 * DivTeam
 * DivxTotal
- * DocumentaryTorrents (DT)
 * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
- * DXDHD
 * EbookParadijs
 * Ebooks-Shares
 * EfectoDoppler
- * Elite-Tracker
 * Empornium (EMP)
 * EpubLibre
 * eShareNet
 * eStone (XiDER, BeLoad)
- * Ethor.net (Thor's Land)
 * ExoticaZ (YourExotic)
 * ExtremeBits
 * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
 * FANO.IN
 * Fantastic Heaven
+ * FeedUrNeed
 * Femdomcult
 * FileList (FL)
 * Film-Paleis
@@ -329,16 +337,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * FocusX
 * Fou-Du-Cinema
 * FreeTorrent
- * FullMixMusic
 * FunFile (FF)
 * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
- * FunReleases [![(invite needed)][inviteneeded]](#)
 * Fuzer (FZ)
 * GFXPeers
 * Galeriens (LaPauseTorrents)
 * Gay-Torrents.net
 * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
- * GAYtorrent.ru [![(invite needed)][inviteneeded]](#)
+ * GAYtorrent.ru
 * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
 * Generation-Free
 * GigaTorrents
@@ -347,7 +353,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * GreekDiamond
 * Greek Team
 * HaiDan
- * HacheDe
 * HD Dolby [![(invite needed)][inviteneeded]](#)
 * HD-Bits.com
 * HD-Forever (HDF)
@@ -358,17 +363,16 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * HD-Torrents (HDT)
 * HD4FANS [![(invite needed)][inviteneeded]](#)
 * HDArea (HDA)
+ * HDAtmos
 * HDBits
 * HDCenter [![(invite needed)][inviteneeded]](#)
 * HDChina (HDWing)
 * HDC (HDCiTY)
 * HDCity
- * HDDisk (HDD)
 * HDHome (HDBigger)
 * HDME
 * HDRoute [![(invite needed)][inviteneeded]](#)
 * HDSky
- * HDStreet
 * HDTime
 * HDTorrents.it
 * HDTurk [![(invite needed)][inviteneeded]](#)
@@ -377,10 +381,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Hebits
 * HellasTZ
 * Hon3y HD
- * Horror Site
 * HQSource (HQS)
 * HuSh [![(invite needed)][inviteneeded]](#)
- * ICE Torrent
 * IPTorrents (IPT)
 * ImmortalSeed (iS)
 * Immortuos
@@ -394,7 +396,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * LatinoP2P
 * Le Saloon
 * LeChaudron
- * LeagueHD
+ * LemonHD
 * LearnFlakes
 * LegacyHD (HD4Free)
 * Libble
@@ -403,29 +405,28 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * LosslessClub
 * M-Team TP (MTTP)
 * MaDs Revolution
+ * magic-heaven
 * Magico (Trellas)
 * Majomparádé (TurkDepo)
+ * MeseVilág (Fairytale World)
 * MicroBit (µBit)
 * Milkie
 * MMA-Torrents
 * MNV (Max-New-Vision)
 * Mononoké-BT [![(invite needed)][inviteneeded]](#)
 * MoreThanTV (MTV)
- * Movie Zone (Mz)
 * MyAnonamouse (MAM)
- * myAmity
 * MySpleen [![(invite needed)][inviteneeded]](#)
 * NBTorrents [![(invite needed)][inviteneeded]](#)
 * NCore
 * Nebulance (NBL) (TransmiTheNet)
 * NetCosmo
 * NetLab
- * New Real World [![(invite needed)][inviteneeded]](#)
 * NorBits
- * notwhat.cd
+ * Nordic+
+ * Oasis
 * oMg[WtF]trackr
- * OnlineSelfEducation
- * ONLYscene
+ * OpenCD
 * Orpheus
 * OshenPT
 * Ourbits (HDPter)
@@ -443,15 +444,16 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * PolishTracker
 * PornBits (PB)
 * Pornbay [![(invite needed)][inviteneeded]](#)
+ * PotUK
 * Pretome
 * PrivateHD (PHD)
 * ProAudioTorrents (PAT)
- * Psytorrents [![(invite needed)][inviteneeded]](#)
 * PTerClub
 * PTFiles (PTF)
 * PThome
 * PTMSG
 * PTSBAO
+ * PTtime
 * PuntoTorrent
 * PuroVicio
 * Puur-Hollands
@@ -459,13 +461,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * R3V WTF! [![(invite needed)][inviteneeded]](#)
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
+ * RedBits
 * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
 * Redacted (PassTheHeadphones)
 * RetroFlix
 * RevolutionTT
+ * ROFD
 * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
 * RPTorrents
- * SceneFZ
 * SceneHD
 * ScenePalace (SP)
 * SceneRush
@@ -473,14 +476,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * SDBits [![(invite needed)][inviteneeded]](#)
 * Secret Cinema
 * SeedFile (SF)
- * ShareUniversity
 * Shareisland
 * Shazbat
- * Shellife (SL) [![(invite needed)][inviteneeded]](#)
 * SiamBIT
 * SnowPT (SSPT)
 * SoulVoice [![(invite needed)][inviteneeded]](#)
- * SpaceTorrent
+ * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
 * SpeedCD
 * Speedmaster HD
 * SpeedTorrent Reloaded
@@ -488,15 +489,15 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * SportHD [![(invite needed)][inviteneeded]](#)
 * SportsCult
 * SpringSunday
+ * SugoiMusic
 * Superbits (SBS)
- * TakeaByte
 * Tapochek
 * Tasmanit [![(invite needed)][inviteneeded]](#)
 * TeamHD
 * TeamOS
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * TellyTorrent
- * TenYardTorrents (TYT) [![(invite needed)][inviteneeded]](#)
+ * teracod (Movie Zone)
 * The Falling Angels (TFA)
 * The Geeks [![(invite needed)][inviteneeded]](#)
 * The Horror Charnel (THC)
@@ -508,6 +509,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * The Vault [![(invite needed)][inviteneeded]](#)
 * TheAudioScene
 * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
+ * TheLeachZone
+ * TheScenePlace (TSP)
 * TJUPT
 * TLFBits [![(invite needed)][inviteneeded]](#)
 * ToTheGlory (TTG)
@@ -532,6 +535,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
 * Torrentland
 * TotallyKids (TK)
+ * Trackeros
 * TranceTraffic [![(invite needed)][inviteneeded]](#)
 * Trezzor
 * TTsWEB
@@ -557,11 +561,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * XWT-Classics
 * XWTorrents (XWT)
 * Xthor
- * XtreMeZone (MYXZ)
 * YDYPT
- * YingK
 * Zamunda.net
 * Zelka.org
+ * ZonaQ
 </details>

 Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com to get them fixed/improved.
@@ -587,12 +590,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.

@@ -676,7 +680,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:
 ```
@@ -700,6 +704,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
@@ -725,9 +743,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
@@ -756,13 +771,15 @@ 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)
-* Right-click on the Jackett solution and click 'Rebuild Solution' to restore NuGet packages
-* Select Jackett.Server as the startup project
-* In the drop-down menu of the run button select "Jackett.Server" instead of "IIS Express"
+* Open PowerShell and from the `src` directory:
+* - run `dotnet msbuild /restore`
+* - then run `dotnet restore`
+* - and run `dotnet build`
+* Open the Jackett solution in Visual Studio 2019 (version 16.9 or above)
+* Select **Jackett.Server** as the startup project
+* In the drop-down menu of the run button select **Jackett.Server** instead of _IIS Express_
 * Build/Start the project

 ### OSX
@@ -776,21 +793,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:
@@ -50,7 +50,7 @@ stages:
              runtime: osx-x64
              archiveType: tar
              artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
              buildDescription: Linux AMD x64
              imageName: ubuntu-latest
              framework: $(netCoreFramework)
@@ -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,22 @@ 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 --fix-whitespace --verbosity diagnostic --folder ./src/DateTimeRoutines
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Common
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Server
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Service
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Test
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Tray
+                dotnet-format --fix-whitespace --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
@@ -346,21 +362,16 @@ stages:
              imageName: macOS-latest
              framework: $(netCoreFramework)
              runtime: osx-x64
-            LinuxAmdx64:
+            LinuxAMDx64:
              buildDescription: Linux AMD x64
              imageName: ubuntu-latest
              framework: $(netCoreFramework)
              runtime: linux-x64
-            LinuxARM32:
-              buildDescription: Linux ARM32
+            LinuxARM:
+              buildDescription: Linux ARM
              imageName: ubuntu-latest
              framework: $(netCoreFramework)
              runtime: linux-arm
-            LinuxARM64:
-              buildDescription: Linux ARM64
-              imageName: ubuntu-latest
-              framework: $(netCoreFramework)
-              runtime: linux-arm64
        pool:
          vmImage: $(imageName)
        displayName: ${{ variables.buildDescription }}
@@ -453,7 +464,7 @@ stages:
              buildDescription: macOS
              imageName: macOS-latest
              artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
              buildDescription: Linux AMD x64
              imageName: ubuntu-latest
              artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz
--- 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/nuget.config
+++ b/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
--- 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/apple-touch-icon-114x114.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-114x114.png
--- a/src/Jackett.Common/Content/apple-touch-icon-120x120.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-120x120.png
--- a/src/Jackett.Common/Content/apple-touch-icon-144x144.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-144x144.png
--- a/src/Jackett.Common/Content/apple-touch-icon-152x152.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-152x152.png
--- a/src/Jackett.Common/Content/apple-touch-icon-180x180.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-180x180.png
--- a/src/Jackett.Common/Content/apple-touch-icon-57x57.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-57x57.png
--- a/src/Jackett.Common/Content/apple-touch-icon-72x72.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-72x72.png
--- a/src/Jackett.Common/Content/apple-touch-icon-76x76.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-76x76.png
--- a/src/Jackett.Common/Content/apple-touch-icon.png
+++ b/src/Jackett.Common/Content/apple-touch-icon.png
--- a/src/Jackett.Common/Content/custom.css
+++ b/src/Jackett.Common/Content/custom.css
@@ -55,6 +55,10 @@ body {
    max-width: 255px;
 }

+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputcheckbox label {
    padding: 0 1.5em;
 }
@@ -134,8 +138,8 @@ hr {
    }

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

@@ -165,7 +169,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
--- a/src/Jackett.Common/Content/custom_mobile.css
+++ b/src/Jackett.Common/Content/custom_mobile.css
@@ -55,6 +55,10 @@ body {
    max-width: 255px;
 }

+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputbool input {
    max-width: 100px;
    height: 20px;
@@ -126,8 +130,8 @@ hr {
    }

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

@@ -157,7 +161,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,16 +7,8 @@
    <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" />
-    <link rel="apple-touch-icon" sizes="76x76" href="../apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="../apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="../apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="../apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="../apple-touch-icon-152x152.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="../apple-touch-icon-180x180.png" />
    <link rel="mask-icon" href="../jackett_medium.png" color="#35c5f4">
    <link rel="icon" type="image/ico" href="../favicon.ico" />
    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
@@ -25,17 +17,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 +119,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,7 +127,7 @@
            <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>

@@ -189,6 +180,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="">
@@ -205,13 +212,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>
@@ -227,6 +227,11 @@
            {{/if}}
        </div>
    </script>
+    <script id="setup-item-password" type="text/x-handlebars-template">
+        <div class="setup-item-password">
+            <input class="form-control" type="password" value="{{{value}}}" />
+        </div>
+    </script>
    <script id="setup-item-inputbool" type="text/x-handlebars-template">
        <div class="setup-item-inputbool">
            {{#if value}}
@@ -262,10 +267,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>
@@ -374,7 +375,12 @@
                </tbody>
                <tfoot>
                    <tr>
-                        <td colspan="6"></td>
+                        <th>Indexer</th>
+                        <th>Categories</th>
+                        <th>Type</th>
+                        <th>Type string</th>
+                        <th>Language</th>
+                        <th></th>
                    </tr>
                </tfoot>
            </table>
@@ -414,13 +420,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>
@@ -537,11 +543,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>
@@ -692,6 +698,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20200926"></script>
+    <script type="text/javascript" src="../custom.js?changed=20210424"></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/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)"}
@@ -99,7 +99,7 @@ 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: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
@@ -149,7 +149,7 @@ search:
      selector: td:nth-child(2) i
      filters:
        - name: append
-          args: " +03:00"
+          args: " +03:00" # MSK
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -14,9 +14,8 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337.root.yt/
-  - https://1337x.unblockit.lat/
-  - https://1337x.unblocked.rest/
+  - https://1337x.unblockit.onl/
+  - https://1337x.nocensor.space/
 legacylinks:
  - https://1337x.unblocked.earth/
  - https://1337x.unblockit.pro/
@@ -35,6 +34,16 @@ legacylinks:
  - 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/
+  - https://1337x.unblockit.link/
+  - https://1337x.unblockit.buzz/
+  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.club/

 caps:
  categorymappings:
@@ -44,7 +53,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"}
@@ -58,7 +66,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"}
@@ -71,7 +78,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"}
@@ -81,44 +87,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"}
@@ -139,10 +141,8 @@ 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
@@ -167,9 +167,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"]
@@ -186,6 +186,7 @@ search:
      selector: td[class^="coll-1"] a[href^="/torrent/"]
      attribute: href
      filters:
+        - name: urldecode
        - name: split
          args: ["/", 3]
    title:
@@ -193,11 +194,28 @@ search:
      text: "{{ if .Result.title_href }}{{ .Result.title_href }}{{ else }}{{ .Result.title_text }}{{ end }}"
      filters:
        - name: re_replace
-          args: ["(-+)", " "]
+          args: ["-", " "]
        - name: replace
          args: ["Grey's Anatomy", "Greys Anatomy"]
        - name: replace
-          args: ["\u000f", ""] # get rid of unwanted character
+          args: ["\u000f", ""] # get rid of unwanted character #6582
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
    category:
      text: 40
    category|noappend:
@@ -221,14 +239,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:
@@ -238,14 +250,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/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -11,15 +11,17 @@ links:
 caps:
  categorymappings:
    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 403, cat: TV, desc: "TV Show/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐视频"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺节目"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
-    - {id: 409, cat: Other, desc: "Other/其它"}
-    - {id: 412, cat: Other, desc: "Education/教育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/高品质音频"}
+    - {id: 412, cat: Other, desc: "Edu/教育"}
+    - {id: 411, cat: PC/Games, desc: "Games/游戏"}
+    - {id: 410, cat: PC/0day, desc: "Software/软件"}

  modes:
    search: [q]
@@ -107,7 +109,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    date:
@@ -126,7 +127,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/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"}
@@ -149,7 +149,7 @@ 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
    incldead: 1
@@ -203,7 +203,7 @@ search:
      filters:
        - name: replace
          args: ["torrents-details.php", "download.php"]
-    banner:
+    poster:
      selector: img.rounded-img
      attribute: src
    size:
--- a/src/Jackett.Common/Definitions/32pages.yml
+++ b/src/Jackett.Common/Definitions/32pages.yml
@@ -1,149 +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]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2facode
-    type: text
-    label: 2FA code
-  - name: info_2fa
-    type: info
-    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 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
@@ -130,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:
@@ -139,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,189 +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.net/
-legacylinks:
-  - https://www.3evils.com/
-  - https://the-unknown.xyz/
-
-caps:
-  categorymappings:
-    - {id: 73, cat: PC, desc: "Appz/Linux"}
-    - {id: 42, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
-    - {id: 65, cat: Books/Ebook, desc: "Books"}
-    - {id: 80, cat: Console/NDS, desc: "Games/Nintendo"}
-    - {id: 78, cat: Console/PS4, desc: "Games/PS4"}
-    - {id: 77, cat: PC/Games, desc: "Games/Windows"}
-    - {id: 79, cat: Console/Xbox, desc: "Games/XBOX"}
-    - {id: 13, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 71, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 72, cat: Movies/BluRay, desc: "Movies/Blu-Ray"}
-    - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
-    - {id: 14, cat: Movies, desc: "Movies/Packs"}
-    - {id: 70, cat: Movies/SD, desc: "Movies/Screeners & Cams"}
-    - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
-    - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
-    - {id: 11, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 74, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 33, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 32, cat: Audio, desc: "Music/Packs"}
-    - {id: 75, cat: Audio/Video, desc: "Music/Videos"}
-    - {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"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-  error:
-    - selector: div.callout:contains("Login failed!")
-  test:
-    path: /
-    selector: a[href*="/logout.php?hash_please="]
-
-search:
-  paths:
-    # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=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
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.unstriped tbody tr:has(a[href^="download.php?torrent="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.*?)</b>"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    banner:
-      selector: a[href^="details.php?id="]
-      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", ""]
-    files:
-      selector: td[data-label="Files"]
-    # 2 flavours of dates
-    date:
-      # Today<br> 10:20 AM
-      # Yesterday<br> 08:03 PM
-      optional: true
-      selector: td[data-label="Added"]:contains("day")
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-    date:
-      # Feb 14 2019<br> 10:20 AM
-      optional: true
-      selector: td[data-label="Added"]:not(:contains("day"))
-      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[data-label="Size"]
-    grabs:
-      selector: td[data-label="Snatched"]
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: td[data-label="Seeders"]
-    leechers:
-      selector: td[data-label="Leechers"]
-    downloadvolumefactor:
-      case:
-        "a.info:contains(\"[FREE]\")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V5 (customised)
--- 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,7 +33,7 @@ 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]
@@ -90,7 +91,7 @@ search:
    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    order_by: "{{ .Config.sort }}"
    order_way: "{{ .Config.type }}"
-    # 0 all 1 onlyfree
+    # 0 all, 1 onlyfree
    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
    title: "{{ .Keywords }}"
    search_type: 1
@@ -117,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=(.*?)>"
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -112,7 +112,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: div.imdb_100 > a
      attribute: href
    date:
@@ -122,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:
@@ -131,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:
--- a/src/Jackett.Common/Definitions/7torrents.yml
+++ b/src/Jackett.Common/Definitions/7torrents.yml
@@ -10,24 +10,16 @@ links:

 caps:
  categories:
-    1: TV
-    2: Movies
-    3: Other
+    Other: Other

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

 settings:
-  - name: category-id
-    type: select
-    label: The 7torrents web site does not provide categories. Select the category you want Jackett to set on all results returned.
-    default: 3
-    options:
-      1: TV
-      2: Movies
-      3: Other
  - name: sort
    type: select
    label: Sort requested from site
@@ -36,6 +28,14 @@ settings:
      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
@@ -50,7 +50,7 @@ search:

  fields:
    category:
-      text: "{{ .Config.category-id }}"
+      text: Other
    title:
      selector: div.media
      attribute: data-name
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -43,7 +43,7 @@ caps:
    - {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"}
@@ -70,11 +70,11 @@ caps:
    # 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"}
@@ -82,7 +82,7 @@ caps:
    - {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"}

@@ -121,6 +121,14 @@ settings:
    options:
      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
--- a/src/Jackett.Common/Definitions/DasUnerwartete.yml
+++ b/src/Jackett.Common/Definitions/DasUnerwartete.yml
@@ -32,20 +32,20 @@ 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]
@@ -61,6 +61,9 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: pin
+    type: text
+    label: Pin

 login:
  path: login.php
@@ -69,15 +72,16 @@ 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}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    incldead: 1

@@ -119,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:
      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,52 +40,53 @@ 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
@@ -96,17 +97,7 @@ settings:
    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

@@ -114,7 +105,7 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # title, descr
    searchin: title
@@ -141,7 +132,7 @@ search:
    download:
      selector: a[href^="download.php?torrent="]
      attribute: href
-    banner:
+    poster:
      selector: img[src*="/img.php?"]
      attribute: src
    files:
--- a/src/Jackett.Common/Definitions/acgsou.yml
+++ b/src/Jackett.Common/Definitions/acgsou.yml
@@ -45,6 +45,7 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep]
+    music-search: [q]
    book-search: [q]

 settings: []
@@ -57,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
@@ -95,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"}
@@ -81,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
@@ -119,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"}
@@ -137,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)
@@ -162,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
--- a/src/Jackett.Common/Definitions/aither.yml
+++ b/src/Jackett.Common/Definitions/aither.yml
@@ -10,14 +10,15 @@ links:

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 9, cat: TV/Sport, desc: "Sports"}
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 9, cat: TV/Sport, desc: "Sport"}
    - {id: 2, cat: TV, desc: "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: 15, cat: Other, desc: "Education"}
    - {id: 6, cat: XXX, desc: "XXX"}

  modes:
@@ -78,7 +79,7 @@ search:
    - 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 }}"
@@ -86,10 +87,13 @@ 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:
@@ -110,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:
@@ -132,49 +134,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)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -20,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"}
@@ -49,9 +49,9 @@ 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"}
@@ -166,7 +166,7 @@ search:
    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
+    # drop the year from searches since site titles do not include year
    - name: re_replace
      args: ["(19|20[0-9]{2})", ""]

@@ -205,7 +205,7 @@ search:
        - name: append
          args: "{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
        - name: re_replace
-          args: ["(Dual-Audio|Dublado)", "Brazilian $1"]
+          args: ["(Dual|[Nn]acional|[Dd]ublado)", "Brazilian $1"]
    details:
      selector: a[href*="torrents-details.php?id="], a[href*="details-misc.php?id="]
      attribute: href
--- a/src/Jackett.Common/Definitions/anaschcc.yml
+++ b/src/Jackett.Common/Definitions/anaschcc.yml
@@ -0,0 +1,159 @@
+---
+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}
+    - {id: 38, cat: Console, desc: Games}
+
+  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: 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: 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/21 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/06 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/anime-free.yml
+++ b/src/Jackett.Common/Definitions/anime-free.yml
@@ -0,0 +1,138 @@
+---
+id: anime-free
+name: Anime-Free
+description: "Anime-Free is a RUSSIAN Semi-Private Torrent Tracker for Hentai manga, eroge and flash porn games"
+language: ru-ru
+type: semi-private
+encoding: windows-1251
+links:
+  - https://anime-free.biz/
+legacylinks:
+  - https://anime-free.net/ # redirects to *.biz
+
+caps:
+  categorymappings:
+    - {id: 14, cat: TV/Anime, desc: "Аниме хентай"}
+    - {id: 47, cat: TV/Anime, desc: "   Хентай на Русском языке"}
+    - {id: 48, cat: TV/Anime, desc: "   Хентай Без русского перевода"}
+    - {id: 45, cat: TV/Anime, desc: "   Хентай Без цензуры"}
+    - {id: 46, cat: TV/Anime, desc: "   Хентай с цензурой"}
+    - {id: 54, cat: Other, desc: "Косплей"}
+    - {id: 51, cat: TV/Anime, desc: "[3D] хентай и анимация"}
+    - {id: 5, cat: Books/Comics, desc: "Хентай манга"}
+    - {id: 56, cat: Console, desc: "Игры"}
+    - {id: 10, cat: Console, desc: "   Эротические и хентай игры"}
+    - {id: 55, cat: Console, desc: "   3DCG/3D-Animation игры"}
+    - {id: 57, cat: Console, desc: "   Игры на русском языке"}
+    - {id: 58, cat: Other, desc: "   Онлайн игры"}
+    - {id: 52, cat: Books/Comics, desc: "Порно комиксы"}
+    - {id: 49, cat: XXX/ImageSet, desc: "Хентай картинки, иллюстрации, обои и Art "}
+    - {id: 43, cat: TV/Anime, desc: "Эччи (Легкая эротика)"}
+    - {id: 4, cat: TV/Anime, desc: "Аниме Хентай"}
+    - {id: 50, cat: Other, desc: "Хентай Онлайн"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: email
+    type: text
+    label: Email
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: /
+  method: form
+  form: form.login-form
+  inputs:
+    login_name: "{{ .Config.email }}"
+    login_password: "{{ .Config.password }}"
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/engine/download.php?id="]
+  attribute: href
+
+search:
+  # https://anime-free.biz/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story=slaves+to+passion&all_word_seach=1&titleonly=3&searchuser=&replyless=0&replylimit=0&searchdate=0&beforeafter=after&sortby=date&resorder=desc&showposts=0&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: 0
+    all_word_seach: 1
+    # 0 article, 1 comments, 2 static pages, 3 article titles
+    titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
+    searchdate: 0
+    searchuser: ""
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    sortby: date
+    resorder: desc
+
+  rows:
+    selector: article
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      case:
+        a[href$="3d_hentai"]: 51
+        a[href$="3dcg_game"]: 55
+        a[href$="censored"]: 46
+        a[href$="comics"]: 52
+        a[href$="cosplay"]: 54
+        a[href$="etty"]: 43
+        a[href$="h-game"]: 10
+        a[href$="h-online"]: 50
+        a[href$="hentai"]: 4
+        a[href$="hentai_games"]: 56
+        a[href$="hentai_manga"]: 5
+        a[href$="hentai_raznoe"]: 49
+        a[href$="hentai_rus"]: 47
+        a[href$="online_games"]: 58
+        a[href$="original_hentai"]: 48
+        a[href$="rus-game"]: 57
+        a[href$="uncensored"]: 45
+    title:
+      selector: h2.title a
+    details:
+      selector: h2.title a
+      attribute: href
+    download:
+      selector: h2.title a
+      attribute: href
+    poster:
+      selector: img.entry-image
+      attribute: src
+    description:
+      selector: div[itemprop="description"]
+      optional: true
+    date:
+      selector: li:has(img#adddate)
+      filters:
+        - name: dateparse
+          args: "02-01-2006, 15:04"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      selector: b.file_size
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- 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:
@@ -53,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
@@ -69,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"]
@@ -117,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,11 +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,28 +40,24 @@ 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]
@@ -140,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 }}"
@@ -172,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:
@@ -193,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
@@ -47,12 +47,12 @@ caps:
    - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
    - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
    - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 109, cat: TV, desc: "رمضان 2020 (Ramadan 2020)"}
+    - {id: 110, cat: TV, desc: "رمضان 2021 (Ramadan 2021)"}
    # المرئيات الاجنبية 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"}
@@ -74,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)"}
@@ -116,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
--- a/src/Jackett.Common/Definitions/arenabg.yml
+++ b/src/Jackett.Common/Definitions/arenabg.yml
@@ -6,65 +6,70 @@ 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]
@@ -85,104 +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: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "15:04:05 -07:00"
-    date:
-      # 2018-10-19
-      selector: td:nth-child(3):contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "2006-01-02 -07:00"
-    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,205 +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]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-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: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - 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: 1
-    # 0 incl non-free, 1 incl only-free
-    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
-    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
-      remove: span
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "2 Jan 2006 15:04:05 -07:00"
-    date:
-      # Today, 20:26:23
-      # Yesterday, 13:50:05
-      selector: td:nth-child(2) > div > div:last-of-type:contains("day")
-      optional: true
-      remove: span
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: fuzzytime
-    downloadvolumefactor:
-      case:
-        img[src="./images/gold.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.95
-# Midgaard
--- a/src/Jackett.Common/Definitions/asiancinema.yml
+++ b/src/Jackett.Common/Definitions/asiancinema.yml
@@ -16,8 +16,8 @@ caps:

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

 settings:
@@ -71,16 +71,17 @@ search:
    - 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 }}"
@@ -103,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:
@@ -125,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:
@@ -149,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
@@ -12,12 +12,12 @@ caps:
  categorymappings:
    - {id: 104, cat: XXX, desc: "Adultos: Fotos +18"}
    - {id: 120, cat: TV/Anime, desc: "Anime: Anime"}
-    - {id: 122, cat: PC/Phone-Android, desc: "Aplicativos: Android"}
-    - {id: 115, cat: PC/Phone-Other, desc: "Aplicativos: Celular"}
+    - {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/Phone-Other, desc: "Aplicativos: Symbian"}
+    - {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"}
@@ -176,6 +176,9 @@ search:
    # 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="])
@@ -205,7 +208,7 @@ search:
        - name: regexp
          args: "(\\d{2}\\/\\d{2}\\/\\d{2} \\d{2}:\\d{2}:\\d{2})"
        - name: append
-          args: " -03:00"
+          args: " -03:00" # BRT
        - name: dateparse
          args: "02/01/06 15:04:05 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -7,14 +7,22 @@ type: public
 encoding: UTF-8
 links:
  - http://audiobookbay.nl/ # site forces http, does not support https
-  - https://audiobookbay.unblockit.lat/
+  - http://audiobookbay.net/
+  - http://audiobookbayabb.com/
+  - https://audiobookbay.unblockit.onl/
 legacylinks:
  - https://audiobookbay.la/
+  - https://audiobookbay.unblockit.lat/
+  - https://audiobookbay.unblockit.app/
+  - https://audiobookbay.unblockit.dev/
+  - https://audiobookbay.unblockit.ltd/
+  - https://audiobookbay.unblockit.link/
+  - https://audiobookbay.unblockit.buzz/
+  - https://audiobookbay.unblockit.club/

 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"}
@@ -40,12 +48,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"}
@@ -68,6 +76,7 @@ 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"}
@@ -101,6 +110,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:
@@ -109,15 +123,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"}
@@ -243,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
--- a/src/Jackett.Common/Definitions/aussierules.yml
+++ b/src/Jackett.Common/Definitions/aussierules.yml
@@ -0,0 +1,91 @@
+---
+id: aussierules
+name: Aussierul.es
+description: "Aussierul.es is a torrent site for Aussie Rules Football played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://aussierul.es/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: type
+    label: Search Type
+    type: select
+    default: t_name
+    options:
+      t_name: Torrent Name
+      t_description: Torrent Description
+      t_both: Name & Description
+      t_uploader: Uploader
+      t_genre: IMDB Genre
+  - name: dead
+    label: Include Dead Torrents
+    type: select
+    default: No
+    options:
+      yes: Yes
+      no: No
+
+login:
+  method: form
+  form: form
+  path: login.php
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:contains("An error has occured!")
+  test:
+    path: browse.php
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    search_type: "{{ .Config.type }}"
+    include_dead_torrents: "{{ .Config.dead }}"
+    keywords: "{{ .Keywords }}"
+
+  rows:
+    selector: table#sortabletable > tbody > tr:not(:first-child)
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: td:nth-child(2) > div:nth-child(1) > a > strong
+    details:
+      selector: td:nth-child(2) > div:nth-child(1) > a
+      attribute: href
+    download:
+      selector: a[href*="download.php?id="]
+      attribute: href
+    date:
+      # 27-03-2021 18:34
+      selector: td:nth-child(2) > div:nth-child(2)
+      filters:
+        - name: dateparse
+          args: "2-01-2006 15:04"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+# TS Special Edition v.7.4
--- a/src/Jackett.Common/Definitions/backups.yml
+++ b/src/Jackett.Common/Definitions/backups.yml
@@ -65,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:
@@ -90,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:
@@ -109,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/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -112,7 +112,7 @@ search:
    details:
      selector: a[href^="details.php?id="]
      attribute: href
-    banner:
+    poster:
      selector: img[src^="/posters/"]
      attribute: src
    download:
--- a/src/Jackett.Common/Definitions/beitai.yml
+++ b/src/Jackett.Common/Definitions/beitai.yml
@@ -114,7 +114,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: div.imdb_100 > a
      attribute: href
    date:
@@ -124,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:
@@ -133,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
@@ -16,7 +16,7 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    movie-search: [q, imdbid, tmdbid]

 settings:
  - name: oneurl
@@ -55,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:
@@ -79,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:
@@ -105,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
@@ -16,7 +16,7 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    movie-search: [q, imdbid, tmdbid]

 settings:
  - name: info_oid
@@ -75,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:
@@ -99,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:
@@ -125,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,8 +13,8 @@ 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]
@@ -30,25 +30,20 @@ settings:
  - name: orderby
    type: select
    label: Sort requested from site
-    default: relevance
+    default: added
    options:
-      relevance: relevance
-      year: year
+      "@relevance": relevance
+      title: title
      size: size
-      duration: duration
      added: added
-      leechers: leechers
      seeders: seeders
-      snatches: snatches
-      comments: comments
-      files: files
  - 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,54 +11,49 @@ 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]
@@ -96,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
@@ -183,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"}
@@ -52,8 +52,8 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    sent: "yes"
-    returnto: "/"
+    sent: yes
+    returnto: /
  error:
    - selector: div.error
  test:
@@ -67,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="]
@@ -98,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,148 +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]
-    book-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"}
@@ -90,7 +89,7 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep]
-    movie-search: [q, imdbid]
+    movie-search: [q]
    music-search: [q]
    book-search: [q]

@@ -111,9 +110,9 @@ settings:
    default: 1
    options:
      1: created
-      8: seeders
-      6: size
-      2: title
+      2: seeders
+      5: size
+      9: title
  - name: type
    type: select
    label: Order requested from site
@@ -137,97 +136,101 @@ login:
  error:
    - selector: div#login_error
  test:
-    path: browse.php
-    selector: a[href="logout.php"]
+    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: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # searchin: 1 name, 2 descr, 3 all, 4 genre, 5 movei titles, 6 actors, 7 authors, 8 directors, 9 filmcrew, 10 plot, 11 imdbid, 12 tmdbid
-    # note: although tmdbid appears as option 12, searching for this yields no results.
-    durchsuche: "{{ if .Query.IMDBID }}11{{ else }}1{{ end }}"
-    # incldead: 1 active, 2 all, 3 onlydead, 4 highlight, 5 bookmark, 6 onlyups, 7 freeleech, 8 multi2, 9 multi5, 10 multi10, 11 25%d,l 12 50%dl, 13 75%dl
-    # note: searching with freeleech yielded no results, using onlyups works.
-    suchein: "{{ if .Config.freeleech }}6{{ else }}2{{ end }}"
-    # 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("."))
+      # &nbsp;Heute 13:30:04
+      # &nbsp;Gestern 22:44:23
+      selector: td.added:not(:contains("."))
      optional: true
      filters:
+        - name: replace
+          args: ["\u00a0", ""]
        - name: replace
          args: ["Heute", "Today"]
        - name: replace
          args: ["Gestern", "Yesterday"]
        - name: append
          args: " +01:00" # CET
+        - name: fuzzytime
    date:
-      # &nbsp;&nbsp;27.05.2019 <b>12:52:11</b>
-      selector: div.tor-date:contains(".")
+      # &nbsp;24.05.2019 20:15:38
+      selector: td.added:contains(".")
      optional: true
      filters:
-        - name: replace
-          args: ["\u00a0", ""]
        - name: append
          args: " +01:00" # CET
        - name: dateparse
          args: "02.01.2006 15:04:05 -07:00"
    size:
-      selector: div.tor-size
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
+      selector: td.size
    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)
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -35,7 +35,7 @@ caps:
    - {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"}
@@ -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:
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@@ -38,7 +38,7 @@ 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:
@@ -64,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:
@@ -97,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:
@@ -123,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(" × ")
@@ -131,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,20 +6,22 @@ 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]
@@ -30,12 +32,9 @@ caps:

 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
@@ -50,8 +49,8 @@ search:
    - 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
@@ -81,7 +80,7 @@ search:
      filters:
        - name: replace
          args: ["Присутствует реклама", "Contains Adverts"]
-    banner:
+    poster:
      selector: a[href^="details.php?id="]
      attribute: onmouseover
      filters:
@@ -132,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"}
--- 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"}
@@ -132,8 +136,9 @@ search:
    searchin: title
    "sortOptions[sortBy]": "{{ .Config.sort }}"
    "sortOptions[sortOrder]": "{{ .Config.type }}"
-  error:
-    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))
+# Drop error trap to stop Sonarr disabling indexer, see https://github.com/Jackett/Jackett/issues/1415
+#  error:
+#    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))

  rows:
    selector: "table#torrents_table_classic tr:has(td.torrent_name){{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
@@ -185,9 +190,8 @@ search:
      selector: a[rel="torrent_leechers"]
    grabs:
      selector: a[rel="times_completed"]
-    banner:
+    poster:
      selector: a[rel="fancybox"]
-      optional: true
      attribute: href
    downloadvolumefactor:
      case:
--- 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
@@ -74,13 +74,12 @@ search:
    - 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 }}"
-    view: list
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
@@ -90,6 +89,7 @@ search:
    direction: "{{ .Config.type }}"
    qty: 100
    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -103,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:
@@ -132,49 +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)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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
@@ -194,4 +193,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# UNIT3D 3.0.0b
+# UNIT3D 5.2.1b
--- a/src/Jackett.Common/Definitions/booktracker.yml
+++ b/src/Jackett.Common/Definitions/booktracker.yml
@@ -10,7 +10,7 @@ links:

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

  modes:
    search: [q]
@@ -71,6 +71,8 @@ search:

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

  fields:
    category:
--- a/src/Jackett.Common/Definitions/bootytape.yml
+++ b/src/Jackett.Common/Definitions/bootytape.yml
@@ -3,7 +3,7 @@ id: bootytape
 name: BootyTape
 language: en-us
 description: "BootyTape is a Semi-Private site for 3X"
-type: private
+type: semi-private
 encoding: UTF-8
 links:
  - https://ssl.bootytape.com/
@@ -103,10 +103,9 @@ search:
      attribute: href
    description:
      selector: div.specg
-    banner:
+    poster:
      selector: img[src*="/thbx/imgx/"]
      attribute: src
-      optional: true
    files:
      text: 1
    files:
--- a/src/Jackett.Common/Definitions/borgzelle.yml
+++ b/src/Jackett.Common/Definitions/borgzelle.yml
@@ -17,7 +17,7 @@ caps:
    - {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: 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"}
@@ -33,11 +33,11 @@ caps:
    - {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: 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/Phone-Other, desc: "Software PDA/Handy"}
+    - {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"}

@@ -130,7 +130,7 @@ search:
    download:
      selector: a[href^="torrents.php?action=download&id="]
      attribute: href
-    banner:
+    poster:
      selector: a[href^="torrents.php?torrentid="] span img
      attribute: src
    date:
@@ -139,33 +139,33 @@ search:
      filters:
        - name: regexp
          args: "\\((.+?)\\)"
-        # 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)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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
@@ -173,7 +173,8 @@ search:
        - name: re_replace
          args: ["(?i) (an)", "year"]
        - name: re_replace
-          args: ["(?i)(und)", ""]
+          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:
--- a/src/Jackett.Common/Definitions/boxingtorrents.yml
+++ b/src/Jackett.Common/Definitions/boxingtorrents.yml
@@ -86,7 +86,7 @@ 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}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
    # 1 incldead, null active
    incldead: 1
    # 1 freeleech only, null all
--- a/src/Jackett.Common/Definitions/brasiltracker.yml
+++ b/src/Jackett.Common/Definitions/brasiltracker.yml
@@ -10,9 +10,7 @@ links:

 caps:
  categories:
-    1: TV
-    2: Movies
-    3: Other
+    Other: Other

  modes:
    search: [q]
@@ -26,14 +24,10 @@ settings:
  - name: password
    type: password
    label: Password
-  - name: category-id
-    type: select
-    label: The BrasilTracker web site does not provide categories. Select the category you want Jackett to set on all results returned.
-    default: 3
-    options:
-      1: TV
-      2: Movies
-      3: Other
+  - 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
@@ -91,7 +85,7 @@ search:

  fields:
    category:
-      text: "{{ .Config.category-id }}"
+      text: Other
    details:
      selector: a[href^="torrents.php?id="]
      attribute: href
@@ -100,14 +94,12 @@ search:
      attribute: href
    description:
      selector: div.tags
-    banner:
+    poster:
      selector: img[alt="Cover"]
      attribute: src
-      optional: true
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-      optional: true
    files:
      selector: td:nth-child(3)
    date:
@@ -141,8 +133,8 @@ search:
        - name: append
          args: " {{ .Result.title_details }}"
    minimumratio:
-      text: 0.6
+      text: 1.0
    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 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,35 +6,36 @@ 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:
    - {id: 1, cat: Movies/UHD, desc: "UHD"}
-    - {id: 2, cat: Movies/HD, desc: "BluRay"}
-    - {id: 8, cat: Movies/HD, desc: "TV"}
-    - {id: 6, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 16, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 3, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 25, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 4, cat: Movies/HD, desc: "BluRay"}
-    - {id: 7, cat: Movies/HD, desc: "TV"}
-    - {id: 5, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 14, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 27, cat: Movies/HD, desc: "LORD Rips"}
+    - {id: 2, cat: Movies/UHD, desc: "UHD - BluRay"}
+    - {id: 8, cat: Movies/UHD, desc: "UHD - TV"}
+    - {id: 6, cat: Movies/UHD, desc: "UHD - WEB-DL"}
+    - {id: 16, cat: Movies/UHD, desc: "UHD - WEBRip"}
+    - {id: 31, cat: Movies/BluRay, desc: "BluRay Disk"}
+    - {id: 3, cat: Movies/HD, desc: "HD"}
+    - {id: 25, cat: Movies/3D, desc: "HD - 3D"}
+    - {id: 4, cat: Movies/HD, desc: "HD - BluRay"}
+    - {id: 7, cat: Movies/HD, desc: "HD - TV"}
+    - {id: 5, cat: Movies/HD, desc: "HD - WEB-DL"}
+    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
+    - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
    - {id: 9, cat: Movies/SD, desc: "SD"}
-    - {id: 23, cat: Movies/SD, desc: "BluRay"}
-    - {id: 10, cat: Movies/SD, desc: "DVD"}
-    - {id: 12, cat: Movies/SD, desc: "TV"}
-    - {id: 13, cat: Movies/SD, desc: "WEB-DL"}
-    - {id: 15, cat: Movies/SD, desc: "WEBRip"}
+    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
+    - {id: 10, cat: Movies/SD, desc: "SD - DVD"}
+    - {id: 36, cat: Movies/SD, desc: "SD - DVDRip"}
+    - {id: 12, cat: Movies/SD, desc: "SD - TV"}
+    - {id: 13, cat: Movies/SD, desc: "SD - WEB-DL"}
+    - {id: 15, cat: Movies/SD, desc: "SD - WEBRip"}
    - {id: 17, cat: TV, desc: "TV"}
-    - {id: 26, cat: TV/Other, desc: "TV Program"}
-    - {id: 19, cat: TV, desc: "Yabanci Dizi"}
-    - {id: 18, cat: TV, desc: "Yerli Dizi"}
-    - {id: 20, cat: Movies/HD, desc: "VIP"}
+    - {id: 26, cat: TV/Other, desc: "TV - TV Program"}
+    - {id: 19, cat: TV, desc: "TV - Yabanci Dizi"}
+    - {id: 18, cat: TV, desc: "TV - Yerli Dizi"}

  modes:
    search: [q]
@@ -76,6 +77,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:
@@ -84,13 +91,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:
@@ -99,14 +103,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:
@@ -124,4 +124,9 @@ search:
      case:
        img[src$="/x2.gif"]: 2
        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TS Special Edition v.7.5
--- 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,8 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
+  # update poster placeholder link too
  - https://btdb.eu/
-  - https://btdb.unblockit.lat/
+  - https://btdb.unblockit.onl/
 legacylinks:
  - https://btdb.to/
  - https://btdb.unblocked.app/
@@ -28,21 +29,34 @@ legacylinks:
  - 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/
+  - https://btdb.unblockit.link/
+  - https://btdb.unblockit.buzz/
+  - https://btdb.unblockit.club/

 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
@@ -54,18 +68,18 @@ settings:

 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
@@ -80,12 +94,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:
@@ -100,10 +118,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
@@ -7,27 +7,24 @@ type: public
 encoding: UTF-8
 links:
  - https://btdig.com/
+  - http://btdiggwzoyrwwbiv.onion.ly/

 caps:
  categories:
-    1: TV
-    2: Movies
-    3: Other
+    Other: Other

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

 settings:
-  - name: category-id
-    type: select
-    label: The BTDigg web site does not provide categories. Select the category you want Jackett to set on all results returned.
-    default: 3
-    options:
-      1: TV
-      2: Movies
-      3: Other
+  - name: info_8000
+    type: info
+    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
@@ -54,7 +51,7 @@ search:

  fields:
    category:
-      text: "{{ .Config.category-id }}"
+      text: Other
    title:
      selector: div.torrent_name a
    details:
--- a/src/Jackett.Common/Definitions/btetree.yml
+++ b/src/Jackett.Common/Definitions/btetree.yml
@@ -12,7 +12,7 @@ legacylinks:

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

  modes:
    search: [q]
@@ -33,7 +33,7 @@ search:
    # 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/btgigs.yml
+++ b/src/Jackett.Common/Definitions/btgigs.yml
@@ -1,144 +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]
-    book-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,8 +92,8 @@ 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]
@@ -165,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:
@@ -177,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
@@ -199,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:
@@ -240,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
@@ -40,6 +40,10 @@ settings:
    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
@@ -58,7 +62,7 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .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%
@@ -94,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:
@@ -119,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.work/
+  - https://btsow.digital
 legacylinks:
  - https://btos.pw/
  - https://btio.pw/
@@ -20,27 +20,28 @@ legacylinks:
  - https://btsow.casa/
  - https://btsow.website/
  - https://btsow.online/
+  - https://btsow.work/
+  - https://btsow.store/
+  - https://btsow.surf/
+  - https://btsow.com/
+  - https://btsow.cam/

 caps:
  categories:
-    tv: TV
-    movies: Movies
-    other: Other
+    Other: Other

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

 settings:
-  - name: category-id
-    type: select
-    label: The BTSOW web site does not provide categories. Select the category you want Jackett to set on all results returned.
-    default: other
-    options:
-      tv: TV
-      movies: Movies
-      other: Other
+  - 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
@@ -48,12 +49,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: "{{ .Config.category-id }}"
+      text: Other
    title:
      selector: a[href*="/detail/hash/"]
      attribute: title
@@ -66,8 +69,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
@@ -9,6 +9,8 @@ links:
  - https://bwtorrents.tv/
  - https://bwtorrents.fun/
  - https://bwtorrents.xyz/
+  - https://bwtorrents.us/
+  - https://bwtorrents.live/

 caps:
  categorymappings:
@@ -18,33 +20,32 @@ 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-1080p WEB-Rips"}
-    - {id: 188, cat: Movies/WEBDL, desc: "Bollywood-720p 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: 189, cat: Movies/DVD, desc: "Bollywood-Encoded DVDs"}
-    - {id: 122, cat: Movies/WEBDL, desc: "Bollywood-DVDRips 1080p/720p"}
-    - {id: 123, cat: Movies/WEBDL, desc: "Bollywood-SDRips WEB/DVD"}
+    - {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: 190, cat: Movies, desc: "Bollywood-Movies packs"}
-    - {id: 125, cat: Movies/WEBDL, desc: "Bollywood-WEB Originals"}
+    - {id: 190, cat: Movies, desc: "Bollywood-Movie packs"}
+    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-Web Series"}
+    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
    - {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: 132, cat: Movies, desc: "Hollywood-WEB-Rips"}
+    - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"}
+    - {id: 132, cat: Movies, desc: "Hollywood-1080p WEB-Rips"}
+    - {id: 192, cat: Movies, desc: "Hollywood-720p WEB-Rips"}
    - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"}
-    - {id: 191, cat: Movies/WEBDL, desc: "Hollywood-Encoded DVDs"}
-    - {id: 134, cat: Movies/WEBDL, desc: "Hollywood-DVDRips 1080p/720p"}
+    - {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: 194, cat: Movies, desc: "Hollywood-Movie 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"}
@@ -52,10 +53,9 @@ caps:
    - {id: 144, cat: Movies, desc: "Marathi-Movies"}
    - {id: 145, cat: Movies, desc: "Bangla-Movies"}
    - {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: 184, cat: Movies, desc: "South Hindi Dubbed"}
+    - {id: 183, cat: Movies, desc: "English Hindi Dubbed"}
    - {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"}
@@ -66,13 +66,17 @@ caps:
    - {id: 152, cat: TV, desc: "TV-Star Bharat"}
    - {id: 153, cat: TV, desc: "TV-Star Plus"}
    - {id: 154, cat: TV, desc: "TV-Zee TV"}
+    - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
+    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
    - {id: 155, cat: TV/Sport, desc: "TV-Sports"}
-    - {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: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
+    - {id: 198, cat: Movies, desc: "TV-MTV"}
+    - {id: 158, cat: TV, desc: "TV-Other Tv Shows"}
+    - {id: 157, cat: TV, desc: "TV-Hollywood Tv Shows"}
+    - {id: 195, cat: TV, desc: "TV-Tv Packs"}
+    - {id: 159, cat: Audio, desc: "Music-Religion & Spirituality"}
    - {id: 160, cat: Audio, desc: "Music-Classical"}
+    - {id: 172, cat: Audio, desc: "Music-Remix"}
    - {id: 161, cat: Audio/Lossless, desc: "Music-Flacs"}
    - {id: 162, cat: Audio, desc: "Music-Ghazals"}
    - {id: 163, cat: Audio, desc: "Music-Hindi OSTs"}
@@ -84,18 +88,37 @@ caps:
    - {id: 169, cat: Audio/Video, desc: "Music-Videos"}
    - {id: 170, cat: Audio, desc: "Music-Pop"}
    - {id: 171, cat: Audio, desc: "Music-Punjabi"}
-    - {id: 172, cat: Audio, desc: "Music-Remix"}
-    - {id: 173, cat: Audio, desc: "Music-Tamil"}
    - {id: 174, cat: Audio, desc: "Music-Telugu"}
+    - {id: 173, cat: Audio, desc: "Music-Tamil"}
    - {id: 196, cat: Audio, desc: "Music-Packs"}
-    - {id: 175, cat: Books/Ebook, desc: "EBooks"}
+    - {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]
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -262,10 +262,10 @@ download:
  attribute: href

 search:
-  # keywords (any age posts, article titles only search)
+  # keywords (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
+  # keywordless (article body search) query=game
+  # do=search&subaction=search&story=game&titleonly=0&searchdate=0&sortby=date&resorder=desc&catlist[]=0
  paths:
    - path: index.php
  inputs:
@@ -278,13 +278,13 @@ search:
    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 }}"
+    searchdate: 0
    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}game{{ end }}"
    sortby: date
    resorder: desc

  rows:
-    selector: div.short_search:not(div.shor_subtitles span:nth-child(2):empty)
+    selector: div.short_search:has(div.shor_subtitles span:nth-child(2):contains("Б"))

  fields:
    category:
@@ -305,10 +305,9 @@ search:
    download:
      selector: div.short_titles > a
      attribute: href
-    banner:
+    poster:
      selector: img
      attribute: src
-      optional: true
    description:
      selector: div.shor_desc
      optional: true
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -11,27 +11,25 @@ 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"}
@@ -82,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
@@ -116,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)
@@ -160,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
@@ -36,7 +36,7 @@ caps:
    - {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/Phone-Other, desc: "Mobil"}
+    - {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"}
@@ -134,11 +134,9 @@ search:
        - name: replace
          args: ["/details", "/download"]
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: a[onmouseover]
      attribute: onmouseover
      filters:
@@ -151,7 +149,7 @@ search:
        - name: replace
          args: ["\u00a0", " "]
        - name: append
-          args: " +02:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    files:
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -55,7 +55,7 @@ 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"}

@@ -85,7 +85,7 @@ search:
  inputs:
    page: torrents
    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{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
@@ -97,22 +97,21 @@ search:
    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:
@@ -121,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:
--- 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"}
@@ -179,7 +179,7 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    banner:
+    poster:
      selector: img[src*="/uploads/images/"]
      attribute: src
    grabs:
@@ -200,8 +200,10 @@ 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
--- 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:
@@ -270,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
--- a/src/Jackett.Common/Definitions/catorrent.yml
+++ b/src/Jackett.Common/Definitions/catorrent.yml
@@ -0,0 +1,105 @@
+---
+id: catorrent
+name: Catorrent
+description: "Catorrent is a RUSSIAN Semi-Private Torrent Tracker for GAMES"
+language: ru-ru
+type: semi-private
+encoding: UTF-8
+links:
+  - https://catorrent.org/
+
+caps:
+  categorymappings:
+    - {id: PC, cat: PC/Games, desc: "PC"}
+    - {id: PS1, cat: Console/Other, desc: "Playstation 1"}
+    - {id: PS2, cat: Console/Other, desc: "Playstation 2"}
+    - {id: PS3, cat: Console/PS3, desc: "Playstation 3"}
+    - {id: PS4, cat: Console/PS4, desc: "Playstation 4"}
+    - {id: SWITCH, cat: Console/Other, desc: "Nintendo Switch"}
+    - {id: PSP, cat: Console/PSP, desc: "Playstation (portable) PSP"}
+    - {id: PSVITA, cat: Console/PS Vita, desc: "Playstation Vita"}
+    - {id: XONE, cat: Console/XBox One, desc: "Xbox ONE"}
+    - {id: X360, cat: Console/XBox 360, desc: "Xbox 360"}
+    - {id: WIIU, cat: Console/WiiU, desc: "Nintendo WIIU"}
+    - {id: WII, cat: Console/Wii, desc: "Nintendo WII"}
+    - {id: 3DS, cat: Console/3DS, desc: "Nintendo 3DS"}
+    - {id: NDS, cat: Console/NDS, desc: "Nintendo DS"}
+    - {id: N64, cat: Console/Other, desc: "Nintendo 64"}
+    - {id: NGC, cat: Console/Other, desc: "Nintendo Game Cube"}
+    - {id: DREAMCAST, cat: Console/Other, desc: "Dreamcast"}
+    - {id: SAT, cat: Console/Other, desc: "Sega Saturn"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: index.php
+  method: form
+  form: form[action=""]
+  inputs:
+    login_name: "{{ .Config.username }}"
+    login_password: "{{ .Config.password }}"
+    login_not_save: ""
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/index.php?do=download&id="]
+  attribute: href
+
+search:
+  # https://catorrent.org/index.php?do=search&subaction=search&story=lovelot
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.short_game_search
+
+  fields:
+    category:
+      selector: div.icon_default
+    title:
+      selector: div.short_game_title
+    details:
+      selector: a[href$=".html"]
+      attribute: href
+    download:
+      selector: a[href$=".html"]
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    description:
+      selector: div.short_game_genre
+      optional: true
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      text: "512 MB"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/src/Jackett.Common/Definitions/ccfbits.yml
@@ -83,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 }}"

@@ -113,7 +113,6 @@ search:
      selector: a[href^="download.php/"]
      attribute: href
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
@@ -134,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/chilebt.yml
+++ b/src/Jackett.Common/Definitions/chilebt.yml
@@ -24,8 +24,8 @@ caps:

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

@@ -82,17 +82,18 @@ search:
    - 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:
@@ -113,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:
@@ -135,45 +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)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          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/cilipro.yml
+++ b/src/Jackett.Common/Definitions/cilipro.yml
@@ -6,20 +6,9 @@ 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/
@@ -80,6 +69,17 @@ legacylinks:
  - http://www.lrsoso9.xyz/
  - http://www.lrsoso10.xyz/
  - http://www.cilijj.xyz/
+  - 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.cilinb4.xyz/

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

 settings: []

@@ -98,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
@@ -119,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
@@ -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,14 +18,14 @@ 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"}
@@ -118,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:
--- 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/Show More
+++ b/Show More