bitbazis: update row selector

torrentqq: change domain *119.com
skipthecommercials: update category description (#12641 )
2025-09-15 16:34:11 +02:00 · 2021-12-05 06:32:47 +00:00 · 2021-12-05 05:28:20 +00:00 · 2021-12-05 04:14:21 +00:00 · 2021-12-04 21:13:01 +00:00 · 2021-12-04 21:07:38 +00:00
652 changed files with 15472 additions and 8934 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,36 +0,0 @@
-### 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. 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.
-
-### Environment
-
-**OS**:
-
-**.Net Runtime**: [.Net-Core/.Net-Framework/Mono]
-
-**.Net Version**:
-
-**Jackett Version**:
-
-**Last Working Jackett Version**:
-
-**Are you using a proxy or VPN?** [yes/no]
-
-### Description
-
-[List steps to reproduce the error and details on what happens and what you expected to happen]
-
-
-### Logged Error Messages
-
-[Place any relevant error messages you noticed from the logs here.]
-
-[Make sure you attach the full logs with your personal information removed in case we need more information]
-
-### Screenshots
-
-[Place any screenshots of the issue here if needed]
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,61 @@
+name: Bug report
+description: Create a report of your issue
+body:
+- type: checkboxes
+  attributes:
+    label: Have you checked our Troubleshooting page for your issue?
+    description: Please read the <a href="https://github.com/Jackett/Jackett/wiki/Troubleshooting">Troubleshooting</a> page for steps to resolve common issues.
+    options:
+      - label: I have checked the Troubleshooting page
+        required: true
+- type: checkboxes
+  attributes:
+    label: Is there already an issue for your problem?
+    description: Please make sure you are not creating an already submitted <a href="https://github.com/Jackett/Jackett/issues">Issue</a>. Check closed issues as well, because your issue may have already been fixed.
+    options:
+      - label: I have checked older issues, open and closed
+        required: true
+- type: checkboxes
+  attributes:
+    label: Have you read our Contributing Guidelines?
+    description: Please read our <a href="https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md">Contributing Guidelines</a> before submitting your issue to ensure a prompt response to your bug.
+    options:
+      - label: I have read the Contributing Guidelines
+        required: true
+- type: textarea
+  attributes:
+    label: Environment
+    description: Please provide the details of the system Jackett is running on. The best way to do this is to restart Jackett, access the dashboard, view the log, and copy/paste replacing the example below with the last 10 Info lines at the bottom of the log.
+    placeholder: |
+      Using HTTP Client: HttpWebClient/HttpWebClient2
+      Using FlareSolverr: Disabled or a url
+      Using proxy: Disabled or HTTP/SOCKS4/SOCKS5
+      App config/log directory: folder path
+      Running in Docker: No/Yes
+      Jackett variant: CoreWindows/FullFrameworkWindows/CoreMacOs/CoreLinuxAmdx64/CoreLinuxArm32/CoreLinuxArm64/Mono
+      OS version: platform n.nn (32bit/64bit)
+      Environment version: n.n.nn (folder path)
+      Starting Jackett vn.nn.nn
+    render: markdown
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Description
+    description: List steps to reproduce the error and details on what happens and what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Logged Error Messages
+    description: |
+      Place any relevant error messages you noticed from the logs here.
+      Make sure you attach the full logs with your personal information removed in case we need more information.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Screenshots
+    description: Place any screenshots of the issue here if needed
+  validations:
+    required: false
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,29 @@
+name: Feature request
+description: Suggest an idea for this project
+title: "[req]: "
+body:
+- type: checkboxes
+  attributes:
+    label: Is there already a request for your feature?
+    description: Please make sure you are not creating an already submitted <a href="https://github.com/Jackett/Jackett/issues">request</a>. Check closed issues as well, because your request may have already been implemented or rejected.
+    options:
+      - label: I have checked older issues, open and closed
+        required: true
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem? Please describe.
+    description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like
+    description: A clear and concise description of what you want to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe alternatives you've considered
+    description: A clear and concise description of any alternative solutions or features you've considered.
+  validations:
+    required: false
--- a/.github/ISSUE_TEMPLATE/indexer-request.yml
+++ b/.github/ISSUE_TEMPLATE/indexer-request.yml
@@ -0,0 +1,42 @@
+name: Indexer request
+description: Suggest a new indexer for this project
+title: "[req]: "
+body:
+- type: checkboxes
+  attributes:
+    label: Is there already a request for your tracker?
+    description: Please make sure you are not creating an already submitted <a href="https://github.com/Jackett/Jackett/issues">request</a>. Check closed issues as well, because your request may have already been added or rejected.
+    options:
+      - label: I have checked older issues, open and closed
+        required: true
+- type: dropdown
+  id: type
+  attributes:
+    label: Type
+    description: Select which type of Web Site this is
+    options:
+    - Public
+    - Semi-Private
+    - Private
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Tracker details
+    description: |
+      Please provide the details of your tracker.
+      Example:
+      - Name: TrackerX
+      - URL: https://trackerx.yz
+      - Description: TrackerX is a Private Torrent Tracker for Movies, TV, and e-Learning
+      - Minimum Seeding Time and Minimum Ratio (if Private): MST 24hrs, MR 1.0
+      - Additional Comments: IMDB search has to be enabled in account settings, often has hcaptcha at login
+    value: |
+      - Name:
+      - URL:
+      - Description:
+      - Minimum Seeding Time and Minimum Ratio (if Private):
+      - Additional Comments:
+    render: markdown
+  validations:
+    required: true
--- a/.gitignore
+++ b/.gitignore
@@ -198,3 +198,6 @@ FakesAssemblies/
 *.DS_Store
 .idea/
 launchSettings.json
+
+# JetBrains Rider
+/src/.run
--- a/README.md
+++ b/README.md
@@ -5,13 +5,14 @@
 [![Build Status](https://dev.azure.com/Jackett/Jackett/_apis/build/status/Jackett.Jackett?branchName=master)](https://dev.azure.com/jackett/jackett/_build/latest?definitionId=1&branchName=master)
 [![GitHub Releases](https://img.shields.io/github/downloads/Jackett/Jackett/total.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/jackett.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/jackett/)
-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA)
+
+_Our [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA) server is no longer maintained. If you have a problem, request, or question then please open a new issue here._

 This project is a new fork and is recruiting development help.  If you are able to help out please [contact us](https://github.com/Jackett/Jackett/issues/8180).

 Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) before submitting any issues or pull requests

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

 Developer note: The software implements the [Torznab](https://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.

@@ -19,16 +20,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht

 #### Supported Systems
 * 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)
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux)
 * macOS 10.13 or greater

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

+ * ØMagnet
 * 1337x
+ * 24rolika
 * 7torrents
 * ACG.RIP
 * ACGsou (36DM)
- * AngieTorrents
 * Anidex
 * AniLibria
 * AnimeClipse
@@ -38,6 +40,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * AniSource
 * AudioBook Bay (ABB)
 * Badass Torrents
+ * Bangumi Moe
 * BigFANGroup
 * BitRu
 * BitSearch
@@ -59,9 +62,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Erai-Raws
 * ETTV
 * EXT Torrents
- * ExtraTorrent.cd
+ * ExtraTorrent.st
 * EZTV
- * Filebase
 * FileListing
 * FireBit
 * Frozen Layer
@@ -79,26 +81,31 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * iTorrent
 * kickasstorrents.ws
 * kickasstorrents.to
+ * KissSub
 * Legit Torrents
 * LePorno.info
 * LimeTorrents
+ * LimeTorrents clone
 * LinuxTracker
- * MacTorrents
+ * Mac Torrents Download
+ * MegaPeer
 * MejorTorrent
+ * Mikan
 * MixTapeTorrent
- * Montorrent
 * MoviesDVDR
 * MovieTorrent
 * MyPornClub
 * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
+ * NewPCT.me
 * Newstudio
+ * Nipponsei
 * Nitro
 * NNTT
 * NoNaMe Club (NNM-Club)
- * Nyaa-Pantsu
 * Nyaa.si
 * OnceSearch
 * OneJAV
+ * OpenSharing
 * OxTorrent
 * ParnuXi
 * PC-torrent
@@ -108,7 +115,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PornLeech
 * PornoLive
 * PornoRip
+ * PornosLab
 * PornoTor
+ * PornoTorrent
 * Portugas
 * ProPorn
 * ProStyleX
@@ -120,6 +129,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * RuTor
 * RuTracker.RU
 * seleZen
+ * Sexxi
 * Sexy-Pics
 * ShizaProject
 * shokweb
@@ -127,12 +137,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Solid Torrents
 * sosulki
 * SubsPlease
- * sukebei-Pantsu
 * sukebei.Nyaa.si
 * The Pirate Bay (TPB)
- * TNTfork
 * Tokyo Tosho
 * Torlock
+ * Torlook
 * TOROS
 * Torrent Downloads (TD)
 * Torrent Oyun indir
@@ -214,6 +223,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Sharewood
 * SkTorrent
 * SkTorrent-org
+ * SoundPark
 * themixingbowl (TMB)
 * Toloka.to
 * Torrent-Explosiv
@@ -221,6 +231,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TribalMixes
 * Union Fansub
 * YggTorrent (YGG)
+ * ZOMB
 * Ztracker
 </details>

@@ -236,16 +247,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * 720pier
 * Abnormal
 * ABtorrents (ABT + RNS)
- * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
+ * Acid Lounge (A-L)
 * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
 * Aftershock
 * Aidoru!Online
 * Aither
+ * Alleen Retail
 * AlphaRatio (AR)
 * AmigosShareClub
 * anasch.cc
 * AnimeBytes (AB)
- * AnimeTorrents (AnT)
+ * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
 * AnimeWorld [![(invite needed)][inviteneeded]](#)
 * Anthelion
 * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
@@ -255,19 +267,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * AudioNews (AN)
 * Aussierul.es [![(invite needed)][inviteneeded]](#)
 * AvistaZ (AsiaTorrents)
- * Back-ups
- * bB
+ * Back-ups [![(invite needed)][inviteneeded]](#)
+ * bB [![(invite needed)][inviteneeded]](#)
 * BakaBT
 * BeiTai
+ * Best-Core
 * BeyondHD (BHD)
 * Bibliotik
- * BIGTorrent
+ * Bit-Bázis
 * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
 * BIT-HDTV
 * BiT-TiTAN
 * Bitded
 * Bithorlo (BHO)
- * BitHUmen
+ * BitHUmen [![(invite needed)][inviteneeded]](#)
 * BitSexy
 * Bitspyder
 * BitTorrentFiles
@@ -275,62 +288,65 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BJ-Share (BJ)
 * BlueBird [![(invite needed)][inviteneeded]](#)
 * Blutopia (BLU)
- * Borgzelle
+ * Borgzelle  [![(invite needed)][inviteneeded]](#)
 * Boxing Torrents
 * Brasil Tracker
 * BroadcasTheNet (BTN)
 * BroadCity
 * BrokenStones [![(invite needed)][inviteneeded]](#)
 * BrSociety
- * BTNext (BTNT)
+ * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
 * BTSCHOOL
 * BWTorrents
+ * BYRBT
 * Carp-Hunter
 * Carpathians
 * CartoonChaos (CC)
 * CasaTorrent [![(invite needed)][inviteneeded]](#)
 * Cathode-Ray.Tube (CRT)
- * CCFBits
+ * CCFBits [![(invite needed)][inviteneeded]](#)
 * CeskeForum
- * CGPeers
- * CHDBits
+ * CGPeers [![(invite needed)][inviteneeded]](#)
+ * CHDBits [![(invite needed)][inviteneeded]](#)
 * ChileBT
 * Cinecalidad
 * CinemaMovieS_ZT
 * CinemaZ (EuTorrents)
- * Cinemageddon
- * Cinematik
- * Classix
+ * Cinemageddon [![(invite needed)][inviteneeded]](#)
+ * Cinematik [![(invite needed)][inviteneeded]](#)
+ * Classix [![(invite needed)][inviteneeded]](#)
 * Coastal-Crew
 * Concertos
 * CrazyHD
 * CrazySpirits
 * CrnaBerza
+ * CrypticHaven Comedy Club (CCC)
 * DANISH BYTES
 * Darius Tracker
 * Dark-Shadow
 * Dark Tracker
- * Das Unerwartete [![(invite needed)][inviteneeded]](#)
- * DesiReleasers
+ * DataScene (DS)
+ * DataTalli
 * DesiTorrents
- * Diablo Torrent
- * DICMusic
+ * Diablo Torrent [![(invite needed)][inviteneeded]](#)
 * DigitalCore
+ * DiscFan
 * DivTeam
+ * DocsPedia
 * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
 * EbookParadijs
 * Ebooks-Shares
 * EfectoDoppler
 * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
 * eShareNet
- * eStone (XiDER, BeLoad)
+ * eStone (XiDER, BeLoad, BigTorrent)
 * ExoticaZ (YourExotic)
 * ExtremeBits
 * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
- * FANO.IN
- * Fantastic Heaven
- * Fantastiko
- * FeedUrNeed
+ * Falkon Vision Team
+ * FANO.IN [![(invite needed)][inviteneeded]](#)
+ * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
+ * Fantastiko [![(invite needed)][inviteneeded]](#)
 * Femdomcult
 * FileList (FL)
 * Film-Paleis
@@ -339,13 +355,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * FunFile (FF)
 * FunkyTorrents (FT)
 * Fuzer (FZ)
- * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
+ * Gay-Torrents.org
 * GAYtorrent.ru
 * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
- * Generation-Free
+ * Generation-Free [![(invite needed)][inviteneeded]](#)
 * GFXPeers
 * GigaTorrents
- * GimmePeers (formerly ILT)
+ * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
 * GiroTorrent
 * GreekDiamond
 * Greek Team
@@ -353,67 +369,73 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Haitang
 * HappyFappy
 * HD Dolby
- * HD-Bits.com
+ * HD-Bits.com [![(invite needed)][inviteneeded]](#)
 * HD-Forever (HDF)
 * HD-Olimpo
- * HD-Only (HDO)
+ * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
 * HD-Space (HDS)
 * HD-Spain [![(invite needed)][inviteneeded]](#)
 * HD-Torrents (HDT)
 * HD4FANS [![(invite needed)][inviteneeded]](#)
+ * HDAI
 * HDArea (HDA)
 * HDAtmos
- * HDBits
- * HDC (HDCiTY)
+ * HDBits [![(invite needed)][inviteneeded]](#)
+ * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
 * HDCenter [![(invite needed)][inviteneeded]](#)
- * HDChina (HDWing)
- * HDCity
- * HDHome (HDBigger)
+ * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
+ * HDCity [![(invite needed)][inviteneeded]](#)
+ * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
 * HDME
 * HDRoute [![(invite needed)][inviteneeded]](#)
- * HDSky
+ * HDSky [![(invite needed)][inviteneeded]](#)
 * HDTime
- * HDTorrents.it
+ * HDTorrents.it [![(invite needed)][inviteneeded]](#)
 * HDTurk
 * HDU
 * HDZone
 * Hebits
 * HellasTZ
 * HQSource (HQS)
- * HuSh [![(invite needed)][inviteneeded]](#)
+ * Il Corsaro Verde
+ * Indietorrents [![(invite needed)][inviteneeded]](#)
 * IPTorrents (IPT)
- * ImmortalSeed (iS)
- * Immortuos
+ * ImmortalSeed (iS) [![(invite needed)][inviteneeded]](#)
+ * Immortuos [![(invite needed)][inviteneeded]](#)
 * Insane Tracker
 * IPTorrents (IPT)
- * JPopsuki
+ * JPopsuki [![(invite needed)][inviteneeded]](#)
 * JPTV
 * Karagarga
- * Keep Friends
+ * Keep Friends [![(invite needed)][inviteneeded]](#)
 * LastFiles
+ * Lat-Team [![(invite needed)][inviteneeded]](#)
 * Le Saloon
- * LearnBits
- * LearnFlakes
+ * LearnBits [![(invite needed)][inviteneeded]](#)
+ * LearnFlakes [![(invite needed)][inviteneeded]](#)
+ * leech24
 * LegacyHD (HD4Free)
 * LemonHD
- * Libble
+ * Libble [![(invite needed)][inviteneeded]](#)
 * LibraNet (LN)
- * LinkoManija
- * LosslessClub
- * M-Team TP (MTTP)
+ * LinkoManija [![(invite needed)][inviteneeded]](#)
+ * LosslessClub [![(invite needed)][inviteneeded]](#)
+ * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
 * MaDs Revolution [![(invite needed)][inviteneeded]](#)
 * magic-heaven
- * Magico (Trellas)
+ * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
 * Majomparádé (TurkDepo)
+ * MegamixTracker
 * MeseVilág (Fairytale World)
 * MicroBit (µBit)
 * Milkie
 * MIRcrew
- * MMA-Torrents
+ * MMA-Torrents [![(invite needed)][inviteneeded]](#)
 * MNV (Max-New-Vision)
 * Mononoké-BT [![(invite needed)][inviteneeded]](#)
 * MoreThanTV (MTV)
 * MouseBits
+ * Moviesite
 * MyAnonamouse (MAM)
 * MySpleen [![(invite needed)][inviteneeded]](#)
 * NBTorrents [![(invite needed)][inviteneeded]](#)
@@ -423,15 +445,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * NetCosmo
 * NetLab
 * NorBits
- * Oasis
 * oMg[WtF]trackr
- * OpenCD
+ * OpenCD [![(invite needed)][inviteneeded]](#)
 * Oppaitime [![(invite needed)][inviteneeded]](#)
 * Orpheus
 * OshenPT
- * Ourbits (HDPter)
+ * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
 * P2PBG
 * P2PElite
+ * Partis [![(invite needed)][inviteneeded]](#)
 * PassThePopcorn (PTP)
 * PeerJunkies
 * Peers.FM
@@ -439,7 +461,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PirateTheNet (PTN)
 * PixelCove (Ultimate Gamer)
 * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
- * Pleasuredome
 * PolishSource (PS)
 * PolishTracker
 * PornBits (PB)
@@ -450,12 +471,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ProAudioTorrents (PAT)
 * PTerClub
 * PTFiles (PTF)
- * PThome
+ * PThome [![(invite needed)][inviteneeded]](#)
 * PTMSG
 * PTSBAO
 * PTtime
+ * Punk's Horror Tracker
 * PuntoTorrent
 * PuroVicio
+ * PuTao
 * Puur-Hollands
 * PWTorrents (PWT)
 * R3V WTF! [![(invite needed)][inviteneeded]](#)
@@ -463,33 +486,36 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * RacingForMe (RFM)
 * RedBits
 * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
- * Redacted (PassTheHeadphones)
+ * Redacted (PassTheHeadphones) [![(invite needed)][inviteneeded]](#)
+ * Renegade
 * Resurrect The Net
 * RetroFlix
 * RevolutionTT
 * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
 * RPTorrents
- * SceneHD
+ * SceneHD  [![(invite needed)][inviteneeded]](#)
 * ScenePalace (SP)
 * SceneRush
 * SceneTime
 * SDBits [![(invite needed)][inviteneeded]](#)
+ * Seals
 * Secret Cinema
 * SeedFile (SF)
- * ShareFiles
 * Shareisland
- * Shazbat
+ * Shazbat [![(invite needed)][inviteneeded]](#)
 * SiamBIT
+ * SkipTheCommercials
+ * slosoul
 * SnowPT (SSPT)
 * SoulVoice
 * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
 * SpeedCD
- * Speedmaster HD
- * SpeedTorrent Reloaded
+ * Speedmaster HD [![(invite needed)][inviteneeded]](#)
+ * SpeedTorrent Reloaded [![(invite needed)][inviteneeded]](#)
 * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
 * SportHD [![(invite needed)][inviteneeded]](#)
 * SportsCult
- * SpringSunday
+ * SpringSunday [![(invite needed)][inviteneeded]](#)
 * SugoiMusic
 * Superbits (SBS)
 * Swarmazon
@@ -500,14 +526,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * TellyTorrent
 * teracod (Movie Zone)
- * The Falling Angels (TFA)
+ * The-Devils-Lounge
+ * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
 * The Geeks
 * The Horror Charnel (THC)
 * The New Retro
 * The Occult [![(invite needed)][inviteneeded]](#)
 * The Place [![(invite needed)][inviteneeded]](#)
 * The Shinning (TsH)
- * The Show [![(invite needed)][inviteneeded]](#)
+ * The Show
 * The Vault [![(invite needed)][inviteneeded]](#)
 * TheAudioScene
 * TheEmpire (TE)
@@ -515,7 +542,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TheScenePlace (TSP)
 * TJUPT
 * TLFBits [![(invite needed)][inviteneeded]](#)
- * ToTheGlory (TTG)
+ * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
 * Torrent Network (TN)
 * Torrent Sector Crew (TSC)
 * Torrent Surf
@@ -529,21 +556,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentDB
 * Torrentech (TTH)
 * TorrentHeaven [![(invite needed)][inviteneeded]](#)
- * TorrentHR
+ * TorrentHR [![(invite needed)][inviteneeded]](#)
 * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
 * TotallyKids (TK)
 * Torrentland
 * TorrentLeech (TL)
 * TorrentLeech.pl
+ * TorrentMasters
 * TorrentSeeds (TS)
 * Trackeros
 * TranceTraffic [![(invite needed)][inviteneeded]](#)
- * Trezzor
- * TTsWEB
+ * Trezzor [![(invite needed)][inviteneeded]](#)
 * TurkSeed
 * TurkTorrent (TT)
 * TV Chaos UK (TVCUK)
- * TV-Vault
 * TVstore
 * Twilight Torrents
 * Twilights Zoom
@@ -553,9 +579,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * UnlimitZ
 * Vizuk
 * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
+ * White Angel
 * wOOt [![(invite needed)][inviteneeded]](#)
 * World-In-HD [![(invite needed)][inviteneeded]](#)
- * x-ite.me (XM) [![(invite needed)][inviteneeded]](#)
+ * x-ite.me (XM)
 * xBytesV2
 * XSpeeds (XS)
 * XWT-Classics
@@ -596,7 +623,7 @@ Filter | Condition
 `tag:<tag>` | where the indexer tags contains `<tag>`
 `lang:<tag>` | where the indexer language start with `<lang>`
 `test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
-`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (succesfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
+`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (successfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)

 Supported operators
 Operator | Condition
@@ -616,7 +643,7 @@ 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. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net50#dependencies
+1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#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.
@@ -686,7 +713,7 @@ On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chri
 macOS 10.13 or greater

 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.

@@ -694,7 +721,7 @@ The service will start on each logon. You can always stop it by running `launchc
 Logs are stored as usual under `~/.config/Jackett/log.txt`.

 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
+Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.


 ## Installation using Docker
@@ -778,8 +805,6 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a

 -   `-p, --Port`               Web server port

-   `-m, --MigrateSettings`    Migrate settings manually (Must be an admin on Windows)
-
 -   `-n, --IgnoreSslErrors`    [true/false] Ignores invalid SSL certificates

 -   `-d, --DataFolder`         Specify the location of the data folder (Must be an admin on Windows)
@@ -822,21 +847,21 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

 # dotnet core version
-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
+dotnet publish Jackett.Server -f net6.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net6.0/osx-x64/jackett # run jackett
 ```

 ### Linux


 ```bash
-sudo apt install nuget msbuild dotnet-sdk-5.0 # install build tools (Debian/ubuntu)
+sudo apt install nuget msbuild dotnet-sdk-6.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 net5.0 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net5.0/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net6.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net6.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: 18
+  minorVersion: 20
  patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
-  netCoreFramework: net5.0
-  netCoreSdkVersion: 5.0.x
+  netCoreFramework: net6.0
+  netCoreSdkVersion: 6.0.x
  # system.debug: true

 trigger:
@@ -31,42 +31,49 @@ stages:
          matrix:
            Mono:
              buildDescription: Mono
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              framework: net461
              runtime: linux-x64
              archiveType: tar
              artifactName: Jackett.Binaries.Mono.tar.gz
            Windows:
              buildDescription: Windows
-              imageName: windows-latest
+              imageName: windows-2019
              framework: $(netCoreFramework)
              runtime: win-x86
              archiveType: zip
              artifactName: Jackett.Binaries.Windows.zip
            macOS:
              buildDescription: macOS
-              imageName: macOS-latest
+              imageName: macOS-10.15
              framework: $(netCoreFramework)
              runtime: osx-x64
              archiveType: tar
              artifactName: Jackett.Binaries.macOS.tar.gz
+            macOSARM64:
+              buildDescription: macOS ARM64
+              imageName: macOS-10.15
+              framework: $(netCoreFramework)
+              runtime: osx-arm64
+              archiveType: tar
+              artifactName: Jackett.Binaries.macOSARM64.tar.gz
            LinuxAMDx64:
              buildDescription: Linux AMD x64
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              framework: $(netCoreFramework)
              runtime: linux-x64
              archiveType: tar
              artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz
            LinuxARM32:
              buildDescription: Linux ARM32
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              framework: $(netCoreFramework)
              runtime: linux-arm
              archiveType: tar
              artifactName: Jackett.Binaries.LinuxARM32.tar.gz
            LinuxARM64:
              buildDescription: Linux ARM64
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              framework: $(netCoreFramework)
              runtime: linux-arm64
              archiveType: tar
@@ -91,7 +98,7 @@ stages:
              projects: 'src/Jackett.Server/Jackett.Server.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) --self-contained --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'

          - task: DotNetCoreCLI@2
            displayName: Build Jackett Updater
@@ -100,7 +107,7 @@ stages:
              projects: 'src/Jackett.Updater/Jackett.Updater.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) --self-contained --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'

          - task: DotNetCoreCLI@2
            displayName: Build Jackett Tray (Windows only)
@@ -110,7 +117,7 @@ stages:
              projects: 'src/Jackett.Tray/Jackett.Tray.csproj'
              publishWebProjects: false
              zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --self-contained --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 +127,7 @@ stages:
              projects: 'src/Jackett.Service/Jackett.Service.csproj'
              publishWebProjects: false
              zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --self-contained --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'

          - task: CopyFiles@2
            displayName: Copy Jackett Server
@@ -274,7 +281,7 @@ stages:
      - job: Linting_Dotnet
        displayName: Linting Dotnet
        pool:
-          vmImage: ubuntu-latest
+          vmImage: ubuntu-20.04
        workspace:
          clean: all
        steps:
@@ -307,7 +314,7 @@ stages:
      - job: Linting_YAML
        displayName: Linting YAML
        pool:
-          vmImage: ubuntu-latest
+          vmImage: ubuntu-20.04
        workspace:
          clean: all
        steps:
@@ -335,29 +342,24 @@ stages:
          matrix:
            Mono:
              buildDescription: Mono
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              framework: net461
              runtime: linux-x64
            Windows:
              buildDescription: Windows
-              imageName: windows-latest
+              imageName: windows-2019
              framework: $(netCoreFramework)
              runtime: win-x86
            macOS:
              buildDescription: macOS
-              imageName: macOS-latest
+              imageName: macOS-10.15
              framework: $(netCoreFramework)
              runtime: osx-x64
            LinuxAMDx64:
              buildDescription: Linux AMD x64
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              framework: $(netCoreFramework)
              runtime: linux-x64
-            LinuxARM:
-              buildDescription: Linux ARM
-              imageName: ubuntu-latest
-              framework: $(netCoreFramework)
-              runtime: linux-arm
        pool:
          vmImage: $(imageName)
        displayName: ${{ variables.buildDescription }}
@@ -380,20 +382,13 @@ stages:
              projects: '**/*.Test*/*.csproj'
              includeNuGetOrg: true

-          - task: DotNetCoreCLI@2
-            displayName: Build Test Project
-            inputs:
-              command: build
-              projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
-
          - task: DotNetCoreCLI@2
            displayName: Unit Tests (Mono, Linux and macOS)
            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
            inputs:
              command: test
              projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --framework $(framework) --runtime $(runtime)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
              testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'

          - task: DotNetCoreCLI@2
@@ -427,33 +422,41 @@ stages:
              codeCoverageTool: Cobertura
              summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml

-  - stage: Integration
+  - stage: IntegrationTestJackett
    displayName: Integration Tests
    dependsOn:
      - BuildJackett
      - CodeStyle
    jobs:
-      - job: Selenium
+      - job: IntegrationTest
        workspace:
          clean: all
        strategy:
          matrix:
            Mono:
              buildDescription: Mono
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              artifactName: Jackett.Binaries.Mono.tar.gz
+              framework: net461
+              runtime: linux-x64
            Windows:
              buildDescription: Windows
-              imageName: windows-latest
+              imageName: windows-2019
              artifactName: Jackett.Binaries.Windows.zip
+              framework: $(netCoreFramework)
+              runtime: win-x86
            macOS:
              buildDescription: macOS
-              imageName: macOS-latest
+              imageName: macOS-10.15
              artifactName: Jackett.Binaries.macOS.tar.gz
+              framework: $(netCoreFramework)
+              runtime: osx-x64
            LinuxAMDx64:
              buildDescription: Linux AMD x64
-              imageName: ubuntu-latest
+              imageName: ubuntu-20.04
              artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz
+              framework: $(netCoreFramework)
+              runtime: linux-x64
        pool:
          vmImage: $(imageName)
        displayName: ${{ variables.buildDescription }}
@@ -495,23 +498,45 @@ stages:
              version: $(netCoreSdkVersion)
              installationPath: $(Agent.ToolsDirectory)/dotnet

+          # this task is a workaround to fix a bug in Azure (not required under normal circumstances)
+          # https://developercommunity.visualstudio.com/content/problem/983843/dotnet-build-task-does-not-use-nugetorg-for-one-pr.html
          - task: DotNetCoreCLI@2
-            displayName: Run Integration Tests
+            displayName: Restore IntegrationTest Project
+            inputs:
+              command: restore
+              projects: '**/*IntegrationTest*/*.csproj'
+              includeNuGetOrg: true
+
+          - task: DotNetCoreCLI@2
+            displayName: Integration Tests (Mono, Linux and macOS)
+            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
            inputs:
              command: test
              projects: '**/*IntegrationTest*/*.csproj'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
+              testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'
+
+          - task: DotNetCoreCLI@2
+            displayName: Integration Tests (Windows only)
+            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+            inputs:
+              command: test
+              projects: '**/*IntegrationTest*/*.csproj'
+              arguments: '--configuration $(buildConfiguration) --framework $(framework)'
              testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'

  - stage: PublishGithub
    displayName: Publish to Github
    dependsOn:
      - UnitTestJackett
-      - Integration
+      - IntegrationTestJackett
    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
    jobs:
      - job: Publish
        workspace:
          clean: all
+        pool:
+          vmImage: ubuntu-20.04
        steps:
          - checkout: self

@@ -553,6 +578,6 @@ stages:
                    $successCount = (Select-String "Uploaded file successfully:" -InputObject $logInspect -AllMatches).Matches.Count
                    $failureCount = (Select-String "Duplicate asset found:" -InputObject $logInspect -AllMatches).Matches.Count
                    Write-Output "Success count is: $successCount and failure count is: $failureCount"
-                    if (($successCount -ne 7) -or ($failureCount -ne 0)) { Write-Host "##vso[task.complete result=Failed;]DONE" }
+                    if (($successCount -ne 8) -or ($failureCount -ne 0)) { Write-Host "##vso[task.complete result=Failed;]DONE" }
                  }
                }
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -197,7 +197,7 @@ function reloadIndexers() {
        configuredTags = configuredIndexers.map(i => i.tags).reduce((a, g) => a.concat(g), []).filter((v, i, a) => a.indexOf(v) === i);

        configureFilters(configuredIndexers);
-        
+
        displayFilteredIndexersList(configuredIndexers, currentFilter);

        $('#indexers div.dataTables_filter input').focusWithoutScrolling();
@@ -546,15 +546,17 @@ function addIndexer(indexerId, displayNotification) {
                doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
            }
        }).fail(function (data) {
+                var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
            if (data.responseJSON.error !== undefined) {
-                var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
                var githubrepo = "Jackett/Jackett";
                var githubtext = "this indexer";
+                var githubtemplate = "?template=bug_report.yml&"
                if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
                    githubrepo = "FlareSolverr/FlareSolverr";
                    githubtext = "FlareSolverr";
+                    githubtemplate = "?"
                }
-                doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new" + githubtemplate + "title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
            } else {
                doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
            }
@@ -714,14 +716,16 @@ function testIndexer(id, notifyResult) {
    }).fail(function (data) {
        updateTestState(id, "error", data.error, indexers);
        if (data.responseJSON.error !== undefined && notifyResult) {
-            var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - id.length - "] ".length - " (Test)".length; // keep url <= 2k #5104
+            var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[".length - id.length - "] ".length - " (Test)".length; // keep url <= 2k #5104
            var githubrepo = "Jackett/Jackett";
            var githubtext = "this indexer";
+            var githubtemplate = "?template=bug_report.yml&"
            if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
                githubrepo = "FlareSolverr/FlareSolverr";
                githubtext = "FlareSolverr";
+                githubtemplate = "?"
            }
-            doNotify("An error occurred while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
+            doNotify("An error occurred while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new" + githubtemplate + "title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
        } else {
            doNotify("An error occurred while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
        }
@@ -887,8 +891,8 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
            }
        }).fail(function (data) {
            if (data.responseJSON.error !== undefined) {
-                var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
-                doNotify("An error occurred while updating this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
+                doNotify("An error occurred while updating this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
            } else {
                doNotify("An error occurred while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
            }
@@ -966,8 +970,9 @@ function updateReleasesRow(row) {

    labels.empty();

-    if (IMDBId) {
-        labels.append('\n<a href="http://www.imdb.com/title/tt' + ("0000000" + IMDBId).slice(-8) + '/" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
+  if (IMDBId) {
+    var imdbLen = (IMDBId.toString().length > 7) ? 8 : 7;
+        labels.append('\n<a href="https://www.imdb.com/title/tt' + ("00000000" + IMDBId).slice(-imdbLen) + '/" target="_blank" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
    }

    if (!isNaN(DownloadVolumeFactor)) {
@@ -1120,7 +1125,7 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {
    var searchTracker = releaseDialog.find("#searchTracker");
    var searchCategory = releaseDialog.find('#searchCategory');
    var searchFilter = releaseDialog.find('#searchFilter');
-    
+
    searchFilter.multiselect({
        maxHeight: 400,
        enableFiltering: true,
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -732,6 +732,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=PR11721"></script>
+    <script type="text/javascript" src="../custom.js?changed=2021103101"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Definitions/0daykiev.yml
+++ b/src/Jackett.Common/Definitions/0daykiev.yml
@@ -2,7 +2,7 @@
 id: 0daykiev
 name: 0day.kiev
 description: "0day.kiev.ua is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-ru
+language: ru-RU
 type: private
 encoding: windows-1251
 links:
--- a/src/Jackett.Common/Definitions/0magnet.yml
+++ b/src/Jackett.Common/Definitions/0magnet.yml
@@ -0,0 +1,72 @@
+---
+id: 0magnet
+name: 0Magnet
+description: "ØMagnet is a CHINESE Public tracker for Asian 3X (JAV)"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://0magnet.com/
+  - https://9mag.net/
+
+caps:
+  categories:
+    XXX: XXX
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  infohash:
+    hash:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "&dn=(.+?)&"
+        - name: validfilename
+
+search:
+  paths:
+    - path: search
+  inputs:
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: table > tbody > tr:has(td)
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: XXX
+    title:
+      selector: a
+      remove: p
+    details:
+      selector: a
+      attribute: href
+    download:
+      selector: a
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: td.td-size
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -2,7 +2,7 @@
 id: 1337x
 name: 1337x
 description: "1337X is a Public torrent site that offers verified torrent downloads"
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 followredirect: true
@@ -13,8 +13,8 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337x.unblockit.ch/
-  - https://1337x.nocensor.space/
+  - https://1337x.unblockit.bz/
+  - https://1337x.nocensor.biz/
 legacylinks:
  - https://1337x.unblocked.earth/
  - https://1337x.unblockit.pro/
@@ -47,6 +47,11 @@ legacylinks:
  - https://1337x.unblockit.li/
  - https://1337x.unblockit.uno/
  - https://1337x.is/
+  - https://1337x.unblockit.ch/
+  - https://1337x.nocensor.space/
+  - https://1337x.unblockit.ws/
+  - https://1337x.nocensor.work/
+  - https://1337x.unblockit.kim/

 caps:
  categorymappings:
@@ -142,25 +147,21 @@ settings:
  - name: downloadlink
    type: select
    label: Download link
-    default: "magnet:"
+    default: "http://itorrents.org/"
    options:
      "http://itorrents.org/": iTorrents.org
-      "http://torrage.info/": Torrage
-      "http://btcache.me/": BTcache
      "magnet:": magnet
  - name: downloadlink2
    type: select
    label: Download link (fallback)
-    default: "http://itorrents.org/"
+    default: "magnet:"
    options:
      "http://itorrents.org/": iTorrents.org
-      "http://torrage.info/": Torrage
-      "http://btcache.me/": BTcache
      "magnet:": magnet
  - name: info_download
    type: info
    label: About the Download links
-    default: As the .torrent download links on this site are known to fail from time to time, you can optionally set as a fallback an automatic alternate link. We suggest using the magnet link as a fallback.
+    default: As the iTorrents .torrent download link on this site is known to fail from time to time, we suggest using the magnet link as a fallback. The BTCache and Torrage services are not supported because they require additional user interaction (a captcha for BTCache and a download button on Torrage.)
  - name: sort
    type: select
    label: Sort requested from site
@@ -199,10 +200,10 @@ search:
    selector: tr:has(a[href^="/torrent/"])

  fields:
-    title_text:
+    title_default:
      # the movies, tv and music pages abbreviate the title
      selector: td[class^="coll-1"] a[href^="/torrent/"]
-    title_href:
+    title_optional:
      # the movies, tv and music pages abbreviate the title so we process the href instead. #8137
      selector: td[class^="coll-1"] a[href^="/torrent/"]
      attribute: href
@@ -211,8 +212,8 @@ search:
        - name: split
          args: ["/", 3]
    title:
-      # title_href can be empty so use the title_text instead #8586
-      text: "{{ if .Result.title_href }}{{ .Result.title_href }}{{ else }}{{ .Result.title_text }}{{ end }}"
+      # title_optional can be empty so use the title_default instead #8586
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
      filters:
        - name: re_replace
          args: ["-", " "]
@@ -237,9 +238,7 @@ search:
          args: ["(?i)WEB\\sDL", "WEB-DL"]
        - name: re_replace
          args: ["(?i)HDTVRIP", "HDTV"]
-    category:
-      text: 40
-    category|noappend:
+    category_sub:
      optional: true
      selector: td[class^="coll-1"] a[href^="/sub/"]
      attribute: href
@@ -247,6 +246,8 @@ search:
        # extract the third part
        - name: split
          args: ["/", 2]
+    category:
+      text: "{{ if .Result.category_sub }}{{ .Result.category_sub }}{{ else }}40{{ end }}"
    details:
      selector: td[class^="coll-1"] a[href^="/torrent/"]
      attribute: href
@@ -255,7 +256,7 @@ search:
      selector: td[class^="coll-1"] a[href^="/torrent/"]
      attribute: href
    # dates come in three flavours:
-    date:
+    date_year:
      # (within this year) 7am Sep. 14th
      optional: true
      selector: td[class^="coll-date"]:not(:contains(":")):not(:contains("'"))
@@ -264,7 +265,7 @@ search:
          args: ["st|nd|rd|th", ""]
        - name: dateparse
          args: "3pm Jan. 2"
-    date:
+    date_years:
      # (more than a year ago) Apr. 18th '11
      optional: true
      selector: td[class^="coll-date"]:contains("'")
@@ -275,12 +276,14 @@ search:
          args: ["st|nd|rd|th", ""]
        - name: dateparse
          args: "Jan. 2 06"
-    date:
+    date_today:
      # (today) 12:25am
      optional: true
      selector: td[class^="coll-date"]:contains(":")
      filters:
        - name: fuzzytime
+    date:
+      text: "{{ if or .Result.date_year .Result.date_years .Result.date_today }}{{ or .Result.date_year .Result.date_years .Result.date_today }}{{ else }}now{{ end }}"
    size:
      selector: td[class^="coll-4"]
    seeders:
--- a/src/Jackett.Common/Definitions/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -2,7 +2,7 @@
 id: 1ptbar
 name: 1ptbar
 description: "1ptbar is a CHINESE Private Torrent Tracker for Movies, TV, and e-Learning"
-language: zh-cn
+language: zh-CN
 type: private
 encoding: UTF-8
 links:
@@ -96,22 +96,24 @@ search:
      filters:
        - name: querystring
          args: cat
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: a[title][href^="details.php?id="]
      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    details:
      selector: a[href^="details.php?id="]
      attribute: href
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-    date:
+    date_elapsed:
      # time type: time elapsed (default)
      selector: td.rowfollow:nth-last-of-type(7) > span[title]
      attribute: title
@@ -121,7 +123,7 @@ search:
          args: " +08:00"
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
      # time added
      selector: td.rowfollow:nth-last-of-type(7):not(:has(span))
      optional: true
@@ -130,6 +132,8 @@ search:
          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td.rowfollow:nth-last-of-type(6)
    seeders:
--- a/src/Jackett.Common/Definitions/24rolika.yml
+++ b/src/Jackett.Common/Definitions/24rolika.yml
@@ -0,0 +1,89 @@
+---
+id: 24rolika
+name: 24rolika
+description: "24rolika is a RUSSIAN Public Torrent Tracker for 3X"
+language: ru-RU
+type: public
+encoding: UTF-8
+links:
+  - http://24rolika.ru/ # does not support https
+
+caps:
+  categorymappings:
+    - {id: xxx, cat: XXX, desc: xxx}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+
+download:
+  selectors:
+    - selector: a[href*="index.php?do=download&id="]
+      attribute: href
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%D0%9F%D0%BE%D0%B8%D1%81%D0%BA{{ end }}"
+    # 0 in article 1 in comments 2 in static pages 3 in article titles
+    titleonly: 3
+    sortby: "{{ .Config.sort }}"
+    resorder: "{{ .Config.type }}"
+    showposts: 0
+    # does not have categories in results so there is little point in providing a full category map or multi-cat search support
+    catlist[]: 0
+
+  rows:
+    selector: article.shortstory
+
+  fields:
+    category:
+      text: xxx
+    title:
+      selector: h2.short_title a
+    details:
+      selector: h2.short_title a
+      attribute: href
+    download:
+      selector: h2.short_title a
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    date:
+      text: now
+    size:
+      text: "512 MB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    description:
+      selector: div.video_time
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# DataLife
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/src/Jackett.Common/Definitions/2fast4you.yml
@@ -2,7 +2,7 @@
 id: 2fast4you
 name: 2 Fast 4 You
 description: "2 Fast 4 You is a FRENCH Private site for TV / MOVIES / GENERAL"
-language: fr-fr
+language: fr-FR
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -2,7 +2,7 @@
 id: 3changtrai
 name: 3ChangTrai
 description: "3ChangTrai (3CT) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV"
-language: vi-vn
+language: vi-VN
 type: private
 encoding: UTF-8
 links:
@@ -111,19 +111,21 @@ search:
      filters:
        - name: querystring
          args: cat
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: a[title][href^="details.php?id="]
      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    details:
      selector: a[href^="details.php?id="]
      attribute: href
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    date:
+    date_elapsed:
      # time type: time elapsed (default)
      selector: td:nth-child(4) > span[title]
      attribute: title
@@ -133,7 +135,7 @@ search:
          args: " +07:00" # ICT
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
      # time added
      selector: td:nth-child(4):not(:has(span))
      optional: true
@@ -142,6 +144,8 @@ search:
          args: " +07:00" # ICT
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td:nth-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/3dtorrents.yml
+++ b/src/Jackett.Common/Definitions/3dtorrents.yml
@@ -2,7 +2,7 @@
 id: 3dtorrents
 name: 3D Torrents
 description: "3D Torrents (3DT) is a Private Torrent Tracker for 3D HD / BLURAY MOVIES"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/4thd.yml
+++ b/src/Jackett.Common/Definitions/4thd.yml
@@ -2,7 +2,7 @@
 id: 4thd
 name: 4thD
 description: "4th Dimension is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-us
+language: en-US
 encoding: UTF-8
 type: private
 links:
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -2,7 +2,7 @@
 id: 52pt
 name: 52PT
 description: "52PT is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-cn
+language: zh-CN
 type: private
 encoding: UTF-8
 links:
@@ -93,12 +93,14 @@ search:
    selector: table.torrents > tbody > tr:has(table.torrentname)

  fields:
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: a[title][href^="details.php?id="]
      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    category:
      selector: a[href^="?cat="]
      attribute: href
@@ -111,10 +113,10 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    imdb:
+    imdbid:
      selector: div.imdb_100 > a
      attribute: href
-    date:
+    date_elapsed:
      # time type: time elapsed (default)
      selector: td:nth-child(4) > span[title]
      attribute: title
@@ -124,7 +126,7 @@ search:
          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
      # time added
      selector: td:nth-child(4):not(:has(span))
      optional: true
@@ -133,6 +135,8 @@ search:
          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td:nth-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/7torrents.yml
+++ b/src/Jackett.Common/Definitions/7torrents.yml
@@ -2,7 +2,7 @@
 id: 7torrents
 name: 7torrents
 description: "7torrents is a Public BitTorrent DHT search engine."
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -2,7 +2,7 @@
 id: Bittorrentfiles
 name: Bittorrentfiles
 description: "Bittorrentfiles is a Private GERMAN tracker"
-language: de-de
+language: de-DE
 type: private
 encoding: UTF-8
 links:
@@ -27,7 +27,7 @@ caps:
    - {id: 79, cat: TV/HD, desc: "Staffeln HD"}
    - {id: 56, cat: TV/SD, desc: "Staffeln SD"}
    - {id: 88, cat: TV/UHD, desc: "Staffeln UHD"}
-    - {id: 86, cat: TV/HD, desc: "Folgen UHD"}
+    - {id: 86, cat: TV/UHD, desc: "Folgen UHD"}
    - {id: 54, cat: TV/HD, desc: "Folgen HD"}
    - {id: 80, cat: TV/HD, desc: "Folgen HD/BD"}
    - {id: 7, cat: TV/SD, desc: "Folgen SD"}
@@ -68,7 +68,7 @@ caps:
    - {id: 74, cat: TV/Sport, desc: "Sport HD"}
    - {id: 39, cat: TV/Sport, desc: "Sport SD"}
    # Sonstiges
-    - {id: 41, cat: Books/Comics, desc: "Sonstiges A-Book"}
+    - {id: 41, cat: Audio/Audiobook, 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"}
@@ -79,11 +79,10 @@ caps:
    - {id: 47, cat: Other, desc: "Sonstiges Line"}
    - {id: 9, cat: Other, desc: "Sonstiges Andere"}
    # XXX
-    - {id: 58, cat: Books/Comics, desc: "XXX HD"}
+    - {id: 58, cat: XXX/x264, desc: "XXX HD"}
    - {id: 46, cat: XXX, desc: "XXX Hentai"}
-    - {id: 35, cat: XXX/Other, desc: "XXX Andere"}
    - {id: 59, cat: XXX/Pack, desc: "XXX Pack"}
-    - {id: 27, cat: XXX, desc: "XXX SD"}
+    - {id: 27, cat: XXX/SD, desc: "XXX SD"}
    - {id: 76, cat: XXX, desc: "XXX Andere"}


@@ -173,30 +172,30 @@ search:
    download:
      selector: a[href^="/download.php"]
      attribute: href
-    grabs:
-      text: 0
-    grabs:
+    grabs_optional:
      selector: a[title="Snatcher"]
      optional: true
-    files:
-      text: 0
-    files:
+    grabs:
+      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
+    files_optional:
      selector: a[title="Files"]
      optional: true
+    files:
+      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}0{{ end }}"
    size:
      selector: td:nth-child(6)
-    seeders:
-      text: 0
-    seeders:
+    seeders_optional:
      selector: a[title="Seeder"]
      optional: true
-    leechers:
-      text: 0
-    leechers:
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
      selector: a[title="Leecher"]
      optional: true
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
      # 2 flavours of dates
-    date:
+    date_day:
      # Heute 13:30:04
      # Gestern 09:10:10
      selector: td:nth-child(10):contains("Heute"),  td:nth-child(10):contains("Gestern")
@@ -210,7 +209,7 @@ search:
          args: ["Gestern", "Yesterday"]
        - name: append
          args: " +01:00" # CET
-    date:
+    date_year:
      # 30.02.2018 23:12:50
      selector: td:nth-child(10):contains("."):contains(":")
      optional: true
@@ -221,6 +220,8 @@ search:
          args: " +01:00" # CET
        - name: dateparse
          args: "02.01.2006 15:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
    downloadvolumefactor:
      case:
        img[alt="OU"]: 0
--- a/src/Jackett.Common/Definitions/DasUnerwartete.yml
+++ b/src/Jackett.Common/Definitions/DasUnerwartete.yml
@@ -1,125 +0,0 @@
---
-id: Das-Unerwartete
-name: Das Unerwartete
-description: "Das Unerwartete is a Private GERMAN tracker"
-language: de-de
-type: private
-encoding: UTF-8
-links:
-  - https://dasunerwartete.nl
-
-caps:
-  categorymappings:
-
-    - {id: 112, cat: Audio/Audiobook, desc: "Hoerbuecher/Hoerspiele"}
-    - {id: 51, cat: Audio, desc: "Musik"}
-    - {id: 124, cat: Audio/Video, desc: "Musikvideo"}
-    - {id: 103, cat: Movies/DVD, desc: "DVD"}
-    - {id: 88, cat: Movies, desc: "Kids Only"}
-    - {id: 43, cat: Movies, desc: "Movie Packs"}
-    - {id: 105, cat: Movies/HD, desc: "Movie/1080 P"}
-    - {id: 107, cat: Movies/HD, desc: "Movie/3D"}
-    - {id: 102, cat: Movies/HD, desc: "Movie/720 P"}
-    - {id: 101, cat: Movies/BluRay, desc: "Movie/Blueray - HD"}
-    - {id: 108, cat: Movies, desc: "Movie/Bollywood"}
-    - {id: 93, cat: TV/Documentary, desc: "Movie/Dokus"}
-    - {id: 125, cat: Movies/Foreign, desc: "Movie/International"}
-    - {id: 91, cat: Movies/SD, desc: "Movie/SD"}
-    - {id: 114, cat: Movies, desc: "Movie/TV-Rip"}
-    - {id: 132, cat: Movies/HD, desc: "Movie/UHD"}
-    - {id: 110, cat: Movies/HD, desc: "x264"}
-    - {id: 106, cat: Console/PS3, desc: "Games/PS3"}
-    - {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/XBox 360, desc: "Games/Xbox360"}
-    - {id: 116, cat: PC/Games, desc: "Linux/Spiele"}
-    - {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: 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/Mags, desc: "Zeitschriften/Zeitungen"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: pin
-    type: text
-    label: Pin
-
-login:
-  path: login.php
-  method: form
-  form: form
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    pin: "{{ .Config.pin }}"
-  error:
-    - selector: .tablea:contains("Benutzername, Passwort oder Pin ungültig")
-  test:
-    path: browse.php
-
-search:
-  path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-
-  rows:
-    selector: table.tableinborder > tbody > tr:has(a[href^="download.php"])
-
-  fields:
-    title:
-      selector: a[href^="details.php"]
-      filters:
-        - name: replace
-          args: [".torrent", ""]
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php"]
-      attribute: href
-    download:
-      selector: a[href^="download.php"]
-      attribute: href
-    files:
-      selector: .tablea tr:nth-child(2) td:nth-child(1) b:nth-child(2)
-    grabs:
-      selector: .tablea tr:nth-child(2) td:nth-child(3) b
-    size:
-      selector: .tablea tr:nth-child(2) td:nth-child(1) b:nth-child(1)
-    seeders:
-      selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(1) font
-    leechers:
-      selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(3) font
-    downloadvolumefactor:
-      case:
-        img[src="pic/oupic.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd
--- a/src/Jackett.Common/Definitions/abtorrents.yml
+++ b/src/Jackett.Common/Definitions/abtorrents.yml
@@ -2,7 +2,7 @@
 id: abtorrents
 name: ABtorrents
 description: "ABtorrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -137,7 +137,7 @@ search:
      attribute: src
    files:
      selector: td:nth-last-child(8)
-    date:
+    date_yday:
      # Yesterday<br/>6:00 AM
      selector: td:nth-last-child(7):contains("day")
      optional: true
@@ -145,7 +145,7 @@ search:
        - name: append
          args: " +00:00" # auto adjusted by site account profile
        - name: fuzzytime
-    date:
+    date_year:
      # Aug 6 2021<br/>7:25 PM
      selector: td:nth-last-child(7):not(:contains("day"))
      optional: true
@@ -154,6 +154,8 @@ search:
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "Jan 2 2006 3:04 PM -07:00"
+    date:
+      text: "{{ if or .Result.date_yday .Result.date_year }}{{ or .Result.date_yday .Result.date_year }}{{ else }}now{{ end }}"
    size:
      selector: td:nth-last-child(6)
    grabs:
--- a/src/Jackett.Common/Definitions/acgrip.yml
+++ b/src/Jackett.Common/Definitions/acgrip.yml
@@ -2,7 +2,7 @@
 id: acgrip
 name: ACG.RIP
 description: "ACG.RIP is a CHINESE Public torrent tracker for the latest anime and Japanese related torrents"
-language: zh-cn
+language: zh-CN
 type: public
 followredirect: true
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/acgsou.yml
+++ b/src/Jackett.Common/Definitions/acgsou.yml
@@ -2,7 +2,7 @@
 id: acgsou
 name: ACGsou
 description: "ACGsou (36DM) is a CHINESE Public torrent tracker for ANIME"
-language: zh-cn
+language: zh-CN
 type: public
 followredirect: true
 encoding: UTF-8
@@ -79,21 +79,15 @@ 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("昨天"))
+    date_year:
+      selector: td:nth-child(1):contains(":")
      optional: true
      filters:
        - name: append
          args: " +08:00" # CST
        - name: dateparse
          args: "01/02 15:04 -07:00"
-    date:
+    date_years:
      selector: td:nth-child(1):not(:contains(":"))
      optional: true
      filters:
@@ -101,6 +95,8 @@ search:
          args: " +08:00" # CST
        - name: dateparse
          args: "2006/01/02 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_years }}{{ or .Result.date_year .Result.date_years }}{{ else }}now{{ end }}"
    size:
      selector: td:nth-child(4)
    seeders:
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/src/Jackett.Common/Definitions/acidlounge.yml
@@ -2,7 +2,7 @@
 id: acidlounge
 name: Acid-Lounge
 description: "Acid Lounge (A-L) is a Private Torrent Tracker for 0DAY / GENERAL"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -18,9 +18,9 @@ caps:
    - {id: 32, cat: PC, desc: "Appz/PC"}
    - {id: 48, cat: Audio/Audiobook, desc: "Audio/Books"}
    - {id: 84, cat: Other, desc: "Damaged Torrent"}
-    - {id: 14, cat: Books, desc: "eBooks"}
-    - {id: 82, cat: Books, desc: "eBooks/Comics"}
-    - {id: 81, cat: Books, desc: "eBooks/Mags"}
+    - {id: 14, cat: Books/EBook, desc: "eBooks"}
+    - {id: 82, cat: Books/Comics, desc: "eBooks/Comics"}
+    - {id: 81, cat: Books/Mags, desc: "eBooks/Mags"}
    - {id: 60, cat: PC/Mac, desc: "Games/Mac"}
    - {id: 54, cat: Console/NDS, desc: "Games/NDS"}
    - {id: 4, cat: PC/Games, desc: "Games/PC"}
@@ -52,7 +52,9 @@ caps:
    - {id: 75, cat: TV/HD, desc: "TV/Boxsets HD"}
    - {id: 76, cat: TV/SD, desc: "TV/Boxsets SD"}
    - {id: 37, cat: XXX, desc: "XXX"}
+    - {id: 68, cat: XXX, desc: "XXX/0-Day"}
    - {id: 78, cat: XXX, desc: "XXX/3D"}
+    - {id: 67, cat: XXX/ImageSet, desc: "XXX/Imagesets"}

  modes:
    search: [q]
@@ -61,6 +63,33 @@ caps:
    music-search: [q]
    book-search: [q]

+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: dateAdded
+    options:
+      dateAdded: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 login:
  path: Main/?act=Login
  method: form
@@ -81,50 +110,39 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
    search: "{{ .Keywords }}"
+    # alive, aliveanddead, nobot, dead, free, nuked
+    status: "{{ if .Config.freeleech }}free{{ else }}aliveanddead{{ end }}"
+    # title, desc, both
    search_type: title
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"

  rows:
    selector: table#browse_torrents_table > tbody > tr[id^="torrent_row_"]

  fields:
-    title:
-      selector: a.torrent_name
-      attribute: title
-    description:
-      selector: span.torrent_small_desc
    category:
-      selector: td.torrent_table_type > a
+      selector: a[href^="browse.php?cat[]="]
      attribute: href
      filters:
        - name: querystring
          args: cat[]
+    title:
+      selector: a.torrent_name
+      attribute: title
    details:
      selector: a.torrent_name
      attribute: href
    download:
      selector: a[href^="download.php?"]
      attribute: href
-    size:
-      selector: td.torrent_table_size
+    description:
+      optional: true
+      selector: span.torrent_small_desc
    files:
      selector: td.torrent_table_files
-    seeders:
-      selector: td.torrent_table_seeders
-    leechers:
-      selector: td.torrent_table_leechers
-    grabs:
-      selector: td.torrent_table_snatched
-      filters:
-        - name: regexp
-          args: ([\d\.]+)
-    downloadvolumefactor:
-      case:
-        ":root div#notice_ratioBoostingMadness": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
    date:
      selector: td.torrent_table_dateAdded
      filters:
@@ -132,4 +150,27 @@ search:
          args: " +01:00" # CET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
-# engine tbd
+    size:
+      selector: td.torrent_table_size
+    grabs:
+      selector: td.torrent_table_snatched
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td.torrent_table_seeders
+    leechers:
+      selector: td.torrent_table_leechers
+    downloadvolumefactor:
+      case:
+        ":root div#notice_ratioBoostingMadness": 0
+        img[src$="images/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 5 day (as seconds = 5 x 24 x 60 x 60)
+      text: 432000 # 3 days for torrents under 20GB
+# engine n/a
--- a/src/Jackett.Common/Definitions/acrossthetasman.yml
+++ b/src/Jackett.Common/Definitions/acrossthetasman.yml
@@ -2,7 +2,7 @@
 id: acrossthetasman
 name: Across The Tasman
 description: "ATT is a torrent site for Rugby and other sports played in Australia"
-language: en
+language: en-AU
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -2,7 +2,7 @@
 id: aftershock
 name: Aftershock
 description: "Aftershock is a HUNGARIAN Private Torrent Tracker for MOVIES / GENERAL"
-language: hu-hu
+language: hu-HU
 type: private
 encoding: iso-8859-1
 links:
@@ -143,7 +143,7 @@ search:
      filters:
        - name: regexp
          args: "src=(.*?) width="
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
--- a/src/Jackett.Common/Definitions/aidoruonline.yml
+++ b/src/Jackett.Common/Definitions/aidoruonline.yml
@@ -2,7 +2,7 @@
 id: aidoruonline
 name: Aidoru!Online
 description: "Aidoru!Online is a Private Torrent Tracker for Female Japanese Idol related files"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -64,8 +64,6 @@ login:
  method: cookie
  inputs:
    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
  test:
    path: /
    selector: a[href="account-logout.php"]
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -0,0 +1,139 @@
+---
+id: aither-api
+name: Aither (API)
+description: "Aither is a Private Torrent Tracker for HD MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://aither.cc/
+
+caps:
+  # dont forget to update the case block in the search fields category
+  categorymappings:
+    - {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: "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:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://aither.cc/\" target =_blank>Aither</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+        attribute: attributes
+
+  rows:
+    selector: data
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category
+      case:
+        "Movie": 1
+        "Sport": 9
+        "TV": 2
+        "Music": 3
+        "Games": 4
+        "Software & Apps": 10
+        "Ebooks & Magazines": 11
+        "Audiobooks": 14
+        "Education": 15
+        "XXX": 6
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 5.3.0
--- a/src/Jackett.Common/Definitions/aither.yml
+++ b/src/Jackett.Common/Definitions/aither.yml
@@ -2,7 +2,7 @@
 id: aither
 name: Aither
 description: "Aither is a Private Torrent Tracker for HD MOVIES / TV"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -122,6 +122,8 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
    size:
      selector: td:nth-last-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/alleenretail.yml
+++ b/src/Jackett.Common/Definitions/alleenretail.yml
@@ -0,0 +1,186 @@
+---
+id: alleenretail
+name: Alleen Retail
+description: "Alleen Retail is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: nl-NL
+type: private
+encoding: UTF-8
+links:
+  - http://www.alleenretail.org/ # does not support https ERR_CONNECTION_REFUSED
+
+caps:
+  categorymappings:
+    - {id: 2, cat: Movies/DVD, desc: "Films DVD"}
+    - {id: 17, cat: Movies, desc: "Films Promo"}
+    - {id: 3, cat: Audio/Video, desc: "Muziek Video"}
+    - {id: 4, cat: Audio/Video, desc: "Cabaret"}
+    - {id: 18, cat: Movies, desc: "Films Kids"}
+    - {id: 6, cat: TV, desc: "TV Series"}
+    - {id: 19, cat: Other, desc: "Overigen"}
+    - {id: 20, cat: TV/Documentary, desc: "Documentaire"}
+    - {id: 9, cat: PC/Games, desc: "Games PC"}
+    - {id: 10, cat: Books/Mags, desc: "Magazines"}
+    - {id: 11, cat: Movies/SD, desc: "Films AVI/DivX"}
+    - {id: 22, cat: Movies, desc: "Films Classics"}
+    - {id: 8, cat: Audio, desc: "Muziek"}
+    - {id: 23, cat: PC/Mac, desc: "Software Mac"}
+    - {id: 1, cat: Books/Comics, desc: "Stripboeken"}
+    - {id: 13, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 14, cat: PC/Mobile-Other, desc: "Navigatie"}
+    - {id: 7, cat: PC/0day, desc: "Software PC"}
+    - {id: 12, cat: PC/Mobile-iOS, desc: "iOS"}
+    - {id: 21, cat: Movies/HD, desc: "Films HD"}
+    - {id: 5, cat: Audio/Audiobook, desc: "Luisterboeken"}
+    - {id: 15, cat: XXX, desc: "18+"}
+    - {id: 24, cat: Movies/UHD, desc: "Films Blu-ray/3D/4K"}
+    - {id: 16, cat: Books/EBook, desc: "Ebooks"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+#  - name: thankyou
+#    type: text
+#    label: Thank You Comment
+#  - name: info
+#    type: info
+#    label: Thank you comment
+#    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table.main:contains("Aanmelden mislukt")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+# download:
+#  before:
+#    # /comment.php?action=add&tid=166386
+#    path: comment.php
+#    method: post
+#    inputs:
+#      action: add
+#      tid: "{{ .DownloadUri.Query.id }}"
+#      text: "{{ .Config.thankyou }}"
+#      submit: Opslaan
+#  selectors:
+#    - selector: a[href^="download.php?id="]
+#      attribute: href
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    incldead: 1
+    # does not support imdbid search and does not return imdb link in results
+
+  rows:
+    selector: table.mainouter
+    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="]
+      filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
+        - name: re_replace
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+        - name: re_replace
+          args: ["(?i)compleet", "Complete"]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    size:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "(.+?) in"
+    files:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "in (\\d+) bestan"
+    grabs:
+      selector: table tr:nth-child(2) td:nth-child(1)
+    date:
+      selector: table tr:nth-child(2) td:nth-child(3)
+      filters:
+        - name: replace
+          args: ["januari", "January"]
+        - name: replace
+          args: ["februari", "February"]
+        - name: replace
+          args: ["maart", "March"]
+        - name: replace
+          args: ["april", "April"]
+        - name: replace
+          args: ["mei", "May"]
+        - name: replace
+          args: ["juni", "June"]
+        - name: replace
+          args: ["juli", "July"]
+        - name: replace
+          args: ["augustus", "August"]
+        - name: replace
+          args: ["september", "September"]
+        - name: replace
+          args: ["oktober", "October"]
+        - name: replace
+          args: ["november", "November"]
+        - name: replace
+          args: ["december", "December"]
+        - name: re_replace
+          args: ["\\s*om\\s*", " "]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2 January 2006 15:04:05 -07:00"
+    seeders_optional:
+      optional: true
+      selector: table tr:nth-child(3) td:nth-child(6)  font b
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
+      optional: true
+      selector: table tr:nth-child(3) td:nth-child(6) font b:nth-child(2)
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      # between 1.00 and 1.50 is required, and above 1.50 prohibited
+      text: 1.25
+# engine n/a
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -2,7 +2,7 @@
 id: amigosshare
 name: Amigos Share Club
 description: "Amigos Share Club is a Brazilian Private site for TV / MOVIES / GENERAL"
-language: pt-br
+language: pt-BR
 type: private
 encoding: UTF-8
 links:
@@ -292,9 +292,7 @@ search:
        "[src$=\"/Scripts.png\"]": 128
        "[src$=\"/Vetores.png\"]": 124
        "[src$=\"/outros2.png\"]": 130
-    date:
-      text: now
-    date:
+    date_optional:
      selector: p:contains("Lançado:")
      optional: true
      filters:
@@ -306,6 +304,8 @@ search:
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "02/01/06 15:04:05 -07:00"
+    date:
+      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
    size:
      selector: div.list-group-item-content p.m-0 span.badge-info
    seeders:
--- a/src/Jackett.Common/Definitions/anaschcc.yml
+++ b/src/Jackett.Common/Definitions/anaschcc.yml
@@ -2,7 +2,7 @@
 id: anaschcc
 name: anasch.cc
 description: "anasch.cc is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -104,7 +104,7 @@ search:
    download:
      selector: td a[href^="download.php"]
      attribute: href
-    imdb:
+    imdbid:
      selector: a[href^="index.php?page=torrent-details"]
      attribute: onmouseover
      filters:
@@ -140,9 +140,6 @@ search:
      selector: td:nth-child(8)
    grabs:
      selector: td:nth-child(9)
-      filters:
-        - name: replace
-          args: ["---", "0"]
    downloadvolumefactor:
      case:
        img[src*="freeleech.png"]: 0
--- a/src/Jackett.Common/Definitions/angietorrents.yml
+++ b/src/Jackett.Common/Definitions/angietorrents.yml
@@ -1,147 +0,0 @@
---
-id: angietorrents
-name: AngieTorrents
-description: "AngieTorrents is a Public Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://angietorrents.cc/
-
-caps:
-  categorymappings:
-    - {id: 48, cat: XXX/x264, desc: "Adult - HD"}
-    - {id: 47, cat: XXX/SD, desc: "Adult - SD"}
-    - {id: 28, cat: TV/Anime, desc: "Anime - All"}
-    - {id: 18, cat: PC/0day, desc: "Apps - PC"}
-    - {id: 19, cat: PC/Mac, desc: "Apps - Mac"}
-    - {id: 20, cat: PC, desc: "Apps - Linux"}
-    - {id: 21, cat: PC/Mobile-Other, desc: "Apps - Other"}
-    - {id: 54, cat: Books/EBook, desc: "Books - eBooks"}
-    - {id: 55, cat: Audio/Audiobook, desc: "Books - Audio Books"}
-    - {id: 9, cat: TV/Documentary, desc: "Documentaries - All"}
-    - {id: 51, cat: Movies/Foreign, desc: "Foreign Movies - HD"}
-    - {id: 52, cat: Movies/Foreign, desc: "Foreign Movies - SD"}
-    - {id: 10, cat: PC/Games, desc: "Games - PC"}
-    - {id: 11, cat: Console/Other, desc: "Games - PS2"}
-    - {id: 43, cat: Console/PS3, desc: "Games - PS3"}
-    - {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: 16, cat: Console/Other, desc: "Games - Dreamcast"}
-    - {id: 44, cat: Console/Wii, desc: "Games - Wii"}
-    - {id: 45, cat: Console/Other, desc: "Games - DS"}
-    - {id: 46, cat: Console/Other, desc: "Games - GameCube"}
-    - {id: 17, cat: Console/Other, desc: "Games - Other"}
-    - {id: 50, cat: Movies, desc: "Movies - Packs"}
-    - {id: 1, cat: Movies/DVD, desc: "Movies - DVD"}
-    - {id: 2, cat: Movies/SD, desc: "Movies - Divx/Xvid"}
-    - {id: 3, cat: Movies/SD, desc: "Movies - SD"}
-    - {id: 42, cat: Movies/HD, desc: "Movies - HD"}
-    - {id: 4, cat: Movies/Other, desc: "Movies - Other"}
-    - {id: 22, cat: Audio/MP3, desc: "Music - MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Music - Lossless"}
-    - {id: 24, cat: Audio/Video, desc: "Music - DVD"}
-    - {id: 25, cat: Audio/Video, desc: "Music - Video"}
-    - {id: 26, cat: Audio/Other, desc: "Music - Radio"}
-    - {id: 27, cat: Audio/Other, desc: "Music - Other"}
-    - {id: 33, cat: PC, desc: "Other - Emulation"}
-    - {id: 34, cat: PC/Mobile-Other, desc: "Other - PPC/PDA"}
-    - {id: 35, cat: Audio, desc: "Other - Sounds"}
-    - {id: 36, cat: Books/EBook, desc: "Other - E-Books"}
-    - {id: 37, cat: Other, desc: "Other - Images"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Other - Mobile Phone"}
-    - {id: 39, cat: Other, desc: "Other - Extra Pars/Fills"}
-    - {id: 40, cat: Other, desc: "Other - Other"}
-    - {id: 53, cat: Other, desc: "Tutorials - All"}
-    - {id: 49, cat: TV, desc: "TV - Packs"}
-    - {id: 5, cat: TV/SD, desc: "TV - DVD"}
-    - {id: 41, cat: TV/HD, desc: "TV - HD"}
-    - {id: 6, cat: TV/SD, desc: "TV - Divx/Xvid"}
-    - {id: 7, cat: TV/SD, desc: "TV - SD"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-search:
-  paths:
-    # https://angietorrents.cc/search.php?search=white&cat=42&incldead=1&freeleech=0&inclexternal=0&lang=0
-    - path: search.php
-    # 20 torrents per page
-    - path: search.php
-      inputs:
-        page: 1
-    - path: search.php
-      inputs:
-        page: 2
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # site supports exact matching only
-    search: "{{ .Keywords }}"
-    cat: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: 0
-    # 0 both 1 local 2 external
-    inclexternal: 0
-    # 0 all 1 english etc
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-
-  rows:
-    selector: table.ttable_headinner tr.t-row
-
-  fields:
-    category:
-      selector: a[href^="/torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="/details.php?id="]
-      attribute: title
-    details:
-      selector: a[href^="/details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/download.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    date:
-      text: now
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/anilibria.yml
+++ b/src/Jackett.Common/Definitions/anilibria.yml
@@ -0,0 +1,85 @@
+---
+id: anilibria
+name: AniLibria
+description: "AniLibria is a Public torrent tracker for anime, voiced on russian by AniLibria team"
+language: ru-RU
+type: public
+encoding: UTF-8
+links:
+  - https://www.anilibria.tv/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: Anime}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+settings: []
+
+search:
+  paths:
+    # https://github.com/anilibria/docs/blob/master/api_v2.md
+    - path: "https://api.anilibria.tv/v2/{{ if .Keywords }}searchTitles?filter=names,poster.url,code,torrents.list,season.year&limit=100&search={{ .Keywords }}{{ else }}getUpdates?filter=names,poster.url,code,torrents.list,season.year&limit=100{{ end }}"
+      response:
+        type: json
+        attribute: torrents.list
+        multiple: true
+
+  keywordsfilters:
+    # strip season and ep
+    - name: re_replace
+      args: ["(?i)(?:[SE]?\\d{1,4}){1,2}$", ""]
+
+  rows:
+    selector: $
+
+  fields:
+    category:
+      text: 1
+    title_ru:
+      selector: ..names.ru
+    title_en:
+      selector: ..names.en
+    title_alternative:
+      selector: ..names.alternative
+      optional: true
+    year:
+      selector: ..season.year
+    quality:
+      selector: quality.string
+    series:
+      selector: series.string
+    title:
+      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} [{{ .Result.quality }}] - {{ .Result.series }}"
+    code:
+      selector: ..code
+    details:
+      text: "{{ .Config.sitelink }}release/{{ .Result.code }}.html"
+    download:
+      selector: url
+      filters:
+        - name: prepend
+          args: "{{ .Config.sitelink }}"
+    poster:
+      selector: ..poster.url
+      filters:
+        - name: prepend
+          args: "https://static.anilibria.tv/"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: downloads
+    date:
+      # unix
+      selector: uploaded_timestamp
+    size:
+      selector: total_size
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# json api v2
--- a/src/Jackett.Common/Definitions/anime-free.yml
+++ b/src/Jackett.Common/Definitions/anime-free.yml
@@ -2,9 +2,10 @@
 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
+language: ru-RU
 type: semi-private
 encoding: windows-1251
+testlinktorrent: false
 links:
  - https://anime-free.biz/
 legacylinks:
@@ -86,9 +87,7 @@ search:
    selector: article

  fields:
-    category:
-      text: 54
-    category|noappend:
+    category_optional:
      optional: true
      selector: a[href*="category="]
      attribute: href
@@ -110,6 +109,8 @@ search:
        a[href$="original_hentai"]: 48
        a[href$="rus-game"]: 57
        a[href$="uncensored"]: 45
+    category:
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}54{{ end }}"
    title:
      selector: h2.title a
    details:
@@ -133,11 +134,11 @@ search:
      text: 1
    leechers:
      text: 1
-    size:
-      text: "0 B"
-    size:
+    size_optional:
      optional: true
      selector: b.file_size
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/animeclipse.yml
+++ b/src/Jackett.Common/Definitions/animeclipse.yml
@@ -2,7 +2,7 @@
 id: animeclipse
 name: AnimeClipse
 description: "AnimeClipse is a Public site for Hellenic Fansubs Anime."
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/animeworld-api.yml
+++ b/src/Jackett.Common/Definitions/animeworld-api.yml
@@ -0,0 +1,140 @@
+---
+id: animeworld-api
+name: AnimeWorld (API)
+description: "AnimeWorld (AW) is a GERMAN Private site for ANIME / MANGA / HENTAI"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://animeworld.cx/
+
+caps:
+  # dont forget to update the case block in the search fields category
+  categorymappings:
+    - {id: 1, cat: Movies/Other, desc: "Anime Movie"}
+    - {id: 2, cat: TV/Anime, desc: "Anime Serie"}
+    - {id: 3, cat: Audio, desc: "Anime Musik/OST"}
+    - {id: 4, cat: PC/Games, desc: "Anime Spiele"}
+    - {id: 5, cat: XXX, desc: "Hentai"}
+    - {id: 6, cat: PC, desc: "Spiele Linux"}
+    - {id: 7, cat: Other, desc: "Sonstiges"}
+    - {id: 8, cat: Movies, desc: "Filme"}
+    - {id: 9, cat: TV, desc: "Serien"}
+    - {id: 10, cat: PC/Games, desc: "Spiele"}
+    - {id: 11, cat: Audio, desc: "Musik"}
+    - {id: 12, cat: Books, desc: "Mangas"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target =_blank>AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+        attribute: attributes
+
+  rows:
+    selector: data
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category
+      case:
+        "Anime Movie": 1
+        "Anime Serie": 2
+        "Anime Musik/OST": 3
+        "Anime Spiele": 4
+        "Hentai": 5
+        "Spiele Linux": 6
+        "Sonstiges": 7
+        "Filme": 8
+        "Serien": 9
+        "Spiele": 10
+        "Musik": 11
+        "Mangas": 12
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 5.3.0
--- a/src/Jackett.Common/Definitions/animeworld.yml
+++ b/src/Jackett.Common/Definitions/animeworld.yml
@@ -2,7 +2,7 @@
 id: animeworld
 name: AnimeWorld
 description: "AnimeWorld (AW) is a GERMAN Private site for ANIME / MANGA / HENTAI"
-language: de-de
+language: de-DE
 type: private
 encoding: UTF-8
 links:
@@ -122,6 +122,8 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
    size:
      selector: td:nth-last-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/anirena.yml
+++ b/src/Jackett.Common/Definitions/anirena.yml
@@ -2,7 +2,7 @@
 id: aniRena
 name: AniRena
 description: "AniRena is a Public torrent tracker for the latest anime and Japanese related torrents"
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/anisource.yml
+++ b/src/Jackett.Common/Definitions/anisource.yml
@@ -2,7 +2,7 @@
 id: anisource
 name: AniSource
 description: "AniSource is a Public site for HD Anime raws."
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/arabafenice.yml
+++ b/src/Jackett.Common/Definitions/arabafenice.yml
@@ -2,7 +2,7 @@
 id: arabafenice
 name: ArabaFenice
 description: "Araba Fenice (Phoenix) is an ITALIAN Private site for TV / MOVIES / GENERAL"
-language: it-it
+language: it-IT
 type: private
 encoding: UTF-8
 links:
@@ -209,9 +209,6 @@ search:
          args: "02/01/2006 -07:00"
    grabs:
      selector: td:nth-last-child(6)
-      filters:
-        - name: replace
-          args: ["---", "0"]
    seeders:
      selector: td:nth-last-child(8)
    leechers:
--- a/src/Jackett.Common/Definitions/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -2,7 +2,7 @@
 id: arabp2p
 name: ArabP2P
 description: "ArabP2P is an ARABIC Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ar-ar
+language: ar-AR
 type: private
 encoding: UTF-8
 links:
@@ -47,7 +47,6 @@ caps:
    - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
    - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
    - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 110, cat: TV, desc: "رمضان 2021 (Ramadan 2021)"}
    # المرئيات الاجنبية Foreign Movies
    - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
    - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
--- a/src/Jackett.Common/Definitions/asiancinema.yml
+++ b/src/Jackett.Common/Definitions/asiancinema.yml
@@ -2,7 +2,7 @@
 id: asiancinema
 name: AsianCinema
 description: "Tracker Movies/TV/Music"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -122,7 +122,7 @@ search:
      selector: td:nth-last-child(2)
    grabs:
      selector: td:nth-last-child(1)
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
--- a/src/Jackett.Common/Definitions/asiandvdclub.yml
+++ b/src/Jackett.Common/Definitions/asiandvdclub.yml
@@ -2,7 +2,7 @@
 id: asiandvdclub
 name: AsianDVDClub
 description: "AsianDVDClub (ADC) is a Private Torrent Tracker for Asian DVD and BluRay"
-language: en
+language: en-US
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -2,14 +2,14 @@
 id: audiobookbay
 name: AudioBookBay
 description: "AudioBook Bay (ABB) is a public Torrent Tracker for AUDIOBOOKS"
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
  - http://audiobookbay.nl/ # site forces http, does not support https
-  - http://audiobookbay.net/
+  - http://audiobookbay.ws/
  - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.ch/
+  - https://audiobookbay.unblockit.bz/
 legacylinks:
  - https://audiobookbay.la/
  - https://audiobookbay.unblockit.lat/
@@ -22,6 +22,10 @@ legacylinks:
  - https://audiobookbay.unblockit.onl/
  - https://audiobookbay.unblockit.li/
  - https://audiobookbay.unblockit.uno/
+  - https://audiobookbay.unblockit.ch/
+  - https://audiobookbay.unblockit.ws/
+  - http://audiobookbay.net/
+  - https://audiobookbay.unblockit.kim/

 caps:
  categorymappings:
@@ -91,13 +95,17 @@ caps:
 settings: []

 download:
-  selectors:
-    - selector: td:contains("Info Hash:") ~ td
+  infohash:
+    hash:
+      selector: td:contains("Info Hash:") ~ td
      filters:
-        - name: prepend
-          args: "magnet:?xt=urn:btih:"
-        - name: append
-          args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: h1
+      filters:
+        - name: trim
+        - name: validfilename

 search:
  paths:
@@ -130,7 +138,7 @@ search:
    poster:
      selector: img
      attribute: src
-    _date:
+    date_optional:
      selector: div.postContent
      filters:
        - name: regexp
@@ -138,8 +146,8 @@ search:
        - name: dateparse
          args: "2 Jan 2006"
    date:
-      text: "{{ if .Result._date }}{{ .Result._date }}{{ else }}now{{ end }}"
-    _size:
+      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
+    size_optional:
      selector: div.postContent
      filters:
        - name: regexp
@@ -151,7 +159,7 @@ search:
        - name: replace
          args: ["KBs", "KB"]
    size:
-      text: "{{ if .Result._size }}{{ .Result._size }}{{ else }}0 B{{ end }}"
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
    seeders:
      text: 1
    leechers:
--- a/src/Jackett.Common/Definitions/audionews.yml
+++ b/src/Jackett.Common/Definitions/audionews.yml
@@ -2,7 +2,7 @@
 id: audionews
 name: AudioNews
 description: "AudioNews (AN) is a Private Torrent Tracker for AUDIO SOFTWARE / SAMPLES / ETC"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -161,6 +161,7 @@ caps:
    - {id: 201, cat: Audio/Other, desc: "PRESETS Xfer Serum"}
    - {id: 164, cat: Audio/Other, desc: "PRESETS Sylenth"}
    - {id: 168, cat: Audio/Other, desc: "PRESETS Toontrack"}
+    - {id: 239, cat: Books, desc: "Service Manuals"}
    - {id: 21, cat: Other, desc: "UPDATE"}
    - {id: 222, cat: Other, desc: "GFXNEWS 3D"}
    - {id: 235, cat: Other, desc: "GFXNEWS APPS ANDROID & IOS"}
@@ -294,35 +295,26 @@ search:
      filters:
        - name: querystring
          args: f
-    size:
-      text: "0 B"
-    size:
+    size_optional:
      optional: true
-      selector: td:contains(\00a0GB)
+      selector: td:contains(\00a0GB), td:contains(\00a0MB), td:contains(\00a0kB), td:contains(\00a0B)
    size:
-      optional: true
-      selector: td:contains(\00a0MB)
-    size:
-      optional: true
-      selector: td:contains(\00a0kB)
-    size:
-      optional: true
-      selector: td:contains(\00a0B)
-    seeders:
-      text: 0
-    seeders:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
+    seeders_optional:
      optional: true
      selector: td[title="Seeders"]
-    leechers:
-      text: 0
-    leechers:
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
      optional: true
      selector: td[title="Leechers"]
-    grabs:
-      text: 0
-    grabs:
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    grabs_optional:
      optional: true
      selector: td[title^="Replies:"]
+    grabs:
+      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
    downloadvolumefactor:
      text: 1
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/aussierules.yml
+++ b/src/Jackett.Common/Definitions/aussierules.yml
@@ -2,7 +2,7 @@
 id: aussierules
 name: Aussierul.es
 description: "Aussierul.es is a torrent site for Aussie Rules Football played in Australia"
-language: en
+language: en-AU
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/backups.yml
+++ b/src/Jackett.Common/Definitions/backups.yml
@@ -2,7 +2,7 @@
 id: backups
 name: Back-ups
 description: "Back-Ups is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -84,11 +84,13 @@ search:
      filters:
        - name: querystring
          args: category
-    title:
+    title_default:
      selector: a[href*="/details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: div.tooltip-content > div
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    details:
      selector: a[href*="/details.php?id="]
      attribute: href
@@ -115,7 +117,6 @@ search:
        - name: dateparse
          args: "02-01-2006 15:04 -07:00"
    poster:
-      optional: true
      selector: div.tooltip-content > img
      attribute: src
    downloadvolumefactor:
--- a/src/Jackett.Common/Definitions/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -2,11 +2,14 @@
 id: badasstorrents
 name: Badass Torrents
 description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL"
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
  - https://badasstorrents.com/
+  - https://badasstorrents.nocensor.biz/
+legacylinks:
+  - https://badasstorrents.nocensor.work/

 caps:
  categories:
@@ -78,6 +81,8 @@ search:

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

  fields:
    category:
--- a/src/Jackett.Common/Definitions/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -2,7 +2,7 @@
 id: baibako
 name: BaibaKo
 description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
-language: ru-ru
+language: ru-RU
 type: semi-private
 encoding: windows-1251
 links:
--- a/src/Jackett.Common/Definitions/bangumi-moe.yml
+++ b/src/Jackett.Common/Definitions/bangumi-moe.yml
@@ -0,0 +1,79 @@
+---
+id: bangumi-moe
+name: Bangumi Moe
+description: "Bangumi Moe is a Public torrent site for ANIME"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://bangumi.moe/
+
+caps:
+  categorymappings:
+    - {id: 549ef207fe682f7549f1ea90, cat: TV/Anime, desc: "Anime"}
+    - {id: 54967e14ff43b99e284d0bf7, cat: TV/Anime, desc: "Anime Pack"}
+    - {id: 549cc9369310bc7d04cddf9f, cat: Movies, desc: "Anime Movie"}
+    - {id: 549eef6ffe682f7549f1ea8b, cat: Audio, desc: "Music"}
+    - {id: 549eefebfe682f7549f1ea8c, cat: Books/Comics, desc: "Comic"}
+    - {id: 549ef015fe682f7549f1ea8d, cat: Console, desc: "Game"}
+    - {id: 549ef250fe682f7549f1ea91, cat: Other, desc: "Other"}
+    - {id: 549ff1db30bcfc225bf9e607, cat: Console, desc: "Dorama"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://bangumi.moe/api/torrent/latest
+    # https://bangumi.moe/api/v2/torrent/search
+    - path: "{{ if .Keywords }}api/v2/torrent/search{{ else }}api/torrent/latest{{ end }}"
+      method: "{{ if .Keywords }}post{{ else }}get{{ end }}"
+      response:
+        type: json
+
+  inputs:
+#    $raw: "{{ if .Keywords }}query={{ .Keywords }}{{ else }}{{ end }}"
+    query: "{{ .Keywords }}"
+
+  rows:
+    selector: torrents
+
+  fields:
+    category:
+      selector: category_tag_id
+    title:
+      selector: title
+    details:
+      text: "{{ .Config.sitelink }}"
+    infohash:
+      selector: infoHash
+    poster:
+      selector: introduction
+      filters:
+        - name: regexp
+          args: "src=\\\"(.+?)\\\""
+    description:
+      selector: category_tag.locale.en
+      optional: true
+    date:
+      # 2021-10-19T06:10:15.772Z
+      selector: publish_time
+    size:
+      selector: size
+    grabs:
+      selector: downloads
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# json api v2
--- a/src/Jackett.Common/Definitions/beitai.yml
+++ b/src/Jackett.Common/Definitions/beitai.yml
@@ -2,7 +2,7 @@
 id: beitai
 name: BeiTai
 description: "BeiTai is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-cn
+language: zh-CN
 type: private
 encoding: UTF-8
 links:
@@ -95,12 +95,14 @@ search:
    selector: table.torrents > tbody > tr:has(table.torrentname)

  fields:
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: a[title][href^="details.php?id="]
      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    category:
      selector: a[href^="?cat="]
      attribute: href
@@ -113,10 +115,10 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    imdb:
+    imdbid:
      selector: div.imdb_100 > a
      attribute: href
-    date:
+    date_elapsed:
      # time type: time elapsed (default)
      selector: td:nth-child(4) > span[title]
      attribute: title
@@ -126,7 +128,7 @@ search:
          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
      # time added
      selector: td:nth-child(4):not(:has(span))
      optional: true
@@ -135,6 +137,8 @@ search:
          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td:nth-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/bestcore.yml
+++ b/src/Jackett.Common/Definitions/bestcore.yml
@@ -0,0 +1,197 @@
+---
+id: bestcore
+name: Best-Core
+description: "Best-Core is a HUNGARIAN Private Tracker for MOVIES / TV"
+language: hu-HU
+type: private
+encoding: ISO-8859-2
+links:
+  - https://best-core.info/
+
+caps:
+  categorymappings:
+    - {id: 81, cat: Movies/3D, desc: "3D"}
+    - {id: 83, cat: Movies/UHD, desc: "4K/UHD"}
+    - {id: 80, cat: Movies/Other, desc: "Best-Core"}
+    - {id: 51, cat: Books/EBook, desc: "E-book"}
+    - {id: 88, cat: Audio/Audiobook, desc: "E-book/Hangoskönyv"}
+    - {id: 77, cat: Movies/HD, desc: "Film/BDRip/Eng"}
+    - {id: 86, cat: Movies/HD, desc: "Film/BDRip/Ger"}
+    - {id: 76, cat: Movies/HD, desc: "Film/BDRip/Hun"}
+    - {id: 75, cat: Movies/BluRay, desc: "Film/Blu-ray/Eng"}
+    - {id: 74, cat: Movies/BluRay, desc: "Film/Blu-ray/Hun"}
+    - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Eng"}
+    - {id: 24, cat: Movies/DVD, desc: "Film/DVD/Hun"}
+    - {id: 85, cat: Movies/DVD, desc: "Film/DVD9"}
+    - {id: 21, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 53, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 20, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 34, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 90, cat: Movies/SD, desc: "Film/XviD/Pack"}
+    - {id: 26, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 52, cat: PC/Games, desc: "Játék/Rip"}
+    - {id: 89, cat: Movies/SD, desc: "Kamerás/Eng"}
+    - {id: 82, cat: Movies/SD, desc: "Kamerás/Hun"}
+    - {id: 38, cat: Other, desc: "Képek"}
+    - {id: 43, cat: Console/PS3, desc: "Konzol/PS"}
+    - {id: 45, cat: Console/PSP, desc: "Konzol/PSP"}
+    - {id: 44, cat: Console/XBox, desc: "Konzol/Xbox"}
+    - {id: 73, cat: TV/Anime, desc: "Mese/Eng"}
+    - {id: 70, cat: TV/Anime, desc: "Mese/Hun"}
+    - {id: 37, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 1, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 22, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 54, cat: TV/SD, desc: "Sorozat/DVD/Eng"}
+    - {id: 55, cat: TV/SD, desc: "Sorozat/DVD/Hun"}
+    - {id: 58, cat: TV/SD, desc: "Sorozat/Xvid/Eng"}
+    - {id: 7, cat: TV/SD, desc: "Sorozat/Xvid/Hun"}
+    - {id: 62, cat: Audio/Video, desc: "Videoklip"}
+    - {id: 64, cat: XXX/DVD, desc: "XXX/DVD"}
+    - {id: 48, cat: XXX/ImageSet, desc: "XXX/Képek"}
+    - {id: 9, cat: XXX/XviD, desc: "XXX/Xvid"}
+    - {id: 40, cat: Audio/MP3, desc: "Zene/Eng"}
+    - {id: 6, cat: Audio/MP3, desc: "Zene/Hun"}
+    - {id: 87, cat: Audio/Lossless, desc: "Zene/Lossless"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    book-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search FreeLeech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: title
+      4: added
+      5: size
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrent oldalankén:</b> setting to <b>100</b> on your account profile.
+  - name: info_login
+    type: info
+    label: About login error
+    default: If you get a <b>Login Failed, got redirected.</b> error during your config <i>save</i> then most likely you have used an incorrect username or password.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  test:
+    path: index.php
+    selector: a[href^="logout.php?c="]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 active, 1 all, 2 deadonly, 3 freeleech
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: tr.torrent_h
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      # can be abbreviated
+      selector: a[href^="details.php?id="]
+    title_optional:
+      # usually full length
+      selector: a[href^="details.php?id="]
+      attribute: title
+      optional: true
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) "
+        - name: replace
+          args: ["https://i.kek.sh/null", ""]
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "(\\d{4}-\\d{2}-\\d{2}\\s\\d{2}:\\d{2}:\\d{2})"
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(7)
+      filters:
+        - name: regexp
+          args: x \d(\d+) x$
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        img[src="pic/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      selector: td:nth-child(7) b
+      filters:
+        - name: regexp
+          args: (\d+)
+    minimumratio:
+      text: 0.8
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# custom v3.0
--- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
@@ -2,7 +2,7 @@
 id: beyond-hd-oneurl
 name: Beyond-HD (OneURL)
 description: "This is BeyondHD using OneURL (for those that have enabled 2FA)"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -67,7 +67,7 @@ search:
    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]

  fields:
-    _category:
+    category_optional:
      selector: a[href*="/categories/"]
      optional: true
      attribute: href
@@ -75,7 +75,7 @@ search:
        - name: regexp
          args: "/categories/.*?\\.(\\d+)"
    category:
-      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}1{{ end }}"
    title:
      selector: a.torrent-name
    details:
@@ -96,7 +96,7 @@ search:
      selector: a[href$="/peers"] span.text-red
    grabs:
      selector: a[href$="/history"]
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
--- a/src/Jackett.Common/Definitions/beyond-hd.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd.yml
@@ -2,7 +2,7 @@
 id: beyond-hd
 name: Beyond-HD
 description: "Without BeyondHD, your HDTV is just a TV"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -87,7 +87,7 @@ search:
    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]

  fields:
-    _category:
+    category_optional:
      selector: a[href*="/categories/"]
      optional: true
      attribute: href
@@ -95,7 +95,7 @@ search:
        - name: regexp
          args: "/categories/.*?\\.(\\d+)"
    category:
-      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
+      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}1{{ end }}"
    title:
      selector: a.torrent-name
    details:
@@ -116,7 +116,7 @@ search:
      selector: a[href$="/peers"] span.text-red
    grabs:
      selector: a[href$="/history"]
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
--- a/src/Jackett.Common/Definitions/bibliotik.yml
+++ b/src/Jackett.Common/Definitions/bibliotik.yml
@@ -87,7 +87,7 @@ search:
      selector: .editorLink
      optional: true
    author:
-      text: "{{ or (.Result._author) (.Result._editor) }}"
+      text: "{{ or .Result._author .Result._editor }}"
    _year:
      selector: .torYear
      optional: true
@@ -122,21 +122,21 @@ search:
    size:
      selector: .t_files_size_added span
      attribute: data-bytecount
-    seeders:
-      text: 0
-    seeders:
+    seeders_optional:
      optional: true
      selector: .seeders
-    leechers:
-      text: 0
-    leechers:
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
      optional: true
      selector: .leechers
-    grabs:
-      text: 0
-    grabs:
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    grabs_optional:
      optional: true
      selector: .snatches
+    grabs:
+      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
    downloadvolumefactor:
      text: 1
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/bigfangroup.yml
+++ b/src/Jackett.Common/Definitions/bigfangroup.yml
@@ -2,7 +2,7 @@
 id: bigfangroup
 name: BigFANGroup
 description: "BigFANGroup is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
-language: ru-ru
+language: ru-RU
 type: public
 encoding: windows-1251
 links:
--- a/src/Jackett.Common/Definitions/bigtorrent.yml
+++ b/src/Jackett.Common/Definitions/bigtorrent.yml
@@ -1,107 +0,0 @@
---
-id: bigtorrent
-name: BIGTorrent
-description: "BIGTorrent is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hu
-type: private
-encoding: UTF-8
-links:
-  - https://www.bigtorrent.eu/
-legacylinks:
-  - http://www.bigtorrent.eu/
-
-caps:
-  categorymappings:
-    - {id: 24533, cat: Movies/3D, desc: "3D"}
-    - {id: 47, cat: Other, desc: "Other"}
-    - {id: 24541, cat: Movies/DVD, desc: "Film DVD English"}
-    - {id: 24540, cat: Movies/DVD, desc: "Film DVD Hungarian"}
-    - {id: 24539, cat: Movies/HD, desc: "Film HD English"}
-    - {id: 24538, cat: Movies/HD, desc: "Film HD Hungarian"}
-    - {id: 24537, cat: Movies/SD, desc: "Film SD English"}
-    - {id: 24536, cat: Movies/SD, desc: "Film SD Hungarian"}
-    - {id: 69, cat: PC/Games, desc: "Games ISO"}
-    - {id: 67, cat: PC/Games, desc: "Games Rip"}
-    - {id: 24534, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 65, cat: Other, desc: "Picture"}
-    - {id: 64, cat: Other, desc: "Video"}
-    - {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/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"}
-    - {id: 24543, cat: TV/SD, desc: "English SD Series"}
-    - {id: 24542, cat: TV/SD, desc: "Hungarian SD Series"}
-    - {id: 24535, cat: XXX, desc: "XXX"}
-    - {id: 59, cat: Audio, desc: "Music"}
-    - {id: 58, cat: Audio, desc: "Hungarian Music"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    sent: yes
-    returnto: /
-  error:
-    - selector: div.error
-  test:
-    path: index.php
-
-download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $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="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td:nth-child(2) a
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    date:
-      selector: td:nth-child(4)
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd
--- a/src/Jackett.Common/Definitions/bit-titan.yml
+++ b/src/Jackett.Common/Definitions/bit-titan.yml
@@ -2,9 +2,9 @@
 id: bit-titan
 name: BiT-TiTAN
 description: "BiT-TiTAN is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-de
+language: de-DE
 type: private
-encoding: iso-8859-1
+encoding: UTF-8
 links:
  - https://bit-titan.net/

@@ -94,12 +94,13 @@ caps:
    book-search: [q]

 settings:
-  - name: username
+  - name: apikey
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new key <a href=\"https://bit-titan.net/api_cp.php\" target =_blank>here</a>."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -116,126 +117,68 @@ settings:
  - name: type
    type: select
    label: Order requested from site
-    default: 1
+    default: DESC
    options:
-      1: desc
-      2: asc
-
-login:
-  path: login.php
-  method: form
-  form: form[action$="login.php"]
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
-  captcha:
-    type: image
-    selector: img[src*="captcha_math.php"]
-    input: stringCaptcha
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div#login_error
-  test:
-    path: index.php
-#    selector: a[href="logout.php"] # ajax does not return a full page so cant test this.
+      DESC: desc
+      ASC: asc

 search:
  paths:
-    - path: ajax_browse.php
-      method: post
+    - path: api.php
+      response:
+        type: json
+
  inputs:
-    # 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: ""
+    apiKey: "{{ .Config.apikey }}"
+    categories: "{{ if .Categories }}{{ join .Categories \",\" }}{{ else }}0{{ end }}"
    search: "{{ .Keywords }}"
+    # searchIn: 0 all, 1 active, 2 dead, 3 highlights, 4 own uploads, 5 uploads bots, 6 onlyupload, 7 multiplier, 8 %download, 9 freeleech
+    searchIn: "{{ if .Config.freeleech }}9{{ else }}0{{ end }}"
    # 1 25, 2 50, 3 75, 4 100
-    limit: 4
-    # 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 }}"
+    # api only responds with results if limit=1 is used !?! (as at 22-Nov-2021)
+    limit: 1
+    downloadLink: 1
+    # 1 = Sat, 28 Nov 2020 23:29:38 +0100 (DEFAULT VALUE) , 2 = 1606606178 (UNIX TIMESTAMP) , 3 = 28.11.2020 23:29.38 (German Timestamp) ,  4 = 2020-11-28 23:29:38 (Default Datetime)
+    timeFormat: 2
    orderBy: "{{ .Config.sort }}"
    order: "{{ .Config.type }}"
-  headers:
-    x-requested-with: ["XMLHttpRequest"]

  rows:
-    selector: table.tableinborder tr:has(.catPic)
+    selector: results
+    count:
+      selector: filesFound

  fields:
+    id:
+      selector: id
    category:
-      selector: td.catPic > img
-      attribute: src
-      filters:
-        - name: regexp
-          args: (\d+).png$
+      selector: category
    title:
-      selector: a[href^="details.php?id="]
+      selector: name
    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+      text: "details.php?id={{ .Result.id }}"
    download:
-      # 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="
+      selector: download
    poster:
-      selector: div[data-image]
-      attribute: data-image
+      selector: poster
    seeders:
-      selector: td.peers:has(i[title="Seeders"])
+      selector: seeds
    leechers:
-      selector: td.peers:has(i[title="Leechers"])
+      selector: leechers
    grabs:
-      selector: td.peers:has(i[title="Snatchers"])
-      # 2 flavours of dates
+      selector: snatchers
    date:
-      # &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;24.05.2019 20:15:38
-      selector: td.added:contains(".")
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
+      # unix
+      selector: added
    size:
-      selector: td.size
+      selector: size
    downloadvolumefactor:
-      case:
-        "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
+      selector: downloadFactor
    uploadvolumefactor:
-      case:
-        "span:contains(\"x2\")": 2
-        "span:contains(\"x5\")": 5
-        "span:contains(\"x10\")": 10
-        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted
-        "*": 1
+      selector: uploadFactor
+    minimumratio:
+      text: 1.0
    minimumseedtime:
      # 2 day (as seconds = 2 x 24 x 60 x 60)
      text: 172800
-# engine n/a
+# json engine v.2.011.021
--- a/src/Jackett.Common/Definitions/bitbazis.yml
+++ b/src/Jackett.Common/Definitions/bitbazis.yml
@@ -0,0 +1,165 @@
+---
+id: bitbazis
+name: Bit-Bázis
+description: "Bit-Bázis is a HUNGARIAN Private Tracker for MOVIES / TV"
+language: hu-HU
+type: private
+# encoding: ISO-8859-2
+encoding: UTF-8
+links:
+  - https://bitbazis.net/
+
+caps:
+  categorymappings:
+    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 64, cat: Movies, desc: "Film/Pack"}
+    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 69, cat: TV/Anime, desc: "Mese/XviD"}
+    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 68, cat: TV/Anime, desc: "Mese/DVD"}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 31, cat: PC/Games, desc: "Játék/PC"}
+    - {id: 81, cat: PC/0day, desc: "Program/PC"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
+    - {id: 49, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 54, cat: Console, desc: "Játék/Konzol"}
+    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Android"}
+    - {id: 33, cat: XXX/SD, desc: "Film/SD/XXX"}
+    - {id: 89, cat: XXX/x264, desc: "Film/HD/XXX"}
+    - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX"}
+    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
+    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
+    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
+    - {id: 65, cat: Other, desc: "Egyéb"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    book-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: title
+      4: added
+      5: size
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table[width="920"]:contains("Hiba")
+  test:
+    path: index.php
+    selector: a[href^="logout.php?k="]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # site does not support imdbid searching or appear to have freeleech
+
+  rows:
+    selector: table[width="900px"]:last-child tbody tr:has(a[href^="userdetails.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    poster:
+      selector: a.preview
+      attribute: href
+    download:
+      selector: a[href^="details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
+    size:
+      selector: td:last-child
+    date:
+      # 2021-11-09 16:51:24
+      selector: td:nth-last-child(2)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    files:
+      selector: td:nth-last-child(4)
+    grabs:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "D:(\\d+)x"
+    seeders:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "S:(\\d+)"
+    leechers:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "L:(\\d+)"
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumseedtime:
+      # 3 day (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a
--- a/src/Jackett.Common/Definitions/bitded.yml
+++ b/src/Jackett.Common/Definitions/bitded.yml
@@ -2,7 +2,7 @@
 id: bitded
 name: Bitded
 description: "Bitded is a THAI Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: th-th
+language: th-TH
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -2,7 +2,7 @@
 id: bithorlo
 name: Bithorlo
 description: "Bithorlo (BHO) is a HUNGARIAN Private Torrent Tracker for MOVIES / GENERAL"
-language: hu-hu
+language: hu-HU
 type: private
 encoding: ISO-8859-2
 links:
@@ -54,10 +54,6 @@ caps:
    book-search: [q]

 settings:
-  - name: info_alert
-    type: info
-    label: Alert about Cookie
-    default: "If during your cookie save you get the following error:</br><b>The 'Value'='xzlogin,xzrecover,xzsignup' part of the cookie is invalid.</b></br>Then remove <b>acopendivids=xzlogin,xzrecover,xzsignup; </b> from the cookie string before proceeding to save."
  - name: cookie
    type: text
    label: Cookie
@@ -152,5 +148,9 @@ search:
      filters:
        - name: replace
          args: ["Feltöltési szorzó × ", ""]
-# minimumseedtime: there is no mandatory seed time
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # engine n/a
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@@ -2,7 +2,7 @@
 id: bithumen
 name: BitHUmen
 description: "BitHUmen is a Hungarian Private site for TV / MOVIES / GENERAL"
-language: hu-hu
+language: hu-HU
 type: private
 encoding: ISO-8859-2
 links:
@@ -85,16 +85,18 @@ search:
          args: ["details.php?id=", "download.php/"]
        - name: append
          args: "/invalid.torrent"
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: a[href^="details.php?id="]
      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    details:
      selector: a[href^="details.php?id="]
      attribute: href
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    poster:
@@ -124,15 +126,15 @@ search:
      selector: td:nth-child(6) > u
    downloadvolumefactor:
      text: 0
-    uploadvolumefactor:
-      text: 1
-    uploadvolumefactor:
+    uploadvolumefactor_optional:
      optional: true
      selector: td:nth-child(5) > nobr > font:contains(" × ")
      filters:
        - name: replace
          args: ["×", ""]
-    date:
+    uploadvolumefactor:
+      text: "{{ if .Result.uploadvolumefactor_optional }}{{ .Result.uploadvolumefactor_optional }}{{ else }}1{{ end }}"
+    date_year:
      selector: td:nth-child(5):contains('.')
      optional: true
      remove: font
@@ -143,7 +145,7 @@ search:
          args: "{{ .Today.Year }}."
        - name: re_replace
          args: ["([0-9]{4}).([0-9]+).([0-9]+) (.*)", "$2.$3.$1 $4"]
-    date:
+    date_day:
      selector: td:nth-child(5):contains('ma'), td:nth-child(5):contains("tegnap"), td:nth-child(5):contains('-')
      optional: true
      remove: font
@@ -152,6 +154,8 @@ search:
          args: ["ma", "today"]
        - name: replace
          args: ["tegnap", "yesterday"]
+    date:
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
    description:
      selector: td:nth-child(2) > div
 # engine tbd
--- a/src/Jackett.Common/Definitions/bitru.yml
+++ b/src/Jackett.Common/Definitions/bitru.yml
@@ -2,7 +2,7 @@
 id: bitru
 name: BitRu
 description: "BitRu is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-ru
+language: ru-RU
 type: public
 encoding: UTF-8
 links:
@@ -86,7 +86,7 @@ search:
      filters:
        - name: regexp
          args: "src=(.*?) "
-    date:
+    date_today:
      # Сегодня в 09:09 от
      # Вчера в 22:47 от
      selector: td:nth-child(2) div.b-info div span:nth-child(1):contains("Сегодня"),  td:nth-child(2) div.b-info div span:nth-child(1):contains("Вчера")
@@ -98,7 +98,7 @@ search:
          args: ["Сегодня в", "Today"]
        - name: replace
          args: ["Вчера в", "Yesterday"]
-    date:
+    date_year:
      # 08 ноября 2019 в 23:53 от
      selector: td:nth-child(2) div.b-info div span:nth-child(1):not(:contains("Сегодня")):not(:contains("Вчера"))
      optional: true
@@ -135,6 +135,8 @@ search:
          args: " +03:00" # MSK
        - name: dateparse
          args: "02 January 2006 15:04 -07:00"
+    date:
+      text: "{{ if or .Result.date_today .Result.date_year }}{{ or .Result.date_today .Result.date_year }}{{ else }}now{{ end }}"
    size:
      selector: td:nth-child(3)
      filters:
--- a/src/Jackett.Common/Definitions/bitsearch.yml
+++ b/src/Jackett.Common/Definitions/bitsearch.yml
@@ -2,17 +2,21 @@
 id: bitsearch
 name: BitSearch
 description: "BitSearch is a Public torrent meta-search engine"
-language: en
+language: en-US
 type: public
 encoding: UTF-8
 links:
  - https://bitsearch.to/
+  - https://bitsearch.nocensor.biz/

 caps:
  categories:
    eBook: Books/EBook
    "Ebook/Course": Books/EBook
+    Games: PC/Games
+    "Games/PC": PC/Games
    Movies: Movies
+    Music: Audio
    "Music/Album": Audio
    "Music/mp3": Audio/MP3
    "Music/Lossless": Audio/Lossless
@@ -20,13 +24,15 @@ caps:
    "Other/Android": PC/Mobile-Android
    "Other/Archive": Other
    "Other/Audio": Audio
-    "Other/Database": Movies/DVD
+    "Other/Database": PC
    "Other/DiskImage": PC/ISO
    "Other/Document": Books/Comics
    "Other/Image": Other/Misc
    "Other/Program": PC/0day
-    "Other/Sourcecode": Movies/Other
+    "Other/Sourcecode": PC
+    "Other/Source Code": PC
    "Other/Video": TV
+    Softwares: PC/0day
    "Softwares/Windows": PC/0day
    TV: TV
    Unknown: Other
@@ -57,9 +63,21 @@ settings:
      asc: asc

 download:
-  selectors:
-    - selector: a[href^="magnet:?xt"]
+  # the magnet URI on this site exceeds 2048 bytes which some interfaces will reject. So we use the infohash and build our own.
+  infohash:
+    hash:
+      selector: a[href^="magnet:?xt"]
      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "&dn=(.+?)$"
+        - name: validfilename

 search:
  paths:
@@ -91,6 +109,8 @@ search:
          args: [".", ""]
        - name: replace
          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
    size:
      selector: div.stats div:has(img[alt="Size"])
    seeders:
@@ -100,6 +120,8 @@ search:
          args: [".", ""]
        - name: replace
          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
    leechers:
      selector: div.stats div:has(img[alt="Leecher"])
      filters:
@@ -107,6 +129,8 @@ search:
          args: [".", ""]
        - name: replace
          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
    date:
      selector: div.stats div:has(img[alt="Date"])
      filters:
--- a/src/Jackett.Common/Definitions/bitsexy.yml
+++ b/src/Jackett.Common/Definitions/bitsexy.yml
@@ -2,7 +2,7 @@
 id: bitsexy
 name: BitSexy
 description: "BitSexy is a Private Torrent Tracker for 3x"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -106,7 +106,7 @@ login:
    - selector: table.main:contains("failed")
  test:
    path: my.php
-    selector: a[href="logout.php"]
+    selector: a[href$="logout.php"]

 search:
  paths:
@@ -116,9 +116,11 @@ search:
    search: "{{ .Keywords }}"
    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 4 480p, 5 720p, 6 1080p, 7 4k
    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"

  rows:
-    selector: table[cellpadding="5"] tbody tr:has(a[href^="download.php?torrent="])
+    selector: div.torrentrow:has(a[href^="download.php?torrent="])

  fields:
    category:
@@ -142,29 +144,31 @@ search:
        - name: regexp
          args: "src=(.*?) width"
    files:
-      selector: td:nth-last-child(7)
-    date:
+      selector: div.torrenttable:nth-last-child(7)
+    date_year:
      # Jul 4 2019 08:04 AM
-      selector: td:nth-last-child(5):not(:contains("day"))
+      selector: div.torrenttable:nth-last-child(5):not(:contains("day"))
      optional: true
      filters:
        - name: append
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "Jan 2 2006 03:04 PM -07:00"
-    date:
+    date_day:
      # Today 02:40 PM
      # Yesterday 09:10 AM
-      selector: td:nth-last-child(5):contains("day")
+      selector: div.torrenttable:nth-last-child(5):contains("day")
      optional: true
+    date:
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
    size:
-      selector: td:nth-last-child(4)
+      selector: div.torrenttable:nth-last-child(4)
    grabs:
-      selector: td:nth-last-child(3)
+      selector: div.torrenttable:nth-last-child(3)
    seeders:
-      selector: td:nth-last-child(2)
+      selector: div.torrenttable:nth-last-child(2)
    leechers:
-      selector: td:nth-last-child(1)
+      selector: div.torrenttable:nth-last-child(1)
    downloadvolumefactor:
      case:
        img[src$="/pic/freeleech.gif"]: 0
--- a/src/Jackett.Common/Definitions/bitspyder.yml
+++ b/src/Jackett.Common/Definitions/bitspyder.yml
@@ -2,7 +2,7 @@
 id: bitspyder
 name: Bitspyder
 description: "Bitspyder is a Private site for Educational BOOKS / AUDIO"
-language: en-us
+language: en-US
 type: private
 encoding: windows-1252
 links:
@@ -22,27 +22,27 @@ caps:
    - {id: 39, cat: Books, desc: "Cert QA"}
    - {id: 63, cat: Books, desc: "College"}
    - {id: 53, cat: Books, desc: "Cooking"}
+    - {id: 35, cat: Books, desc: "Developer"}
    - {id: 42, cat: Books, desc: "Documentary"}
    - {id: 37, cat: Books/EBook, desc: "e-Books"}
    - {id: 65, cat: Books, desc: "Engineering"}
+    - {id: 45, cat: Books, desc: "Ethical hacking"}
    - {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/Mags, desc: "Magazines"}
-    - {id: 71, cat: Books, desc: "Pluralsight"}
    - {id: 60, cat: Books, desc: "Medical"}
    - {id: 44, cat: Books, desc: "Misc Learning"}
    - {id: 51, cat: Books, desc: "Music Learning"}
    - {id: 41, cat: Books, desc: "Others"}
+    - {id: 58, cat: Books, desc: "Packt"}
    - {id: 52, cat: Books, desc: "Photography"}
-    - {id: 35, cat: Books, desc: "Developer"}
-    - {id: 38, cat: Books, desc: "Udemy"}
+    - {id: 71, cat: Books, desc: "Pluralsight"}
    - {id: 68, cat: Books, desc: "Self Growth"}
    - {id: 72, cat: Books, desc: "Templates"}
-    - {id: 58, cat: Books, desc: "Packt"}
-    - {id: 45, cat: Books, desc: "Ethical hacking"}
+    - {id: 38, cat: Books, desc: "Udemy"}
    - {id: 59, cat: Books, desc: "WEB | SocialMedia"}

  modes:
@@ -137,7 +137,7 @@ search:
      selector: td.rowcol:nth-last-child(3)
    leechers:
      selector: td.rowcol:nth-last-child(2)
-    date:
+    date_added:
      optional: true
      selector: font[color="5F5F5F"]
      filters:
@@ -149,7 +149,7 @@ search:
          args: " +00:00" # GMT
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_upload:
      optional: true
      selector: a[title^="Upploaded at"]
      attribute: title
@@ -162,6 +162,8 @@ search:
          args: " +00:00" # GMT
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_upload .Result.date_added }}{{ or .Result.date_upload .Result.date_added }}{{ else }}now{{ end }}"
    downloadvolumefactor:
      text: 1
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -2,7 +2,7 @@
 id: bitturk
 name: BiTTuRK
 description: "BiTTuRK is a Turkish Private Torrent Tracker for HD MOVIES / TV / GENERAL. This Indexer is for English only."
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -27,7 +27,8 @@ caps:
    - {id: 72, cat: Movies, desc: "Belgesel"}
    - {id: 60, cat: Movies/3D, desc: "3D"}
    - {id: 76, cat: Movies/UHD, desc: "4K UHD"}
-    - {id: 45, cat: Movies, desc: "Eğitim / Prog"}
+    - {id: 80, cat: TV/Sport, desc: "Formula-1"}
+    - {id: 45, cat: Other, 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"}
@@ -35,7 +36,7 @@ caps:
    - {id: 17, cat: TV/Anime, desc: "Anime"}
    - {id: 31, cat: Movies, desc: "Belgesel"}
    - {id: 32, cat: Movies/BluRay, desc: "Bluray"}
-    - {id: 33, cat: Movies/BluRay, desc: "BRRiP"}
+    - {id: 33, cat: Movies/HD, desc: "BRRiP"}
    - {id: 34, cat: Movies, desc: "Çizgi Film"}
    - {id: 35, cat: Movies, desc: "D-Z0N3"}
    - {id: 36, cat: Movies/DVD, desc: "DVD"}
@@ -52,9 +53,9 @@ caps:
    - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
    - {id: 21, cat: Audio/Video, desc: "Video Klipler"}
    - {id: 2, cat: Console, desc: "Oyun"}
-    - {id: 74, cat: PC, desc: "PC"}
+    - {id: 74, cat: PC/Games, desc: "PC"}
    - {id: 73, cat: Console, desc: "SONY-PS"}
-    - {id: 6, cat: PC, desc: "Program"}
+    - {id: 6, cat: PC/0day, desc: "Program"}
    - {id: 47, cat: Other, desc: "Resimler"}
    - {id: 48, cat: TV, desc: "Televizyon"}
    - {id: 49, cat: TV/HD, desc: "Tv HD"}
@@ -160,7 +161,7 @@ search:
    download:
      selector: a[href*="?p=torrents&pid=10&action=download"]
      attribute: href
-    date:
+    date_year:
      optional: true
      # Uploaded 30-01-2019 15:02 by
      selector: td.torrent_name:not(:contains(" at "))
@@ -171,7 +172,7 @@ search:
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "02-01-2006 15:04 -07:00"
-    date:
+    date_day:
      optional: true
      # Uploaded Friday at 05:11 by
      # Uploaded Today at 00:48 by
@@ -184,6 +185,8 @@ search:
          args: [" at ", " "]
        - name: append
          args: " +00:00" # auto adjusted by site account profile
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
    size:
      selector: a[rel="torrent_size"]
    seeders:
--- a/src/Jackett.Common/Definitions/bluebird.yml
+++ b/src/Jackett.Common/Definitions/bluebird.yml
@@ -2,7 +2,7 @@
 id: bluebirdhd
 name: BlueBird
 description: "BlueBird is a RUSSIAN Private Torrent Tracker for HD MOVIES"
-language: ru-ru
+language: ru-RU
 type: private
 encoding: windows-1251
 links:
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -0,0 +1,125 @@
+---
+id: blutopia-api
+name: Blutopia (API)
+description: "Blutopia (BLU) is a Private Torrent Tracker for HD MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://blutopia.xyz/
+
+caps:
+  # dont forget to update the case block in the search fields category
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 2, cat: TV, desc: "TV Show"}
+    - {id: 3, cat: Movies/Other, desc: "FANRES"}
+    - {id: 5, cat: Movies/Other, desc: "Trailer"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.xyz/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+        attribute: attributes
+
+  rows:
+    selector: data
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category
+      case:
+        Movie: 1
+        TV Show: 2
+        FANRES: 3
+        Trailer: 5
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 5.3.1b
--- a/src/Jackett.Common/Definitions/blutopia.yml
+++ b/src/Jackett.Common/Definitions/blutopia.yml
@@ -2,7 +2,7 @@
 id: blutopia
 name: Blutopia
 description: "Blutopia (BLU) is a Private Torrent Tracker for HD MOVIES / TV"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -114,6 +114,8 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
    size:
      selector: td:nth-last-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/booktracker.yml
+++ b/src/Jackett.Common/Definitions/booktracker.yml
@@ -2,7 +2,7 @@
 id: booktracker
 name: BookTracker
 description: "BookTracker is a RUSSIAN Semi-Private Torrent Tracker for EBOOKS"
-language: ru-ru
+language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/bootytape.yml
+++ b/src/Jackett.Common/Definitions/bootytape.yml
@@ -1,8 +1,8 @@
 ---
 id: bootytape
 name: BootyTape
-language: en-us
 description: "BootyTape is a Semi-Private site for 3X"
+language: en-US
 type: semi-private
 encoding: UTF-8
 links:
@@ -106,23 +106,25 @@ search:
    poster:
      selector: img[src*="/thbx/imgx/"]
      attribute: src
-    files:
-      text: 1
-    files:
+    files_optional:
      selector: a[href$="filelist=1"]
      optional: true
-    size:
+    files:
+      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}1{{ end }}"
+    size_optional:
      selector: td:nth-child(3)
-    seeders:
-      text: 0
-    seeders:
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
+    seeders_optional:
      selector: a[href$="toseeders=1"]
      optional: true
-    leechers:
-      text: 0
-    leechers:
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
      selector: a[href$="todlers=1"]
      optional: true
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
    date:
      text: now
    downloadvolumefactor:
--- a/src/Jackett.Common/Definitions/borgzelle.yml
+++ b/src/Jackett.Common/Definitions/borgzelle.yml
@@ -2,7 +2,7 @@
 id: borgzelle
 name: Borgzelle
 description: "Borgzelle is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-de
+language: de-DE
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/boxingtorrents.yml
+++ b/src/Jackett.Common/Definitions/boxingtorrents.yml
@@ -2,7 +2,7 @@
 id: boxingtorrents
 name: Boxing Torrents
 description: "Boxing Torrents is a Private Torrent Tracker for BOXING"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/brasiltracker.yml
+++ b/src/Jackett.Common/Definitions/brasiltracker.yml
@@ -2,7 +2,7 @@
 id: brasiltracker
 name: BrasilTracker
 description: "BrasilTracker is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pt-br
+language: pt-BR
 encoding: UTF-8
 type: private
 links:
@@ -97,7 +97,7 @@ search:
    poster:
      selector: img[alt="Cover"]
      attribute: src
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
--- a/src/Jackett.Common/Definitions/broadcity.yml
+++ b/src/Jackett.Common/Definitions/broadcity.yml
@@ -15,22 +15,23 @@ caps:
    - {id: 1, cat: Movies/UHD, desc: "UHD"}
    - {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: 6, cat: Movies/WEB-DL, 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: 5, cat: Movies/WEB-DL, desc: "HD - WEB-DL"}
    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
+    - {id: 40, cat: Movies/HD, desc: "PTer"}
    - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
    - {id: 9, cat: Movies/SD, desc: "SD"}
    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
-    - {id: 10, cat: Movies/SD, desc: "SD - DVD"}
+    - {id: 10, cat: Movies/DVD, 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: 13, cat: Movies/WEB-DL, 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 - TV Program"}
--- a/src/Jackett.Common/Definitions/brsociety-api.yml
+++ b/src/Jackett.Common/Definitions/brsociety-api.yml
@@ -0,0 +1,129 @@
+---
+id: brsociety-api
+name: BrSociety (API)
+description: "BrSociety (SemeandoCC) is a BRAZILIAN Private Torrent Tracker for E-LEARNING"
+language: pt-BR
+type: private
+encoding: UTF-8
+links:
+  - https://brsociety.club/
+
+caps:
+  # dont forget to update the case block in the search fields category
+  categorymappings:
+    - {id: 1, cat: TV, desc: "Cursos (courses)"}
+    - {id: 2, cat: Books/EBook, desc: "eBooks"}
+    - {id: 5, cat: Books/Mags, desc: "Revistas (Magazines)"}
+    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
+    - {id: 4, cat: Other, desc: "Arquivos de Auxilio (Help Files)"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target =_blank>BrSociety</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+        attribute: attributes
+
+  rows:
+    selector: data
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category
+      case:
+        "Cursos": 1
+        "eBooks": 2
+        "Revistas": 5
+        "Audiobooks": 3
+        "Arquivos de Auxilio": 4
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    size:
+      selector: size
+    magnet:
+      selector: magnet_link
+      optional: true
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 5.3.0
--- a/src/Jackett.Common/Definitions/brsociety.yml
+++ b/src/Jackett.Common/Definitions/brsociety.yml
@@ -2,7 +2,7 @@
 id: brsociety
 name: BrSociety
 description: "BrSociety (SemeandoCC) is a BRAZILIAN Private Torrent Tracker for E-LEARNING"
-language: pt-br
+language: pt-BR
 type: private
 encoding: UTF-8
 links:
@@ -113,6 +113,8 @@ search:
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
    size:
      selector: td:nth-last-child(5)
    seeders:
@@ -176,7 +178,9 @@ search:
        i[class*="fa-globe text-green"]: 2 # Global Double Upload
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
+    minimumratio:
+      text: 1.0
    minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
 # UNIT3D 5.3.0
--- a/src/Jackett.Common/Definitions/bt4g.yml
+++ b/src/Jackett.Common/Definitions/bt4g.yml
@@ -2,7 +2,7 @@
 id: bt4g
 name: BT4G
 description: "BT4G is a Public metadata crawler for magnets"
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
@@ -41,7 +41,7 @@ search:
      selector: a
    category:
      selector: span.cpill
-    category:
+    category|append:
      # add tv to video
      optional: true
      selector: span.cpill
--- a/src/Jackett.Common/Definitions/btdigg.yml
+++ b/src/Jackett.Common/Definitions/btdigg.yml
@@ -2,7 +2,7 @@
 id: btdigg
 name: BTDigg
 description: "BTDigg is a Public BitTorrent DHT search engine."
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
@@ -68,11 +68,11 @@ search:
      filters:
        - name: replace
          args: ["found ", ""]
-    files:
-      text: 1
-    files:
+    files_optional:
      selector: span.torrent_files
      optional: true
+    files:
+      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}1{{ end }}"
    size:
      selector: span.torrent_size
    seeders:
--- a/src/Jackett.Common/Definitions/btetree.yml
+++ b/src/Jackett.Common/Definitions/btetree.yml
@@ -2,7 +2,7 @@
 id: btetree
 name: BT.etree
 description: "BT.etree is a Public Tracker dedicated to Bootleg FLAC MUSIC"
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/btnext.yml
+++ b/src/Jackett.Common/Definitions/btnext.yml
@@ -2,11 +2,13 @@
 id: btnext
 name: BTNext
 description: "BTNext (BTNT) is a PORTUGUESE Private Torrent Tracker for 0DAY / GENERAL"
-language: pt-pt
+language: pt-PT
 type: private
 encoding: UTF-8
 links:
-  - http://tracker.btnext.com/ # site forces http, https is not supported
+  - https://tracker.btnext.com/ # site forces https
+legacylinks:
+  - http://tracker.btnext.com/

 caps:
  categorymappings:
@@ -202,26 +204,24 @@ search:
    poster:
      selector: a[rel="fancybox"]
      attribute: href
-    imdb:
+    imdbid:
      # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg"
      selector: a[href*="/imdb/tt"]
      attribute: href
      filters:
        - name: regexp
-          args: "imdb/(.+?).jpg"
-        - name: prepend
-          args: "https://www.imdb.com/title/"
+          args: tt(\d+)
    downloadvolumefactor:
      case:
        "img[title=\"FREE!\"]": 0
        "*": 1
    uploadvolumefactor:
      text: 1
-    date:
+    date_ago:
      selector: td.torrent_name > abbr.timeago
      optional: true
      attribute: data-time
-    date:
+    date_year:
      selector: td.torrent_name:not(:has(abbr.timeago)):not(:contains("day")):not(:contains("Domingo")):not(:contains("Sábado")):not(:contains("Sexta")):not(:contains("Quinta")):not(:contains("Quarta")):not(:contains("Terça")):not(:contains("Segunda")):not(:contains("ontem")):not(:contains("Hoje"))
      optional: true
      remove: span, a, br
@@ -242,7 +242,7 @@ search:
          args: " +00:00" # WET
        - name: dateparse
          args: "02-01-2006 15:04 -07:00"
-    date:
+    date_day:
      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
      remove: span, a, br
@@ -278,4 +278,6 @@ search:
        - name: replace
          args: ["Domingo", "Sunday"]
        - name: fuzzytime
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day .Result.date_ago }}{{ or .Result.date_year .Result.date_day .Result.date_ago }}{{ else }}now{{ end }}"
 # TSUE 2.2
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -2,7 +2,7 @@
 id: btschool
 name: BTSCHOOL
 description: "BTSCHOOL is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: zh-cn
+language: zh-CN
 type: private
 encoding: UTF-8
 links:
@@ -12,10 +12,10 @@ caps:
  categorymappings:
    - {id: 405, cat: Movies, desc: "电影/Movies"}
    - {id: 406, cat: TV, desc: "连续剧/TV-Series"}
-    - {id: 407, cat: TV/Anime, desc: "动漫/Anime"}
+    - {id: 407, cat: TV/Anime, desc: "动漫/Animation"}
    - {id: 408, cat: TV/Documentary, desc: "纪录片/Documentary"}
    - {id: 412, cat: TV, desc: "综艺/TV-Show"}
-    - {id: 404, cat: PC, desc: "软件/Software"}
+    - {id: 404, cat: PC/0day, desc: "软件/Software"}
    - {id: 402, cat: TV, desc: "资料/Education"}
    - {id: 411, cat: PC/Games, desc: "游戏/Game"}
    - {id: 409, cat: Audio, desc: "音乐/Music"}
@@ -93,14 +93,27 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    date:
+    date_elapsed:
+      # time type: time elapsed (default)
      selector: td:nth-child(4) > span[title]
      attribute: title
+      optional: true
      filters:
        - name: append
          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td.rowfollow:nth-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -2,11 +2,11 @@
 id: btsow
 name: BTSOW
 description: "BTSOW is a Public torrent indexer"
-language: en-us
+language: en-US
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.one/
+  - https://btsow.rest/
 legacylinks:
  - https://btos.pw/
  - https://btio.pw/
@@ -28,6 +28,7 @@ legacylinks:
  - https://btsow.digital/
  - https://btsow.shop/
  - https://btsow.us/
+  - https://btsow.one/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/bwtorrents.yml
+++ b/src/Jackett.Common/Definitions/bwtorrents.yml
@@ -2,7 +2,7 @@
 id: bwtorrents
 name: BwTorrents
 description: "BwTorrents is a Private Torrent Tracker for BollyWood MOVIES / TV / GENERAL"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -14,6 +14,8 @@ links:

 caps:
  categorymappings:
+    # note: to update cats for this site its easier to use my.php and sort by cat integer
+    # also cat 187 is undocumented but exists
    - {id: 113, cat: Movies, desc: "Bollywood-Pre-Release"}
    - {id: 114, cat: Movies/UHD, desc: "Bollywood-4K Ultra HD / Upscaled"}
    - {id: 115, cat: Movies/BluRay, desc: "Bollywood-Untouched BluRay"}
@@ -22,15 +24,11 @@ caps:
    - {id: 118, cat: Movies, desc: "Bollywood-Remuxes BluRay"}
    - {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/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-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"}
@@ -38,13 +36,10 @@ caps:
    - {id: 130, cat: Movies, desc: "Hollywood-BluRay Remuxes"}
    - {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/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: 194, cat: Movies, desc: "Hollywood-Movie packs"}
+    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
    - {id: 137, cat: Movies, desc: "Malayalam-Movies"}
    - {id: 140, cat: Movies, desc: "Punjabi-Movies"}
    - {id: 141, cat: Movies, desc: "Kannada-Movies"}
@@ -52,11 +47,6 @@ caps:
    - {id: 143, cat: Movies, desc: "Bhoipuri-Movies"}
    - {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: "South Hindi Dubbed"}
-    - {id: 183, cat: Movies, desc: "English Hindi Dubbed"}
-    - {id: 197, cat: Movies, desc: "Turkish Hindi Dubbed"}
-    - {id: 182, cat: Movies, desc: "Other Movies"}
    - {id: 146, cat: TV, desc: "TV-Colors"}
    - {id: 147, cat: TV, desc: "TV-TV"}
    - {id: 148, cat: TV, desc: "TV-Life OK"}
@@ -66,18 +56,12 @@ 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: 155, cat: TV/Sport, desc: "TV-Sports"}
    - {id: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
-    - {id: 198, cat: Movies, desc: "TV-MTV"}
-    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
-    - {id: 219, cat: TV, desc: "TV-Bengali Tv"}
-    - {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: 158, cat: TV, desc: "TV-Other Tv Shows"}
    - {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"}
@@ -89,9 +73,9 @@ caps:
    - {id: 169, cat: Audio/Video, desc: "Music-Videos"}
    - {id: 170, cat: Audio, desc: "Music-Pop"}
    - {id: 171, cat: Audio, desc: "Music-Punjabi"}
-    - {id: 174, cat: Audio, desc: "Music-Telugu"}
+    - {id: 172, cat: Audio, desc: "Music-Remix"}
    - {id: 173, cat: Audio, desc: "Music-Tamil"}
-    - {id: 196, cat: Audio, desc: "Music-Packs"}
+    - {id: 174, cat: Audio, desc: "Music-Telugu"}
    - {id: 175, cat: Books/EBook, desc: "Ebooks"}
    - {id: 176, cat: PC/Games, desc: "Games PC"}
    - {id: 177, cat: Console, desc: "Games Console"}
@@ -99,27 +83,43 @@ caps:
    - {id: 179, cat: PC, desc: "Appz"}
    - {id: 180, cat: PC/Mobile-Other, desc: "Mobile Stuff"}
    - {id: 181, cat: Other, desc: "Pics/Wallpapers"}
+    - {id: 182, cat: Movies, desc: "Other Movies"}
+    - {id: 183, cat: Movies, desc: "English Hindi Dubbed"}
+    - {id: 184, cat: Movies, desc: "South Hindi Dubbed"}
+    - {id: 185, cat: Movies, desc: "Gujarati-Movies"}
+    - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
    - {id: 187, cat: XXX, desc: "Adult XXX 18+"}
-    # Telugu-Movies
+    - {id: 188, cat: Movies/WEB-DL, desc: "Bollywood-720p WEB-Rips"}
+    - {id: 189, cat: Movies/DVD, desc: "Bollywood-Encoded DVDs"}
+    - {id: 190, cat: Movies, desc: "Bollywood-Movie packs"}
+    - {id: 191, cat: Movies/WEB-DL, desc: "Hollywood-Encoded DVDs"}
+    - {id: 192, cat: Movies, desc: "Hollywood-720p WEB-Rips"}
+    - {id: 193, cat: Movies/SD, desc: "Hollywood-SDRips - WEB/DVD"}
+    - {id: 194, cat: Movies, desc: "Hollywood-Movie packs"}
+    - {id: 195, cat: TV, desc: "TV-Tv Packs"}
+    - {id: 196, cat: Audio, desc: "Music-Packs"}
+    - {id: 197, cat: Movies, desc: "Turkish Hindi Dubbed"}
+    - {id: 198, cat: Movies, desc: "TV-MTV"}
    - {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: 207, cat: Movies, desc: "Telgu-Movies | BluRay Rips"}
+    - {id: 208, cat: Movies, desc: "Telgu-Movies | Remuxes BluRay"}
    - {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"}
+    - {id: 216, cat: Movies, desc: "Tamil-Movies | BluRay Rips"}
+    - {id: 217, cat: Movies, desc: "Tamil-Movies | Remuxes BluRay"}
+    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
+    - {id: 219, cat: TV, desc: "TV-Bengali Tv"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/byrbt.yml
+++ b/src/Jackett.Common/Definitions/byrbt.yml
@@ -0,0 +1,182 @@
+---
+id: byrbt
+name: BYRBT
+description: "BYRBT is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://byr.pt/
+
+caps:
+  categorymappings:
+    - {id: 408, cat: Movies, desc: "电影Movies"}
+    - {id: 401, cat: TV, desc: "剧集TV Series"}
+    - {id: 404, cat: TV/Anime, desc: "动漫Animations"}
+    - {id: 402, cat: Audio, desc: "音乐Music"}
+    - {id: 405, cat: Other, desc: "综艺Arts"}
+    - {id: 403, cat: Console, desc: "游戏Games"}
+    - {id: 406, cat: PC, desc: "软件Software"}
+    - {id: 407, cat: TV/Documentary, desc: "资料Documentaries"}
+    - {id: 409, cat: TV/Sport, desc: "体育Sports"}
+    - {id: 410, cat: Other/Misc, desc: "纪录Records"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+    - selector: td.embedded:has(h2:contains("failed!"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href^="logout.php?key="]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact, 3 NOT
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-last-of-type(6) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-last-of-type(6):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-last-of-type(5)
+    seeders:
+      selector: td.rowfollow:nth-last-of-type(4)
+    leechers:
+      selector: td.rowfollow:nth-last-of-type(3)
+    grabs:
+      selector: td.rowfollow:nth-last-of-type(2)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, img
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+# NexusPHP v1.5 beta 5 20120707
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -2,7 +2,7 @@
 id: byrutor
 name: Byrutor
 description: "Byrutor is a RUSSIAN Public Torrent Tracker for GAMES"
-language: ru-ru
+language: ru-RU
 type: public
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -2,7 +2,7 @@
 id: carpathians
 name: Carpathians
 description: "Carpathians is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
-language: hu-hu
+language: hu-HU
 type: private
 encoding: UTF-8
 links:
@@ -10,7 +10,7 @@ links:

 caps:
  categorymappings:
-    - {id: 186, cat: Books, desc: "E-book"}
+    - {id: 186, cat: Books/EBook, desc: "E-book"}
    - {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"}
@@ -18,7 +18,7 @@ caps:
    - {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: 200, cat: Movies/UHD, 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"}
@@ -112,7 +112,7 @@ search:
    details:
      selector: a[id][href^="details.php?"]
      attribute: href
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    poster:
--- a/src/Jackett.Common/Definitions/carphunter.yml
+++ b/src/Jackett.Common/Definitions/carphunter.yml
@@ -2,7 +2,7 @@
 id: carphunter
 name: Carp-Hunter
 description: "Carp-Hunter is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hu-hu
+language: hu-HU
 type: private
 encoding: UTF-8
 links:
@@ -10,8 +10,6 @@ links:

 caps:
  categorymappings:
-    - {id: 5, cat: Movies/BluRay, desc: "Film/BDRip/Eng"}
-    - {id: 6, cat: Movies/BluRay, desc: "Film/BDRip/Hun"}
    - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng"}
    - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun"}
    - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng"}
@@ -20,10 +18,10 @@ caps:
    - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun"}
    - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng"}
    - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun"}
+    - {id: 4, cat: Movies/SD, desc: "Film/SD/Eng"}
+    - {id: 3, cat: Movies/SD, desc: "Film/SD/Hun"}
    - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng"}
    - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun"}
-    - {id: 4, cat: Movies/SD, desc: "Film/Xvid/Eng"}
-    - {id: 3, cat: Movies/SD, desc: "Film/Xvid/Hun"}
    - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny"}
    - {id: 19, cat: PC/Games, desc: "Játék/ISO"}
    - {id: 20, cat: PC/Games, desc: "Játék/RIP"}
@@ -38,7 +36,7 @@ caps:
    - {id: 33, cat: TV, desc: "Sorozat/Eng"}
    - {id: 32, cat: TV, desc: "Sorozat/Hun"}
    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
-    - {id: 39, cat: XXX, desc: "XXX/Képek"}
+    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"}
    - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng"}
    - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun"}
    - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng"}
@@ -52,12 +50,13 @@ caps:
    book-search: [q]

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>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
@@ -79,18 +78,12 @@ settings:
      asc: asc

 login:
-  path: login.php?takelogin
-  method: post
+  method: cookie
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    two_factor_auth_code: ""
-    inactivity_: ""
-    returnto: /
-  error:
-    - selector: td.embedded:contains("Sikertelen bejelentkezés")
+    cookie: "{{ .Config.cookie }}"
  test:
-    path: letoltes.php
+  test:
+    path: index.php
    selector: a[href^="logout.php"]

 search:
@@ -131,7 +124,7 @@ search:
      filters:
        - name: replace
          args: ["/details", "/download"]
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    poster:
@@ -167,6 +160,7 @@ search:
    uploadvolumefactor:
      case:
        font:contains("x2"): 2
+        font:contains("x4"): 4
        "*": 1
    minimumratio:
      text: 1.0
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -2,7 +2,7 @@
 id: cartoonchaos
 name: CartoonChaos
 description: "CartoonChaos (CC) is a Private Torrent Tracker for ANIMATED MOVIES / TV"
-language: en-us
+language: en-US
 type: private
 encoding: UTF-8
 links:
@@ -121,15 +121,13 @@ search:
    download:
      selector: td a[href^="download.php"]
      attribute: href
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
      filters:
        # http://anonym.to?javascript:popdetails('http://www.imdb.com/title/tt0086817');
-        - name: replace
-          args: [" http://anonym.to?javascript:popdetails('", ""]
-        - name: replace
-          args: ["');", ""]
+        - name: regexp
+          args: tt(\d+)
    poster:
      selector: td a[href^="index.php?page=torrent-details"]
      attribute: onmouseover
@@ -141,7 +139,7 @@ search:
    size:
      selector: td:nth-child(10)
      # two flavours of dates
-    date:
+    date_day:
      # Yesterday at 10:03:30 PM
      selector: td:nth-child(5):contains("day")
      optional: true
@@ -150,7 +148,7 @@ search:
          args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
        - name: append
          args: " +00:00" # auto adjusted by site account profile
-    date:
+    date_year:
      # February 09, 2019, 06:35:08 AM
      selector: td:nth-child(5):not(:contains("day"))
      optional: true
@@ -161,6 +159,8 @@ search:
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "January 02  2006  03:04:05 PM -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
    seeders:
      selector: td:nth-child(6)
    leechers:
--- a/src/Jackett.Common/Definitions/casatorrent.yml
+++ b/src/Jackett.Common/Definitions/casatorrent.yml
@@ -2,7 +2,7 @@
 id: casatorrent
 name: Casa-Torrent
 description: "Casa-Torrent is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-fr
+language: fr-FR
 type: private
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/cathoderaytube.yml
+++ b/src/Jackett.Common/Definitions/cathoderaytube.yml
@@ -2,7 +2,7 @@
 id: cathoderaytube
 name: Cathode-Ray.Tube
 description: "Cathode-Ray.Tube (CRT) is a Private Torrent Tracker for CLASSIC MOVIES / TV"
-language: en
+language: en-GB
 type: private
 encoding: UTF-8
 links:
@@ -62,7 +62,7 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    cinfo: "2550|1350|24|-60"
+    cinfo: "2550|1350|1.25|24|-60"
    iplocked: 0
    keeploggedin: 1
  error:
--- a/src/Jackett.Common/Definitions/catorrent.yml
+++ b/src/Jackett.Common/Definitions/catorrent.yml
@@ -2,7 +2,7 @@
 id: catorrent
 name: Catorrent
 description: "Catorrent is a RUSSIAN Semi-Private Torrent Tracker for GAMES"
-language: ru-ru
+language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
@@ -90,7 +90,6 @@ search:
      attribute: src
    description:
      selector: div.short_game_genre
-      optional: true
    date:
      text: now
    seeders:
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/src/Jackett.Common/Definitions/ccfbits.yml
@@ -2,7 +2,7 @@
 id: ccfbits
 name: CCFBits
 description: "CCFBits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-cn
+language: zh-CN
 type: private
 encoding: UTF-8
 links:
@@ -112,7 +112,7 @@ search:
    download:
      selector: a[href^="download.php/"]
      attribute: href
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
--- a/src/Jackett.Common/Definitions/ceskeforum.yml
+++ b/src/Jackett.Common/Definitions/ceskeforum.yml
@@ -2,7 +2,7 @@
 id: ceskeforum
 name: CeskeForum
 description: "CeskeForum is a CZECH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: cs-cz
+language: cs-CZ
 type: private
 encoding: UTF-8
 links:
@@ -107,22 +107,24 @@ search:
      filters:
        - name: querystring
          args: cat
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: a[title][href^="details.php?id="]
      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    details:
      selector: a[href^="details.php?id="]
      attribute: href
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    imdb:
+    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-    date:
+    date_elapsed:
      # time type: time elapsed (default)
      selector: td.rowfollow:nth-child(4) > span[title]
      attribute: title
@@ -132,7 +134,7 @@ search:
          args: " +02:00" # EET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
      # time added
      selector: td.rowfollow:nth-child(4):not(:has(span))
      optional: true
@@ -141,6 +143,8 @@ search:
          args: " +02:00" # EET
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td.rowfollow:nth-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -2,7 +2,7 @@
 id: chdbits
 name: CHDBits
 description: "CHDBits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-cn
+language: zh-CN
 type: private
 encoding: UTF-8
 links:
@@ -101,12 +101,14 @@ search:
      filters:
        - name: querystring
          args: cat
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-    title:
+    title_optional:
      optional: true
      selector: a[title][href^="details.php?id="]
      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
    details:
      selector: a[href^="details.php?id="]
      attribute: href
@@ -121,14 +123,27 @@ search:
      selector: td:nth-child(6)
    leechers:
      selector: td:nth-child(7)
-    date:
+    date_elapsed:
+      # time type: time elapsed (default)
      selector: td:nth-child(4) > span[title]
      attribute: title
+      optional: true
      filters:
        - name: append
          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    downloadvolumefactor:
      case:
        img.pro_free: 0
--- a/Show More
+++ b/Show More