tapochek: download link is required for sonarr radarr. resolves #6654

torrentexplosiv: add config sort options
tsc: add config sort options
2025-12-21 13:52:16 +01:00 · 2019-12-21 11:28:01 +13:00 · 2019-12-21 11:01:51 +13:00 · 2019-12-21 10:48:17 +13:00 · 2019-12-21 10:34:42 +13:00 · 2019-12-21 10:26:38 +13:00
414 changed files with 30573 additions and 13061 deletions
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@

 This project is a new fork and is recruiting development help.  If you are able to help out please contact us.

-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), [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/), [Mylar](https://github.com/evilhero/mylar), [Lidarr](https://github.com/lidarr/lidarr), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.

 Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/dev/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.

@@ -17,108 +17,151 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/

 #### Supported Systems
 * Windows 7SP1 or greater using .NET 4.6.1 or above [Download here](https://www.microsoft.com/net/framework/versions/net461)
-* Linux ([supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/2.1/2.1-supported-os.md))
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/2.1/2.1-supported-os.md#linux)
 * macOS 10.12 or greater

 ### Supported Public Trackers
 * 1337x
 * ACG.RIP
+ * ACGsou
 * Anidex
 * Anime Tosho
 * AniRena
 * AudioBook Bay (ABB)
- * btbit
+ * BigFANGroup
+ * BitRu
+ * BitTorrent.AM
 * BTDB
- * BTDigg
- * BTKitty
+ * BTDIGG
+ * BT.etree
+ * BTSOW
+ * ConCen
+ * Corsaro.red
 * cpasbien
 * cpasbienClone
- * DIGBT
+ * Demonoid
+ * dmhy
 * ETTV
 * EliteTorrent.biz
+ * EstrenosDTL
 * ExtraTorrent.ag
+ * EXT Torrents
 * EZTV
+ * FireBit
 * Frozen Layer
+ * GamesTorrents
 * GkTorrent
+ * GloDLS
+ * HDReactor
+ * Hon3yHD.net
 * Horrible Subs
+ * Idope
 * Il Corsaro Nero <!-- maintained by bonny1992 -->
 * Il Corsaro Blu
 * Isohunt2
- * KATcrs
+ * iTorrent
 * KickAssTorrent (KATcr)
- * KickAssTorrent (thekat.se clone)
- * KikiBT
+ * KickAssTorrent (kat.li)
+ * Legit Torrents
+ * LePorno
 * LimeTorrents
 * MacTorrents
 * MagnetDL
 * MejorTorrent <!-- maintained by ivandelabeldad -->
 * Monova
+ * MovCr
+ * MoviesDVDR
 * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
+ * Newstudio
+ * Nitro
+ * NNTT
+ * NoName Club (NNM-Club)
 * Nyaa.si
 * Nyaa-Pantsu
- * Nyoo
+ * OxTorrent
+ * PiratBit
 * ProStyleX
- * QXR
 * RARBG
+ * Rus-media
 * RuTor
+ * Seedpeer
 * shokweb
 * ShowRSS
 * SkyTorrentsClone
 * SolidTorrents
 * sukebei.Nyaa.si
 * sukebei-Pantsu
+ * TFile
 * The Pirate Bay (TPB)
- * TNTVillage <!-- maintained by bonny1992 -->
 * Tokyo Tosho
+ * TopNow
 * Torlock
+ * TOROS
 * Torrent Downloads (TD)
- * TorrentFunk
- * TorrentGalaxy.org (TGx)
- * TorrentKitty
- * TorrentProject2
- * Torrents.csv
 * Torrent9
- * Torernt9 clone (torrents9.ch)
+ * Torrent9Clone
+ * TorrentDownload
+ * TorrentFunk
+ * TorrentGalaxy (TGx)
+ * TorrentParadise
+ * TorrentProject2
+ * TorrentQuest
+ * Torrents.csv
+ * TorrentWal
 * Torrentz2
- * World Wide Torrents
+ * Underverse
+ * YourBittorrent
 * YTS.ag
 * Zooqle

 ### Supported Semi-Private Trackers
- * 7tor
 * Alein
+ * AlexFilm
+ * AniDUB
 * ArenaBG
+ * BaibaKo
+ * BookTracker
+ * CasStudioTV
+ * Crazy's Corner
 * CzTorrent
 * Deildu
+ * DXP (Deaf Experts)
+ * EniaHD
 * Film-Paleis
 * Gay-Torrents.net
 * Gay-Torrents.org
- * GDF76
+ * HamsterStudio
+ * HD Dolby
 * Kinozal
 * LostFilm.tv
- * Mega-Bliz
+ * Marine Tracker
 * Metal Tracker
+ * MuziekFrabriek
 * MVGroup Forum
 * MVGroup Main
- * Newstudio
 * NetHD (VietTorrent)
- * NoName Club (NNM-Club)
+ * Pornolab
+ * RiperAM
 * RockBox
 * RuTracker
 * Sharewood
 * SkTorrent
 * SoundPark
+ * Toloka.to
+ * Torrent-Explosiv
 * Torrents-Local
+ * TribalMixes
 * Union Fansub
 * Vanila
- * XtreMeZone (MYXZ)
 * YggTorrent (YGG)
 * Ztracker

 ### Supported Private Trackers
+ * 0day.kiev
 * 2 Fast 4 You
 * 3D Torrents (3DT) 
 * 3evils
+ * 4thD (4th Dimension)
 * 720pier
 * Abnormal
 * Acid Lounge (A-L)
@@ -128,17 +171,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * AnimeBytes (AB)
 * AnimeTorrents (AnT)
 * Anthelion
- * AOX (Chippu)
 * Araba Fenice (Phoenix)
+ * Asgaard (AG)
 * AsianCinema
- * AsianDVDClub
 * AST4u
 * Audiobook Torrents (ABT)
 * AudioNews (AN)
 * Awesome-HD (AHD)
- * AVG (Audio Video Games)
 * Avistaz (AsiaTorrents)
- * B2S-Share
 * Back-ups
 * BakaBT
 * BaconBits (bB)
@@ -150,36 +190,33 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BiT-TiTAN
 * Bithorlo (BHO)
 * BitHUmen
- * BitMe
- * BitMeTV
- * BitsPiracy
 * Bitspyder
 * BitTorrentFiles
 * BitTurk
 * BJ-Share (BJ)
 * BlueBird
 * Blutopia (BLU)
- * Brasil Tracker
 * BroadcastTheNet (BTN)
 * BrokenStones
 * BTGigs (TG)
 * BTNext (BTNT)
+ * BTSCHOOL
 * Carpathians
 * CartoonChaos (CC)
 * CasaTorrent
- * CasStudioTV
 * CCFBits
 * CGPeers
 * CHDBits
 * ChannelX
- * CiNEFiLHD
 * Cinemageddon
 * Cinematik
 * CinemaZ (EuTorrents)
 * Classix
+ * Concertos
+ * CrazyHD
+ * CrazySpirits
 * CrnaBerza
 * DanishBits (DB)
- * Dark-Shadow
 * Das Unerwartete
 * DataScene (DS)
 * DesiReleasers
@@ -191,42 +228,42 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * DocumentaryTorrents (DT)
 * Downloadville
 * Dragonworld Reloaded
- * Dream Team
 * DXDHD
- * EliteHD (HDClub) [![(invite needed)][inviteneeded]](#)
- * Elit Tracker (ET)
+ * EbookParadijs
+ * Ebooks-Shares
+ * EfectoDoppler
 * Elite-Tracker
 * Empornium (EMP)
+ * eShareNet
 * eStone (XiDER, BeLoad)
 * Ethor.net (Thor's Land)
 * FANO.IN
 * FileList (FL)
 * Femdomcult
 * FocusX
- * Freedom-HD (Freedom Paradise)
 * FreeTorrent
 * FullMixMusic
 * FunFile (FF)
 * FunkyTorrents (FT)
 * Fuzer (FZ)
+ * Galeriens (LaPauseTorrents)
 * GAYtorrent.ru
 * GazelleGames (GGn)
- * GFXNews
+ * Generation-Free
 * GFXPeers
 * GigaTorrents
 * GimmePeers (formerly ILT) <!-- maintained by jamesb2147 -->
 * GiroTorrent
- * GODS
+ * Greek Legends
 * Greek Team
 * HacheDe
- * Hardbay
- * HD4Free (HD4)
 * HD-Forever (HDF)
 * HD-Only (HDO)
 * HD-Space (HDS)
 * HD-Spain
 * HD-Torrents (HDT)
 * HD-Bits.com
+ * HD4FANS
 * HDArea (HDA)
 * HDBits
 * HDCenter
@@ -234,17 +271,19 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * HDCity
 * HDHome (HDBigger)
 * HDME
- * HDplus
+ * HDRoute
 * HDSky
 * HDTorrents.it
+ * HDTurk
+ * HDU
+ * HDZone
 * Hebits
 * Hon3y HD
 * HQSource (HQS)
 * HuSh 
- * Hyperay
 * ICE Torrent
- * iLoveClassics (iLC)
 * ImmortalSeed (iS)
+ * Immortuos
 * inPeril
 * Insane Tracker
 * IPTorrents (IPT)
@@ -252,19 +291,22 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Kapaki
 * Karagarga
 * Le Saloon
+ * LearnFlakes
+ * LibraNet (LN)
 * LinkoManija
 * LosslessClub
 * M-Team TP (MTTP)
 * Magico (Trellas)
 * Majomparádé (TurkDepo)
- * Manicomio Share
 * Mononoké-BT
 * MoreThanTV (MTV)
 * MyAnonamouse (MAM)
 * myAmity
 * MySpleen
+ * NBTorrents
 * NCore
 * Nebulance (NBL) (TransmiTheNet)
+ * NetLab
 * New Real World
 * Norbits
 * NordicBits (NB)
@@ -273,15 +315,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Orpheus
 * Ourbits (HDPter)
 * P2PBG
+ * Partis
 * Passione Torrent <!-- maintained by bonny1992 -->
 * PassThePopcorn (PTP)
 * Peers.FM
- * PiratBit
 * PirateTheNet (PTN)
+ * PixelCove (Ultimate Gamer)
 * PiXELHD (PxHD)
 * Pleasuredome
 * PolishSource (PS)
 * PolishTracker
+ * Pornbay
 * Pretome
 * PrivateHD (PHD)
 * ProAudioTorrents (PAT)
@@ -291,49 +335,59 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * PThome
 * PuntoTorrent
 * PWTorrents (PWT)
+ * R3V WTF!
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
+ * RainbowNation Sharing (RNS)
 * Redacted (PassTheHeadphones)
 * Red Star Torrent (RST)
 * RetroFlix
 * RevolutionTT
- * RGU
 * RoDVD (Cinefiles)
 * Romanian Metal Torrent (RMT)
+ * RPTorrents
 * SceneFZ
 * SceneHD
- * SceneReactor
+ * ScenePalace (SP)
 * SceneRush
 * SceneTime
 * SDBits
 * Secret Cinema
+ * SeedFile (SF)
 * Shareisland
 * ShareSpaceDB
- * Sharingue
+ * ShareUniversity
 * Shazbat
 * Shellife (SL)
+ * SiamBIT
 * SpaceTorrent
- * Speed-Share
 * SpeedCD
 * SpeedTorrent Reloaded
 * SportHD
 * SportsCult
+ * SpringSunday
 * SuperBits (SBS)
 * TakeaByte
+ * Tapochek
 * Tasmanit
- * TBPlus
+ * Tazmania-Den
+ * TeamHD
+ * TeamOS
+ * TEKNO3D
+ * TellyTorrent
 * TenYardTorrents (TYT)
+ * TheAudioScene
 * TheEmpire (TE)
 * The Geeks
 * The Horror Charnel (THC)
- * The Occult
+ * The Movie Cave
 * The New Retro
+ * The Occult
 * The Place
 * The Shinning (TsH)
 * The Show
 * The-Torrents
 * The Vault
- * Tigers-dl
 * Torrent Network (TN)
 * Torrent Sector Crew (TSC)
 * Torrent.LT
@@ -350,29 +404,30 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * TorrentSeeds (TS)
 * Torrent-Syndikat
 * TOrrent-tuRK (TORK)
- * TorViet  (HDVNBits)
 * TotallyKids (TK)
 * ToTheGlory
 * TranceTraffic
 * Trezzor
- * TurkTorrent (TT)
+ * TurkTorrent (TT) [![(invite needed)][inviteneeded]](#)
 * TV Chaos UK (TVCUK)
 * TV-Vault
 * TVstore
+ * Twilight Torrents
 * u-torrents (SceneFZ)
 * UHDBits
- * Ultimate Gamer Club (UGC)
+ * UnionGang
+ * UnlimitZ
 * Vizuk
- * Waffles
 * World-In-HD
 * World-of-Tomorrow
- * WorldOfP2P (WOP)
 * x-ite.me (XM)
 * xBytesV2
 * XSpeeds (XS)
- * XKTorrent
 * XWTorrents (XWT)
+ * XWT-Classics
 * Xthor
+ * XtremeFile
+ * XtreMeZone (MYXZ)
 * ExoticaZ (YourExotic)
 * Zamunda.net
 * Zelka.org
@@ -381,7 +436,7 @@ Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maint

 ### Aggregate indexers

-A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab/api`.
+A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
 It will query all configured indexers and return the combined results.

 If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
@@ -413,26 +468,28 @@ Jackett can also be run from the command line if you would like to see log messa


 ## Install on Linux (AMDx64)
-On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x#linux-distribution-dependencies
+On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md      

 ### Install as service
-To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
+2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.

 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxAMDx64.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.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`

 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  


 ## Install on Linux (ARMv7 or above)
-On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x#linux-distribution-dependencies
+On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md    

 ### Install as service
-To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases) 
+2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.

 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) 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.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`

 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
@@ -456,7 +513,7 @@ Mono must be compiled with the Roslyn compiler (default), using MCS will cause "

 ### Installation on Linux via Ansible

-On a RHEL/Centos 7 system: [linuxhq.jackett](https://galaxy.ansible.com/linuxhq/jackett)
+On a CentOS/RedHat 7 system: [jewflix.jackett](https://galaxy.ansible.com/jewflix/jackett)

 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)

@@ -559,8 +616,8 @@ All contributions are welcome just send a pull request.
 ### Windows
 * Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
-* From the `src` directory, run `dotnet restore`
-* Open the Jackett solution in Visual Studio 2017 (version 15.9 or above)
+* Open Powershell and from the `src` directory, run `dotnet restore`
+* Open the Jackett solution in Visual Studio 2019 (version 16.3 or above)
 * Right click on the Jackett solution and click 'Rebuild Solution' to restore nuget packages
 * Select Jackett.Server as startup project
 * In the drop down menu of the run button select "Jackett.Server" instead of "IIS Express"
@@ -577,21 +634,21 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

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

 ### Linux


 ```bash
-sudo apt install mono-complete nuget msbuild dotnet-sdk-2.2 # install build tools (debian/ubuntu)
+sudo apt install mono-complete nuget msbuild dotnet-sdk-3.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 netcoreapp2.2 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp2.2/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f netcoreapp3.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/netcoreapp3.0/linux-x64/jackett # run jackett
 ```

 ## Screenshots
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,8 @@
-version: 0.11.{build}
+version: 0.12.{build}
 skip_tags: true
 image:
  - Ubuntu
-  - Visual Studio 2017
+  - Visual Studio 2019
 environment:
  APPVEYOR_YML_DISABLE_PS_LINUX: true
 configuration: Release
--- a/build.cake
+++ b/build.cake
@@ -16,7 +16,7 @@ var configuration = Argument("configuration", "Debug");
 var workingDir = MakeAbsolute(Directory("./"));
 string artifactsDirName = "Artifacts";
 string testResultsDirName = "TestResults";
-string netCoreFramework = "netcoreapp2.2";
+string netCoreFramework = "netcoreapp3.0";
 string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
 string updaterProjectPath = "./src/Jackett.Updater/Jackett.Updater.csproj";

@@ -28,7 +28,7 @@ Task("Info")
 	.Does(() =>
 	{
 		Information(@"Jackett Cake build script starting...");
-		Information(@"Requires InnoSetup and C:\cygwin to be present for packaging (Pre-installed on AppVeyor) on Windows");
+		Information(@"Requires InnoSetup and C:\msys64 to be present for packaging (Pre-installed on AppVeyor) on Windows");
 		Information(@"Working directory is: " + workingDir);

 		if (IsRunningOnWindows())
@@ -64,7 +64,7 @@ Task("Build-Full-Framework")

 		var buildSettings = new MSBuildSettings()
                .SetConfiguration(configuration)
-                .UseToolVersion(MSBuildToolVersion.VS2017);
+                .UseToolVersion(MSBuildToolVersion.VS2019);
 		
 		MSBuild("./src/Jackett.sln", buildSettings);
 	});
@@ -106,6 +106,8 @@ Task("Package-Windows-Full-Framework")

 		InnoSetupSettings settings = new InnoSetupSettings();
 		settings.OutputDirectory = workingDir + "/" + artifactsDirName;
+		//Can remove below line once Cake is updated for InnoSetup 6 - https://github.com/cake-build/cake/pull/2565
+		settings.ToolPath = @"C:\Program Files (x86)\Inno Setup 6\ISCC.exe";
 		settings.Defines = new Dictionary<string, string>
 			{
 				{ "MyFileForVersion", sourceFolder + "/Jackett.Common.dll" },
@@ -126,7 +128,6 @@ Task("Package-Mono-Full-Framework")

 		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath);  //builds against multiple frameworks

-		CopyFileToDirectory("./install_service_macos_mono", buildOutputPath);
 		CopyFileToDirectory("./install_service_systemd_mono.sh", buildOutputPath);
 		CopyFileToDirectory("./Upstart.config", buildOutputPath);

@@ -146,6 +147,7 @@ Task("Package-Mono-Full-Framework")

 		DeleteFile(buildOutputPath + "/System.Runtime.InteropServices.RuntimeInformation.dll");

+		InstallMsysTar();
 		Gzip("./BuildOutput/net461/linux-x64", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.Mono.tar.gz");
 	});

@@ -183,6 +185,7 @@ Task("Package-DotNetCore-LinuxAMDx64")
 		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});

 		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
+		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);

 		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxAMDx64.tar.gz");
 	});
@@ -202,6 +205,7 @@ Task("Package-DotNetCore-LinuxARM32")
 		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});

 		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
+		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);

 		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxARM32.tar.gz");
 	});
@@ -221,6 +225,7 @@ Task("Package-DotNetCore-LinuxARM64")
 		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});

 		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
+		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);

 		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxARM64.tar.gz");
 	});
@@ -327,13 +332,13 @@ Task("Linux-Environment")
 	});


-private void RunCygwinCommand(string utility, string utilityArguments)
+private void RunMsysCommand(string utility, string utilityArguments)
 {
-	var cygwinDir = @"C:\cygwin\bin\";
-	var utilityProcess = cygwinDir + utility + ".exe";
+	var msysDir = @"C:\msys64\usr\bin\";
+	var utilityProcess = msysDir + utility + ".exe";

-	Information("CygWin Utility: " + utility);
-	Information("CygWin Directory: " + cygwinDir);
+	Information("MSYS2 Utility: " + utility);
+	Information("MSYS2 Directory: " + msysDir);
 	Information("Utility Location: " + utilityProcess);
 	Information("Utility Arguments: " + utilityArguments);

@@ -344,7 +349,7 @@ private void RunCygwinCommand(string utility, string utilityArguments)
 			utilityProcess,
 			new ProcessSettings {
 				Arguments = utilityArguments,
-				WorkingDirectory = cygwinDir,
+				WorkingDirectory = msysDir,
 				RedirectStandardOutput = true
 			},
 			out redirectedStandardOutput,
@@ -365,11 +370,9 @@ private void RunCygwinCommand(string utility, string utilityArguments)
 	Information(utility + " Exit code: {0}", exitCodeWithArgument);
 }

-private string RelativeWinPathToCygPath(string relativePath)
+private string RelativeWinPathToFullPath(string relativePath)
 {
-	var cygdriveBase = "/cygdrive/" + workingDir.ToString().Replace(":", "").Replace("\\", "/");
-	var cygPath = cygdriveBase + relativePath.TrimStart('.');
-	return cygPath;
+	return (workingDir + relativePath.TrimStart('.'));
 }

 private void RunLinuxCommand(string file, string arg)
@@ -391,12 +394,12 @@ private void Gzip(string sourceFolder, string outputDirectory, string tarCdirect
 	
 	if (IsRunningOnWindows())
 	{
-		var cygSourcePath = RelativeWinPathToCygPath(sourceFolder);
-		var tarArguments = @"-cvf " + cygSourcePath + "/" + tarFileName + " -C " + cygSourcePath + $" {tarCdirectoryOption} --mode ='755'";
-		var gzipArguments = @"-k " + cygSourcePath + "/" + tarFileName;
+		var fullSourcePath = RelativeWinPathToFullPath(sourceFolder);
+		var tarArguments = @"--force-local -cvf " + fullSourcePath + "/" + tarFileName + " -C " + fullSourcePath + $" {tarCdirectoryOption} --mode ='755'";
+		var gzipArguments = @"-k " + fullSourcePath + "/" + tarFileName;

-		RunCygwinCommand("Tar", tarArguments);
-		RunCygwinCommand("Gzip", gzipArguments);
+		RunMsysCommand("tar", tarArguments);
+		RunMsysCommand("gzip", gzipArguments);
 		MoveFile($"{sourceFolder}/{tarFileName}.gz", $"{outputDirectory}/{tarFileName}.gz");
 	}
 	else
@@ -406,32 +409,85 @@ private void Gzip(string sourceFolder, string outputDirectory, string tarCdirect
 		RunLinuxCommand("chmod", $"755 {MakeAbsolute(Directory(sourceFolder))}/Jackett/jackett");
 		RunLinuxCommand("chmod", $"755 {MakeAbsolute(Directory(sourceFolder))}/Jackett/JackettUpdater");

-		string systemdScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd.sh";
-		if (FileExists(systemdScript))
-		{
-			RunLinuxCommand("chmod", $"755 {systemdScript}");
-		}
-
 		string macOsServiceScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_macos";
 		if (FileExists(macOsServiceScript))
 		{
 			RunLinuxCommand("chmod", $"755 {macOsServiceScript}");
 		}

+		string systemdMonoScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd_mono.sh";
+		if (FileExists(systemdMonoScript))
+		{
+			RunLinuxCommand("chmod", $"755 {systemdMonoScript}");
+		}
+
+		string systemdScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd.sh";
+		if (FileExists(systemdScript))
+		{
+			RunLinuxCommand("chmod", $"755 {systemdScript}");
+		}
+
+		string launcherScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/jackett_launcher.sh";
+		if (FileExists(launcherScript))
+		{
+			RunLinuxCommand("chmod", $"755 {launcherScript}");
+		}
+
 		RunLinuxCommand("tar",  $"-C {sourceFolder} -zcvf {outputDirectory}/{tarFileName}.gz {tarCdirectoryOption}");
 	}	
 }

-private void DotNetCorePublish(string projectPath, string framework, string runtime, string outputPath)
+private void InstallMsysTar()
 {
-	var settings = new DotNetCorePublishSettings
+	//Gzip is included by default with MSYS2, but not tar. Use the package manager to install tar
+
+	var startInfo = new System.Diagnostics.ProcessStartInfo()
 	{
-		Framework = framework,
-		Runtime = runtime,
-		OutputDirectory = outputPath
+		Arguments = "-S --noconfirm tar",
+		FileName = @"C:\msys64\usr\bin\pacman.exe",
+		UseShellExecute = false
 	};

-	DotNetCorePublish(projectPath, settings);
+	var process = System.Diagnostics.Process.Start(startInfo);
+	process.WaitForExit();
+
+	if (FileExists(@"C:\msys64\usr\bin\tar.exe") && FileExists(@"C:\msys64\usr\bin\gzip.exe"))
+	{
+		Information("tar.exe and gzip.exe were found");
+	}
+	else
+    {
+        throw new Exception("tar.exe and gzip.exe were NOT found");   
+    }
+}
+
+private void DotNetCorePublish(string projectPath, string framework, string runtime, string outputPath)
+{
+	bool publishSingleFile = false;
+
+	if (publishSingleFile && framework != "net461")
+	{
+		var settings = new DotNetCorePublishSettings
+		{
+			Framework = framework,
+			Runtime = runtime,
+			OutputDirectory = outputPath,
+			ArgumentCustomization = args=>args.Append("/p:PublishSingleFile=true")
+		};
+
+		DotNetCorePublish(projectPath, settings);
+	}
+	else
+	{
+		var settings = new DotNetCorePublishSettings
+		{
+			Framework = framework,
+			Runtime = runtime,
+			OutputDirectory = outputPath
+		};
+
+		DotNetCorePublish(projectPath, settings);
+	}
 }

 //////////////////////////////////////////////////////////////////////
--- a/77
+++ b/77
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-#Setting up colors
-BOLDRED="$(printf '\033[1;31m')"
-BOLDGREEN="$(printf '\033[1;32m')"
-NC="$(printf '\033[0m')" # No Color
-
-# Stop and unload the service if it's running
-launchctl remove org.user.Jackett
-
-# Move working directory to Jackett's
-cd "$(dirname "$0")"
-
-# Check if we're running from Jackett's directory
-if [ ! -f ./JackettConsole.exe ]; then
-echo "${BOLDRED}ERROR${NC}: Couldn't locate JackettConsole.exe. Is the script in the right directory?"
-    exit 1
-fi
-jackettdir="$(pwd)"
-
-# Check if mono is installed
-command -v mono >/dev/null 2>&1 || { echo >&2 "${BOLDRED}ERROR${NC}: Jackett requires Mono but it's not installed. Aborting."; exit 1; }
-monodir="$(dirname $(command -v mono))"
-
-# Check that no other service called Jackett is already running
-if [[ $(launchctl list | grep org.user.Jackett) ]]; then
-    echo "${BOLDRED}ERROR${NC}: Jackett already seems to be running as a service. Please stop it before running this script again."
-    exit 1
-fi
-
-# Write the plist to LaunchAgents
-mkdir -p ~/Library/LaunchAgents/
-cat >~/Library/LaunchAgents/org.user.Jackett.plist <<EOL
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>EnvironmentVariables</key>
-    <dict>
-        <key>PATH</key>
-        <string>/usr/bin:/bin:/usr/sbin:/sbin:${monodir}</string>
-    </dict>
-    <key>KeepAlive</key>
-    <true/>
-    <key>Label</key>
-    <string>org.user.Jackett</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>${monodir}/mono</string>
-        <string>--debug</string>
-        <string>JackettConsole.exe</string>
-        <string>--NoRestart</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>WorkingDirectory</key>
-    <string>${jackettdir}</string>
-</dict>
-</plist>
-
-EOL
-
-# Run the agent
-launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist
-
-# Check that it's running
-if [[ $(launchctl list | grep org.user.Jackett) ]]; then
-echo "${BOLDGREEN}Agent successfully installed and launched!${NC}"
-else
-    cat << EOL
-${BOLDRED}ERROR${NC}: Could not launch agent. The installation might have failed.
-Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
-Mono directory: \`${monodir}\`
-Jackett directory: \`${jackettdir}\`
-
-EOL
-fi
--- a/install_service_systemd.sh
+++ b/install_service_systemd.sh
@@ -46,7 +46,7 @@ Type=simple
 User=${jackettuser}
 Group=${jackettuser}
 WorkingDirectory=${jackettdir}
-ExecStart=${jackettdir}/jackett --NoRestart
+ExecStart=${jackettdir}/jackett_launcher.sh
 TimeoutStopSec=20

 [Install]
@@ -70,7 +70,6 @@ else
    cat << EOL
 ${BOLDRED}ERROR${NC}: Could not launch service. The installation might have failed.
 Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
-Mono directory: \`${monodir}\`
 Jackett directory: \`${jackettdir}\`
 Jackett user: \`${jackettuser}\`

--- a/jackett_launcher.sh
+++ b/jackett_launcher.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Helper script to fix
+# https://github.com/Jackett/Jackett/issues/5208#issuecomment-547565515
+
+# Get full Jackett root path
+JACKETT_DIR="$(dirname "$(readlink -f "$0")")"
+
+# Launch Jackett
+${JACKETT_DIR}/jackett --NoRestart
+
+# Get user running the service
+JACKETT_USER=$(whoami)
+
+# Wait until the updater ends
+while pgrep -u ${JACKETT_USER} JackettUpdater > /dev/null; do
+     sleep 1
+done
--- a/src/Jackett.Common/Content/congruent_outline.png
+++ b/src/Jackett.Common/Content/congruent_outline.png
--- a/src/Jackett.Common/Content/crissXcross.png
+++ b/src/Jackett.Common/Content/crissXcross.png
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -94,6 +94,10 @@ function loadJackettSettings() {
            $("#logoutBtn").show();
        }

+        if (data.can_run_netcore != null && data.can_run_netcore === true) {
+            $("#can-upgrade-from-mono").show();
+        }
+
        $.each(data.notices, function (index, value) {
            console.log(value);
            doNotify(value, "danger", "glyphicon glyphicon-alert", false);
@@ -222,12 +226,12 @@ function displayUnconfiguredIndexersList() {
 		                    doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
 		                }
 			        }).fail(function (data) {
-			            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (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 occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
-            }
-                        
+                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 occured while configuring 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);
+                } else {
+                  doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
+                }
 			        });
                });
            });
@@ -444,12 +448,13 @@ function testIndexer(id, notifyResult) {
                doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
        }
    }).fail(function (data) {
-        updateTestState(id, "error", data.error, indexers);
-        if(data.responseJSON.error !== undefined && notifyResult) {
-                doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
-            }
+      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
+        doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+      } else {
+        doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
+      }
    });
 }

@@ -651,11 +656,12 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
                doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
            }
        }).fail(function (data) {
-            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (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 occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
-            }
+          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 occured 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);
+          } else {
+            doNotify("An error occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
+          }
        }).always(function () {
            $goButton.html(originalBtnText);
            $goButton.prop('disabled', false);
@@ -732,7 +738,7 @@ function updateReleasesRow(row)
    labels.empty();

    if (IMDBId) {
-        labels.append('\n<a href="http://www.imdb.com/title/tt' + ("000000" + IMDBId).slice(-7) + '/" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
+        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 (!isNaN(DownloadVolumeFactor)) {
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -14,10 +14,10 @@
    <link rel="apple-touch-icon" sizes="76x76" href="../apple-touch-icon-76x76.png" />
    <link rel="apple-touch-icon" sizes="114x114" href="../apple-touch-icon-114x114.png" />
    <link rel="apple-touch-icon" sizes="120x120" href="../apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="../apple-touch-icon-144x144" />
+    <link rel="apple-touch-icon" sizes="144x144" href="../apple-touch-icon-144x144.png" />
    <link rel="apple-touch-icon" sizes="152x152" href="../apple-touch-icon-152x152.png" />
    <link rel="apple-touch-icon" sizes="180x180" href="../apple-touch-icon-180x180.png" />
-    <link rel="mask-icon" href="jackett_medium.png" color="#35c5f4">
+    <link rel="mask-icon" href="../jackett_medium.png" color="#35c5f4">
    <link rel="icon" type="image/ico" href="../favicon.ico" />
    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
    <script type="text/javascript" src="../libs/filesize.min.js?changed=2017083001"></script>
@@ -51,6 +51,14 @@
            <input id="api-key-input" class="form-control input-right" type="text" value="" placeholder="API Key" readonly="">
        </div>
        <hr />
+
+        <div id="can-upgrade-from-mono" hidden class="alert alert-info" role="alert"> 
+            <strong>Standalone version of Jackett is now available - Mono not required</strong> <br>
+            To upgrade to the standalone version of Jackett, <a href="https://github.com/Jackett/Jackett#install-on-linux-amdx64" target="_blank" class="alert-link">click here</a> for install instructions. 
+            Upgrading is straight forward, simply install the standalone version and your indexers/configuration will carry over. 
+            Benefits include: increased performance, improved stability and no dependency on Mono. 
+        </div>
+
        <div class="pull-right">
            <button id="jackett-add-indexer" class="btn btn-success btn-sm">
                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add indexer
@@ -142,8 +150,7 @@
        </div>
        <div id="proxy-warning" hidden>
            <span>
-                WARNING: The proxy option is unstable and potentially leaks requests. If no fix from the community is forthcoming 
-                in the next few months, the proxy option will be removed from Jackett. Recommendation is to use a VPN.
+                WARNING: The proxy option potentially leaks requests. Recommendation is to use a VPN.
            </span>
        </div>
        <div class="input-area">
@@ -671,6 +678,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20190401"></script>
+    <script type="text/javascript" src="../custom.js?changed=20190427"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Definitions/0daykiev.yml
+++ b/src/Jackett.Common/Definitions/0daykiev.yml
@@ -0,0 +1,185 @@
+---
+  site: 0daykiev
+  name: 0day.kiev
+  description: "0day.kiev.ua is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://tracker.0day.kiev.ua/
+
+  caps:
+    categorymappings:
+      - {id: 10, cat: Movies, desc: "Фильмы (Movies)"}
+      - {id: 11, cat: TV, desc: "Мультфильмы (Cartoons)"}
+      - {id: 29, cat: TV, desc: "Мультсериалы (TV Series)"}
+      - {id: 34, cat: TV/Anime, desc: "Аниме (Anime)"}
+      - {id: 20, cat: TV/Documentary, desc: "Документальное (Documentary)"}
+      - {id: 14, cat: Audio, desc: "Музыка / Аудио (Music / Audio)"}
+      - {id: 15, cat: Audio/Video, desc: "Музыка / Видео (Music / Video)"}
+      - {id: 16, cat: Movies/HD, desc: "HD / Фильмы (HD / Movies)"}
+      - {id: 27, cat: TV/HD, desc: "HD / Мультфильмы (HD / Cartoons)"}
+      - {id: 28, cat: TV/HD, desc: "HD / Документальное (HD / Documentary)"}
+      - {id: 41, cat: Movies/3D, desc: "HD / 3D видео (HD / 3D video)"}
+      - {id: 47, cat: Movies, desc: "HDv 0day Team"}
+      - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"}
+      - {id: 25, cat: Console/Xbox 360, desc: "Игры / XBOX360 (Games / XBOX360)"}
+      - {id: 33, cat: Console/PSP, desc: "Игры / PSP - PS2 (Games / PSP - PS2)"}
+      - {id: 37, cat: Console/PS3, desc: "Игры / PS3 (Games / PS3)"}
+      - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"}
+      - {id: 39, cat: PC/Mac, desc: "Mac OS (Софт / Игры) (Mac OS (Software / Games))"}
+      - {id: 19, cat: TV, desc: "TV / Сериалы (TV shows)"}
+      - {id: 30, cat: TV/HD, desc: "HD / Сериалы (HD / TV Shows)"}
+      - {id: 23, cat: TV, desc: "TV / Передачи (TV / Broadcasts)"}
+      - {id: 22, cat: TV/Sport, desc: "Спорт (Sports)"}
+      - {id: 31, cat: Other, desc: "Прочее (Other)"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: true
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/browse.php"
+    error:
+      - selector: div.maintitle:contains("Ошибка")
+        message:
+          selector: div.borderwrap table.embedded
+    test:
+      path: browse.php
+      selector: a[href="/logout.php"]
+
+  search:
+    paths:
+    # https://tracker.0day.kiev.ua/browse.php?c10=1&c27=1&search=endgame&incldead=1&where=0
+      - path: browse.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to Cезон 1
+        args: ["(?i)\\bS0*(\\d+)\\b", "езон $1"]
+      - name: re_replace # S01E01 to Сезон 1 Серии 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver
+      incldead: 1
+      # 0 title 1 title and descr
+      where: 0
+      sort: "{{ .Config.sort}}"
+      type: "{{ .Config.type}}"
+
+    rows:
+      selector: table > tbody > tr.rowtorrentinfo
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\:\\-\\/\\|]", " "]
+          - name: replace
+            args: ["Кураж Бамбей", "kurazh"]
+          - name: replace
+            args: ["Кубик в Кубе", "Kubik"]
+          - name: replace
+            args: ["Кравец", "Kravec"]
+          - name: re_replace
+            args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)\\s+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(2) i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      size:
+        selector: td:nth-child(4)
+        filters:
+          - name: replace
+            args: [".", ""] 
+          - name: replace
+            args: [",", "."] 
+          - name: replace
+            args: ["ТБ", "TB"] 
+          - name: replace
+            args: ["ГБ", "GB"]
+          - name: replace
+            args: ["МБ", "MB"]
+          - name: replace
+            args: ["КБ", "KB"]
+      grabs:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: (\d+) 
+      seeders:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 1]
+      downloadvolumefactor:
+        case:
+          img[src="pic/freedownload.gif"]: 0
+          img[src="pic/silverdownload.gif"]: 0.5
+          "*": 1
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -7,6 +7,13 @@
  encoding: UTF-8
  links:
    - https://1337x.to/
+    - https://1337x.gd/
+    - https://1337x.is/
+    - https://1337x.st/
+    - https://x1337x.ws/
+    - https://x1337x.eu/
+    - https://x1337x.se/
+    - https://1337x.unblocked.earth/

  caps:
    categorymappings:
@@ -36,7 +43,6 @@
      - {id: 2, cat: Movies/SD, desc: "Movies/Divx/Xvid"}
      - {id: 3, cat: Movies, desc: "Movies/SVCD/VCD"}
      - {id: 4, cat: Movies/Foreign, desc: "Movies/Dubs/Dual Audio"}
-      - {id: 9, cat: Movies, desc: "Documentaries/Documentary"}
      - {id: 42, cat: Movies/HD, desc: "Movies/HD"}
      - {id: 54, cat: Movies, desc: "Movies/h.264/x264"}
      - {id: 55, cat: Movies, desc: "Movies/Mp4"}
@@ -53,6 +59,7 @@
      - {id: 71, cat: TV, desc: "TV/HEVC/x265"}
      - {id: 74, cat: TV, desc: "TV/Cartoons"}
      - {id: 75, cat: TV/SD, desc: "TV/SD"}
+      - {id: 9, cat: TV/Documentary, desc: "TV/Documentary"}

      #Apps
      - {id: 18, cat: PC, desc: "Apps/PC Software"}
@@ -110,20 +117,41 @@
      default: "magnet:"
      options:
        "http://itorrents.org/" : "iTorrents.org"
+        "http://torrage.info/" : "Torrage.info"
+        "http://btcache.me/" : "BTcache.me"
        "magnet:": "magnet"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "time"
+      options:
+        "time": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  download:
    # the .torrent url is on the on the details page 
    selector: ul li a[href^="{{ .Config.downloadlink }}"]
+    filters:
+      - name: replace # temp fix for #5372
+        args: ["%E2%AD%90", ""]

  search:
    paths:
-      # present trending results if there are no search parms supplied
-      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/1/{{else}}trending{{end}}"
-      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/2/{{else}}{{end}}"
-      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/3/{{else}}{{end}}"
-      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/4/{{else}}{{end}}"
-      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/5/{{else}}{{end}}"
+      # present first page of movies and tv results if there are no search parms supplied
+      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/{{ .Config.sort }}/{{ .Config.type }}/1/{{else}}cat/Movies/{{ .Config.sort }}/{{ .Config.type }}/1/{{end}}"
+      - path: "{{if .Keywords}}{{else}}cat/TV/{{ .Config.sort }}/{{ .Config.type }}/1/{{end}}"
+      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/{{ .Config.sort }}/{{ .Config.type }}/2/{{else}}{{end}}"
+      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/{{ .Config.sort }}/{{ .Config.type }}/3/{{else}}{{end}}"
+      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/{{ .Config.sort }}/{{ .Config.type }}/4/{{else}}{{end}}"
+      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/{{ .Config.sort }}/{{ .Config.type }}/5/{{else}}{{end}}"
    keywordsfilters: 
      - name: replace # use this as a workaround till #893 is implemented
        args: ["Greys Anatomy", "Grey's Anatomy"]
@@ -135,6 +163,8 @@
        filters:
          - name: replace
            args: ["Grey's Anatomy", "Greys Anatomy"]
+          - name: replace
+            args: ["\u000f", ""] # get rid of unwanted character
      category:
        optional: true
        selector:  td[class^="coll-1"] a[href^="/sub/"]
@@ -184,7 +214,7 @@
          - name: dateparse
            args: "Jan. 2 06"
      date:
-        # # (today) 12:25am
+        # (today) 12:25am
        optional: true
        selector: td[class^="coll-date"]:contains(":")
        filters:
@@ -197,6 +227,6 @@
      leechers:
        selector: td[class^="coll-3"]
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/src/Jackett.Common/Definitions/2fast4you.yml
@@ -6,9 +6,10 @@
  type: private
  encoding: UTF-8
  links:
-    - https://www.2f4y.me/
+    - https://2f4y.me/
  legacylinks:
    - http://www.2f4y.me/
+    - https://www.2f4y.me/

  caps:
    categorymappings:
@@ -79,6 +80,31 @@
    modes:
      search: [q]
      tv-search: [q, season, ep]
+      movie-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: "id"
+      options:
+        "id": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: order
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  login:
    path: account-login.php
@@ -100,13 +126,27 @@
    inputs:
      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
-      incldead: "1"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 0 all 1 notfree 2 onlyfree
+      freeleech: 0
+      # 0 any 1 French 2 English 3 Multi 4-8 32-41
+      lang: 0
+      sort: "{{ .Config.sort}}"
+      order: "{{ .Config.order}}"
    keywordsfilters:
      - name: re_replace
        args: ["^$", "%"] # replace empty search string with %
+
    rows:
      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
      download:
        selector: a[href^="torrents-details.php?id="]
        attribute: href
@@ -118,12 +158,6 @@
        filters:
          - name: replace
            args: [" - (Nouveau!)", ""]
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
      details:
        selector: a[href^="torrents-details.php?id="]
        attribute: href
@@ -133,13 +167,15 @@
      size:
        selector: td:nth-child(5)
      seeders:
-        selector: td:nth-child(6)
-      leechers:
        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        text: now
      downloadvolumefactor:
        case:
-          img[title="freeleech"]: "0"
-          "*": "1"
+          img[title="freeleech"]: 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
--- a/src/Jackett.Common/Definitions/3evils.yml
+++ b/src/Jackett.Common/Definitions/3evils.yml
@@ -11,132 +11,142 @@
  caps:
    categorymappings:
      - {id: 65, cat: Books, desc: "Books"}
-      - {id: 27, cat: Console/NDS, desc: "Games/Nintendo-DS"}
-      - {id: 28, cat: Console/Other, desc: "Games/Switch"}
-      - {id: 42, cat: PC/Phone-Android, desc: "Mobile/Android"}
-      - {id: 44, cat: Movies/UHD, desc: "Movies/4K"}
-      - {id: 13, cat: Movies/BluRay, desc: "Movies/Bluray"}
-      - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
+      - {id: 11, cat: Movies/UHD, desc: "Movies/Encodes 2160p"}
+      - {id: 12, cat: Movies/UHD, desc: "Movies/Remux 2160p"}
+      - {id: 13, cat: Movies/HD, desc: "Movies/Remux 1080p"}
      - {id: 14, cat: Movies, desc: "Movies/Packs"}
-      - {id: 67, cat: Movies/HD, desc: "Movies/x264"}
-      - {id: 55, cat: Movies/HD, desc: "Movies/X265"}
-      - {id: 45, cat: Movies, desc: "Movies/Remux"}
-      - {id: 62, cat: Audio, desc: "Music/Audio"}
+      - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
+      - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
+      - {id: 33, cat: Audio, desc: "Music/Audio"}
      - {id: 32, cat: Audio, desc: "Music/Packs"}
      - {id: 6, cat: TV, desc: "TV/Packs"}
      - {id: 3, cat: TV/HD, desc: "TV/x264"}
      - {id: 4, cat: TV/HD, desc: "TV/x265"}
      - {id: 8, cat: TV/SD, desc: "TV/Xvid"}
-      - {id: 63, cat: PC/0day, desc: "Windows/Applications"}
+      - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
+      - {id: 42, cat: PC/Phone-Android, desc: "Appz/Android"}

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

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
+    path: takelogin.php
+    method: post
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      returnto: "/browse.php"
+      submitme: "X"
    error:
-      - selector: h2:contains("Login failed!")
-        message:
-          selector: table tr td.colhead2
+      - selector: div.callout:contains("Login failed!")
    test:
      path: /
-      selector: :has(a[href$="/logout.php?hash_please="])
+      selector: a[href*="/logout.php?hash_please="]

  search:
    paths:
-    # ttps://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
-    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=0
+    # https://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
+    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=1
      - path: browse.php
    inputs:
      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
      search: "{{.Keywords}}"
-      searchin: "title"
+      # title descr genre all
+      searchin: title
+      # 0 active 1 incldead 2 onlydead
      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
    rows:
-      selector: table.table-bordered tr:has(a[href^="browse.php?cat="])
+      selector: table.responsive-card-table tr:has(td[data-label])
      filters:
        - name: andmatch
    fields:
+      category:
+        selector: td[data-label="Type"] a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
      title:
-        selector: a[href^="details.php?id="] b
-      title:
-        # if this is available it is the full length title, as the one above can be abbreviated with ...
-        optional: true
-        selector: a[href^="details.php?id="][onmouseover]
+        selector: td[data-label="Name"] a[onmouseover]
        attribute: onmouseover
        filters:
          - name: regexp
            args: "Tip\\('<b>(.*?)</b>"
      details:
-        selector: a[href^="details.php?id="]
+        selector: td[data-label="Name"] a
        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
      download:
-        selector: a[href^="details.php?id="]
+        selector: td[data-label="Download"] a
        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
      banner:
-        selector: a[href^="details.php?id="][onmouseover]
+        selector: td[data-label="Name"] a[onmouseover]
        attribute: onmouseover
+        optional: true
        filters:
-            #  onmouseover="Tip('<b>blahblah /><img src=\'/imdb/images/0090293.jpg\' blahblah />');"
+            #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
+            # <img src=\'./pic/noposter.png\' 
          - name: regexp
-            args: "/imdb/(.*?).jpg"
-          - name: prepend
-            args: "/imdb/"
-          - name: append
-            args: ".jpg"
+            args: "src=\\\\\'(.+?)\\\\\'"
+          - name: replace
+            args: ["./pic/noposter.png", ""]
      size:
-        selector: td:nth-last-child(4)
+        selector: td[data-label="Size"]
      files:
-        selector: a[href^="filelist.php?id="]
+        selector: td[data-label="Files"]
      grabs:
-        selector: a[href^="snatches.php?id="]
+        selector: td[data-label="Snatched"]
        filters:
          - name: regexp
-            args: "(\\d+)"
+            args: (\d+)
      # 2 flavours of dates
      date:
-        # Today<br /> 10:20 AM
-        # Yesterday<br /> 08:03 PM
+        # Today<br> 10:20 AM
+        # Yesterday<br> 08:03 PM
        optional: true
-        selector: td:nth-last-child(5):contains("day")
+        selector: td[data-label="Added"]:contains("day")
      date:
-        # Feb 14 2019<br /> 10:20 AM
+        # Feb 14 2019<br> 10:20 AM
        optional: true
-        selector: td:nth-last-child(5):not(:contains("day"))
+        selector: td[data-label="Added"]:not(:contains("day"))
        filters:
          - name: dateparse
-            args: "Jan 2 2006 03:04 pm"
+            args: "Jan 2 2006 03:04 PM"
      seeders:
-        text: "0"
-      seeders:
-        optional: true
-        selector: a[href$="#seeders"]
+        selector: td[data-label="Seeders"]
      leechers:
-        text: "0"
-      leechers:
-        optional: true
-        selector: a[href$="#leechers"]
+        selector: td[data-label="Leechers"]
      downloadvolumefactor:
        case:
-          "b:contains(\"[FREE]\")": "0"
-          "*": "1"
+          img[src="./pic/freedownload.gif"]: 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
--- a/src/Jackett.Common/Definitions/4thd.yml
+++ b/src/Jackett.Common/Definitions/4thd.yml
@@ -0,0 +1,143 @@
+---
+  site: 4thd
+  name: 4thD
+  description: "4th Dimension is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  encoding: UTF-8
+  type: private
+  links:
+    - https://4thd.xyz/
+
+  caps:
+    categorymappings:
+      - {id: 38, cat: Movies, "Movie Pack"}
+      - {id: 36, cat: Movies, "Movies/Classic Films"}
+      - {id: 13, cat: Movies, "Movies/Documentary"}
+      - {id: 21, cat: Movies/Foreign, "Movies/Foreign"}
+      - {id: 27, cat: Movies/HD, "MoviesHD"}
+      - {id: 29, cat: Movies/SD, "Movies/SD"}
+      - {id: 26, cat: Movies/SD, "Movies/XviD"}
+      - {id: 41, cat: TV/FOREIGN, "Foreign tv"}
+      - {id: 40, cat: TV, "Mini-Series"}
+      - {id: 43, cat: TV/HD, "TV H265"}
+      - {id: 42, cat: TV, "TV Movie"}
+      - {id: 4, cat: TV/HD, "TV/HD-x720"}
+      - {id: 14, cat: TV, "TV/Packs"}
+      - {id: 2, cat: TV/SD, "TV/SD MP4/mkv"}
+      - {id: 31, cat: TV/SD, "TV/XviD"}
+      - {id: 18, cat: PC/Games, "Games/PC"}
+      - {id: 44, cat: Audio, "Music/Pack"}
+      - {id: 12, cat: Audio/Lossless, "Music/FLAC"}
+      - {id: 15, cat: Audio/MP3, "Music/MP3"}
+      - {id: 37, cat: Audio, "Radio"}
+      - {id: 9, cat: PC/0day, "Apps/PC"}
+      - {id: 34, cat: Audio/Audiobook, "Audiobooks"}
+      - {id: 25, cat: Books/Ebook, "eBooks"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-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: "time"
+      options:
+        "time": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login.php
+    method: form
+    form: form#loginform
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+    error:
+      - selector: form#loginform .warning
+    test:
+      path: index.php
+      selector: a[href^="logout.php?auth="]
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+    # https://4thd.xyz/torrents.php?order_by=time&order_way=desc&filter_freeleech=1&title=twilight+zone&search_type=1&taglist=&tags_type=0
+      $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+      order_by: "{{ .Config.sort }}"
+      order_way: "{{ .Config.type }}"
+      # 0 all 1 onlyfree
+      filter_freeleech: 0
+      title: "{{ .Keywords }}"
+      search_type: 1
+      taglist: ""
+      tags_type: 0
+
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+
+    fields:
+      category:
+        selector: td.cats_col div a
+        attribute: href
+        filters:
+          - name: regexp
+            args: \[(\d+)\]
+      title:
+        selector: a[href^="torrents.php?id="]
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.tags
+      banner:
+        selector: td:nth-child(2) script
+        optional: true
+        filters:
+          - name: regexp
+            args: "src=(.*?)>"
+          - name: re_replace
+            args: ["\\\\", ""]
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: replace
+            args: ["Never", "99 years ago"]
+      size:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          img[src$="/freedownload.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -107,6 +107,22 @@
    - name: pass
      type: password
      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeds": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

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

    rows:
      selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
@@ -199,11 +217,11 @@
            args: "02.01.2006 15:04:05"
      downloadvolumefactor:
        case:
-          img[alt="OU"]: "0"
-          img[alt="D/2"]: "0.5"
-          img[alt="D / 2"]: "0.5"
-          "*": "1"
+          img[alt="OU"]: 0
+          img[alt="D/2"]: 0.5
+          img[alt="D / 2"]: 0.5
+          "*": 1
      uploadvolumefactor:
        case:
-          img[alt="2xU"]: "2"
-          "*": "1"
+          img[alt="2xU"]: 2
+          "*": 1
--- a/src/Jackett.Common/Definitions/acgsou.yml
+++ b/src/Jackett.Common/Definitions/acgsou.yml
@@ -0,0 +1,91 @@
+---
+  site: acgsou
+  name: ACGsou
+  description: "ACGsou is a CHINESE Public torrent tracker for ANIME"
+  language: zh-cn
+  type: public
+  followredirect: true
+  encoding: UTF-8
+  links:
+    - https://www.acgsou.com/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: TV/Anime, desc: "动画 (Anime)"}
+      - {id: 7, cat: TV/Anime, desc: "新番连载 (Anime New Fan Series)"}
+      - {id: 8, cat: TV/Anime, desc: "动画合集 (Anime Collection)"}
+      - {id: 14, cat: TV/Anime, desc: "英译动画 (Anime English Translation)"}
+      - {id: 5, cat: TV/Anime, desc: "RAW片源"}
+      - {id: 3, cat: Books/Comics, desc: "漫画 (Manga)"}
+      - {id: 12, cat: Books/Comics, desc: "港台漫画 (Manga Hong Kong and Taiwan)"}
+      - {id: 13, cat: Books/Comics, desc: "原版日漫 (Manga Original Japanese)"}
+      - {id: 16, cat: Books/Comics, desc: "英译漫画 (Manga English Translation)"}
+      - {id: 4, cat: Audio, desc: "动漫音乐 (Anime Music)"}
+      - {id: 15, cat: Audio/Video, desc: "音乐视频 (Music Video)"}
+      - {id: 20, cat: TV, desc: "日剧 (Drama Japanese)"}
+      - {id: 21, cat: TV, desc: "特摄片 (Drama Special)"}
+      - {id: 22, cat: TV, desc: "原版日剧 (Drama Original Japanese)"}
+      - {id: 23, cat: TV, desc: "英译日剧 (Drama English Translation)"}
+      - {id: 18, cat: PC/Games, desc: "游戏 (Games)"}
+      - {id: 6, cat: Other, desc: "其他资源 (Other)"}
+      - {id: 17, cat: Other, desc: "写真集 (Photobook)"}
+      - {id: 19, cat: Other, desc: "图集 (Atlas)"}
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    paths:
+    # https://www.acgsou.com/1.html
+    # https://www.acgsou.com/search.php?keyword=test
+      - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{else}}1.html{{end}}"
+    rows:
+      selector: table tbody tr[class^="alt"]:has(td:nth-child(3) a)
+    fields:
+      date:
+        selector: td:nth-child(1):contains("昨天")
+        optional: true
+        filters:
+          - name: replace
+            args: ["昨天", "Yesterday"]
+      date:
+        selector: td:nth-child(1):contains(":"):not(:contains("昨天"))
+        optional: true
+        filters:
+          - name: dateparse
+            args: "01/02 15:04"
+      date:
+        selector: td:nth-child(1):not(:contains(":"))
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006/01/02"
+      category:
+        selector: td:nth-child(2) a
+        attribute: href
+        filters:
+          - name: regexp
+            args: "sort-(\\d+)-1.html"
+      title:
+        selector: td:nth-child(3) a
+      details:
+        selector: td:nth-child(3) a
+        attribute: href
+      download:
+        selector: td:nth-child(3) a
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -53,6 +53,30 @@
      tv-search: [q, season, ep]
      movie-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: "0"
+      options:
+        "0": "created"
+        "6": "seeders"
+        "4": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: takelogin.php
    method: post
@@ -81,8 +105,14 @@
      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
    rows:
      selector: table tbody#torrent_background tr:has(a.index)
+      filters:
+        - name: andmatch
+
    fields:
      title:
        selector: a.index
--- a/src/Jackett.Common/Definitions/alein.yml
+++ b/src/Jackett.Common/Definitions/alein.yml
@@ -40,7 +40,6 @@
      - {id: 24, cat: PC/Phone-Other, desc: "Mobile-GSM"}
      - {id: 23, cat: TV/Sport, desc: "Sport"}

-
    modes:
      search: [q]
      tv-search: [q, season, ep]
@@ -53,6 +52,22 @@
    - name: password
      type: password
      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "3"
+      options:
+        "3": "created"
+        "5": "seeders"
+        "4": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"

  login:
    path: index.php?page=login
@@ -65,17 +80,20 @@
      - selector: td.lista span[style="color:#FF0000;"]
    test:
      path: /
-      selector: :has(a[href="logout.php"])
+      selector: a[href="logout.php"]

  search:
    paths:
-    # http://alein.org/index.php?page=torrents&category=1%3B15%3B41%3B14%3B48%3B39%3B20%3B16%3B5%3B21%3B22%3B11&search=venom&active=1
+      # http://alein.org/index.php?page=torrents&category=1;15;41;14;48;39;20;16;5;21;22;11&search=venom&active=1
      - path: index.php
    inputs:
-      page: "torrents"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      search: "{{if .Keywords }}{{.Keywords}}{{else}}{{end}}"
-      active: "1"
+      page: torrents
+      category: "{{ range .Categories }}{{.}};{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 all 1 active only 2 dead only
+      active: 0
+      order: "{{ .Config.sort }}"
+      by: "{{ .Config.type }}"

    rows:
      selector: tr.trclass:not(:has(td.lista-cat-rec))
@@ -100,7 +118,7 @@
          - name: prepend
            args: "download.php?id="
          - name: append
-            args: "&f={{.Result.title}}.torrent"
+            args: "&f={{ .Result.title }}.torrent"
      banner:
        selector: td a[href*="id="]
        attribute: onmouseover
@@ -121,6 +139,7 @@
          - name: dateparse
            args: "02/01/2006"
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
+  
--- a/src/Jackett.Common/Definitions/alexfilm.yml
+++ b/src/Jackett.Common/Definitions/alexfilm.yml
@@ -0,0 +1,155 @@
+---
+  site: alexfilm
+  name: AlexFilm
+  description: "AlexFilm is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://alexfilm.org/
+  legacylinks:
+    - https://alexfilm.cc/
+  certificates:
+    - 9200e15406272061df1f609a0f40d76282f54295 # expired 30 nov '19
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "1"
+      options:
+        "1": "created"
+        "10": "seeders"
+        "7": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "1"
+      options:
+        "2": "desc"
+        "1": "asc"
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      "login_username": "{{ .Config.username }}"
+      "login_password": "{{ .Config.password }}"
+      autologin: 1
+      login: "Log in"
+    error:
+      - selector: div.bg-danger
+    test:
+      path: tracker.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+        method: post
+    inputs:
+      prev_allw: 1
+      prev_a: 0
+      prev_dla: 0
+      prev_dlc: 0
+      prev_dld: 0
+      prev_dlw: 0
+      prev_my: 0
+      prev_new: 0
+      prev_sd: 0
+      prev_da: 1
+      prev_dc: 0
+      prev_df: 1
+      prev_ds: 0
+      prev_tor_type: 0
+      # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+      o: "{{ .Config.sort }}"
+      # 1=asc 2=desc
+      s: "{{ .Config.type }}"
+      # show category
+      dc: 0
+      # show forum
+      df: 1
+      # show author
+      da: 1
+      # show speed
+      ds: 0
+      # -1=all time
+      tm: -1
+      # seed not seen -1=disregard
+      sns: -1
+      # group releases -1=not selected
+      srg: -1
+      nm: "{{ .Keywords }}"
+      # find a username
+      pn: ""
+      # despite the all words flag the search engine returns anywords matching.
+      allw: 1
+
+    rows:
+      selector: tr[id^="tor_"]
+    fields:
+      title:
+        selector: td a.tLink
+        filters:
+          - name: re_replace
+            args: ["[\\/]+", ""]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: re_replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)\\s+[CСcс]ери[ия]\\s+(\\d+)[\\-](\\d+)\\s+\\((\\d+)\\)(.*)", "$1 S$2E$3-$4 rus $6"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+      details:
+        selector: td a.tLink
+        attribute: href
+      download:
+        selector: li a
+        attribute: href
+      category:
+        text: 1
+      seeders:
+        selector: td:nth-child(3) u
+      leechers:
+        selector: td:nth-child(4) u
+      size:
+        selector: td:nth-child(5) u
+      date:
+        selector: td:nth-child(6) u
+      grabs:
+        selector: td:nth-child(6) span:nth-last-child(1)
+      downloadvolumefactor:
+        case:
+          img[src="./styles/images/tor_gold.gif"]: "0"
+          img[src="./styles/images/tor_silver.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -21,111 +21,92 @@
      type: info
      label: "Search results"
      default: "Set <b>Exibição De Torrents</b> to <b>Lista</b> in your <b>Minhas Configurações</b>.<br />Using <b>Capas</b> is not supported and will return 0 results."
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "id"
+      options:
+        "id": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  caps:
    categorymappings:
      - {id: 107, cat: XXX, desc: "Adultos: Gay"}
+      - {id: 75, cat: XXX, desc: "Adultos: Hentai"}
      - {id: 108, cat: XXX, desc: "Adultos: Transex/Female"}
      - {id: 74, cat: XXX, desc: "Adultos: XXX"}
-      - {id: 75, cat: XXX, desc: "Adultos: Hentai"}
      - {id: 69, cat: TV/Anime, desc: "Anime: Anime"}
-      - {id: 21, cat: PC/0day, desc: "Aplicativos: Windows"}
-      - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"}
+      - {id: 116, cat: TV/Anime, desc: "Anime: Filmes"}
+      - {id: 118, cat: TV/Anime, desc: "Anime: Séries"}
      - {id: 23, cat: PC/Phone-Android, desc: "Aplicativos: Android"}
-      - {id: 25, cat: PC, desc: "Aplicativos: Linux"}
-      - {id: 26, cat: PC/Phone-IOS, desc: "Aplicativos: iPhone"}
      - {id: 27, cat: PC/Phone-IOS, desc: "Aplicativos: iPad"}
+      - {id: 26, cat: PC/Phone-IOS, desc: "Aplicativos: iPhone"}
      - {id: 28, cat: PC/Phone-IOS, desc: "Aplicativos: iPod"}
-      - {id: 71, cat: Books, desc: "Apostila: Cursos"}
+      - {id: 25, cat: PC, desc: "Aplicativos: Linux"}
+      - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"}
+      - {id: 21, cat: PC/0day, desc: "Aplicativos: Windows"}
      - {id: 72, cat: Books, desc: "Apostila: Apostila"}
+      - {id: 71, cat: Books, desc: "Apostila: Cursos"}
+      - {id: 121, cat: Audio/Audiobook, desc: "Ebook: Audio-book"}
+      - {id: 112, cat: Books, desc: "Ebook: HQs"}
      - {id: 67, cat: Books, desc: "Ebook: Livros"}
      - {id: 68, cat: Books, desc: "Ebook: Revistas"}
-      - {id: 85, cat: Movies, desc: "Filmes: Guerra"}
-      - {id: 81, cat: Movies, desc: "Filmes: Musical"}
-      - {id: 17, cat: Movies, desc: "Filmes: Biografia"}
-      - {id: 16, cat: Movies, desc: "Filmes: Esportes"}
-      - {id: 15, cat: Movies, desc: "Filmes: Ficção"}
-      - {id: 14, cat: Movies, desc: "Filmes: Infantil"}
-      - {id: 13, cat: Movies, desc: "Filmes: Nacionais"}
-      - {id: 12, cat: Movies, desc: "Filmes: Policial"}
-      - {id: 11, cat: Movies, desc: "Filmes: Religioso"}
-      - {id: 10, cat: Movies, desc: "Filmes: Suspense"}
-      - {id: 9, cat: Movies, desc: "Filmes: Western"}
-      - {id: 8, cat: Movies, desc: "Filmes: Animação"}
-      - {id: 7, cat: Movies, desc: "Filmes: Clássicos"}
-      - {id: 6, cat: Movies, desc: "Filmes: Comédia"}
-      - {id: 5, cat: Movies, desc: "Filmes: Documentário"}
-      - {id: 4, cat: Movies, desc: "Filmes: Drama"}
-      - {id: 3, cat: Movies, desc: "Filmes: Romance"}
-      - {id: 2, cat: Movies, desc: "Filmes: Terror"}
-      - {id: 1, cat: Movies, desc: "Filmes: Ação"}
-      - {id: 80, cat: Movies, desc: "Filmes: Aventura"}
+      - {id: 119, cat: Movies, desc: "Filmes:"}
      - {id: 70, cat: XXX, desc: "Fotos: XXX"}
-      - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"}
-      - {id: 47, cat: PC/Games, desc: "Jogos: Pc"}
+      - {id: 57, cat: Console, desc: "Jogos: Android"}
+      - {id: 52, cat: Console, desc: "Jogos: Dreamcast"}
+      - {id: 109, cat: Console, desc: "Jogos: Emulação"}
      - {id: 61, cat: Console, desc: "Jogos: Emuladores e Roms"}
      - {id: 48, cat: PC/Mac, desc: "Jogos: Mac"}
+      - {id: 58, cat: Console/NDS, desc: "Jogos: Nintendo DS"}
+      - {id: 110, cat: Console, desc: "Jogos: Nintendo Switch"}
+      - {id: 47, cat: PC/Games, desc: "Jogos: Pc"}
      - {id: 49, cat: Console, desc: "Jogos: Ps1"}
      - {id: 50, cat: Console, desc: "Jogos: Ps2"}
      - {id: 51, cat: Console/PS3, desc: "Jogos: Ps3"}
-      - {id: 52, cat: Console, desc: "Jogos: Dreamcast"}
-      - {id: 54, cat: Console/Xbox 360, desc: "Jogos: X360"}
-      - {id: 56, cat: Console/Xbox, desc: "Jogos: Xbox"}
-      - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"}
-      - {id: 58, cat: Console/NDS, desc: "Jogos: Nintendo DS"}
-      - {id: 111, cat: Console, desc: "Jogos: Nintendo Swich"}
-      - {id: 110, cat: Console, desc: "Jogos: Nintendo Switch"}
-      - {id: 57, cat: Console, desc: "Jogos: Android"}
+      - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"}
      - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"}
+      - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"}
+      - {id: 54, cat: Console/Xbox 360, desc: "Jogos: Xbox360"}
+      - {id: 56, cat: Console/Xbox, desc: "Jogos: Xbox"}
      - {id: 78, cat: Console/Xbox One, desc: "Jogos: Xbox One"}
      - {id: 29, cat: Audio, desc: "Musica: Axé"}
-      - {id: 30, cat: Audio, desc: "Musica: Eletronica"}
-      - {id: 31, cat: Audio, desc: "Musica: Funk"}
-      - {id: 32, cat: Audio, desc: "Musica: Pagode"}
-      - {id: 33, cat: Audio, desc: "Musica: Hip-Hop"}
-      - {id: 34, cat: Audio, desc: "Musica: Rap"}
-      - {id: 36, cat: Audio, desc: "Musica: Rock"}
-      - {id: 37, cat: Audio, desc: "Musica: Hard Rock"}
      - {id: 38, cat: Audio, desc: "Musica: Blues"}
      - {id: 39, cat: Audio, desc: "Musica: Dance"}
-      - {id: 40, cat: Audio, desc: "Musica: Dicografia"}
+      - {id: 40, cat: Audio, desc: "Musica: Discografia"}
+      - {id: 43, cat: Audio, desc: "Musica: Dubstep"}
      - {id: 41, cat: Audio, desc: "Musica: Erudita"}
      - {id: 42, cat: Audio, desc: "Musica: Forró"}
-      - {id: 43, cat: Audio, desc: "Musica: Dubstep"}
-      - {id: 46, cat: Audio, desc: "Musica: Sertanejo"}
-      - {id: 45, cat: Audio, desc: "Musica: Samba"}
-      - {id: 77, cat: Audio, desc: "Musica: Outros"}
-      - {id: 76, cat: Audio, desc: "Musica: Reggae"}
-      - {id: 83, cat: Audio, desc: "Musica: Gospel"}
+      - {id: 31, cat: Audio, desc: "Musica: Funk"}
      - {id: 84, cat: Audio, desc: "Musica: Game (OST)"}
-      - {id: 88, cat: TV, desc: "Series: Musical"}
-      - {id: 86, cat: TV, desc: "Series: Guerra"}
-      - {id: 105, cat: TV, desc: "Series: Biografia"}
-      - {id: 99, cat: TV/Sport, desc: "Series: Esportes"}
-      - {id: 103, cat: TV, desc: "Series: Ficção"}
-      - {id: 102, cat: TV, desc: "Series: Infantil"}
-      - {id: 89, cat: TV, desc: "Series: Nacionais"}
-      - {id: 100, cat: TV, desc: "Series: Policial"}
-      - {id: 98, cat: TV, desc: "Series: Religioso"}
-      - {id: 90, cat: TV, desc: "Series: Suspense"}
-      - {id: 91, cat: TV, desc: "Series: Western"}
-      - {id: 92, cat: TV, desc: "Series: Animação"}
-      - {id: 93, cat: TV, desc: "Series: Clássicos"}
-      - {id: 94, cat: TV, desc: "Series: Comédia"}
-      - {id: 95, cat: TV/Documentary, desc: "Series: Documentário"}
-      - {id: 96, cat: TV, desc: "Series: Drama"}
-      - {id: 97, cat: TV, desc: "Series: Romance"}
-      - {id: 101, cat: TV, desc: "Series: Terror"}
-      - {id: 104, cat: TV, desc: "Series: Ação"}
-      - {id: 24, cat: TV, desc: "Series: Cartoon"}
-      - {id: 19, cat: TV/HD, desc: "Series: HD"}
-      - {id: 20, cat: TV, desc: "Series: Seriados"}
-      - {id: 87, cat: TV, desc: "Series: Aventura"}
+      - {id: 83, cat: Audio, desc: "Musica: Gospel"}
+      - {id: 37, cat: Audio, desc: "Musica: Hard Rock"}
+      - {id: 33, cat: Audio, desc: "Musica: Hip-Hop"}
+      - {id: 114, cat: Audio, desc: "Musica: MPB"}
+      - {id: 77, cat: Audio, desc: "Musica: Outros"}
+      - {id: 32, cat: Audio, desc: "Musica: Pagode"}
+      - {id: 115, cat: Audio, desc: "Musica: POP"}
+      - {id: 34, cat: Audio, desc: "Musica: Rap"}
+      - {id: 76, cat: Audio, desc: "Musica: Reggae"}
+      - {id: 36, cat: Audio, desc: "Musica: Rock"}
+      - {id: 45, cat: Audio, desc: "Musica: Samba"}
+      - {id: 46, cat: Audio, desc: "Musica: Sertanejo"}
+      - {id: 120, cat: TV, desc: "Series:"}
      - {id: 65, cat: TV, desc: "Shows: Show"}
      - {id: 63, cat: TV, desc: "Tv: Aberta"}
      - {id: 62, cat: TV/Sport, desc: "Tv: Esportes"}
      - {id: 64, cat: TV, desc: "Tv: Fechada"}
      - {id: 73, cat: TV, desc: "Video Aula: Video Aula"}
+      - {id: 999, cat: Other, desc: "Error Cat not Found"}

    modes:
      search: [q]
@@ -138,7 +119,7 @@
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      remember: "yes"
+      remember: yes
    error:
      - selector: div.alert-error
    test:
@@ -167,32 +148,51 @@
        inputs:
          page: 4
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
      incldead: 1
      freeleech: 0
      lang: 0
-      sort: "id"
-      order: "desc"
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"
+    keywordsfilters:
+      - name: re_replace
+        args: ["([12][0-9]{3})", ""]
    rows:
-      selector: table > tbody > tr:has(a[href^="torrents-details.php?id="])
+      selector: div#fancy-list-group ul.list-group li.list-group-item
    fields:
+      _quality:
+        selector: div.list-group-item-content p.m-0 span.badge-primary:contains("1080p"), div.list-group-item-content p.m-0 span.badge-primary:contains("720p"), div.list-group-item-content p.m-0 span.badge-primary:contains("4k")
+        optional: true
+      _year:
+        selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#246AB6;"]
+        optional: true
+      _type:
+        selector: div.list-group-item-content p.m-0 span.badge-info:contains("Rip"), div.list-group-item-content p.m-0 span.badge-info:contains("WEB-"), div.list-group-item-content p.m-0 span.badge-info:contains("TV"), div.list-group-item-content p.m-0 span.badge-info:contains("Blu-Ray"), div.list-group-item-content p.m-0 span.badge-info:contains("BD50"), div.list-group-item-content p.m-0 span.badge-info:contains("MUX"), div.list-group-item-content p.m-0 span.badge-info:contains("DVD"), div.list-group-item-content p.m-0 span.badge-info:contains("320"), div.list-group-item-content p.m-0 span.badge-info:contains("CAM"), div.list-group-item-content p.m-0 span.badge-info:contains("rip")
+        optional: true
      title:
        selector: a[href^="torrents-details.php?id="]
+        filters:
+            # strip out the non-english title [to the left of the brackets] and drop the brackets enclosing the english title
+          - name: re_replace
+            args: ["^(.*?)[\\(](.*?)[\\)](.*?)$", "$2$3"]
+            # add the year to the title
+          - name: append
+            args: "{{if .Result._year}} {{.Result._year}}{{else}}{{end}}"
+            # add the quality to the title
+          - name: append
+            args: "{{if .Result._quality}} {{.Result._quality}}{{else}}{{end}}"
+            # add the type to the title
+          - name: append
+            args: "{{if .Result._type}} {{.Result._type}}{{else}}{{end}}"
      details:
        selector: a[href^="torrents-details.php?id="]
        attribute: href
      download:
        selector: a[href^="download.php?id="]
        attribute: href
-      banner:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: title
-        filters:
-          - name: regexp
-            args: "src=\"(.*?)\""
      category:
-        selector: td:first-child img
+        selector: div.list-group-item-addon img
        attribute: src
        case:
        # unfortunately the site does not have category numbers on the results page, just a .png which can apply to both movies and tv.
@@ -212,102 +212,77 @@
         "[src$=\"/Apostila.png\"]": "72"
         "[src$=\"/E-books.png\"]": "67"
         "[src$=\"/Revista.png\"]": "68"
-         "[src$=\"/Aventura.png\"]": "80"
+         "[src$=\"/HQ.png\"]": "112"
+         "[src$=\"/Filmes.png\"]": "119"
         "[src$=\"/Revistas-XXX.png\"]": "70"
-         "[src$=\"/Jogos-Ps4.png\"]": "79"
+         "[src$=\"/PS4.png\"]": "79"
         "[src$=\"/Jogos-PC.png\"]": "47"
-         "[src$=\"/Jogos-EmuladoreseRoms.png\"]": "61"
+         "[src$=\"/Emulador.png\"]": "61"
+         "[src$=\"/Emulacao.png\"]": "109"
         "[src$=\"/Jogos-Mac.png\"]": "48"
-         "[src$=\"/Jogos-Ps1.png\"]": "49"
-         "[src$=\"/Jogos-Ps2.png\"]": "50"
-         "[src$=\"/Jogos-Ps3.png\"]": "51"
+         "[src$=\"/Jogos-PS1.png\"]": "49"
+         "[src$=\"/Jogos-PS2.png\"]": "50"
+         "[src$=\"/Jogos-PS3.png\"]": "51"
         "[src$=\"/Jogos-Dreamcast.png\"]": "52"
-         "[src$=\"/ogos-X360.png\"]": "54"
-         "[src$=\"/Jogos-Xbox.png\"]": "55"
-         "[src$=\"/Jogos-Wii.png\"]": "56"
-         "[src$=\"/Jogos-NintendoDS.png\"]": "58"
-         "[src$=\"/Jogos-Android.png\"]": "57"
+         "[src$=\"/Jogos-Xbox360.png\"]": "54"
+         "[src$=\"/Jogos-Xbox.png\"]": "56"
+         "[src$=\"/Jogos-Wii.png\"]": "55"
+         "[src$=\"/Jogos-DS.png\"]": "58"
+         "[src$=\"/jogosandroid.png\"]": "57"
         "[src$=\"/Jogos-PSP.png\"]": "82"
+         "[src$=\"/Jogos-NS.png\"]": "110"
         "[src$=\"/Jogos-XboxOne.png\"]": "78"
         "[src$=\"/Axe.png\"]": "29"
-         "[src$=\"/Electronica.png\"]": "30"
         "[src$=\"/Funk.png\"]": "31"
         "[src$=\"/Pagode.png\"]": "32"
-         "[src$=\"/Hip-Hop.png\"]": "33"
+         "[src$=\"/HIP_HOP.png\"]": "33"
         "[src$=\"/Rap.png\"]": "34"
         "[src$=\"/Rock.png\"]": "36"
         "[src$=\"/Hard-Rock.png\"]": "37"
         "[src$=\"/Blues.png\"]": "38"
         "[src$=\"/Dance.png\"]": "39"
-         "[src$=\"/Dicografia.png\"]": "40"
+         "[src$=\"/Discografia.png\"]": "40"
         "[src$=\"/Erudita.png\"]": "41"
         "[src$=\"/Forro.png\"]": "42"
         "[src$=\"/Dubstep.png\"]": "43"
         "[src$=\"/Sertanejo.png\"]": "46"
         "[src$=\"/Samba.png\"]": "45"
-         "[src$=\"/Outros.png\"]": "77"
+         "[src$=\"/Musica-Outros.png\"]": "77"
         "[src$=\"/Reggae.png\"]": "76"
         "[src$=\"/Gospel.png\"]": "83"
-         "[src$=\"/Game-OST.png\"]": "84"
-         "[src$=\"/Musical.png\"]": "88"
-         "[src$=\"/Guerra.png\"]": "86"
-         "[src$=\"/Biografia.png\"]": "105"
-         "[src$=\"/Esportes.png\"]": "99"
-         "[src$=\"/Ficcao.png\"]": "103"
-         "[src$=\"/Infantil.png\"]": "102"
-         "[src$=\"/Nacionais.png\"]": "89"
-         "[src$=\"/Policial.png\"]": "100"
-         "[src$=\"/Religioso.png\"]": "98"
-         "[src$=\"/Suspense.png\"]": "90"
-         "[src$=\"/Western.png\"]": "91"
-         "[src$=\"/Animacao.png\"]": "92"
-         "[src$=\"/Classicos.png\"]": "93"
-         "[src$=\"/Comedia.png\"]": "94"
-         "[src$=\"/Documentario.png\"]": "95"
-         "[src$=\"/Drama.png\"]": "96"
-         "[src$=\"/Romance.png\"]": "97"
-         "[src$=\"/Terror.png\"]": "101"
-         "[src$=\"/Acao.png\"]": "104"
-         "[src$=\"/Cartoon.png\"]": "24"
-         "[src$=\"/Serieshd.png\"]": "19"
-         "[src$=\"/Seriado.png\"]": "20"
-         "[src$=\"/Aventura.png\"]": "87"
+         "[src$=\"/POP.png\"]": "115"
+         "[src$=\"/MPB.png\"]": "114"
+         "[src$=\"/OST.png\"]": "84"
+         "[src$=\"/Seriados.png\"]": "120"
         "[src$=\"/Shows.png\"]": "65"
         "[src$=\"/Aberta.png\"]": "63"
-         "[src$=\"/Esportes.png\"]": "62"
+         "[src$=\"/Esporte.png\"]": "62"
         "[src$=\"/Fechada.png\"]": "64"
         "[src$=\"/Videoaula.png\"]": "73"
-         "[src$=\"/Guerra.png\"]": "85"
-         "[src$=\"/Musical.png\"]": "81"
-         "[src$=\"/Biografia.png\"]": "17"
-         "[src$=\"/Esportes.png\"]": "16"
-         "[src$=\"/Ficcao.png\"]": "15"
-         "[src$=\"/Infantil.png\"]": "14"
-         "[src$=\"/Nacionais.png\"]": "13"
-         "[src$=\"/Policial.png\"]": "12"
-         "[src$=\"/Religioso.png\"]": "11"
-         "[src$=\"/Suspense.png\"]": "10"
-         "[src$=\"/Western.png\"]": "9"
-         "[src$=\"/Animacao.png\"]": "8"
-         "[src$=\"/Classicos.png\"]": "7"
-         "[src$=\"/Comedia.png\"]": "6"
-         "[src$=\"/Documentario.png\"]": "5"
-         "[src$=\"/Drama.png\"]": "4"
-         "[src$=\"/Romance.png\"]": "3"
-         "[src$=\"/Terror.png\"]": "2"
-         "[src$=\"/Acao.png\"]": "1"
      date:
        text: now
+      date:
+        selector: p:contains("Lançado:")
+        optional: true
+        filters:
+          - name: regexp
+            args: "Lançado: (.+?)$"
+          - name: re_replace
+            args: [" (\\d:)", " 0$1"]
+          - name: dateparse
+            args: "02/01/06 15:04:05"
      size:
-        selector: td:nth-child(2) span.badge-info
+        selector: div.list-group-item-content p.m-0 span.badge-info
      seeders:
-        selector: td:nth-child(4)
+        selector: div.list-group-item-controls a:nth-child(1)
      leechers:
-        selector: td:nth-child(5)
+        selector: div.list-group-item-controls a:nth-child(2)
+      grabs:
+        selector: div.list-group-item-controls a:nth-child(3)
      downloadvolumefactor:
        case:
-          "span.badge-success:contains(\"FREE\")": "0"
-          "*": "1"
+          "span.badge-success:contains(\"FREE\")": 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
--- a/src/Jackett.Common/Definitions/anidex.yml
+++ b/src/Jackett.Common/Definitions/anidex.yml
@@ -26,6 +26,7 @@
      - {id: 14, cat: TV/Anime, desc: "Pictures"}
      - {id: 15, cat: TV/Anime, desc: "Adult Video"}
      - {id: 16, cat: TV/Anime, desc: "Other"}
+
    modes:
      search: [q]
      tv-search: [q, season, ep]
@@ -38,13 +39,31 @@
      type: info
      label: Language ID Note
      default: "You can filter your searches using any of the following language ID (comma delimited):<br>19 :Arabic<br>22 :Bengali<br>14 :Bulgarian<br>21 :Chinese (Simplified)<br>24 :Czech<br>20 :Danish<br>5 :Dutch<br>1 :English<br>11 :Finnish<br>10 :French<br>8 :German<br>13 :Greek<br>9 :Hungarian<br>27 :Indonesian<br>6 :Italian<br>2 :Japanese<br>28 :Korean<br>31 :Malaysian<br>25 :Mongolian<br>30 :Persian<br>3 :Polish<br>16 :Portuguese (Brazil)<br>17 :Portuguese (Portugal)<br>23 :Romanian<br>7 :Russian<br>4 :Serbo-Croatian<br>29 :Spanish (LATAM)<br>15 :Spanish (Spain)<br>18 :Swedish<br>26 :Turkish<br>12 :Vietnamese"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "upload_timestamp"
+      options:
+        "upload_timestamp": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "filename": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  search:
    paths:
    # https://anidex.info/?page=search&id=1,2,3&lang_id=5,1,10&group_id=0&q=rinshi
-      - path: "?page=search&id={{if .Categories}}{{range .Categories}}{{.}},{{end}}{{else}}0{{end}}{{if .Config.lang-id}}&lang_id={{.Config.lang-id}}{{else}}{{end}}&group_id=0&q={{if .Keywords}}{{.Keywords}}{{else}}{{end}}"
+      - path: "?page=search&id={{ if .Categories }}{{ range .Categories }},{{.}}{{end}}{{else}}0{{end}}{{ if .Config.lang-id }}&lang_id={{ .Config.lang-id }}{{else}}{{end}}&group_id=0&q={{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}&s={{ .Config.sort }}&o={{ .Config.type }}"
+
    rows:
      selector: div.table-responsive > table > tbody > tr
+
    fields:
      category:
        selector: a[href^="/?id="]
@@ -83,6 +102,6 @@
      grabs:
        selector: td:nth-child(11)
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/aox.yml
+++ b/src/Jackett.Common/Definitions/aox.yml
@@ -1,106 +0,0 @@
---
-  site: aox
-  name: AOX
-  description: "AOX (Chippu) is a Private Torrent Tracker for ASIAN MOVIES / TV"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://aox.to/
-
-  caps:
-    categorymappings:
-      - {id: 13, cat: Movies, desc: "Movie"}
-      - {id: 11, cat: TV, desc: "TV-Show"}
-      - {id: 5, cat: TV/Other, desc: "Variety Show"}
-      - {id: 24, cat: XXX, desc: "Adult"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: index.php?page=login
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: body[onLoad^="makeAlert('"]
-        message:
-          selector: body[onLoad^="makeAlert('"]
-          attribute: onLoad
-          filters:
-            - name: replace
-              args: ["makeAlert('Error' , '", ""]
-            - name: replace
-              args: ["');", ""]
-    test:
-      path: index.php
-
-  search:
-    paths:
-      - path: index.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      page: "torrents"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      options: "0"
-      active: "0"
-    rows:
-      selector: table.table.table-bordered > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-    fields:
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      title:
-        selector: a[title][href^="index.php?page=torrent-details&id="]
-      banner:
-        selector: img[src^="torrentimg/"]
-        attribute: src
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: a[title][href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: p:has(b:contains("Size:"))
-        remove: b
-      date:
-        selector: p:has(b:contains("Added:"))
-        remove: b
-        filters:
-          - name: replace
-            args: ["@ ", ""]
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "01/02/2006 15:04:05 -07:00"
-      seeders:
-        selector: b:contains("Seeds:") + a
-      leechers:
-        selector: b:contains("Leechers:") + a
-      grabs:
-        selector: p:has(b:contains("Complete:"))
-        remove: b, a[href^="index.php?page=peers"]
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      downloadvolumefactor:
-        case:
-          i.fa-star: "0"
-          i.fa-star-half-o: "0.5"
-          i.fa-star-o: "0.75"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          span[title="2x Upload Multiplier"]: "2"
-          "*": "1"
-      description:
-        selector: p:has(b:contains("Language:"))
-       
-        
--- a/src/Jackett.Common/Definitions/arenabg.yml
+++ b/src/Jackett.Common/Definitions/arenabg.yml
@@ -12,53 +12,54 @@
    categorymappings:
      - {id: "movies", cat: Movies, desc: "Movies"}
      - {id: "arenabgtv", cat: Movies, desc: "Movies / ArenaBG.TV"}
-      - {id: "xvid", cat: Movies, desc: "Movies / XviD"}
-      - {id: "dvd-r", cat: Movies, desc: "Movies / DVD-R"}
-      - {id: "x264", cat: Movies, desc: "Movies / x264"}
-      - {id: "animemanga", cat: Movies, desc: "Movies / Anime &amp; Manga"}
-      - {id: "documentaries", cat: Movies, desc: "Movies / Documentaries"}
-      - {id: "blu-ray", cat: Movies, desc: "Movies / Blu-ray"}
+      - {id: "xvid", cat: Movies/SD, desc: "Movies / XviD"}
+      - {id: "dvd-r", cat: Movies/DVD, desc: "Movies / DVD-R"}
+      - {id: "x264", cat: Movies/HD, desc: "Movies / x264"}
+      - {id: "animemanga", cat: TV/Anime, desc: "Movies / Anime & Manga"}
+      - {id: "documentaries", cat: TV/Documentary, desc: "Movies / Documentaries"}
+      - {id: "blu-ray", cat: Movies/BluRay, desc: "Movies / Blu-ray"}
      - {id: "boxset", cat: Movies, desc: "Movies / Boxset"}
-      - {id: "x264boxset", cat: Movies, desc: "Movies / x264 Boxset"}
-      - {id: "tvepisodeshd", cat: Movies, desc: "Movies / HDTV"}
-      - {id: "3d", cat: Movies, desc: "Movies / 3D"}
-      - {id: "movies-hd", cat: Movies, desc: "Movies / Movies HD"}
-      - {id: "x265", cat: Movies, desc: "Movies / x265"}
+      - {id: "x264boxset", cat: Movies/HD, desc: "Movies / x264 Boxset"}
+      - {id: "tvepisodeshd", cat: Movies/HD, desc: "Movies / HDTV"}
+      - {id: "3d", cat: Movies/3D, desc: "Movies / 3D"}
+      - {id: "movies-hd", cat: Movies/HD, desc: "Movies / Movies HD"}
+      - {id: "x265", cat: Movies/HD, desc: "Movies / x265"}
+      - {id: "4k", cat: Movies/UHD, desc: "Movies / 4K"}
      - {id: "series", cat: TV, desc: "Series"}
-      - {id: "hdtv", cat: TV, desc: "Series / TV Episodes HD"}
+      - {id: "hdtv", cat: TV/HD, desc: "Series / TV Episodes HD"}
      - {id: "tvepisodes", cat: TV, desc: "Series / TV Episodes"}
      - {id: "tvboxset", cat: TV, desc: "Series / TV Boxset"}
-      - {id: "tvboxsethd", cat: TV, desc: "Series / TV Boxset HD"}
+      - {id: "tvboxsethd", cat: TV/HD, desc: "Series / TV Boxset HD"}
      - {id: "music", cat: Audio, desc: "Music"}
-      - {id: "mp3", cat: Audio, desc: "Music / MP3"}
-      - {id: "music-video", cat: Audio, desc: "Music / Video"}
-      - {id: "flac", cat: Audio, desc: "Music / FLAC"}
+      - {id: "mp3", cat: Audio/MP3, desc: "Music / MP3"}
+      - {id: "music-video", cat: Audio/Video, desc: "Music / Video"}
+      - {id: "flac", cat: Audio/Lossless, desc: "Music / FLAC"}
      - {id: "music-dvd", cat: Audio, desc: "Music / DVD"}
-      - {id: "music-ape", cat: Audio, desc: "Music / APE"}
+      - {id: "music-ape", cat: Audio/Lossless, desc: "Music / APE"}
      - {id: "music-dts", cat: Audio, desc: "Music / DTS"}
      - {id: "musicwavpack", cat: Audio, desc: "Music / WavePack"}
      - {id: "musicost", cat: Audio, desc: "Music / OST"}
-      - {id: "games", cat: PC, desc: "Games"}
-      - {id: "games-iso", cat: PC, desc: "Games / PC ISO"}
+      - {id: "games", cat: PC/Games, desc: "Games"}
+      - {id: "games-iso", cat: PC/Games, desc: "Games / PC ISO"}
      - {id: "pc-rip", cat: PC, desc: "Games / PC RIP"}
      - {id: "ps2", cat: Console, desc: "Games / PS2"}
-      - {id: "psp", cat: Console, desc: "Games / PSP"}
-      - {id: "xbox", cat: Console, desc: "Games / XBOX"}
-      - {id: "xbox-360", cat: Console, desc: "Games / XBOX-360"}
-      - {id: "ps3", cat: Console, desc: "Games / PS3"}
-      - {id: "wii", cat: Console, desc: "Games / WII"}
-      - {id: "PS4", cat: Console, desc: "Games / PS4"}
+      - {id: "psp", cat: Console/PSP, desc: "Games / PSP"}
+      - {id: "xbox", cat: Console/Xbox, desc: "Games / XBOX"}
+      - {id: "xbox-360", cat: Console/Xbox 360, desc: "Games / XBOX-360"}
+      - {id: "ps3", cat: Console/PS3, desc: "Games / PS3"}
+      - {id: "wii", cat: Console/Wii, desc: "Games / WII"}
+      - {id: "PS4", cat: Console/PS4, desc: "Games / PS4"}
      - {id: "software", cat: PC, desc: "Software"}
-      - {id: "pc-iso", cat: PC, desc: "Software / PC ISO"}
-      - {id: "pdasmartphone", cat: PC, desc: "Software / Smartphone"}
+      - {id: "pc-iso", cat: PC/ISO, desc: "Software / PC ISO"}
+      - {id: "pdasmartphone", cat: PC/Phone-Other, desc: "Software / Smartphone"}
      - {id: "tutorial", cat: PC, desc: "Software / Tutorial"}
-      - {id: "android", cat: PC, desc: "Software / Android"}
-      - {id: "ios", cat: PC, desc: "Software / iOS"}
-      - {id: "misc", cat: Other, desc: "Misc"}
+      - {id: "android", cat: PC/Phone-Android, desc: "Software / Android"}
+      - {id: "ios", cat: PC/Phone-IOS, desc: "Software / iOS"}
+      - {id: "misc", cat: Other/Misc, desc: "Misc"}
      - {id: "other", cat: Other, desc: "Misc / Other"}
-      - {id: "e-books", cat: Other, desc: "Misc / e-Books"}
-      - {id: "sports", cat: Other, desc: "Misc / Sports"}
-      - {id: "0-day", cat: Other, desc: "Misc / 0-Day"}
+      - {id: "e-books", cat: Books/Ebook, desc: "Misc / e-Books"}
+      - {id: "sports", cat: TV/Sport, desc: "Misc / Sports"}
+      - {id: "0-day", cat: PC/0day, desc: "Misc / 0-Day"}
      - {id: "xxx", cat: XXX, desc: "XXX"}
      - {id: "porn", cat: XXX, desc: "XXX / Porn"}
      - {id: "xxx-hd", cat: XXX, desc: "XXX / XXX HD"}
@@ -173,6 +174,6 @@
          - name: regexp
            args: src=\\'([^\s\\]+)
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/asgaard.yml
+++ b/src/Jackett.Common/Definitions/asgaard.yml
@@ -0,0 +1,181 @@
+---
+  site: asgaard
+  name: Asgaard
+  description: "Asgaard (AG) is a NORDIC Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en
+  type: private
+  encoding: UTF-8
+  links:
+    - https://asgrd.org/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "Kidz"}
+      - {id: 2, cat: Movies, desc: "Movies"}
+      - {id: 3, cat: TV, desc: "TV"}
+      - {id: 4, cat: Audio, desc: "Music"}
+      - {id: 5, cat: PC, desc: "Apps"}
+      - {id: 6, cat: PC/Games, desc: "Games"}
+      - {id: 7, cat: Books, desc: "Books"}
+      - {id: 8, cat: Movies, desc: "Kidz Movies"}
+      - {id: 9, cat: TV, desc: "Kidz TV"}
+      - {id: 10, cat: TV, desc: "Kidz Boxset"}
+      - {id: 54, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 55, cat: Movies/DVD, desc: "Movies DVDR"}
+      - {id: 14, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
+      - {id: 17, cat: Movies/BluRay, desc: "Movies BD"}
+      - {id: 73, cat: Movies, desc: "Movies Boxset"}
+      - {id: 51, cat: Movies, desc: "Movies No Nordic Subs"}
+      - {id: 52, cat: TV/SD, desc: "TV SD"}
+      - {id: 58, cat: TV/SD, desc: "TV DVDR"}
+      - {id: 18, cat: TV/HD, desc: "TV HD"}
+      - {id: 19, cat: TV/UHD, desc: "TV 4K"}
+      - {id: 60, cat: TV/HD, desc: "TV BD"}
+      - {id: 20, cat: TV, desc: "TV Boxset"}
+      - {id: 50, cat: TV, desc: "TV No Nordic Subs"}
+      - {id: 49, cat: Audio/Video, desc: "Music Video"}
+      - {id: 23, cat: Audio/MP3, desc: "Music MP3"}
+      - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"}
+      - {id: 24, cat: Audio/Lossless, desc: "Music Flac"}
+      - {id: 62, cat: Audio/Lossless, desc: "Music Flac Boxset"}
+      - {id: 28, cat: PC/Phone-Android, desc: "Apps Android"}
+      - {id: 29, cat: PC/Phone-IOS, desc: "Apps iOS"}
+      - {id: 25, cat: PC/0day, desc: "Apps Windows"}
+      - {id: 26, cat: PC, desc: "Apps Linux"}
+      - {id: 27, cat: PC/Mac, desc: "Apps MacOS"}
+      - {id: 30, cat: PC/Games, desc: "Games Windows"}
+      - {id: 31, cat: PC, desc: "Games Linux"}
+      - {id: 32, cat: PC/Mac, desc: "Games MacOS"}
+      - {id: 33, cat: PC/Phone-Android, desc: "Games Android"}
+      - {id: 34, cat: PC/Phone-IOS, desc: "Games iOS"}
+      - {id: 35, cat: Console/NDS, desc: "Games Nintendo"}
+      - {id: 38, cat: Console/PSP, desc: "Games Playstation"}
+      - {id: 39, cat: Console/Xbox, desc: "Games XBox"}
+      - {id: 41, cat: Books/Ebook, desc: "Books E-Book"}
+      - {id: 42, cat: Audio/Audiobook, desc: "Books Audiobook"}
+      - {id: 43, cat: Books/Technical, desc: "Books Education"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: info
+      type: info
+      label: "About the Username field"
+      default: "Enter your <b>Email address</b> in the username field."
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "2"
+      options:
+        "2": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login.php
+    method: post
+    form: form
+    inputs:
+      email: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: h2:contains("Error")
+        message:
+          selector: p
+    test:
+      path: /
+      selector: a[href$="/logout.php"]
+      
+  search:
+    paths:
+    # https://asgrd.org/browse.php?sns=&sna=&spf=&sr=&sg=&sys=&sye=&srs=&sre=&si=tt2401090&ss=&incldead=0&only_free=0&sort=4&type=desc
+    - path: browse.php
+    inputs:
+      $raw: "{{ range .Categories }}cats[]={{.}}&{{end}}"
+      sns: ""
+      sna: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      spf: ""
+      sr: ""
+      sg: ""
+      sys: ""
+      sye: ""
+      srs: ""
+      sre: ""
+      si: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{end}}"
+      ss: ""
+      # 0 active 1 incldead 2 onlydead
+      incldead: 0
+      # 0 incl non-free 1 incl only-free
+      only_free: 0
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
+    rows:
+      selector: table.table-striped > tbody > tr:has(a[href*="details.php?id="])
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: div.torrent-name
+        filters:
+        # need to remove the tooltip text
+          - name: regexp
+            args: "(.+?)\\n"
+      details:
+        selector: a[href*="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href*="browse.php?"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: cats\[\]=(\d+)$
+      banner:
+        optional: true
+        selector: img.tooltip-poster
+        attribute: src
+      download:
+        selector: a[href*="download.php?torrent="]
+        attribute: href
+      date:
+        selector: td:nth-child(2) > div > div:last-of-type
+        filters:
+          - name: dateparse
+            args: "2 Jan 2006 15:04:05"
+      files:
+      # remember #5754 advanced users have additional last TD so dont go using nth-last-child ;-)
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      downloadvolumefactor:
+        case:
+          img[src="./images/gold.png"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
--- a/src/Jackett.Common/Definitions/asiancinema.yml
+++ b/src/Jackett.Common/Definitions/asiancinema.yml
@@ -19,43 +19,75 @@
      tv-search: [q, season, ep, imdbid]
      movie-search: [q, imdbid]

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: login
    method: form
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
-      path: torrents
+      path: /
      selector: a[href$="/logout"]

  ratio:
-    path: torrents
+    path: /
    selector: li:has(i.fa-sync-alt)
    filters:
      - name: regexp
        args: "Ratio : (\\d+)"

+  download:
+    selector: a[href*="/download/"]
+
  search:
    paths:
      - path: filterTorrents
    inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
      tmdb: ""
      mal: ""
-      sort: "created_at"
-      direction: "desc"
+      sorting: "{{ .Config.sort }}"
+      sort: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
      qty: 100
+
    rows:
      selector: table > tbody > tr
+
    fields:
      category:
        selector: a[href*="/categories/"]
@@ -66,7 +98,7 @@
      title:
        selector: a.view-torrent
      download:
-        selector: a[href*="/download/"]
+        selector: a[href*="/download_check/"]
        attribute: href
      details:
        selector: a.view-torrent
@@ -78,17 +110,20 @@
        filters:
          - name: replace
            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
        filters:
          - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
      imdb:
        optional: true
        selector: a[href*="www.imdb.com/title/tt"]
@@ -96,42 +131,45 @@
      date:
        selector: time
        filters:
-            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
          - name: re_replace
-            args: ["(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди)", "ago"]
+            args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди|前)", " ago"]
          - name: re_replace
-            args: ["(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
          - name: re_replace
-            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+            args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
          - name: re_replace
-            args: ["(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"]
+            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
          - name: re_replace
-            args: ["(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+            args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
          - name: re_replace
-            args: ["(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден)", "day"]
+            args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
          - name: re_replace
-            args: ["(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+            args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
          - name: re_replace
-            args: ["(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"]
+            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
          - name: re_replace
-            args: ["(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+            args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
          - name: re_replace
-            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+            args: ["(?i) (ay)", "month"]
          - name: re_replace
-            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+            args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand|个月)", " month"]
+          - name: re_replace
+            args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
-          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
-          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
-          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
-          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
-          "*": "1"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
-          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
-          "*": "1"
-# UNIT3D 1.9.2
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.3
--- a/src/Jackett.Common/Definitions/asiandvdclub.yml
+++ b/src/Jackett.Common/Definitions/asiandvdclub.yml
@@ -1,112 +0,0 @@
---
-  site: asiandvdclub
-  name: AsianDVDClub
-  description: "AsianDVDClub is an ASIAN Private Torrent Tracker for HD MOVIES / TV"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://asiandvdclub.org/
-
-  caps:
-    categorymappings:
-      - {id: 19, cat: TV/Anime, desc: "Anime"}
-      - {id: 12, cat: Movies/Foreign, desc: "China"}
-      - {id: 15, cat: Movies/Foreign, desc: "Hong Kong"}
-      - {id: 27, cat: Movies/Foreign, desc: "India"}
-      - {id: 13, cat: Movies/Foreign, desc: "Japan"}
-      - {id: 14, cat: Movies/Foreign, desc: "Korea"}
-      - {id: 20, cat: Movies/Foreign, desc: "Music DVDs"}
-      - {id: 18, cat: Movies/Foreign, desc: "Other Asian"}
-      - {id: 25, cat: Movies/Foreign, desc: "Patches"}
-      - {id: 24, cat: Movies/Foreign, desc: "Philippines"}
-      - {id: 23, cat: Movies/Foreign, desc: "Pinku"}
-      - {id: 21, cat: Audio, desc: "Soundtracks"}
-      - {id: 26, cat: Movies/Foreign, desc: "Taiwan"}
-      - {id: 17, cat: Movies/Foreign, desc: "Thailand"}
-      - {id: 22, cat: TV, desc: "TV Series"}
-      - {id: 16, cat: Movies/Foreign, desc: "Viet Nam"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      apple: "evil"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: browse.php
-
-  search:
-    paths:
-      - path: browse.php
-    keywordsfilters:
-      - name: replace
-        args: ["-", " "]
-      - name: replace
-        args: ["(", " "]
-      - name: replace
-        args: [")", " "]
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
-      incldead: "1"
-    rows:
-      selector: table.torrenttable > tbody > tr
-      filters:
-        - name: andmatch
-    fields:
-      download:
-        selector: a[href^="/details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php", "download.php"]
-      title:
-        selector: td.torrentname > a
-      details:
-        selector: a[href^="/details.php?id="]
-        attribute: href
-      category:
-        selector: td.cat_pic > a
-        attribute: href
-        filters:
-          - name: regexp
-            args: c(\d+)=1
-      seeders:
-        selector: td.seeders
-        filters:
-          - name: replace
-            args: ["-\xA0-\xA0-", "0"]
-      leechers:
-        selector: td.leechers
-        filters:
-          - name: replace
-            args: ["-\xA0-\xA0-", "0"]
-      grabs:
-        selector: td.dls
-        filters:
-          - name: replace
-            args: ["-\xA0-\xA0-", "0"]
-      date:
-        selector: td.time
-        filters:
-          - name: append
-            args: " ago"
-      size:
-        selector: td.size
-      downloadvolumefactor:
-        case:
-          img[title="Free to download"]: "0"
-          img[title="Download counts 50%"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -5,8 +5,10 @@
  language: en-us
  type: semi-private
  encoding: UTF-8
+  followredirect: true
  links:
    - http://audiobookbay.nl/
+  legacylinks:
    - https://audiobookbay.la/

  caps:
@@ -75,21 +77,26 @@

  login:
    path: https://audiobookbay.nl/member/login.php
-    form: form[action="https://audiobookbay.nl/member/login.php"]
+    form: form[action$="/member/login.php"]
    method: post
    form: form
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      login: "Login"
    error:
-      - selector: td.embedded:has(h2:contains("Invalid"))
+      - selector: div.warning
    test:
-      path: /member/users/
+      path: http://audiobookbay.nl/member/users/
+      selector: a[href="/member/logout"]

  download:
-    selector: a[href^="/download?"]
-    attribute: href 
+    method: get
+    before:
+      path:  https://audiobookbay.nl/member/login.php
+      method: "post"
+      inputs:
+        username: "{{ .Config.username }}"
+        password: "{{ .Config.password }}"

  search:
    paths:
@@ -110,8 +117,11 @@
        selector: div.postTitle h2 a
        attribute: href
      download:
-        selector: a[href^="/audio-books/"]
+        selector: a[href^="/dl-now?f="]
        attribute: href
+        filters:
+          - name: replace
+            args: ["/dl-now?f=", "/download?f="]
      banner:
        optional: true
        selector: img
--- a/src/Jackett.Common/Definitions/audionews.yml
+++ b/src/Jackett.Common/Definitions/audionews.yml
@@ -162,11 +162,58 @@
      - {id: 164, cat: Audio/Other, desc: "PRESETS Sylenth"}
      - {id: 168, cat: Audio/Other, desc: "PRESETS Toontrack"}
      - {id: 21, cat: Other, desc: "UPDATE"}
-
+      - {id: 222, cat: Other, desc: "GFXNEWS 3D"}
+      - {id: 207, cat: Other, desc: "GFXNEWS APPS WIN"}
+      - {id: 215, cat: Other, desc: "GFXNEWS APPS LINUX"}
+      - {id: 214, cat: Other, desc: "GFXNEWS APPS MAC"}
+      - {id: 211, cat: Other, desc: "GFXNEWS BOOKS"}
+      - {id: 224, cat: Other, desc: "GFXNEWS CAD/CAM"}
+      - {id: 212, cat: Other, desc: "GFXNEWS FONTS"}
+      - {id: 213, cat: Other, desc: "GFXNEWS FOOTAGE"}
+      - {id: 226, cat: Other, desc: "GFXNEWS MAGAZINE"}
+      - {id: 216, cat: Other, desc: "GFXNEWS PHOTOSTOCK"}
+      - {id: 220, cat: Other, desc: "GFXNEWS PHOTOGRAPHY - ART"}
+      - {id: 227, cat: Other, desc: "GFXNEWS PHOTOSHOP"}
+      - {id: 228, cat: Other, desc: "GFXNEWS PHOTOSHOP Actions, Pattern & Styles"}
+      - {id: 229, cat: Other, desc: "GFXNEWS PHOTOSHOP Background & PSD Source"}
+      - {id: 230, cat: Other, desc: "GFXNEWS PHOTOSHOP Brushes & Gradient"}
+      - {id: 231, cat: Other, desc: "GFXNEWS PHOTOSHOP Toolkits, Papers & Objects"}
+      - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
+      - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
+      - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
+      - {id: 217, cat: Other, desc: "GFXNEWS SCRIPTS - WEB PROGRAMMING"}
+      - {id: 218, cat: Other, desc: "GFXNEWS TEMPLATES"}
+      - {id: 232, cat: Other, desc: "GFXNEWS TEXTURES"}
+      - {id: 219, cat: Other, desc: "GFXNEWS TUTORIALS"}
+      - {id: 221, cat: Other, desc: "GFXNEWS VIDEO PRODUCTION"}

    modes:
      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: "1"
+      options:
+        "1": "created"
+        "10": "seeders"
+        "7": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+
  login:
    path: login.php
    method: post
@@ -207,8 +254,8 @@
      prev_date_from: ""
      prev_date_to: ""
      prev_hide_rereg: 0
-      o: 1
-      s: 2
+      o: "{{ .Config.sort }}"
+      s: "{{ .Config.type }}"
      df: 1
      da: 1
      nm: "{{ .Keywords }}"
@@ -216,7 +263,7 @@
      submit: "Search"

    rows:
-      selector: table > tbody > tr:has(a[href*="/dl.php?id="])
+      selector: table.forumline > tbody > tr:has(a[href*="/dl.php?id="])
      dateheaders:
        selector: td[colspan="20"] > strong
        filters:
@@ -267,6 +314,6 @@
        optional: true
        selector: td[title^="Replies:"]
      downloadvolumefactor:
-        text: "1"
+        text: 1
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/avg.yml
+++ b/src/Jackett.Common/Definitions/avg.yml
@@ -1,299 +0,0 @@
---
-  site: avg
-  name: AVG
-  description: "Audio Video Games (BestRepack) is a RUSSIAN Private Torrent Tracker for GAMES"
-  language: ru-ru
-  type: private
-  encoding: UTF-8
-  links:
-    - https://avg.club/
-
-  caps:
-    categorymappings:
-      - {id: 110, cat: PC/Games, desc: "Репаки от R.G. Catalyst"}
-      - {id: 146, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Горячие новинки"}
-      - {id: 112, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Action"}
-      - {id: 113, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Fighting"}
-      - {id: 114, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst RPG"}
-      - {id: 118, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Аркады"}
-      - {id: 120, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Квесты и приключения"}
-      - {id: 122, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Стратегии"}
-      - {id: 124, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Симуляторы"}
-      - {id: 126, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Гонки"}
-      - {id: 147, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Горячие новинки"}
-      - {id: 115, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Action"}
-      - {id: 116, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Fighting"}
-      - {id: 117, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst RPG"}
-      - {id: 119, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Аркады"}
-      - {id: 121, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Квесты и приключения"}
-      - {id: 123, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Стратегии"}
-      - {id: 125, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Симуляторы"}
-      - {id: 127, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Гонки"}
-      - {id: 9, cat: PC/Games, desc: "Игры PC (Репаки) Горячие новинки"}
-      - {id: 2, cat: PC/Games, desc: "Игры PC (Репаки) Action"}
-      - {id: 8, cat: PC/Games, desc: "Игры PC (Репаки) Fighting"}
-      - {id: 3, cat: PC/Games, desc: "Игры PC (Репаки) RPG"}
-      - {id: 7, cat: PC/Games, desc: "Игры PC (Репаки) Аркады"}
-      - {id: 6, cat: PC/Games, desc: "Игры PC (Репаки) Квесты и приключения"}
-      - {id: 4, cat: PC/Games, desc: "Игры PC (Репаки) Стратегии"}
-      - {id: 5, cat: PC/Games, desc: "Игры PC (Репаки) Симуляторы"}
-      - {id: 73, cat: PC/Games, desc: "Игры PC (Репаки) Гонки"}
-      - {id: 149, cat: PC/Games, desc: "Игры PC (Репаки) «Стройбат»"}
-      - {id: 148, cat: PC/Games, desc: "Игры PC (Оригиналы) Горячие новинки"}
-      - {id: 129, cat: PC/Games, desc: "Игры PC (Оригиналы) Action"}
-      - {id: 131, cat: PC/Games, desc: "Игры PC (Оригиналы) Fighting"}
-      - {id: 133, cat: PC/Games, desc: "Игры PC (Оригиналы) RPG"}
-      - {id: 135, cat: PC/Games, desc: "Игры PC (Оригиналы) Аркады"}
-      - {id: 137, cat: PC/Games, desc: "Игры PC (Оригиналы) Квесты и приключения"}
-      - {id: 139, cat: PC/Games, desc: "Игры PC (Оригиналы) Стратегии"}
-      - {id: 141, cat: PC/Games, desc: "Игры PC (Оригиналы) Симуляторы"}
-      - {id: 143, cat: PC/Games, desc: "Игры PC (Оригиналы) Гонки"}
-      - {id: 19, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты)"}
-      - {id: 130, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Action"}
-      - {id: 132, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Fighting"}
-      - {id: 134, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) RPG"}
-      - {id: 136, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Аркады"}
-      - {id: 138, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Квесты и приключения"}
-      - {id: 140, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Стратегии"}
-      - {id: 142, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Симуляторы"}
-      - {id: 144, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Гонки"}
-      - {id: 145, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Linux / MacOS"}
-      - {id: 10, cat: PC/Games, desc: "Игры PC (Оригиналы) Горячие новинки"}
-      - {id: 11, cat: PC/Games, desc: "Игры PC (Оригиналы) Action"}
-      - {id: 12, cat: PC/Games, desc: "Игры PC (Оригиналы) Fighting"}
-      - {id: 13, cat: PC/Games, desc: "Игры PC (Оригиналы) RPG"}
-      - {id: 14, cat: PC/Games, desc: "Игры PC (Оригиналы) Аркады"}
-      - {id: 15, cat: PC/Games, desc: "Игры PC (Оригиналы) Квесты и приключения"}
-      - {id: 16, cat: PC/Games, desc: "Игры PC (Оригиналы) Стратегии"}
-      - {id: 17, cat: PC/Games, desc: "Игры PC (Оригиналы) Симуляторы"}
-      - {id: 74, cat: PC/Games, desc: "Игры PC (Оригиналы) Гонки"}
-      - {id: 98, cat: PC/Games, desc: "Игры PC (Оригиналы) Игры для Linux"}
-      - {id: 99, cat: PC/Games, desc: "Игры PC (Оригиналы) Игры для MacOS"}
-      - {id: 70, cat: Console/Xbox, desc: "Игры для консолей Xbox"}
-      - {id: 71, cat: Console/PSP, desc: "Игры для консолей Playstation"}
-      - {id: 72, cat: Console/Other, desc: "Игры для консолей Другие консоли"}
-      - {id: 34, cat: Movies, desc: "Кинематограф Новинки"}
-      - {id: 109, cat: Movies/HD, desc: "Кинематограф Новинки HD Remux / Blu-Ray Discs"}
-      - {id: 108, cat: Movies/HD, desc: "Кинематограф Новинки HD Rips (720p,1080p)"}
-      - {id: 20, cat: Movies, desc: "Кинематограф Отечественное кино"}
-      - {id: 21, cat: Movies, desc: "Кинематограф Зарубежное кино"}
-      - {id: 28, cat: TV, desc: "Отечественные сериалы"}
-      - {id: 27, cat: TV, desc: "Зарубежные сериалы"}
-      - {id: 29, cat: TV, desc: "Мультфильмы"}
-      - {id: 30, cat: TV, desc: "Мультсериалы"}
-      - {id: 37, cat: TV, desc: "Документальное кино"}
-      - {id: 38, cat: TV, desc: "Концерты и передачи"}
-      - {id: 67, cat: TV/Anime, desc: "Аниме Релизы"}
-      - {id: 45, cat: Audio, desc: "Музыка Тяжелая и альтернативная музыка"}
-      - {id: 85, cat: Audio, desc: "Музыка Эстрадная и поп-музыка"}
-      - {id: 77, cat: Audio, desc: "Музыка Электронная музыка"}
-      - {id: 58, cat: Audio, desc: "Музыка Рэп, хип-хоп, R`n`B"}
-      - {id: 78, cat: Audio, desc: "Музыка Фолк, этническая и народная музыка"}
-      - {id: 42, cat: Audio, desc: "Музыка Классическая и академическая музыка"}
-      - {id: 82, cat: Audio, desc: "Музыка New Age, Chillout, музыка для медитации"}
-      - {id: 79, cat: Audio, desc: "Музыка Джаз, блюз"}
-      - {id: 80, cat: Audio, desc: "Музыка Авторская песня, шансон"}
-      - {id: 49, cat: Audio, desc: "Музыка Саундтреки"}
-      - {id: 50, cat: Audio, desc: "Музыка Саундтреки Саундтреки к фильмам, мультфильмам, сериалам"}
-      - {id: 51, cat: Audio, desc: "Музыка Саундтреки Саундтреки к играм"}
-      - {id: 81, cat: Audio, desc: "Музыка Прочая музыка"}
-      - {id: 83, cat: Audio, desc: "Музыка Прочая музыка Неофициальные сборники"}
-      - {id: 156, cat: PC, desc: "Программное обеспечение Live CD, DVD, USB версии"}
-      - {id: 157, cat: PC, desc: "Программное обеспечение Windows 10 и более поздние"}
-      - {id: 158, cat: PC, desc: "Программное обеспечение Windows 8.1 и более ранние"}
-      - {id: 159, cat: PC, desc: "Программное обеспечение Обновления и языковые пакеты"}
-      - {id: 160, cat: PC, desc: "Программное обеспечение Серверные версии"}
-      - {id: 193, cat: PC/Mac, desc: "Программное обеспечение macOS"}
-      - {id: 194, cat: PC/Mac, desc: "Программное обеспечение macOS Stable (Release)"}
-      - {id: 195, cat: PC/Mac, desc: "Программное обеспечение macOS Dev (Beta)"}
-      - {id: 164, cat: PC/Mac, desc: "Программное обеспечение macOS Дистрибутивы Linux"}
-      - {id: 163, cat: PC/Mac, desc: "Программное обеспечение macOS *nix OS"}
-      - {id: 162, cat: PC/Mac, desc: "Программное обеспечение macOS Программное обеспечение"}
-      - {id: 165, cat: PC, desc: "Программное обеспечение Мультимедиа и графика"}
-      - {id: 172, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Аудио-редакторы"}
-      - {id: 171, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Видео-редакторы"}
-      - {id: 170, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Графические редакторы"}
-      - {id: 169, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Материалы для аудио"}
-      - {id: 168, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Материалы для видео"}
-      - {id: 167, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Материалы для графики"}
-      - {id: 166, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Моделирование, рендеринг, плагины"}
-      - {id: 173, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка"}
-      - {id: 177, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка DDK/SDK"}
-      - {id: 178, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Веб-редакторы"}
-      - {id: 176, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Системы управления базами данных (СУБД)"}
-      - {id: 175, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Компиляторы и среды разработки"}
-      - {id: 174, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Компоненты и дополнения"}
-      - {id: 179, cat: PC/0day, desc: "Программное обеспечение Windows Software"}
-      - {id: 188, cat: PC/0day, desc: "Программное обеспечение Windows Software Интернет-приложения"}
-      - {id: 187, cat: PC/0day, desc: "Программное обеспечение Windows Software Информационная безопасность"}
-      - {id: 186, cat: PC/0day, desc: "Программное обеспечение Windows Software Офисные приложения и редакторы"}
-      - {id: 185, cat: PC/0day, desc: "Программное обеспечение Windows Software Переводчики и словари"}
-      - {id: 184, cat: PC/0day, desc: "Программное обеспечение Windows Software Проигрыватели и кодеки"}
-      - {id: 183, cat: PC/0day, desc: "Программное обеспечение Windows Software Работа с носителями и медиа"}
-      - {id: 182, cat: PC/0day, desc: "Программное обеспечение Windows Software Системные приложения"}
-      - {id: 181, cat: PC/0day, desc: "Программное обеспечение Windows Software Эмуляторы"}
-      - {id: 180, cat: PC/0day, desc: "Программное обеспечение Windows Software Прочие приложения"}
-      - {id: 197, cat: PC/0day, desc: "Программное обеспечение Windows Software Архиваторы и файловые менеджеры"}
-      - {id: 203, cat: PC/0day, desc: "Программное обеспечение Windows Software Проигрыватели и кодеки"}
-      - {id: 202, cat: PC/0day, desc: "Программное обеспечение Windows Software Офисные приложения и редакторы"}
-      - {id: 201, cat: PC/0day, desc: "Программное обеспечение Windows Software Работа с носителями и медиа"}
-      - {id: 200, cat: PC/0day, desc: "Программное обеспечение Windows Software Информационная безопасность"}
-      - {id: 199, cat: PC/0day, desc: "Программное обеспечение Windows Software Интернет-приложения"}
-      - {id: 198, cat: PC/0day, desc: "Программное обеспечение Windows Software Системные приложения"}
-      - {id: 22, cat: Other, desc: "Прочее Оформление релизов"}
-      - {id: 53, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (игры)"}
-      - {id: 54, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (кино/мультфильмы/аниме)"}
-      - {id: 55, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (музыка)"}
-      - {id: 192, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (софт)"}
-      - {id: 31, cat: Other, desc: "Прочее Обновления/DLC"}
-      - {id: 102, cat: Other, desc: "Прочее Обновления/DLC для MacOS"}
-      - {id: 101, cat: Other, desc: "Прочее Обновления/DLC для Linux"}
-      - {id: 100, cat: Other, desc: "Прочее Обновления/DLC для Windows"}
-      - {id: 76, cat: Other, desc: "Прочее Языковые пакеты"}
-      - {id: 103, cat: Other, desc: "Прочее Языковые пакеты для MacOS"}
-      - {id: 104, cat: Other, desc: "Прочее Языковые пакеты для Linux"}
-      - {id: 105, cat: Other, desc: "Прочее Языковые пакеты для Windows"}
-      - {id: 84, cat: Other, desc: "Прочее Демо-, альфа-, бета-версии"}
-      - {id: 32, cat: Other, desc: "Прочее NoCD/NoDVD"}
-      - {id: 75, cat: Other, desc: "Прочее Моды"}
-      - {id: 106, cat: Other, desc: "Прочее Моды Моды для Titan Quest (+ Immortal Throne)"}
-      - {id: 95, cat: Other, desc: "Прочее Моды Моды для Dungeon Siege"}
-      - {id: 94, cat: Other, desc: "Прочее Моды Моды для Resident Evil 4"}
-      - {id: 93, cat: Other, desc: "Прочее Моды Моды для Doom III"}
-      - {id: 92, cat: Other, desc: "Прочее Моды Плагины для TESV Skyrim"}
-      - {id: 91, cat: Other, desc: "Прочее Моды Плагины для TESIV Oblivion"}
-      - {id: 90, cat: Other, desc: "Прочее Моды Плагины для TESIII Morrowind"}
-      - {id: 97, cat: Other, desc: "Прочее Пиратки"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      "login_username": "{{ .Config.username }}"
-      "login_password": "{{ .Config.password }}"
-      autologin: 1
-      login: "Log in"
-    error:
-      - selector: table.error tr td div.msg:not(:contains(">>>"))
-    test:
-      path: tracker.php
-      selector: a[href="./login.php?logout=1"]
-
-  search:
-    paths:
-      - path: tracker.php
-        method: post
-    inputs:
-      $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
-      prev_allw: 1
-      prev_a: 0
-      prev_dla: 0
-      prev_dlc: 0
-      prev_dld: 0
-      prev_dlw: 0
-      prev_my: 0
-      prev_new: 0
-      prev_sd: 0
-      prev_da: 1
-      prev_dc: 0
-      prev_df: 1
-      prev_ds: 0
-      prev_tor_type: 0
-      # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
-      o: 1
-      # 1=asc 2=desc
-      s: 2
-      # show category
-      dc: 0
-      # show forum
-      df: 1
-      # show author
-      da: 1
-      # show speed
-      ds: 0
-      # -1=all time
-      tm: -1
-      # seed not seen -1=disregard
-      sns: -1
-      # group releases -1=not selected
-      srg: -1
-      nm: "{{ .Keywords }}"
-      # find a username
-      pn: ""
-      submit: "  Search  "
-
-    rows:
-      selector: tr[id^="tor_"]
-    fields:
-      title:
-        selector: td a.genmed b
-      details:
-        selector: td a.genmed
-        attribute: href
-      download:
-        selector: td a.tr-dl
-        attribute: href
-      category:
-        selector: td a.gen
-        attribute: href
-        filters:
-          - name: regexp
-            args: "=(\\d+)\\."
-      size:
-        selector: td a.tr-dl
-      seeders:
-        selector: td.seedmed
-      leechers:
-        selector: td.leechmed
-        # Russian and Ukranian and English languages are supported
-      grabs:
-        optional: true
-        selector: td[title^="Ответов"]
-      grabs:
-        optional: true
-        selector: td[title^="Відповідей"]
-      grabs:
-        optional: true
-        selector: td[title^="Replies"]
-        # date for English, Russian, Ukrainian
-      date:
-        selector: td[title="Added"] p:last-of-type, td[title="Добавлен"] p:last-of-type, td[title="Додано"] p:last-of-type
-        filters:
-            # replace month abbreviations
-          - name: re_replace
-            args: ["Янв|Січ", "Jan"]
-          - name: re_replace
-            args: ["Фев|Лют", "Feb"]
-          - name: re_replace
-            args: ["Мар|Бер", "Mar"]
-          - name: re_replace
-            args: ["Апр|Кві", "Apr"]
-          - name: re_replace
-            args: ["Май|Травень", "May"]
-          - name: re_replace
-            args: ["Июн|Чер", "Jun"]
-          - name: re_replace
-            args: ["Июл|Лип", "Jul"]
-          - name: re_replace
-            args: ["Авг|Сер", "Aug"]
-          - name: re_replace
-            args: ["Сен|Вер", "Sep"]
-          - name: re_replace
-            args: ["Окт|Жов", "Oct"]
-          - name: re_replace
-            args: ["Ноя|Лис", "Nov"]
-          - name: re_replace
-            args: ["Дек|Грудень", "Dec"]
-          - name: dateparse
-            args: "2-Jan-06"
-      downloadvolumefactor:
-        case:
-          img[src="styles/images/tor_gold.gif"]: "0"
-          img[src="styles/images/tor_silver.gif"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
--- a/src/Jackett.Common/Definitions/awesomehd.yml
+++ b/src/Jackett.Common/Definitions/awesomehd.yml
@@ -19,30 +19,54 @@
      movie-search: [q]

  settings:
-    - name: cookie
+    - name: username
      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "time"
+      options:
+        "time": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
-    method: cookie
+    path: login.php
+    method: form
+    form: form#loginform
    inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+    error:
+      - selector: form#loginform .warning
    test:
-      path: index.php
+      path: torrents.php

  search:
    paths:
      - path: torrents.php
    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
+      $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ .Keywords }}"
      page: torrents
+      order_by: "{{ .Config.sort }}"
+      order_way: "{{ .Config.type }}"
+
    rows:
      selector: table#torrent_table > tbody > tr.group, tr.torrent, tr.group_torrent:not(.edition_info) 
+
    fields:
      download:
        selector: a[href^="torrents.php?action=download&id="]
@@ -55,8 +79,6 @@
        selector: td:nth-child(3) > a
      category:
        selector: td:nth-child(2)
-      # files:
-      #   selector: td:nth-child(4)
      date:
        selector: td:nth-last-child(5)
      size:
@@ -69,7 +91,7 @@
        selector: td:nth-last-child(1)
      downloadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
--- a/src/Jackett.Common/Definitions/b2s-share.yml
+++ b/src/Jackett.Common/Definitions/b2s-share.yml
@@ -1,286 +0,0 @@
---
-  site: b2s-share
-  name: B2S-Share
-  description: "B2S-Share is a Brazilian Private site for TV / MOVIES / GENERAL"
-  language: pt-br
-  type: private
-  encoding: iso-8859-1
-  links:
-    - http://www.b2s-share.com/
-
-  caps:
-    categorymappings:
-      #3D
-      - {id: 141, cat: Movies/3D, desc: "3D Ação"}
-      - {id: 142, cat: Movies/3D, desc: "3D Animação"}
-      - {id: 143, cat: Movies/3D, desc: "3D Aventura"}
-      - {id: 144, cat: Movies/3D, desc: "3D Clássico"}
-      - {id: 145, cat: Movies/3D, desc: "3D Comédia"}
-      - {id: 146, cat: Movies/3D, desc: "3D Documentário"}
-      - {id: 147, cat: Movies/3D, desc: "3D Drama"}
-      - {id: 149, cat: Movies/3D, desc: "3D Ficção"}
-      - {id: 150, cat: Movies/3D, desc: "3D Guerra"}
-      - {id: 151, cat: Movies/3D, desc: "3D Infantil"}
-      - {id: 152, cat: Movies/3D, desc: "3D Musical"}
-      - {id: 154, cat: Movies/3D, desc: "3D Outros"}
-      - {id: 155, cat: Movies/3D, desc: "3D Policial"}
-      - {id: 156, cat: Movies/3D, desc: "3D Religioso"}
-      - {id: 157, cat: Movies/3D, desc: "3D Romance"}
-      - {id: 158, cat: Movies/3D, desc: "3D Shows"}
-      - {id: 159, cat: Movies/3D, desc: "3D Suspense"}
-      - {id: 160, cat: Movies/3D, desc: "3D Terror"}
-      - {id: 161, cat: Movies/3D, desc: "3D Thriller"}
-      - {id: 162, cat: Movies/3D, desc: "3D Western"}
-      
-      #4K
-      - {id: 173, cat: Movies, desc: "4K Ação"}
-      - {id: 191, cat: Movies, desc: "4K Animação"}
-      - {id: 190, cat: Movies, desc: "4K Aventura"}
-      - {id: 188, cat: Movies, desc: "4K Clássico"}
-      - {id: 175, cat: Movies, desc: "4K Comédia"}
-      - {id: 186, cat: Movies, desc: "4K Documentário"}
-      - {id: 185, cat: Movies, desc: "4K Drama"}
-      - {id: 177, cat: Movies, desc: "4K Ficção"}
-      - {id: 178, cat: Movies, desc: "4K Guerra"}
-      - {id: 179, cat: Movies, desc: "4K Infantil"}
-      - {id: 180, cat: Movies, desc: "4K Musical"}
-      - {id: 184, cat: Movies, desc: "4K Outros"}
-      - {id: 176, cat: Movies, desc: "4K Policial"}
-      - {id: 187, cat: Movies, desc: "4K Religioso"}
-      - {id: 174, cat: Movies, desc: "4K Romance"}
-      - {id: 181, cat: Movies, desc: "4K Shows"}
-      - {id: 182, cat: Movies, desc: "4K Suspense"}
-      - {id: 189, cat: Movies, desc: "4K Terror"}
-      - {id: 183, cat: Movies, desc: "4K Thriller"}
-      
-      #ANIME
-      - {id: 11, cat: TV/Anime, desc: "Anime"}
-      
-      #PC-APPS
-      - {id: 2, cat: PC, desc: "PC APPS - Linux"}
-      - {id: 3, cat: PC, desc: "PC APPS - Mac"}
-      - {id: 33, cat: PC, desc: "PC APPS - Portateis"}
-      - {id: 1, cat: PC, desc: "PC APPS - Windows"}
-      
-      #BD-R           
-      - {id: 140, cat: Movies, desc: "BD-R Autorado"}
-      - {id: 119, cat: Movies, desc: "BD-R"}
-      
-      #MOBILE        
-      - {id: 163, cat: Other, desc: "Mobile App/Jogos-Android"}
-      - {id: 164, cat: Other, desc: "Mobile App/Jogos-iPhone"}
-      - {id: 93, cat: Other, desc: "Mobile App/Jogos-Java"}
-      - {id: 169, cat: Other, desc: "Mobile App/Jogos-Outros"}
-      - {id: 168, cat: Other, desc: "Mobile App/Jogos-Win"}
-      - {id: 92, cat: Other, desc: "Mobile Filmes"}
-      - {id: 118, cat: Other, desc: "Mobile Séries"}
-      - {id: 94, cat: Other, desc: "Mobile Wallpapers"}
-      
-      #CARTOON       
-      - {id: 172, cat: TV/Other, desc: "Desenho Animado"}
-      
-      #OTHER           
-      - {id: 4, cat: Other, desc: "Apostilas/Cursos"}
-      - {id: 12, cat: Books, desc: "Diversos"}
-      - {id: 167, cat: Books, desc: "E-book/Livros"}
-      - {id: 7, cat: PC/Games, desc: "Emuladores / Roms"}
-      - {id: 166, cat: Books/Comics, desc: "HQ"}
-      - {id: 165, cat: Books, desc: "Revistas"}
-      
-      #DVD-R          
-      - {id: 41, cat: Movies/SD, desc: "DVD-R Autorado"}
-      - {id: 32, cat: Movies/SD, desc: "DVD-R"}
-      
-      #MOVIES        
-      - {id: 14, cat: Movies, desc: "Filmes Ação"}
-      - {id: 99, cat: Movies, desc: "Filmes Animação"}
-      - {id: 15, cat: Movies, desc: "Filmes Aventura"}
-      - {id: 16, cat: Movies, desc: "Filmes Clássico"}
-      - {id: 17, cat: Movies, desc: "Filmes Comédia"}
-      - {id: 31, cat: Movies, desc: "Filmes Documentário"}
-      - {id: 18, cat: Movies, desc: "Filmes Drama"}
-      - {id: 19, cat: Movies, desc: "Filmes Ficção"}
-      - {id: 20, cat: Movies, desc: "Filmes Guerra"}
-      - {id: 126, cat: Movies, desc: "Filmes Infantil"}
-      - {id: 96, cat: Movies, desc: "Filmes Musical"}
-      - {id: 24, cat: Movies, desc: "Filmes Outros"}
-      - {id: 40, cat: Movies, desc: "Filmes Policial"}
-      - {id: 39, cat: Movies, desc: "Filmes Religioso"}
-      - {id: 30, cat: Movies, desc: "Filmes Romance"}
-      - {id: 22, cat: Movies, desc: "Filmes Suspense"}
-      - {id: 23, cat: Movies, desc: "Filmes Terror"}
-      - {id: 130, cat: Movies, desc: "Filmes Thriller"}
-      - {id: 131, cat: Movies, desc: "Filmes Western"}
-      - {id: 34, cat: Movies, desc: "Filmes x264"}
-      
-      #HD-1080p       
-      - {id: 73, cat: Movies/HD, desc: "Filmes 1080p Ação"}
-      - {id: 87, cat: Movies/HD, desc: "Filmes 1080p Animação"}
-      - {id: 74, cat: Movies/HD, desc: "Filmes 1080p Aventura"}
-      - {id: 75, cat: Movies/HD, desc: "Filmes 1080p Clássico"}
-      - {id: 76, cat: Movies/HD, desc: "Filmes 1080p Comédia"}
-      - {id: 77, cat: Movies/HD, desc: "Filmes 1080p Documentário"}
-      - {id: 78, cat: Movies/HD, desc: "Filmes 1080p Drama"}
-      - {id: 79, cat: Movies/HD, desc: "Filmes 1080p Ficção"}
-      - {id: 80, cat: Movies/HD, desc: "Filmes 1080p Guerra"}
-      - {id: 127, cat: Movies/HD, desc: "Filmes 1080p Infantil"}
-      - {id: 97, cat: Movies/HD, desc: "Filmes 1080p Musical"}
-      - {id: 63, cat: Movies/HD, desc: "Filmes 1080p Outros"}
-      - {id: 82, cat: Movies/HD, desc: "Filmes 1080p Policial"}
-      - {id: 83, cat: Movies/HD, desc: "Filmes 1080p Religioso"}
-      - {id: 84, cat: Movies/HD, desc: "Filmes 1080p Romance"}
-      - {id: 88, cat: Movies/HD, desc: "Filmes 1080p Shows"}
-      - {id: 85, cat: Movies/HD, desc: "Filmes 1080p Suspense"}
-      - {id: 86, cat: Movies/HD, desc: "Filmes 1080p Terror"}
-      - {id: 132, cat: Movies/HD, desc: "Filmes 1080p Thriller"}
-      - {id: 135, cat: Movies/HD, desc: "Filmes 1080p Western"}
-      
-      #HD-720p        
-      - {id: 58, cat: Movies/HD, desc: "Filmes 720p Ação"}
-      - {id: 89, cat: Movies/HD, desc: "Filmes 720p Animação"}
-      - {id: 60, cat: Movies/HD, desc: "Filmes 720p Aventura"}
-      - {id: 61, cat: Movies/HD, desc: "Filmes 720p Clássico"}
-      - {id: 62, cat: Movies/HD, desc: "Filmes 720p Comédia"}
-      - {id: 72, cat: Movies/HD, desc: "Filmes 720p Documentário"}
-      - {id: 64, cat: Movies/HD, desc: "Filmes 720p Drama"}
-      - {id: 65, cat: Movies/HD, desc: "Filmes 720p Ficção"}
-      - {id: 66, cat: Movies/HD, desc: "Filmes 720p Guerra"}
-      - {id: 129, cat: Movies/HD, desc: "Filmes 720p Infantil"}
-      - {id: 98, cat: Movies/HD, desc: "Filmes 720p Musical"}
-      - {id: 59, cat: Movies/HD, desc: "Filmes 720p Outros"}
-      - {id: 70, cat: Movies/HD, desc: "Filmes 720p Policial"}
-      - {id: 57, cat: Movies/HD, desc: "Filmes 720p Religioso"}
-      - {id: 71, cat: Movies/HD, desc: "Filmes 720p Romance"}
-      - {id: 90, cat: Movies/HD, desc: "Filmes 720p Shows"}
-      - {id: 68, cat: Movies/HD, desc: "Filmes 720p Suspense"}
-      - {id: 69, cat: Movies/HD, desc: "Filmes 720p Terror"}
-      - {id: 134, cat: Movies/HD, desc: "Filmes 720p Thriller"}
-      - {id: 137, cat: Movies/HD, desc: "Filmes 720p Western"}
-      
-      #GAMES          
-      - {id: 6, cat: Console, desc: "Jogos Console"}
-      - {id: 51, cat: PC/Games, desc: "Jogos Emuladores"}
-      - {id: 44, cat: Console, desc: "Jogos Gamecube"}
-      - {id: 43, cat: Console/NDS, desc: "Jogos Nintendo DS"}
-      - {id: 52, cat: Console, desc: "Jogos Outros"}
-      - {id: 5, cat: PC/Games, desc: "Jogos PC"}
-      - {id: 47, cat: Console, desc: "Jogos PS2"}
-      - {id: 48, cat: Console, desc: "Jogos PS3"}
-      - {id: 170, cat: Console, desc: "Jogos PS4"}
-      - {id: 46, cat: Console, desc: "Jogos PSP"}
-      - {id: 45, cat: Console/Wii, desc: "Jogos Wii"}
-      - {id: 49, cat: Console/Xbox, desc: "Jogos XBOX"}
-      - {id: 50, cat: Console/Xbox 360, desc: "Jogos XBOX360"}
-      - {id: 171, cat: Console, desc: "Jogos XBOXONE"}
-      
-      #MUSIC          
-      - {id: 29, cat: Audio, desc: "Musica Discografia"}
-      - {id: 28, cat: Audio, desc: "Musica Gospel"}
-      - {id: 139, cat: Audio, desc: "Musica Infantil"}
-      - {id: 27, cat: Audio, desc: "Musica Internacionais"}
-      - {id: 26, cat: Audio, desc: "Musica Nacionais"}
-      - {id: 91, cat: Audio, desc: "Musica Outros"}
-      
-      #TV-SERIES      
-      - {id: 35, cat: TV/HD, desc: "Séries HD"}
-      - {id: 8, cat: TV, desc: "Séries"}
-      
-      #SHOWS          
-      - {id: 13, cat: Audio/Video, desc: "Show"}
-      - {id: 56, cat: Audio/Video, desc: "Video Clipes"}
-      
-      #TV             
-      - {id: 53, cat: TV, desc: "Entretenimento"}
-      - {id: 54, cat: TV/Sport, desc: "Esportes"}
-      - {id: 138, cat: TV, desc: "Infantil"}
-      - {id: 55, cat: TV, desc: "Jornalismo"}
-      
-      #XXX            
-      - {id: 36, cat: XXX/Other, desc: "Anime Hentai"}
-      - {id: 10, cat: XXX, desc: "Filmes Adultos"}
-      - {id: 37, cat: XXX/Other, desc: "XXX Fotos"}
-      - {id: 95, cat: XXX/Other, desc: "XXX Revistas"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    test:
-      path: torrents.php
-      selector: div:has(a[href*="account-logout.php"])
-  search:
-    paths:
-      - path: torrents-search.php
-    keywordsfilters: 
-      - name: re_replace
-        args: ["[Ss][0-9]{2}[Ee][0-9]{2,3}", ""] # remove season and episode from search
-      - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "%"]
-    inputs:
-      search: "{{ .Keywords }}"
-    rows:
-      selector: table[class^="ttable_headinner"] > tbody > tr:has(a[href^="torrents-details.php?id="])
-      filters:
-        - name: andmatch
-    fields:
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      is_anime:
-        optional: true
-        selector: a[href^="torrents.php?cat=11"]
-        attribute: href
-      title_anime:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-        - name: re_replace
-          args: ["(Ep[\\.]?[ ]?)|([S]\\d\\d[Ee])", "E"]
-      title_normal:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-        - name: re_replace
-          args: ["^(.*)[ ]([Ss][0-9]{2}[Ee][0-9]{2,3}).*(?:(?:\\((.*?)\\)))(.*$)", "$3 $2 $4"] # Convert series title from "Translated Name SXXEXX (Original Name) [Other stuffs]" to "Original Name SXXEXX [Other stuffs]"
-        - name: re_replace
-          args: ["^(.*)[ ].*(?:(?:\\((.*?)\\)))(.*$)", "$2 $3"] # Convert movies title from "Translated Name (Original Name) [Other stuffs]" to "Original Name [Other stuffs]"
-      title:
-        text: "{{if .Result.is_anime }}{{ .Result.title_anime }}{{else}}{{ .Result.title_normal }}{{end}}"
-      download:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-        filters:
-        - name: replace
-          args: ["torrents-details.php", "download.php"]
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      date:
-        selector: td:nth-child(2) > span
-        filters:
-        - name: replace
-          args: ["(", ""]
-        - name: replace
-          args: [")", ""]
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(4) > font > b
-      seeders:
-        selector: td:nth-child(5) > b > font
-      leechers:
-        selector: td:nth-child(6) > font > b
-      downloadvolumefactor:
-        case:
-          "img[alt=\"[free]\"]": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "img[alt=\"[+UP x2]\"]": "2"
-          "*": "1"
--- a/src/Jackett.Common/Definitions/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -0,0 +1,169 @@
+---
+  site: baibako
+  name: BaibaKo
+  description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: semi-private
+  encoding: windows-1251
+  links:
+    - http://baibako.tv/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.login2
+    test:
+      path: /
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      search: "{{.Keywords }}"
+      # 0 active 1 incldead 2 onlydead 3 gold 4 seedfree
+      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+    keywordsfilters:
+      - name: re_replace
+        args: ["[s|S](\\d+)[e|E][\\d]+", "/s$1"]
+
+    rows:
+      selector: table > tbody > tr:has(a[href^="details.php?id="])
+
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          - name: re_replace
+            args: ["[\\/]+", ""]
+          - name: replace
+            args: [" (Золото)", ""]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: re_replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HD720p", "HD 720p"]
+          - name: replace
+            args: ["HDR720p", "HD 720p"]
+          - name: replace
+            args: ["HD1080p", "HD 1080p"]
+          - name: replace
+            args: ["HDR1080p", "HD 1080p"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: append
+            args: " - rus"
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        text: 1
+      banner:
+        selector: img[src^="/posters/"]
+        attribute: src
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: small
+        filters:
+          - name: replace
+            args: ["Загружена: ", ""]
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["января", "January"]
+          - name: replace
+            args: ["февраля", "February"]
+          - name: replace
+            args: ["марта ", "March"]
+          - name: replace
+            args: ["апреля", "April"]
+          - name: replace
+            args: ["мая", "May"]
+          - name: replace
+            args: ["июня", "June"]
+          - name: replace
+            args: ["июля", "July"]
+          - name: replace
+            args: ["августа", "August"]
+          - name: replace
+            args: ["сентября", "September"]
+          - name: replace
+            args: ["октября", "October"]
+          - name: replace
+            args: ["ноября", "November"]
+          - name: replace
+            args: ["декабря", "December"]
+          - name: dateparse
+            args: "2 January 2006 15:04:05"
+      files:
+        selector: td:nth-last-child(5)
+      size:
+        selector: td:nth-last-child(3)
+      seeders:
+        selector: td:nth-last-child(2)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-last-child(2)
+        filters:
+          - name: split
+            args: ["|", 1]
+      grabs:
+        selector: td:nth-last-child(1)
+      downloadvolumefactor:
+        case:
+          "a[href^=\"details.php?id=\"]:contains(\"(Золото)\")": 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
--- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
@@ -0,0 +1,119 @@
+---
+  site: beyond-hd-oneurl
+  name: Beyond-HD (OneURL)
+  description: "Without BeyondHD, your HDTV is just a TV"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://beyond-hd.me/
+
+  settings:
+    - name: oneurl
+      type: text
+      label: OneURL
+    - 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"
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    method: oneurl
+    inputs: 
+      oneurl: "{{ .Config.oneurl }}"
+    test:
+      path: torrents
+
+  search:
+    paths:
+      - path: torrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
+      uploader: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tmdb: ""
+      sorting: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
+      qty: 100
+
+    rows:
+      selector: table > tbody > tr
+      after: 1
+
+    fields:
+      _category:
+        selector: a[href*="/categories/"]
+        optional: true
+        attribute: href
+        filters:
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+      category:
+        text: "{{if .Result._category}}{{.Result._category}}{{else}}1{{end}}"
+      title:
+        selector: a.torrent-name
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.torrent-name
+        attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["/img/person.png", ""]
+      date:
+        selector: td:not(a[href$="/history"]) span.text-orange
+        filters:
+          - name: timeago
+      size:
+        selector: td span.text-blue
+      seeders:
+        selector: a[href$="/peers"] span.text-green
+      leechers:
+        selector: a[href$="/peers"] span.text-red
+      grabs:
+        selector: a[href$="/history"]
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          i[data-original-title="100% Free"]: 0
+          i[data-original-title="100% Free (Limited UL)"]: 0
+          i[data-original-title="25% Promo"]: 0.75
+          i[data-original-title="50% Promo"]: 0.5
+          i[data-original-title="75% Promo"]: 0.25
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
+# UNIT3D
--- a/src/Jackett.Common/Definitions/beyond-hd.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd.yml
@@ -0,0 +1,131 @@
+---
+  site: beyond-hd
+  name: Beyond-HD
+  description: "Without BeyondHD, your HDTV is just a TV"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://beyond-hd.me/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login
+    method: form
+    captcha:
+      type: text
+      selector: div[style*="#999999;"]
+      input: key
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: on
+    error:
+      - selector: div.has-error
+    test:
+      path: torrents
+
+  search:
+    paths:
+      - path: torrents
+    inputs:
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
+      uploader: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tmdb: ""
+      sorting: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
+      qty: 100
+
+    rows:
+      selector: table > tbody > tr
+      after: 1
+
+    fields:
+      _category:
+        selector: a[href*="/categories/"]
+        optional: true
+        attribute: href
+        filters:
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+      category:
+        text: "{{if .Result._category}}{{.Result._category}}{{else}}1{{end}}"
+      title:
+        selector: a.torrent-name
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.torrent-name
+        attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["/img/person.png", ""]
+      date:
+        selector: td:not(a[href$="/history"]) span.text-orange
+        filters:
+          - name: timeago
+      size:
+        selector: td span.text-blue
+      seeders:
+        selector: a[href$="/peers"] span.text-green
+      leechers:
+        selector: a[href$="/peers"] span.text-red
+      grabs:
+        selector: a[href$="/history"]
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          i[data-original-title="100% Free"]: 0
+          i[data-original-title="100% Free (Limited UL)"]: 0
+          i[data-original-title="25% Promo"]: 0.75
+          i[data-original-title="50% Promo"]: 0.5
+          i[data-original-title="75% Promo"]: 0.25
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
+# UNIT3D
--- a/src/Jackett.Common/Definitions/bigfangroup.yml
+++ b/src/Jackett.Common/Definitions/bigfangroup.yml
@@ -0,0 +1,204 @@
+---
+  site: bigfangroup
+  name: BigFANGroup
+  description: "BigFANGroup is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: public
+  encoding: windows-1251
+  links:
+    - https://bigfangroup.org/
+    - https://www.freebfg.org/
+
+  caps:
+    categorymappings:
+      # Movies
+      - {id: 13, cat: Movies, desc: "Боевик"}
+      - {id: 18, cat: Movies, desc: "Катастрофа"}
+      - {id: 19, cat: Movies, desc: "Мелодрама"}
+      - {id: 21, cat: Movies, desc: "Драма"}
+      - {id: 22, cat: Movies, desc: "Триллер"}
+      - {id: 23, cat: Movies, desc: "Фантастика"}
+      - {id: 24, cat: Movies, desc: "Комедия"}
+      - {id: 26, cat: Movies, desc: "Ужасы"}
+      - {id: 27, cat: Movies, desc: "Приключения"}
+      - {id: 28, cat: Movies, desc: "Исторический"}
+      - {id: 29, cat: Movies/Foreign, desc: "Наше кино"}
+      - {id: 30, cat: Movies, desc: "Фэнтази"}
+      - {id: 31, cat: Movies, desc: "Мистика"}
+      - {id: 33, cat: Movies, desc: "Военный"}
+      - {id: 36, cat: Movies, desc: "Криминал"}
+      - {id: 39, cat: Movies, desc: "Детектив"}
+      - {id: 47, cat: Movies, desc: "Сказки"}
+      - {id: 48, cat: Movies, desc: "Вестерн"}
+      - {id: 52, cat: Movies, desc: "Биография"}
+      - {id: 53, cat: Movies, desc: "Классика"}
+      - {id: 14, cat: Movies/HD, desc: "HDTV"}
+      - {id: 15, cat: Movies/DVD, desc: "DVD"}
+      - {id: 51, cat: Movies/3D, desc: "3D"}
+      - {id: 20, cat: Movies, desc: "Мультфильм"}
+      # Audio
+      - {id: 35, cat: Audio/Audiobook, desc: "Аудио-книги"}
+      - {id: 43, cat: Audio/Foreign, desc: "Русская музыка"}
+      - {id: 44, cat: Audio, desc: "Зарубежная музыка"}
+      - {id: 45, cat: Audio/Video, desc: "Видеоклипы"}
+      - {id: 46, cat: Audio, desc: "Муз. сборники"}
+      - {id: 54, cat: Audio, desc: "Классическая музыка"}
+      - {id: 55, cat: Audio, desc: "Саундтрек"}
+      # TV
+      - {id: 11, cat: TV, desc: "Сериалы"}
+      - {id: 25, cat: TV, desc: "ТВ-шоу"}
+      - {id: 37, cat: TV/Sport, desc: "Спорт"}
+      - {id: 50, cat: TV, desc: "Новости"}
+      - {id: 49, cat: TV, desc: "Научно-популярное"}
+      - {id: 32, cat: TV/Documentary, desc: "Документальный"}
+      - {id: 12, cat: TV, desc: "Анимация"}
+      # PC
+      - {id: 1, cat: PC, desc: "Софт"}
+      - {id: 5, cat: PC/Games, desc: "Игры"}
+      # Other
+      - {id: 38, cat: Books, desc: "Книги и журналы"}
+      - {id: 42, cat: XXX, desc: "Эротика"}
+      - {id: 9, cat: Other, desc: "Разное"}
+
+    modes:
+      search: [q]
+# seems that site does not support season/episode searching      
+#      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seed": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  search:
+    # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
+    # 
+    paths:
+      - path: browse.php
+# cant get season/episode search working on this site
+#    keywordsfilters:
+#      - name: diacritics
+#        args: replace
+#      - name: re_replace # S01 to Сезон 1
+#        args: ["(?i)\\bS0*(\\d+)\\b", ", Сезон $1"]
+#      - name: re_replace # S01E01 to Сезон 1 Серия 1
+#        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ", Сезон $1,  Серия $2"]
+    inputs:
+# multi category filters not supported
+#      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      cat: 0
+      # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver 7 BFG
+      incldead: 1
+      ajax: 1
+      year: 0
+      format: 0
+      s: "{{ .Config.sort }}"
+      d: "{{ .Config.type }}"
+
+    rows:
+      selector: table > tbody#highlighted > tr:has(a[href^="browse.php?cat="])
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\.\\,\\:\\-\\/\\|]", " "]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(.*)[CСcс]]ери[ия]\\s+(\\d+)(.*)", "$1 E$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEB DLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details", "download"]
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        selector: img[src="pic/time.png"]
+        attribute: title
+        filters:
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["января", "January"]
+          - name: replace
+            args: ["февраля", "February"]
+          - name: replace
+            args: ["марта ", "March"]
+          - name: replace
+            args: ["апреля", "April"]
+          - name: replace
+            args: ["мая", "May"]
+          - name: replace
+            args: ["июня", "June"]
+          - name: replace
+            args: ["июля", "July"]
+          - name: replace
+            args: ["августа", "August"]
+          - name: replace
+            args: ["сентября", "September"]
+          - name: replace
+            args: ["октября", "October"]
+          - name: replace
+            args: ["ноября", "November"]
+          - name: replace
+            args: ["декабря", "December"]
+          - name: dateparse
+            args: "2 January 2006 15:04:05"
+      downloadvolumefactor:
+        case:
+          img[src="pic/freedownload.gif"]: 0
+          img[src="pic/silverdown.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/bigtower.yml
+++ b/src/Jackett.Common/Definitions/bigtower.yml
@@ -12,63 +12,31 @@
    categorymappings:

      # Movies
-      - {id: 91, cat: Movies/HD, desc: "DSS"}
-      - {id: 92, cat: Movies/HD, desc: "DSS 3D"}
-      - {id: 14, cat: Movies, desc: "Screener"}     
-      - {id: 15, cat: Movies/SD, desc: "DVDRip"}
-      - {id: 16, cat: Movies/HD, desc: "BDRip"}
-      - {id: 17, cat: Movies/HD, desc: "HD 720p"}
-      - {id: 18, cat: Movies/HD, desc: "HD 1080p"}
-      - {id: 19, cat: Movies/HD, desc: "HD 3D"}
-      - {id: 83, cat: Movies/HD, desc: "4K (Ultra HD)"}
-      - {id: 89, cat: Movies/DVD, desc: "DVD 5"}
-      - {id: 90, cat: Movies/DVD, desc: "DVD 9"}
-      - {id: 37, cat: Movies, desc: "MP4"}
-      - {id: 61, cat: TV, desc: "TV Show"}
-      - {id: 78, cat: TV, desc: "Serie TV"}
-      - {id: 96, cat: TV/HD, desc: "Serie TV 720p"}
-      - {id: 97, cat: TV/HD, desc: "Serie TV 1080p"}
-      - {id: 98, cat: TV, desc: "Serie TV MP4"}
-      - {id: 24, cat: TV/Anime, desc: "Cartoni"}
-      - {id: 66, cat: TV/Anime, desc: "Anime"}
-      - {id: 71, cat: TV, desc: "SUB iTA"}
-      - {id: 75, cat: TV/Documentary, desc: "Documentari"}
-      - {id: 72, cat: TV/Sport, desc: "Sport"}
+      - {id: 11, cat: Movies/HD, desc: "DSS"}
+      - {id: 1, cat: Movies, desc: "Screener"}     
+      - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
+      - {id: 3, cat: Movies/BluRay, desc: "Bluray 1080p & 720p"}
+      - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
+      - {id: 6, cat: TV, desc: "Serie TV"}
+      - {id: 4, cat: TV/Anime, desc: "Cartoni"}

      # GAMES
-      - {id: 28, cat: PC/Games, desc: "PC Games"}
-      - {id: 63, cat: Console/Xbox 360, desc: "XBOX 360"}
-      - {id: 64, cat: Console/PS3, desc: "PS3"}
-      - {id: 33, cat: Console/Wii, desc: "WII"}
-      - {id: 76, cat: Console/Other, desc: "PS2"}
-      - {id: 81, cat: Console/Xbox One, desc: "XBOX ONE"}
-      - {id: 84, cat: Console/PS4, desc: "PS4"}
+      - {id: 7, cat: PC/Games, desc: "Giochi"}

      # MUSIC
-      - {id: 35, cat: Audio, desc: "MP3"}
-      - {id: 67, cat: Audio, desc: "FLAC"}
+      - {id: 8, cat: Audio, desc: "Musica"}
    
      # SOFTWARE
-      - {id: 52, cat: PC/ISO, desc: "Windows"}
-      - {id: 54, cat: PC/ISO, desc: "Mac"}
-      - {id: 69, cat: PC/ISO, desc: "Linux"}
+      - {id: 9, cat: PC/0day, desc: "Software"}
    
      # PHONE
-      - {id: 40, cat: PC/Phone-IOS, desc: "Android"}
-      - {id: 41, cat: PC/Phone-Android, desc: "Iphone"}
+      - {id: 12, cat: PC/Phone-Other, desc: "Applicazioni"}

      # OTHER
-      - {id: 44, cat: Other, desc: "Varie"}
-      - {id: 82, cat: Other, desc: "Music Video"}
-      - {id: 86, cat: Other, desc: "Navigatori"}
-      - {id: 95, cat: Other, desc: "Immagini"}
-      - {id: 99, cat: Other, desc: "AudioLibri"}
+      - {id: 14, cat: Other, desc: "Varie & Altro"}

      # EBOOK
-      - {id: 46, cat: Books, desc: "Ebook"}
-      - {id: 73, cat: Books/Comics, desc: "Fumetti"}
-      - {id: 74, cat: Books/Comics, desc: "Manga"}
-      - {id: 87, cat: Books, desc: "Giornali"}
+      - {id: 13, cat: Books, desc: "Libri & Edicola"}

    modes:
      search: [q]
@@ -140,21 +108,21 @@
      size:
        selector: td:nth-last-child(2)
      date:
-        selector: td:nth-last-child(7)
+        selector: td:nth-last-child(8)
        filters:
          - name: append
            args: " +01:00"
          - name: dateparse
            args: "02/01/2006 -07:00"
      grabs:
-        selector: td:nth-last-child(4)
+        selector: td:nth-last-child(5)
        filters:
          - name: replace
            args: ["---", "0"]
      seeders:
-        selector: td:nth-last-child(6)
+        selector: td:nth-last-child(7)
      leechers:
-        selector: td:nth-last-child(5)
+        selector: td:nth-last-child(6)
      downloadvolumefactor:
        case:
          img[alt="Gold 100% Free"]: "0"
--- a/src/Jackett.Common/Definitions/bit-titan.yml
+++ b/src/Jackett.Common/Definitions/bit-titan.yml
@@ -10,46 +10,81 @@

  caps:
    categorymappings:
-      - {id: 1, cat: TV/Documentary, desc: "Doku HD"}
-      - {id: 2, cat: TV/Documentary, desc: "Doku Packs"}
-      - {id: 3, cat: TV/Documentary, desc: "Doku SD"}
-      - {id: 4, cat: Movies/FOREIGN, desc: "International"}
-      - {id: 5, cat: Movies/HD, desc: "Movies 1080p"}
-      - {id: 6, cat: Movies/3D, desc: "Movies 3D"}
-      - {id: 7, cat: Movies/HD, desc: "Movies 720p"}
-      - {id: 36, cat: Movies/BluRay, desc: "Movies BluRay"}
-      - {id: 8, cat: Movies/DVD, desc: "Movies DVD / HDVD"}
-      - {id: 37, cat: Movies/HD, desc: "Movies HD Pack"}
-      - {id: 9, cat: Movies/SD, desc: "Movies SD"}
-      - {id: 38, cat: Movies/SD, desc: "Movies SD Pack"}
-      - {id: 10, cat: Movies/UHD, desc: "Movies UHD"}
-      - {id: 11, cat: TV/HD, desc: "Serien HD"}
-      - {id: 12, cat: TV/OTHER, desc: "Serien Packs"}
-      - {id: 13, cat: TV/SD, desc: "Serien SD"}
-      - {id: 14, cat: TV/Sport, desc: "Sport"}
-      - {id: 15, cat: XXX/x264, desc: "XXX HD"}
-      - {id: 16, cat: XXX/XviD, desc: "XXX SD"}
-      - {id: 17, cat: Audio/Lossless, desc: "Musik FLAC"}
-      - {id: 18, cat: Audio/MP3, desc: "Musik MP3"}
-      - {id: 19, cat: Audio/Other, desc: "Musik Sonstiges"}
-      - {id: 20, cat: Audio/Video, desc: "Musik Videos"}
-      - {id: 23, cat: Console, desc: "Spiele Handy"}
-      - {id: 24, cat: Console, desc: "Spiele Linux"}
-      - {id: 21, cat: Console/NDS, desc: "Spiele Nintendo"}
-      - {id: 22, cat: Console/PSP, desc: "Spiele PlayStation"}
-      - {id: 25, cat: Console, desc: "Spiele Sonstige"}
-      - {id: 40, cat: Console, desc: "Spiele Wimmelbild"}
-      - {id: 26, cat: PC/Games, desc: "Spiele Windows"}
-      - {id: 27, cat: Console, desc: "XBOX 360/ONE"}
-      - {id: 28, cat: PC, desc: "Software Handy"}
-      - {id: 29, cat: PC, desc: "Software Linux"}
-      - {id: 30, cat: PC/Mac, desc: "Software Mac Os"}
-      - {id: 31, cat: PC, desc: "Software Sonstige"}
-      - {id: 32, cat: PC/0day, desc: "Software Windows"}
-      - {id: 33, cat: TV/Anime, desc: "Anime"}
-      - {id: 39, cat: Books/Ebook, desc: "eBook"}
-      - {id: 34, cat: Audio/Audiobook, desc: "Hörbücher/ -spiele"}
-      - {id: 35, cat: XXX/Other, desc: "XXX Sonstiges"}
+      - {id: 1010, cat: Movies/UHD, desc: "Movies 2160p"}
+      - {id: 1020, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 1030, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 1040, cat: Movies/HD, desc: "Movies x264"}
+      - {id: 1050, cat: Movies/HD, desc: "Movies x265"}
+      - {id: 1060, cat: Movies/SD, desc: "Movies XviD"}
+      - {id: 1070, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 1080, cat: Movies/DVD, desc: "Movies DVD"}
+      - {id: 1090, cat: Movies/BluRay, desc: "Movies BluRay"}
+      - {id: 1100, cat: Movies/DVD, desc: "Movies HD2DVD"}
+      - {id: 1110, cat: Movies/Foreign, desc: "Movies nternational"}
+      - {id: 1120, cat: Movies/HD, desc: "Movies HD Packs"}
+      - {id: 1130, cat: Movies/SD, desc: "Movies SD Packs"}
+      - {id: 2010, cat: TV/UHD, desc: "TV 2160p"}
+      - {id: 2020, cat: TV/HD, desc: "TV 1080p"}
+      - {id: 2030, cat: TV/HD, desc: "TV 720p"}
+      - {id: 2040, cat: TV/HD, desc: "TV x264"}
+      - {id: 2050, cat: TV/HD, desc: "TV x265"}
+      - {id: 2060, cat: TV/SD, desc: "TV XviD"}
+      - {id: 2070, cat: TV/HD, desc: "TV HD Packs"}
+      - {id: 2080, cat: TV/SD, desc: "TV SD Packs"}
+      - {id: 2090, cat: TV/FOREIGN, desc: "TV International"}
+      - {id: 3010, cat: TV/Documentary, desc: "Docu 2160p"}
+      - {id: 3020, cat: TV/Documentary, desc: "Docu 1080p"}
+      - {id: 3030, cat: TV/Documentary, desc: "Docu 720p"}
+      - {id: 3040, cat: TV/Documentary, desc: "Docu x264"}
+      - {id: 3050, cat: TV/Documentary, desc: "Docu x265"}
+      - {id: 3060, cat: TV/Documentary, desc: "Docu XviD"}
+      - {id: 3070, cat: TV/Documentary, desc: "Docu HD Packs"}
+      - {id: 3080, cat: TV/Documentary, desc: "Docu SD Packs"}
+      - {id: 3090, cat: TV/Documentary, desc: "Docu International"}
+      - {id: 4010, cat: TV/Sport, desc: "Sport 2160p"}
+      - {id: 4020, cat: TV/Sport, desc: "Sport 1080p"}
+      - {id: 4030, cat: TV/Sport, desc: "Sport 720p"}
+      - {id: 4040, cat: TV/Sport, desc: "Sport SD Sport"}
+      - {id: 4050, cat: TV/Sport, desc: "Sport HD Packs"}
+      - {id: 4060, cat: TV/Sport, desc: "Sport SD Packs"}
+      - {id: 5010, cat: XXX, desc: "XXX 2160p"}
+      - {id: 5020, cat: XXX, desc: "XXX 1080p"}
+      - {id: 5030, cat: XXX, desc: "XXX 720p"}
+      - {id: 5040, cat: XXX, desc: "XXX x264"}
+      - {id: 5050, cat: XXX, desc: "XXX x265"}
+      - {id: 5060, cat: XXX, desc: "XXX XviD"}
+      - {id: 5070, cat: XXX, desc: "XXX HD Packs"}
+      - {id: 5080, cat: XXX, desc: "XXX SD Packs"}
+      - {id: 6010, cat: PC/Games, desc: "Games Windows"}
+      - {id: 6020, cat: Console, desc: "Games Linux"}
+      - {id: 6030, cat: PC/Mac, desc: "Games MacOS"}
+      - {id: 6040, cat: PC/Phone-Android, desc: "Games Android"}
+      - {id: 6050, cat: Console/Xbox, desc: "Games Xbox"}
+      - {id: 6060, cat: Console/PSP, desc: "Games PlayStation"}
+      - {id: 6070, cat: Console/NDS, desc: "Games Nintendo"}
+      - {id: 6080, cat: Console, desc: "Games Sonstige"}
+      - {id: 7010, cat: PC/0day, desc: "Software Windows"}
+      - {id: 7020, cat: PC, desc: "Software Linux"}
+      - {id: 7030, cat: PC/Mac, desc: "Software MacOS"}
+      - {id: 7040, cat: PC/Phone-Android, desc: "Software Android"}
+      - {id: 8010, cat: Audio/MP3, desc: "Music MP3-Album"}
+      - {id: 8020, cat: Audio/MP3, desc: "Music MP3-Charts"}
+      - {id: 8030, cat: Audio/MP3, desc: "Music MP3-Sampler"}
+      - {id: 8040, cat: Audio/MP3, desc: "Music MP3-Single"}
+      - {id: 8050, cat: Audio/Lossless, desc: "Music FLAC-Album"}
+      - {id: 8060, cat: Audio/Lossless, desc: "Music FLAC-Charts"}
+      - {id: 8070, cat: Audio/Lossless, desc: "Music FLAC-Sampler"}
+      - {id: 8080, cat: Audio/Lossless, desc: "Music FLAC-Single"}
+      - {id: 8090, cat: Audio/Video, desc: "Music Video"}
+      - {id: 9010, cat: Audio/Audiobook, desc: "Books A-Book"}
+      - {id: 9020, cat: Books/Ebook, desc: "Books E-Book"}
+      - {id: 9030, cat: Books, desc: "Books E-Paper"}
+      - {id: 9040, cat: Books, desc: "Books E-Learning"}
+      - {id: 9050, cat: TV, desc: "TV Kids"}
+      - {id: 9060, cat: TV/Anime, desc: "Anime HD"}
+      - {id: 9070, cat: TV/Anime, desc: "Anime SD"}
+      - {id: 9080, cat: TV/Anime, desc: "Anime Pack"}
+      - {id: 9999, cat: Other, desc: "unsort"}

    modes:
      search: [q]
@@ -63,6 +98,22 @@
    - name: password
      type: password
      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeds": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  login:
    path: login.php
@@ -101,11 +152,13 @@
      blah: 0
      # include dead 0=active 1=all 2=dead
      incldead: 1
-      orderby: "added"
-      sort: "desc"
+      orderby: "{{ .Config.sort }}"
+      sort: "{{ .Config.type }}"
      showsearch: 0
+
    rows:
      selector: table.tableinborder[border="0"][cellspacing="0"][cellpadding="0"] tr
+
    fields:
      category:
        selector: td.tableb a
@@ -162,11 +215,17 @@
        selector: div.tor-take
        filters:
          - name: regexp
-            args: "(\\d+)"
+            args: (\d+)
      downloadvolumefactor:
        case:
-          img[src="pic/ou_new.png"]: "0"
-          "*": "1"
+          img[src="pic/new_details/25k.png"]: 0.25
+          img[src="pic/new_details/50k.png"]: 0.5
+          img[src="pic/new_details/75k.png"]: 0.75
+          img[src="pic/ou_new.png"]: 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          img[src="pic/sc-dark/multi2.jpg"]: 2
+          img[src="pic/sc-dark/multi5.jpg"]: 5
+          img[src="pic/sc-dark/multi10.jpg"]: 10
+          "*": 1
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -53,6 +53,7 @@
    modes:
      search: [q]
      tv-search: [q, season, ep]
+      movie-search: [q]

  settings:
    - name: cookie
@@ -62,6 +63,22 @@
      type: info
      label: How to get the Cookie
      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  login:
    method: cookie
@@ -72,33 +89,15 @@
    paths:
      - path: browse.php
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
    rows:
      selector: tr[class^="browse"]
+
    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="torrent.php?id="]
-        attribute: title
-      banner:
-        optional: true
-        selector: a[href^="torrent.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: ", '(.*)'"
-      downloadvolumefactor:
-        case:
-          img[title="Ingyenes letöltés"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        selector: span:contains("Feltöltési szorzó")
-        filters:
-          - name: replace
-            args: ["Feltöltési szorzó × ", ""]
      category:
        selector: a[href^="browse.php?cat="]
        attribute: href
@@ -106,9 +105,22 @@
          - name: querystring
            args: cat
          - name: trim # some torrents have an extra space
+      title:
+        selector: a[href^="torrent.php?id="]
+        attribute: title
      details:
        selector: a[href^="torrent.php?id="]
        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      banner:
+        optional: true
+        selector: a[href^="torrent.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: ", '(.*)'"
      size:
        selector: td:nth-child(4)
      grabs:
@@ -119,3 +131,12 @@
        selector: td:nth-child(7)
      date:
        selector: "a[style=\"font-size: 8pt;cursor: pointer;\"][title]"
+      downloadvolumefactor:
+        case:
+          img[title="Ingyenes letöltés"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        selector: span:contains("Feltöltési szorzó")
+        filters:
+          - name: replace
+            args: ["Feltöltési szorzó × ", ""]
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@@ -91,7 +91,7 @@
        selector: a[href^="details.php?id="]
        attribute: href
      imdb:
-        selector: a[href^="http://anonym.to/?http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        attribute: href
      banner:
        selector: a[onmouseover^="bithumen.UI.images.coverShow"]
--- a/src/Jackett.Common/Definitions/bitme.yml
+++ b/src/Jackett.Common/Definitions/bitme.yml
@@ -1,128 +0,0 @@
---
-  site: bitme
-  name: BitMe
-  description: "BitMe.ORG is an E-Learning torrent tracker"
-  language: en-us
-  type: private
-  encoding: windows-1252
-  links:
-    - http://www.bitme.org/
-
-  caps:
-    categorymappings:
-      - {id: 20, cat: Books, desc: "3D"}
-      - {id: 1, cat: Books, desc: "AppDev"}
-      - {id: 14, cat: Books, desc: "Art"}
-      - {id: 2, cat: Audio/Audiobook, desc: "Audio"}
-      - {id: 3, cat: Books, desc: "CBT"}
-      - {id: 21, cat: Books, desc: "Dating"}
-      - {id: 29, cat: Books, desc: "Do It Yourself"}
-      - {id: 5, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 6, cat: Books, desc: "e-Books"}
-      - {id: 7, cat: Books, desc: "Keystone"}
-      - {id: 8, cat: Books, desc: "Languages"}
-      - {id: 9, cat: Books, desc: "LearnKey"}
-      - {id: 10, cat: Books, desc: "Lynda.com"}
-      - {id: 19, cat: Books, desc: "Magic"}
-      - {id: 30, cat: Books, desc: "MATH"}
-      - {id: 18, cat: Books, desc: "Medical"}
-      - {id: 11, cat: Books, desc: "Misc"}
-      - {id: 12, cat: Books, desc: "Misc E-Learning"}
-      - {id: 22, cat: Books, desc: "Music Learning"}
-      - {id: 28, cat: Books, desc: "Photography"}
-      - {id: 23, cat: Books, desc: "Political"}
-      - {id: 24, cat: Books, desc: "Religion"}
-      - {id: 25, cat: Books, desc: "Self Improvement"}
-      - {id: 16, cat: Audio/Other, desc: "SFX"}
-      - {id: 26, cat: Books, desc: "Sports"}
-      - {id: 17, cat: Other, desc: "Stock Photography"}
-      - {id: 13, cat: Books, desc: "Total Training"}
-      - {id: 4, cat: Books, desc: "TTC"}
-      - {id: 27, cat: Other, desc: "Video Stock"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    method: form
-    path: login.php
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      selector: img[src="visual.php"]
-      input: secimage
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      logout: "no"
-    error:
-      - selector: table:contains("Login failed!")
-      - selector: table:contains("Wrong Code!")
-    test:
-      path: browse.php
-
-  search:
-    path: browse.php
-    method: get
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-    rows:
-      selector: table[cellpadding="5"] > tbody > tr:has(td.latest)
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      category:
-        selector: a[href^="?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      download:
-        selector: a[href^="download.php/"]
-        attribute: href
-      size:
-        selector: td:nth-child(7)
-        filters:
-          - name: replace
-            args: ["<br>", ""]
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: replace
-            args: ["<br>", ""]
-          - name: replace
-            args: ["times", ""]
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      date:
-        selector: font[color="999999"]
-        filters:
-          - name: replace
-            args: ["at", ""]
-          - name: replace
-            args: [",", ""]
-          - name: replace
-            args: ["st", ""]
-          - name: replace
-            args: ["nd", ""]
-          - name: replace
-            args: ["rd", ""]
-          - name: replace
-            args: ["th", ""]
-          - dateparse:
-            args: "Monday January 2 2006 15:04:05 PM"
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-
-
--- a/src/Jackett.Common/Definitions/bitru.yml
+++ b/src/Jackett.Common/Definitions/bitru.yml
@@ -0,0 +1,156 @@
+---
+  site: bitru
+  name: BitRu
+  description: "BitRu is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+  language: ru-ru
+  type: public
+  encoding: UTF-8
+  links:
+    - http://bitru.org/
+
+  caps:
+    categories:
+      "movie": Movies
+      "serial": TV
+      "music": Audio
+      "game": PC/Games
+      "soft": PC
+      "literature": Books
+      "audiobook": Audio/Audiobook
+      "video": Movies
+      "image": Other
+      "xxx": XXX
+
+    modes:
+      search: [q]
+
+  settings:
+    - name: adverts
+      type: select
+      label: Include Advertising
+      default: "yes"
+      options:
+        "yes": "yes"
+        "no": "no"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "_"
+      options:
+        "_": "created"
+        "seeders": "seeders"
+        "size": "size"
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      s: "{{ .Keywords }}"
+      rek: "{{ .Config.adverts }}"
+      sort: "{{ re_replace .Config.sort \"_\" \"\"}}"
+
+    rows:
+      selector: table.browse-list > tbody > tr
+    fields:
+      category:
+        selector: td:nth-child(1) a
+        attribute: href
+        filters:
+          - name: querystring
+            args: tmp
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details", "download"]
+      description:
+        selector: img[src="styles/images/adwarn.png"]
+        optional: true
+        attribute: title
+        filters:
+          - name: replace
+            args: ["Присутствует реклама", "Contains Adverts"]
+      banner:
+        selector: a[href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) "
+      date:
+        # Сегодня в 09:09 от 
+        # Вчера в 22:47 от 
+        selector: td:nth-child(2) div.b-info div span:nth-child(2):contains("Сегодня"),  td:nth-child(2) div.b-info div span:nth-child(2):contains("Вчера")
+        optional: true
+        filters:
+          - name: regexp
+            args: "(.*?) от "
+          - name: replace
+            args: ["Сегодня в", "Today"]
+          - name: replace
+            args: ["Вчера в", "Yesterday"]
+      date:
+        # 08 ноября 2019 в 23:53 от 
+        selector: td:nth-child(2) div.b-info div span:nth-child(2):not(:contains("Сегодня")):not(:contains("Вчера"))
+        optional: true
+        filters:
+          - name: regexp
+            args: "(.*?) от "
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["января", "January"]
+          - name: replace
+            args: ["февраля", "February"]
+          - name: replace
+            args: ["марта ", "March"]
+          - name: replace
+            args: ["апреля", "April"]
+          - name: replace
+            args: ["мая", "May"]
+          - name: replace
+            args: ["июня", "June"]
+          - name: replace
+            args: ["июля", "July"]
+          - name: replace
+            args: ["августа", "August"]
+          - name: replace
+            args: ["сентября", "September"]
+          - name: replace
+            args: ["октября", "October"]
+          - name: replace
+            args: ["ноября", "November"]
+          - name: replace
+            args: ["декабря", "December"]
+          - name: dateparse
+            args: "02 January 2006 15:04"
+      size:
+        selector: td:nth-child(3)
+        filters:
+          - name: replace
+            args: ["ТБ", "TB"] 
+          - name: replace
+            args: ["ГБ", "GB"]
+          - name: replace
+            args: ["МБ", "MB"]
+          - name: replace
+            args: ["КБ", "KB"]
+      seeders:
+        selector: td:nth-child(4)
+        filters:
+          - name: replace
+            args: ["?", "1"] 
+      leechers:
+        selector: td:nth-child(5) 
+        filters:
+          - name: replace
+            args: ["?", "0"] 
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/bitspyder.yml
+++ b/src/Jackett.Common/Definitions/bitspyder.yml
@@ -21,7 +21,7 @@
      - {id: 63, cat: Books, desc: "College"}
      - {id: 53, cat: Books, desc: "Cooking"}
      - {id: 42, cat: Books, desc: "Documentary"}
-      - {id: 37, cat: Books, desc: "e-Books"}
+      - {id: 37, cat: Books/Ebook, desc: "e-Books"}
      - {id: 65, cat: Books, desc: "Engineering"}
      - {id: 54, cat: Books, desc: "Health-Fitness"}
      - {id: 64, cat: Books, desc: "Kids"}
@@ -29,27 +29,26 @@
      - {id: 49, cat: Books, desc: "Linux CBTs"}
      - {id: 43, cat: Books, desc: "Lynda.com"}
      - {id: 57, cat: Books/Magazines, desc: "Magazines"}
-      - {id: 71, cat: Books, desc: "Magic"}
+      - {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: 52, cat: Books, desc: "Photography"}
-      - {id: 35, cat: Books, desc: "PPT 'n Docs"}
-      - {id: 38, cat: Books, desc: "Religion"}
+      - {id: 35, cat: Books, desc: "Developer"}
+      - {id: 38, cat: Books, desc: "Udemy"}
      - {id: 68, cat: Books, desc: "Self Growth"}
      - {id: 72, cat: Books, desc: "Templates"}
-      - {id: 58, cat: Books, desc: "Total Training"}
-      - {id: 45, cat: Books, desc: "Trainsignal"}
-      - {id: 59, cat: Books, desc: "VTC"}
+      - {id: 58, cat: Books, desc: "Packt"}
+      - {id: 45, cat: Books, desc: "Ethical hacking"}
+      - {id: 59, cat: Books, desc: "WEB | SocialMedia"}


    modes:
      search: [q]
-      tv-search: [q, season, ep]

  login:
-    path: processid.php
+    path: processf.php
    method: post
    inputs:
      username: "{{ .Config.username }}"
@@ -64,8 +63,11 @@
      - path: browse.php
        method: post
    inputs:
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 0 title 1 default
+      scope: 1
    rows:
      selector: table > tbody > tr[class]
      filters:
--- a/src/Jackett.Common/Definitions/bittorrentam.yml
+++ b/src/Jackett.Common/Definitions/bittorrentam.yml
@@ -0,0 +1,81 @@
+---
+  site: bittorrentam
+  name: Bittorrent.AM
+  description: "Bittorrent.AM is a Public torrent index"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - http://www.bittorrent.am/
+
+  caps:
+    categorymappings:
+      - {id: 0, cat: XXX, desc: "Adult"}
+      - {id: 1, cat: TV/Anime, desc: "Anime / Hentai"}
+      - {id: 2, cat: PC, desc: "Apps"}
+      - {id: 3, cat: Console, desc: "Games"}
+      - {id: 4, cat: Movies, desc: "Movies"}
+      - {id: 5, cat: Audio, desc: "Music"}
+      - {id: 6, cat: Other, desc: "Other"}
+      - {id: 7, cat: TV, desc: "Series / TV Shows"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "pdd"
+      options:
+        "pdd": "created desc"
+        "pd": "created asc"
+        "sdsd": "seeders desc"
+        "sds": "seeders asc"
+        "szd": "size desc"
+        "sz": "size asc"
+        "td": "title desc"
+        "t": "title asc"
+
+  download:
+    selector: a[ href^="magnet:?xt="]
+
+  search:
+    paths:
+      - path: "{{if .Keywords}}search.php?kwds={{ .Keywords}}&ord={{ .Config.sort }}&cat=100{{else}}/{{end}}"
+    rows:
+      selector: table.torrentsTable:has(tr.r) tbody tr.r
+    fields:
+      category:
+        text: 6
+      title:
+        selector: td:nth-child(3) a
+      details:
+        selector: td:nth-child(3) a
+        attribute: href
+      download:
+        selector: td:nth-child(3) a
+        attribute: href
+      date:
+        selector: td:nth-child(1)
+        filters:
+          - name: dateparse
+            args: "02 Jan 2006"
+      size:
+        selector: td:nth-child(4)
+      seeders:
+        selector: td:nth-child(5)
+        filters:
+          - name: replace
+            args: ["-", "1"]
+      leechers:
+        selector: td:nth-child(6)
+        filters:
+          - name: replace
+            args: ["-", "0"]
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -69,6 +69,21 @@
      type: info
      label: Layout
      default: "<ol><li>Only the English Classic profile is supported.<li>Make sure to set the <b>Torrent Listing (Listeleme Biçimi)</b> option in your profile to <b>Classic (Klasik)</b><li>And set the <b>Language (Dil)</b> to <b>English</b><li>Using the <i>Modern</i> theme will prevent results, and using <i>Turkish</i> will prevent upload dates.</ol>"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
      
  login:
    path: ?p=home&pid=1
@@ -80,7 +95,6 @@
      loginbox_membername: "{{ .Config.username }}"
      loginbox_password: "{{ .Config.password }}"
      loginbox_remember: 1
-      loginbox_remember: "true"
    selectorinputs:
      securitytoken:
        selector: "script:contains(\"stKey: \")"
@@ -100,12 +114,14 @@
      - name: re_replace
        args: ["[^a-zA-Z0-9]+", "%25"]
    inputs:
-      p: "torrents"
-      pid: "32"
-      $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
+      p: torrents
+      pid: 32
+      $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
      keywords: "{{ .Keywords }}"
-      search_type: "name"
-      searchin: "title"
+      search_type: name
+      searchin: title
+      "sortOptions[sortBy]": "{{ .Config.sort }}"
+      "sortOptions[sortOrder]": "{{ .Config.type }}"
    error:
      - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))
    rows:
@@ -159,9 +175,9 @@
        attribute: href
      downloadvolumefactor:
        case:
-          "img[src$=\"/torrent_free.png\"]": "0.5"
-          "*": "1"
+          "img[src$=\"/torrent_free.png\"]": 0.5
+          "*": 1
      uploadvolumefactor:
        case:
-          "img[src$=\"/torrent_multiple_upload.png\"]": "2"
-          "*": "1"
+          "img[src$=\"/torrent_multiple_upload.png\"]": 2
+          "*": 1
--- a/src/Jackett.Common/Definitions/blutopia.yml
+++ b/src/Jackett.Common/Definitions/blutopia.yml
@@ -19,42 +19,80 @@
      tv-search: [q, season, ep, imdbid]
      movie-search: [q, imdbid]

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: login
    method: form
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
-      path: torrents
+      path: /
+      selector: a[href$="/logout"]
+      
+  ratio:
+    path: /
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"

  search:
    paths:
-      - path: filterTorrents
+      - path: torrents/filter
    inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
      tmdb: ""
      mal: ""
-      sort: created_at
-      direction: desc
+      igdb: ""
+      sorting: "{{ .Config.sort }}"
+      sort: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
      qty: 100
+
    rows:
      selector: table > tbody > tr
+
    fields:
      category:
        selector: a[href*="/categories/"]
        attribute: href
        filters:
          - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
      title:
        selector: a.view-torrent
      download:
@@ -70,17 +108,20 @@
        filters:
          - name: replace
            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
        filters:
          - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
      imdb:
        optional: true
        selector: a[href*="www.imdb.com/title/tt"]
@@ -88,42 +129,45 @@
      date:
        selector: time
        filters:
-            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
          - name: re_replace
-            args: ["(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди)", "ago"]
+            args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди|前)", " ago"]
          - name: re_replace
-            args: ["(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
          - name: re_replace
-            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+            args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
          - name: re_replace
-            args: ["(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"]
+            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
          - name: re_replace
-            args: ["(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+            args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
          - name: re_replace
-            args: ["(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден)", "day"]
+            args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
          - name: re_replace
-            args: ["(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+            args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
          - name: re_replace
-            args: ["(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"]
+            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
          - name: re_replace
-            args: ["(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+            args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
          - name: re_replace
-            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+            args: ["(?i) (ay)", "month"]
          - name: re_replace
-            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+            args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand|个月)", " month"]
+          - name: re_replace
+            args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
-          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
-          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
-          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
-          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
-          "*": "1"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
-          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
-          "*": "1"
-# UNIT3D 1.9.2
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 2.2.7
--- a/src/Jackett.Common/Definitions/booktracker.yml
+++ b/src/Jackett.Common/Definitions/booktracker.yml
@@ -0,0 +1,98 @@
+---
+  site: booktracker
+  name: BookTracker
+  description: "BookTracker is a RUSSIAN Semi-Private Torrent Tracker for EBOOKS"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://booktracker.org/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Books/Ebook, desc: "Ebooks"}
+
+    modes:
+      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: "1"
+      options:
+        "1": "created"
+        "10": "seeders"
+        "7": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login.php
+    method: form
+    form: form[action$="/login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      redirect: "index.php"
+      autologin: 1
+    selectorinputs:
+      cookie_test:
+        selector: input[name="cookie_test"]
+        attribute: value
+    error:
+      - selector: h4.warnColor1
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    inputs:
+      nm: "{{ .Keywords }}"
+      o: "{{ .Config.sort }}"
+      s: "{{ .Config.type }}"
+      tm: -1
+      sns: -1
+
+    rows:
+      selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
+
+    fields:
+      title:
+        selector: a.tLink
+      details:
+        selector: a.tLink
+        attribute: href
+      download:
+        selector: a[href^="./download.php?id="]
+        attribute: href
+      category:
+        text: 1
+      size:
+        selector: td:nth-child(6) > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      grabs:
+        selector: td:nth-child(9)
+      date:
+        selector: td:last-child > u
+      downloadvolumefactor:
+        text: 1
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/btbit.yml
+++ b/src/Jackett.Common/Definitions/btbit.yml
@@ -1,70 +0,0 @@
---
-  site: btbit
-  name: btbit
-  description: "btbit is a public magnet search engine for MOVIES / GENERAL. This definition is for the English site."
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - http://en.btbit.org/
-
-  caps:
-    categories:
-      "Movie": Movies
-      "Package": PC/0day
-      "Other": Other
-      "Software": PC
-      "Mirror": PC/ISO
-      "Music": Audio
-      "Picture": Other/Misc
-      "Document": Books
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings: []
-
-  search:
-    paths:
-    # site returns just 15 results per page, attempt to fetch 100
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/1-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/2-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/3-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/4-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/5-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/6-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/7-1-0.html"
-    rows:
-      selector: .rs:has(a[href^="magnet:?xt"])
-    fields:
-      title:
-        selector: .title
-      category:
-        selector: .sbar span[class^="cpill"]
-      details:
-        selector: .title h3 a
-        attribute: href
-      download:
-        selector: .sbar a[href^="magnet:?xt"]
-        attribute: href
-      date:
-        selector: .sbar span:nth-of-type(3) b
-        filters:
-          - name: dateparse 
-            args: "2006-01-02"
-      size:
-        selector: .sbar span:nth-of-type(4) b
-      files:
-        selector: .sbar span:nth-of-type(5) b
-      grabs:
-        selector: .sbar span:nth-of-type(6) b
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -6,10 +6,11 @@
  type: public
  encoding: UTF-8
  links:
-    -  https://btdb.eu/
+    -  https://btdb.io/
  legacylinks:
    -  https://btdb.to/
    -  https://btdb.unblocked.app/
+    -  https://btdb.eu/

  caps:
    categorymappings:
@@ -25,13 +26,17 @@
      type: info
      label: Category for Sonarr and Radarr
      default: BTDB does not use categories. In your Sonarr or Radarr Torznab Indexer settings, set the category to 100001.
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "time"
+      options:
+        "time": "created"
+        "length": "size"

  search:
    paths:
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time{{else}}recent{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=2{{else}}{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=3{{else}}{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=4{{else}}{{end}}"
+      - path: "{{ if .Keywords }}?s={{ .Keywords }}&sort={{ .Config.sort }}{{else}}recent?sort={{ .Config.sort }}{{end}}"
    rows:
      selector: li[class$="item"]
    fields:
@@ -39,7 +44,7 @@
        selector: h2[class$="title"] a[href*="/torrent/"]
        attribute: title
      category:
-        text: "1"
+        text: 1
      details:
        selector: h2[class$="title"] a[href*="/torrent/"]
        attribute: href
@@ -52,6 +57,8 @@
        selector: div[class$="info"] span:nth-of-type(2)
      date:
        selector: div[class$="info"] span:nth-of-type(3)
+        filters:
+          - name: timeago
      grabs:
        selector: div[class$="info"] span:nth-of-type(4)
      seeders:
@@ -59,6 +66,6 @@
      leechers:
        text: 1
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/btdigg.yml
+++ b/src/Jackett.Common/Definitions/btdigg.yml
@@ -21,32 +21,29 @@
    - name: info
      type: info
      default: BTDigg does not use categories. In your software Indexer settings, set the category to 100001.
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "2"
+      options:
+        "2": "created"
+        "3": "size"

  search:
    # https://btdig.com/search?q=test&order=2
    # only 10 results per page
-    # https://btdig.com/search?q=test&p=1&order=2
    paths:
      - path: search
-      - path: search
-        inputs:
-            p: 1
-      - path: search
-        inputs:
-            p: 2
-      - path: search
-        inputs:
-            p: 3
-      - path: search
-        inputs:
-            p: 4
    inputs:
-      q: "{{if .Keywords }}{{.Keywords}}{{else}}test{{end}}"
-      order: 2
+      q: "{{ if .Keywords }}{{ .Keywords }}{{else}}test{{end}}"
+      # 0 relevance 2 age 3 size 4 files
+      order: "{{ .Config.sort }}"
+
    rows:
      selector: div.one_result
      filters:
        - name: andmatch
+
    fields:
      title:
        selector: div.torrent_name a
@@ -75,6 +72,6 @@
      leechers:
        text: 1
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/btetree.yml
+++ b/src/Jackett.Common/Definitions/btetree.yml
@@ -0,0 +1,78 @@
+---
+  site: btetree
+  name: BT.etree
+  description: "BT.etree is a Public Tracker dedicated to Bootleg FLAC MUSIC"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - http://bt.etree.org/
+
+  caps:
+    categories:
+      "Music": Audio/Lossless
+
+    modes:
+      search: [q]
+      music-search: [q, album, artist, label, year]
+
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "name": "title"
+
+  search:
+    paths:
+      # http://bt.etree.org/?searchzzzz=&cat=0
+      - path: /
+    inputs:
+      searchzzzz: "{{ if .Query.Artist }}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+      cat: 0
+      sort: "{{ .Config.sort }}"
+
+    rows:
+      selector: table[bgcolor="#CCCCCC"] tbody tr:has(a[href^="download.php"])
+      filters:
+        - name: andmatch
+
+    fields:
+      category:
+        text: "Music"
+      title:
+        selector: a.details_link
+      details:
+        selector: a.details_link
+        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(4)
+      comments:
+        selector: td:nth-child(5) a
+        attribute: href
+      date:
+        selector: td:nth-child(6)
+        filters:
+          - name: dateparse
+            args: "01/02 15:04"
+      size:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/btgigs.yml
+++ b/src/Jackett.Common/Definitions/btgigs.yml
@@ -39,7 +39,7 @@
      movie-search: [q]

  login:
-    path: takelogin__akcja.php
+    path: takelogin_action.php
    method: post
    inputs:
      username_dupa: "{{ .Config.username }}"
@@ -89,7 +89,7 @@
            args: "{{ .Result.description }}"
      imdb:
        optional: true
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
      date:
        selector: td:nth-child(5)
        filters:
@@ -114,4 +114,4 @@
          "img[src=\"pic/ico_disk2.png\"]": 1
          "*": 1
      uploadvolumefactor:
-        text: "1"
+        text: "1"
--- a/src/Jackett.Common/Definitions/btkitty.yml
+++ b/src/Jackett.Common/Definitions/btkitty.yml
@@ -1,78 +0,0 @@
---
-  site: btkitty
-  name: BTKitty
-  description: "BTKITTY is a Public BitTorrent DHT search engine."
-  language: en-us
-  type: public
-  encoding: UTF-8
-  followredirect: true
-  links:
-    -  http://btkitty.pet/
-  legacylinks:
-    -  https://cnbtkitty.org/
-    -  http://cnbtkitty.org/
-    -  https://cnbtkitty.com/
-    -  http://cnbtkitty.com/
-    -  https://cnbtkitty.me/
-    -  http://cnbtkitty.me/
-    -  http://cnbtkitty.ws/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Other, desc: "Other"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: info
-      type: info
-      default: BTKitty does not use categories. In your software Indexer settings, set the category to 100001.
-
-  download:
-    selector: a[href^="magnet:?"]
-
-  search:
-    paths:
-      - path: /
-        method: post
-        followredirect: true
-    inputs:
-      keyword: "{{if .Keywords }}{{.Keywords}}{{else}}test{{end}}"
-      hidden: "true"
-    rows:
-      selector: dl.list-con
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        selector: dt a
-      category:
-        text: "1"
-      details:
-        selector: dt a
-        attribute: href
-      download:
-        selector: dt a
-        attribute: href
-      size:
-        selector: dd span:nth-of-type(4) b
-      files:
-        selector: dd span:nth-of-type(5) b
-      date:
-        selector: dd span:nth-of-type(3) b
-        filters:
-          - name: dateparse
-            args: "2006-01-02"
-      grabs:
-        selector: dd span:nth-of-type(7) b
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
--- a/src/Jackett.Common/Definitions/btnext.yml
+++ b/src/Jackett.Common/Definitions/btnext.yml
@@ -95,7 +95,7 @@
      action: "login"
      loginbox_membername: "{{ .Config.username }}"
      loginbox_password: "{{ .Config.password }}"
-      loginbox_remember: "true"
+      loginbox_remember: 1
    selectorinputs:
      securitytoken:
        selector: "script:contains(\"stKey: \")"
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -0,0 +1,117 @@
+---
+  site: btschool
+  name: BTSCHOOL
+  description: "BTSCHOOL is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://pt.btschool.club/
+
+  caps:
+    categorymappings:
+      - {id: 405, cat: Movies, desc: "电影/Movies"}
+      - {id: 406, cat: TV, desc: "连续剧/TV-Series"}
+      - {id: 407, cat: TV/Anime, desc: "动漫/Anime"}
+      - {id: 408, cat: TV/Documentary, desc: "纪录片/Documentary"}
+      - {id: 412, cat: TV, desc: "综艺/TV-Show"}
+      - {id: 404, cat: PC, desc: "软件/Software"}
+      - {id: 402, cat: TV, desc: "资料/Education"}
+      - {id: 411, cat: PC/Games, desc: "游戏/Game"}
+      - {id: 409, cat: Audio, desc: "音乐/Music"}
+      - {id: 410, cat: TV/Sport, desc: "体育/Sports"}
+      - {id: 415, cat: Other, desc: "其他/Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  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 }}"
+    error:
+      - selector: td.embedded:has(h2:contains("登錄失敗"))
+      - selector: td.embedded:has(h2:contains("失败"))
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+        
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 incldead 1 active 2 justdead
+      incldead: 0
+      # promotion: 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x 50% 7 30%
+      spstate: 0
+      # 0 all 1 bookmarked 2 not
+      inclbookmarked: 0
+      # 0 title 1 descr 3 uploaded 4 imdb
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 and 1 or 2 exact
+      search_mode: 0
+      sort: 4
+      type: desc
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[title][href^="details.php?id="]
+        attribute: title
+      details:
+        selector: a[title][href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(4) > span[title]
+        attribute: title
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      size:
+        selector: td.rowfollow:nth-child(5)
+      seeders:
+        selector: td.rowfollow:nth-child(6)
+      leechers:
+        selector: td.rowfollow:nth-child(7)
+      grabs:
+        selector: td.rowfollow:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img.pro_free: "0"
+          img.pro_free2up: "0"
+          img.pro_50pctdown: "0.5"
+          img.pro_50pctdown2up: "0.5"
+          img.pro_30pctdown: "0.3"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img.pro_50pctdown2up: "2"
+          img.pro_free2up: "2"
+          img.pro_2up: "2"
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a, img
+# NexusPHP
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -0,0 +1,54 @@
+---
+  site: btsow
+  name: BTSOW
+  description: "BTSOW is a Public torrent indexer"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://btos.pw/
+
+  caps:
+    categories:
+      "other": Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a#magnetOpen
+  search:
+    paths:
+      - path: "search/{{if .Keywords}}{{ .Keywords}}{{else}}2019{{end}}"
+    rows:
+      selector: div.row:has(a[href*="/detail/hash/"])
+    fields:
+      category:
+        text: other
+      title:
+        selector: a[href*="/detail/hash/"]
+      details:
+        selector: a[href*="/detail/hash/"]
+        attribute: href
+      download:
+        selector: a[href*="/detail/hash/"]
+        attribute: href
+      date:
+        selector: div.date
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      size:
+        selector: div.size
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -18,7 +18,23 @@
    - name: info_results
      type: info
      label: "Search results"
-      default: "For best results, increase the torrents number in your profile to 100.<br />Default is 15."
+      default: "Only the <b>xBtit_Default</b> style is supported with this indexer.<br />For best results, increase the torrents number in your profile to 100.<br />Default is 15."
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "3"
+      options:
+        "3": "created"
+        "5": "seeders"
+        "4": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"

  caps:
    categorymappings:
@@ -63,14 +79,17 @@
      - path: index.php
    inputs:
      page: torrents
-      search: "{{if .Query.IMDBID}}{{.Query.IMDBID}}{{else}}{{.Keywords}}{{end}}"
-      category: "{{if .Categories}}{{range .Categories}}{{.}};{{end}}{{else}}0{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
      # options: 0=title, 1=title&descr, 2=descr
-      options: "{{if .Query.IMDBID}}1{{else}}0{{end}}"
+      options: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
      active: 0
+      order: "{{ .Config.sort }}"
+      by: "{{ .Config.type }}"

    rows:
      selector: table.lista tr td table.lista tr:has(a[href^="index.php?page=torrent-details"])
+
    fields:
      title:
        selector: td a[href^="index.php?page=torrent-details"]
@@ -88,7 +107,7 @@
        attribute: href
      imdb:
        optional: true
-        selector: a[href*="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        attribute: href
        filters:
          # http://anonym.to?javascript:popdetails('http://www.imdb.com/title/tt0086817');
@@ -123,7 +142,7 @@
        selector: td:nth-child(8)
      downloadvolumefactor:
        case:
-          img[src="gold/gold.gif"]: "0"
-          "*": "1"
+          img[src="gold/gold.gif"]: 0
+          "*": 1
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/casatorrent.yml
+++ b/src/Jackett.Common/Definitions/casatorrent.yml
@@ -6,59 +6,62 @@
  type: private
  encoding: UTF-8
  links:
+    - https://teamctgame.xyz/
+  legacylinks:
    - https://teamctgame.co/
+    - http://teamctgame.xyz/

  caps:
    categorymappings:
      - {id: 65, cat: Movies/HD, desc: "BD: BD"}
      - {id: 68, cat: Books/Magazines, desc: "Ebooks:  Presse"}
-      - {id: 56, cat: Books/Ebook, desc: "Ebooks: Ebooks"}
      - {id: 90, cat: Audio/Audiobook, desc: "Ebooks: Audio books"}
-      - {id: 84, cat: XXX, desc: "Ebooks: XXX"}
+      - {id: 56, cat: Books/Ebook, desc: "Ebooks: Ebooks"}
      - {id: 95, cat: Books/Comics, desc: "Ebooks: Mangas"}
-      - {id: 53, cat: Movies/HD, desc: "Films: 4K"}
-      - {id: 50, cat: Movies/UHD, desc: "Films: 4K-Remux"}
-      - {id: 72, cat: Movies/HD, desc: "Films: x265"}
+      - {id: 84, cat: XXX, desc: "Ebooks: XXX"}
      - {id: 54, cat: Movies/3D, desc: "Films: 3D"}
-      - {id: 71, cat: Movies/BluRay, desc: "Films: Full Bluray"}
-      - {id: 96, cat: Movies, desc: "Films: Remux"}
+      - {id: 53, cat: Movies/HD, desc: "Films: 4K"}
+      - {id: 77, cat: Movies/UHD, desc: "Films: 4K-HDR"}
+      - {id: 82, cat: Movies/UHD, desc: "Films: 4K-light"}
+      - {id: 50, cat: Movies/UHD, desc: "Films: 4K-Remux"}
+      - {id: 61, cat: Movies, desc: "Films: Animation"}
+      - {id: 48, cat: Movies/BluRay, desc: "Films: BDRip / BRRip"}
      - {id: 78, cat: Movies/DVD, desc: "Films: DVD-R"}
+      - {id: 47, cat: Movies/DVD, desc: "Films: DVDRip"}
+      - {id: 71, cat: Movies/BluRay, desc: "Films: Full Bluray"}
+      - {id: 63, cat: Movies/HD, desc: "Films: HD TV"}
      - {id: 52, cat: Movies/HD, desc: "Films: HD.1080p"}
      - {id: 51, cat: Movies/HD, desc: "Films: HD.720p"}
+      - {id: 80, cat: Movies/HD, desc: "Films: HDLiGHT / M-HD"}
      - {id: 87, cat: Movies/HD, desc: "Films: HDRiP"}
      - {id: 60, cat: Movies, desc: "Films: Pack"}
-      - {id: 47, cat: Movies/DVD, desc: "Films: DVDRip"}
-      - {id: 48, cat: Movies/BluRay, desc: "Films: BDRip / BRRip"}
-      - {id: 80, cat: Movies/HD, desc: "Films: HDLiGHT / M-HD"}
-      - {id: 63, cat: Movies/HD, desc: "Films: HD TV"}
-      - {id: 58, cat: Movies/WEBDL, desc: "Films: Web - DL"}
+      - {id: 96, cat: Movies, desc: "Films: Remux"}
      - {id: 75, cat: TV, desc: "Films: TVRiP"}
-      - {id: 61, cat: Movies, desc: "Films: Animation"}
-      - {id: 82, cat: TV/Anime, desc: "Films: Mangas"}
-      - {id: 55, cat: Movies, desc: "Films: VOSTFR"}
-      - {id: 89, cat: Movies, desc: "Films: VO"}
-      - {id: 57, cat: Movies/WEBDL, desc: "Films: WebRip"}
      - {id: 98, cat: Movies, desc: "Films: VFSTFR"}
+      - {id: 89, cat: Movies, desc: "Films: VO"}
+      - {id: 55, cat: Movies, desc: "Films: VOSTFR"}
+      - {id: 58, cat: Movies/WEBDL, desc: "Films: Web - DL"}
+      - {id: 57, cat: Movies/WEBDL, desc: "Films: WebRip"}
+      - {id: 72, cat: Movies/HD, desc: "Films: x265"}
      - {id: 1, cat: XXX, desc: "Films: XXX"}
+      - {id: 97, cat: Console, desc: "Jeux : Android"}
+      - {id: 81, cat: Console, desc: "Jeux : Consoles"}
      - {id: 66, cat: PC/Games, desc: "Jeux: PC"}
-      - {id: 97, cat: Console/PSP, desc: "Jeux : Jeux PS"}
-      - {id: 81, cat: Console/Xbox, desc: "Jeux : XboX"}
      - {id: 62, cat: PC/0day, desc: "Logiciels:  Windows"}
      - {id: 99, cat: Other, desc: "Logiciels: Graph / Wallpaper"}
-      - {id: 77, cat: PC/Phone-Android, desc: "Logiciels: Android"}
-      - {id: 94, cat: PC/Mac, desc: "Logiciels: MAC"}
-      - {id: 93, cat: TV/Anime, desc: "Mangas: Animés"}
+      - {id: 94, cat: TV/HD, desc: "Series: 4K HDR"}
+      - {id: 93, cat: TV/Anime, desc: "Series: Animés"}
      - {id: 86, cat: TV/HD, desc: "Series: Episode HD"}
-      - {id: 85, cat: TV/SD, desc: "Series: Episode SD"}
-      - {id: 59, cat: TV/SD, desc: "Series: Tv - Pack SD"}
-      - {id: 100, cat: TV/HD, desc: "Series: Tv - Pack HD"}
      - {id: 101, cat: TV/HD, desc: "Series: Episode HD Vostfr"}
+      - {id: 85, cat: TV/SD, desc: "Series: Episode SD"}
      - {id: 102, cat: TV/SD, desc: "Series: Episode SD Vostfr"}
+      - {id: 100, cat: TV/HD, desc: "Series: Tv - Pack HD"}
      - {id: 103, cat: TV/HD, desc: "Series: Tv - Pack HD Vostfr"}
+      - {id: 59, cat: TV/SD, desc: "Series: Tv - Pack SD"}
      - {id: 104, cat: TV/SD, desc: "Series: Tv - Pack SD Vostfr"}
      - {id: 88, cat: TV, desc: "Spectacles: Tous"}
-      - {id: 73, cat: TV/Documentary, desc: "TV: Documentaires"}
      - {id: 83, cat: TV, desc: "TV:  Emissions"}
+      - {id: 73, cat: TV/Documentary, desc: "TV: Documentaires"}
      - {id: 74, cat: TV/Sport, desc: "TV: Sports"}

    modes:
@@ -66,6 +69,30 @@
      tv-search: [q, season, ep]
      movie-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: "id"
+      options:
+        "id": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: account-login.php
    method: post
@@ -86,11 +113,13 @@
    paths:
      - path: torrents-search.php
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
      incldead: 1
      freeleech: 0
      lang: 0
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"

    rows:
      selector: table.ttable_headinner > tbody > tr.t-row
@@ -134,8 +163,8 @@
            args: "02-01-2006"
      downloadvolumefactor:
        case:
-          img[src="images/free.gif"]: "0"
-          "*": "1"
+          img[src="images/free.gif"]: 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
--- a/src/Jackett.Common/Definitions/casstudiotv.yml
+++ b/src/Jackett.Common/Definitions/casstudiotv.yml
@@ -1,235 +1,259 @@
 ---
  site: casstudiotv
  name: CasStudioTV
-  description: "CasStudioTV is a RUSSIAN Private Torrent Tracker for TV"
+  description: "CasStudioTV is a RUSSIAN Semi-Private Torrent Tracker for TV"
  language: ru
-  type: private
+  type: semi-private
  encoding: UTF-8
  links:
+    - https://casstudio.tk/
+  legacylinks:
    - https://casstudio.tv/

  caps:
    categorymappings:
-      - {id: 259, cat: TV, desc: "Сериалы (TV Series)"}
-      - {id: 56, cat: TV, desc: "Зарубежные сериалы (Foreign series)"}
-      - {id: 310, cat: TV, desc: "9-1-1"}
-      - {id: 246, cat: TV, desc: "11.22.63"}
-      - {id: 158, cat: TV, desc: "4400 / The 4400"}
-      - {id: 86, cat: TV, desc: "12 Обезьян / 12 Monkeys"}
-      - {id: 120, cat: TV, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
+      - {id: 259, cat: TV, desc: "Сериалы"}
+      - {id: 372, cat: TV, desc: "Австралийские сериалы"}
+      - {id: 375, cat: TV, desc: "Американские сериалы"}
+      - {id: 343, cat: TV, desc: "A&E"}
+      - {id: 126, cat: TV, desc: "Мотель Бейтс / Bates Motel"}
+      - {id: 317, cat: TV, desc: "ABC"}
      - {id: 72, cat: TV, desc: "Агент Картер / Agent Carter"}
-      - {id: 103, cat: TV, desc: "Ад На Колёсах / Hell On Wheels"}
+      - {id: 120, cat: TV, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
      - {id: 110, cat: TV, desc: "Американская семейка / Modern Family"}
-      - {id: 62, cat: TV, desc: "Американцы / The Americans"}
      - {id: 70, cat: TV, desc: "Анатомия страсти / Анатомия Грей / Grey's Anatomy"}
      - {id: 210, cat: TV, desc: "База Куантико / Quantico"}
-      - {id: 305, cat: TV, desc: "Беглецы / Runaways"}
-      - {id: 122, cat: TV, desc: "Безумцы / Mad Men"}
-      - {id: 134, cat: TV, desc: "Белый воротничок / White Collar"}
-      - {id: 281, cat: TV, desc: "Барыги / Narcos"}
-      - {id: 239, cat: TV, desc: "Баскетс / Baskets"}
-      - {id: 155, cat: TV, desc: "Бешеные псы / Mad Dogs"}
-      - {id: 243, cat: TV, desc: "Библиотекари / The Librarians"}
-      - {id: 154, cat: TV, desc: "Блудливая Калифорния / Californication"}
-      - {id: 208, cat: TV, desc: "Бойтесь ходячих мертвецов / Fear the Walking Dead"}
-      - {id: 150, cat: TV, desc: "Больница Никербокер / The Knick"}
-      - {id: 119, cat: TV, desc: "Бывает и хуже / The Middle"}
-      - {id: 87, cat: TV, desc: "В поле зрения / Person of Interest"}
-      - {id: 219, cat: TV, desc: "В пустыне смерти / Into the Badlands"}
-      - {id: 118, cat: TV, desc: "Веб терапия / Web Therapy"}
-      - {id: 123, cat: TV, desc: "Ведьмы Ист-Энда / Witches of East End"}
-      - {id: 309, cat: TV, desc: "Видоизмененный углерод / Altered Carbon"}
-      - {id: 241, cat: TV, desc: "Винил / Vinyl"}
-      - {id: 91, cat: TV, desc: "Викинги / Vikings"}
-      - {id: 172, cat: TV, desc: "Вице-Президент / Veep"}
-      - {id: 204, cat: TV, desc: "Власть в ночном городе / Power"}
-      - {id: 228, cat: TV, desc: "Волшебники / The Magicians"}
-      - {id: 220, cat: TV, desc: "Восприятие / Perception"}
-      - {id: 254, cat: TV, desc: "Восстание / Rebellion"}
-      - {id: 248, cat: TV, desc: "Вместе / Togetherness"}
-      - {id: 192, cat: TV, desc: "Водолей / Aquarius"}
      - {id: 65, cat: TV, desc: "Возмездие / Revenge"}
-      - {id: 121, cat: TV, desc: "Все Ненавидят Криса / Everybody Hates Chris"}
-      - {id: 166, cat: TV, desc: "Ганнибал / Hannibal"}
-      - {id: 211, cat: TV, desc: "Герои: Возрождение / Heroes Reborn"}
-      - {id: 293, cat: TV, desc: "Голубая кровь / Blue Bloods"}
+      - {id: 119, cat: TV, desc: "Бывает и хуже / The Middle"}
      - {id: 145, cat: TV, desc: "Город Хищниц / Cougar Town"}
-      - {id: 61, cat: TV, desc: "Готэм / Gotham"}
-      - {id: 117, cat: TV, desc: "Гримм / Grimm"}
-      - {id: 108, cat: TV, desc: "Две девицы на мели / 2 Broke Girls"}
-      - {id: 66, cat: TV, desc: "Девочки / Girls"}
-      - {id: 271, cat: TV, desc: "Девушка по вызову / The Girlfriend Experience"}
-      - {id: 176, cat: TV, desc: "Декстер / Dexter"}
-      - {id: 232, cat: TV, desc: "Десница Божья / Hand of God"}
-      - {id: 307, cat: TV, desc: "Династия / Dynasty"}
-      - {id: 102, cat: TV, desc: "Дневники вампира / The Vampire Diaries"}
-      - {id: 229, cat: TV, desc: "Джессика Джонс / Jessica Jones"}
-      - {id: 282, cat: TV, desc: "Дорожная команда / Roadies"}
-      - {id: 205, cat: TV, desc: "До смерти красива / Drop Dead Diva"}
-      - {id: 104, cat: TV, desc: "Древние / The Originals"}
-      - {id: 278, cat: TV, desc: "Загадочные события / Stranger Things"}
-      - {id: 182, cat: TV, desc: "Задержка в развитии / Arrested Development"}
-      - {id: 201, cat: TV, desc: "За пределами / Выжившая / Род человеческий / Extant"}
-      - {id: 301, cat: TV, desc: "Защитники / The Defenders"}
-      - {id: 314, cat: TV, desc: "Звёздный путь / Star Trek"}
-      - {id: 167, cat: TV, desc: "Зов крови / Потерянная / Фейри / Lost Girl"}
-      - {id: 116, cat: TV, desc: "Зовите меня Фитц / Call Me Fitz"}
-      - {id: 74, cat: TV, desc: "Империя / Empire"}
      - {id: 75, cat: TV, desc: "Как избежать наказания за убийство / How to Get Away with Murder"}
-      - {id: 203, cat: TV, desc: "Как бы счастье / Happyish"}
-      - {id: 141, cat: TV, desc: "Как Я Встретил Вашу Маму / How I Met Your Mother"}
-      - {id: 277, cat: TV, desc: "Карантин / Containment"}
-      - {id: 306, cat: TV, desc: "Каратель / The Punisher"}
-      - {id: 174, cat: TV, desc: "Карточный домик / House of Cards"}
      - {id: 63, cat: TV, desc: "Касл / Castle"}
-      - {id: 285, cat: TV, desc: "Квантовый скачок / Quantum Leap"}
-      - {id: 169, cat: TV, desc: "Кей и Пил / Key and Peele"}
-      - {id: 195, cat: TV, desc: "Киллджойс / Killjoys"}
      - {id: 222, cat: TV, desc: "Клуб жен астронавтов / The Astronaut Wives Club"}
-      - {id: 197, cat: TV, desc: "Коварные горничные / Devious Maids"}
-      - {id: 230, cat: TV, desc: "Колония / Colony"}
-      - {id: 170, cat: TV, desc: "Континуум / Continuum"}
-      - {id: 233, cat: TV, desc: "Конец детства / Childhood's End"}
      - {id: 147, cat: TV, desc: "Копы-новобранцы / Rookie Blue"}
-      - {id: 291, cat: TV, desc: "Королева Юга / Queen of the South"}
-      - {id: 193, cat: TV, desc: "Красавица и чудовище / Beauty and the Beast"}
-      - {id: 132, cat: TV, desc: "Крах / The Fall"}
-      - {id: 146, cat: TV, desc: "Красотки в Кливленде / Hot in Cleveland"}
-      - {id: 171, cat: TV, desc: "Красавцы / Антураж / Entourage"}
-      - {id: 207, cat: TV, desc: "Кремниевая долина / Silicon Valley"}
-      - {id: 238, cat: TV, desc: "Легенды завтрашнего дня / Legends of Tomorrow"}
-      - {id: 300, cat: TV, desc: "Легион / Legion"}
-      - {id: 294, cat: TV, desc: "Лемони Сникет: 33 несчастья / A Series of Unfortunate Events"}
-      - {id: 130, cat: TV, desc: "Лиллехаммер / Lilyhammer"}
      - {id: 276, cat: TV, desc: "Любовницы / Mistresses US"}
-      - {id: 198, cat: TV, desc: "Люди / Humans"}
-      - {id: 165, cat: TV, desc: "Лютер / Luther"}
-      - {id: 247, cat: TV, desc: "Люцифер / Lucifer"}
-      - {id: 313, cat: TV, desc: "МакГайвер / MacGyver"}
-      - {id: 127, cat: TV, desc: "Майк и Молли / Mike & Molly"}
-      - {id: 156, cat: TV, desc: "Мастера Секса / Masters of Sex"}
-      - {id: 245, cat: TV, desc: "Медики Чикаго / Chicago Med"}
-      - {id: 180, cat: TV, desc: "Миллеры в разводе / The Millers"}
-      - {id: 244, cat: TV, desc: "Миллиарды / Billions"}
-      - {id: 234, cat: TV, desc: "Мистер Робинсон / Mr. Robinson"}
-      - {id: 200, cat: TV, desc: "Мистер робот / Mr. Robot"}
-      - {id: 173, cat: TV, desc: "Мост / Broen / Bron"}
-      - {id: 126, cat: TV, desc: "Мотель Бейтс / Bates Motel"}
-      - {id: 231, cat: TV, desc: "Моцарт в джунглях / Mozart in the Jungle"}
-      - {id: 69, cat: TV, desc: "Мушкетеры / The Musketeers"}
-      - {id: 76, cat: TV, desc: "Мыслить как преступник / Criminal Minds"}
-      - {id: 202, cat: TV, desc: "На грани / The Brink"}
-      - {id: 175, cat: TV, desc: "Налёт / Braquo"}
-      - {id: 125, cat: TV, desc: "Настоящая кровь / True Blood"}
-      - {id: 152, cat: TV, desc: "Настоящий детектив / True Detective"}
-      - {id: 79, cat: TV, desc: "Не те парни / The Wrong Mans"}
+      - {id: 308, cat: TV, desc: "Хороший доктор / The Good Doctor"}
+      - {id: 189, cat: TV, desc: "Шёпот / The Whispers"}
      - {id: 164, cat: TV, desc: "Нэшвилл / Nashville"}
-      - {id: 58, cat: TV, desc: "Обитель лжи / House of Lies"}
-      - {id: 137, cat: TV, desc: "Оборотень / Teen Wolf"}
      - {id: 303, cat: TV, desc: "Одаренные / The Gifted"}
      - {id: 92, cat: TV, desc: "Однажды в сказке / Once Upon A Time"}
-      - {id: 279, cat: TV, desc: "Однажды ночью / The Night Of"}
-      - {id: 275, cat: TV, desc: "Оранжевый - хит сезона / Orange is the New Black"}
-      - {id: 304, cat: TV, desc: "Орвилл / The Orville"}
-      - {id: 212, cat: TV, desc: "Оставленные / The Leftovers"}
-      - {id: 139, cat: TV, desc: "Острые козырьки / Peaky Blinders"}
      - {id: 163, cat: TV, desc: "Отчаянные домохозяйки / Desperate Housewives"}
-      - {id: 138, cat: TV, desc: "Отбросы / Misfits"}
-      - {id: 80, cat: TV, desc: "Пересекающиеся линии / Пересекая черту / Crossing Lines"}
-      - {id: 218, cat: TV, desc: "Плоть и кости / Flesh and Bone"}
-      - {id: 99, cat: TV, desc: "Под куполом / Under The Dome"}
-      - {id: 149, cat: TV, desc: "Подпольная Империя / Boardwalk Empire"}
-      - {id: 78, cat: TV, desc: "Помнить все / Незабываемое / Unforgettable"}
-      - {id: 272, cat: TV, desc: "Поворот / TURN"}
-      - {id: 90, cat: TV, desc: "Пожарные Чикаго / Chicago Fire"}
-      - {id: 236, cat: TV, desc: "Полицейские на велосипедах / Pacific Blue"}
-      - {id: 144, cat: TV, desc: "Полиция Гавайев / Hawaii Five-0"}
-      - {id: 77, cat: TV, desc: "Полиция Чикаго / Chicago PD"}
-      - {id: 162, cat: TV, desc: "Последователи / The Following"}
      - {id: 287, cat: TV, desc: "Приговор / Conviction"}
      - {id: 135, cat: TV, desc: "ПригорАД / Suburgatory"}
-      - {id: 274, cat: TV, desc: "Проповедник / Preacher"}
-      - {id: 113, cat: TV, desc: "Просветленная / Enlightened"}
-      - {id: 235, cat: TV, desc: "Пространство / The Expanse"}
-      - {id: 290, cat: TV, desc: "Радиоволна / Frequency"}
-      - {id: 112, cat: TV, desc: "Революция / Revolution"}
-      - {id: 83, cat: TV, desc: "Родина / Homeland"}
-      - {id: 128, cat: TV, desc: "Рэй Донован / Ray Donovan"}
-      - {id: 136, cat: TV, desc: "Риццоли и Айлc / Rizzoli & Isles"}
-      - {id: 160, cat: TV, desc: "Рухнувшие Небеса / Falling Skies"}
-      - {id: 199, cat: TV, desc: "Салем / Salem"}
-      - {id: 111, cat: TV, desc: "Сверхъестественное / Supernatural"}
-      - {id: 157, cat: TV, desc: "Секретные материалы / X-Files"}
      - {id: 267, cat: TV, desc: "Семья / The Family"}
-      - {id: 311, cat: TV, desc: "Сирена / Siren"}
      - {id: 64, cat: TV, desc: "Скандал / Scandal"}
-      - {id: 213, cat: TV, desc: "Слепое пятно / Blindspot"}
-      - {id: 129, cat: TV, desc: "Служба новостей / Новости / The Newsroom"}
-      - {id: 286, cat: TV, desc: "Смертельное Оружие / Lethal Weapon"}
-      - {id: 93, cat: TV, desc: "Сообщество / Community"}
-      - {id: 179, cat: TV, desc: "Сопрано / The Sopranos"}
-      - {id: 194, cat: TV, desc: "Сорвиголова / Daredevil"}
+      - {id: 106, cat: TV, desc: "Шпионка / Alias"}
+      - {id: 358, cat: TV, desc: "Adult Swim"}
+      - {id: 323, cat: TV, desc: "Amazon"}
+      - {id: 232, cat: TV, desc: "Десница Божья / Hand of God"}
+      - {id: 231, cat: TV, desc: "Моцарт в джунглях / Mozart in the Jungle"}
+      - {id: 280, cat: TV, desc: "Тик / The Tick"}
+      - {id: 328, cat: TV, desc: "AMC"}
+      - {id: 103, cat: TV, desc: "Ад На Колёсах / Hell On Wheels"}
+      - {id: 122, cat: TV, desc: "Безумцы / Mad Men"}
+      - {id: 208, cat: TV, desc: "Бойтесь ходячих мертвецов / Fear the Walking Dead"}
+      - {id: 219, cat: TV, desc: "В пустыне смерти / Into the Badlands"}
+      - {id: 198, cat: TV, desc: "Люди / Humans"}
+      - {id: 274, cat: TV, desc: "Проповедник / Preacher"}
+      - {id: 95, cat: TV, desc: "Убийство / The Killing"}
+      - {id: 59, cat: TV, desc: "Ходячие мертвецы / The Walking Dead"}
+      - {id: 356, cat: TV, desc: "Audience"}
+      - {id: 320, cat: TV, desc: "CBS"}
+      - {id: 87, cat: TV, desc: "В поле зрения / Person of Interest"}
+      - {id: 293, cat: TV, desc: "Голубая кровь / Blue Bloods"}
+      - {id: 108, cat: TV, desc: "Две девицы на мели / 2 Broke Girls"}
+      - {id: 201, cat: TV, desc: "За пределами / Выжившая / Род человеческий / Extant"}
+      - {id: 314, cat: TV, desc: "Звёздный путь / Star Trek"}
+      - {id: 141, cat: TV, desc: "Как Я Встретил Вашу Маму / How I Met Your Mother"}
+      - {id: 127, cat: TV, desc: "Майк и Молли / Mike & Molly"}
+      - {id: 313, cat: TV, desc: "МакГайвер / MacGyver"}
+      - {id: 180, cat: TV, desc: "Миллеры в разводе / The Millers"}
+      - {id: 76, cat: TV, desc: "Мыслить как преступник / Criminal Minds"}
+      - {id: 144, cat: TV, desc: "Полиция Гавайев / Hawaii Five-0"}
+      - {id: 99, cat: TV, desc: "Под куполом / Under The Dome"}
+      - {id: 78, cat: TV, desc: "Помнить все / Незабываемое / Unforgettable"}
+      - {id: 107, cat: TV, desc: "Теория Большого Взрыва / The Big Bang Theory"}
+      - {id: 105, cat: TV, desc: "Элементарно / Elementary"}
+      - {id: 318, cat: TV, desc: "CW"}
+      - {id: 307, cat: TV, desc: "Династия / Dynasty"}
+      - {id: 102, cat: TV, desc: "Дневники вампира / The Vampire Diaries"}
+      - {id: 104, cat: TV, desc: "Древние / The Originals"}
+      - {id: 277, cat: TV, desc: "Карантин / Containment"}
+      - {id: 193, cat: TV, desc: "Красавица и чудовище / Beauty and the Beast"}
+      - {id: 238, cat: TV, desc: "Легенды завтрашнего дня / Legends of Tomorrow"}
+      - {id: 290, cat: TV, desc: "Радиоволна / Frequency"}
+      - {id: 111, cat: TV, desc: "Сверхъестественное / Supernatural"}
      - {id: 109, cat: TV, desc: "Сотня / 100 / The Hundred"}
-      - {id: 153, cat: TV, desc: "Спартак / Spartacus"}
-      - {id: 266, cat: TV, desc: "Страна чудес / Wonderland"}
-      - {id: 191, cat: TV, desc: "Страшные сказки / Penny Dreadful"}
      - {id: 131, cat: TV, desc: "Стрела / Arrow"}
      - {id: 190, cat: TV, desc: "Супергёрл / Supergirl"}
-      - {id: 82, cat: TV, desc: "Сыны Анархии / Sons of Anarchy"}
-      - {id: 295, cat: TV, desc: "Табу / Taboo"}
-      - {id: 273, cat: TV, desc: "Тайны Лауры / The Mysteries of Laura"}
-      - {id: 178, cat: TV, desc: "Твин Пикс / Twin Peaks"}
-      - {id: 107, cat: TV, desc: "Теория Большого Взрыва / The Big Bang Theory"}
-      - {id: 196, cat: TV, desc: "Тёмная материя / Dark Matter"}
-      - {id: 280, cat: TV, desc: "Тик / The Tick"}
-      - {id: 181, cat: TV, desc: "Тугая струна / Wire in the Blood"}
-      - {id: 95, cat: TV, desc: "Убийство / The Killing"}
-      - {id: 81, cat: TV, desc: "Убить скуку / Bored to Death"}
-      - {id: 98, cat: TV, desc: "Уилфред / Wilfred"}
-      - {id: 187, cat: TV, desc: "Уэйуорд Пайнс / Wayward Pines"}
      - {id: 142, cat: TV, desc: "Флэш / Flash"}
-      - {id: 168, cat: TV, desc: "Форс-мажоры / Костюмы / Suits"}
-      - {id: 59, cat: TV, desc: "Ходячие мертвецы / The Walking Dead"}
-      - {id: 308, cat: TV, desc: "Хороший доктор / The Good Doctor"}
-      - {id: 143, cat: TV, desc: "Хранилище 13 / Warehouse 13"}
-      - {id: 237, cat: TV, desc: "Хроники Шаннары / The Shannara Chronicles"}
-      - {id: 94, cat: TV, desc: "Хэйвен / Haven"}
      - {id: 124, cat: TV, desc: "Царство / Reign"}
-      - {id: 268, cat: TV, desc: "Час пик / Rush Hour"}
-      - {id: 115, cat: TV, desc: "Чёрное зеркало / Black Mirror"}
-      - {id: 73, cat: TV, desc: "Черные Паруса / Black Sails"}
-      - {id: 177, cat: TV, desc: "Черный список / The Blacklist"}
-      - {id: 189, cat: TV, desc: "Шёпот / The Whispers"}
-      - {id: 106, cat: TV, desc: "Шпионка / Alias"}
-      - {id: 85, cat: TV, desc: "Штамм / The Strain"}
-      - {id: 288, cat: TV, desc: "Экзорцист / The Exorcist"}
-      - {id: 105, cat: TV, desc: "Элементарно / Elementary"}
-      - {id: 217, cat: TV, desc: "Эш против Зловещих мертвецов / Ash vs Evil Dead"}
      - {id: 270, cat: TV, desc: "яЗомби / iZombie"}
-      - {id: 53, cat: TV, desc: "Другие сериалы (Other TV series)"}
-      - {id: 240, cat: TV, desc: "Клим (Klim)"}
-      - {id: 283, cat: TV, desc: "Amazon"}
-      - {id: 284, cat: TV, desc: "Amazon English"}
-      - {id: 88, cat: TV, desc: "Мультсериалы (Cartoons)"}
+      - {id: 336, cat: TV, desc: "DC"}
+      - {id: 316, cat: TV, desc: "FOX"}
+      - {id: 310, cat: TV, desc: "9-1-1"}
+      - {id: 61, cat: TV, desc: "Готэм / Gotham"}
+      - {id: 182, cat: TV, desc: "Задержка в развитии / Arrested Development"}
+      - {id: 74, cat: TV, desc: "Империя / Empire"}
+      - {id: 247, cat: TV, desc: "Люцифер / Lucifer"}
+      - {id: 157, cat: TV, desc: "Секретные материалы / X-Files"}
+      - {id: 286, cat: TV, desc: "Смертельное Оружие / Lethal Weapon"}
+      - {id: 304, cat: TV, desc: "Орвилл / The Orville"}
+      - {id: 162, cat: TV, desc: "Последователи / The Following"}
+      - {id: 187, cat: TV, desc: "Уэйуорд Пайнс / Wayward Pines"}
+      - {id: 288, cat: TV, desc: "Экзорцист / The Exorcist"}
+      - {id: 327, cat: TV, desc: "FX"}
+      - {id: 62, cat: TV, desc: "Американцы / The Americans"}
+      - {id: 239, cat: TV, desc: "Баскетс / Baskets"}
+      - {id: 300, cat: TV, desc: "Легион / Legion"}
+      - {id: 85, cat: TV, desc: "Штамм / The Strain"}
+      - {id: 82, cat: TV, desc: "Сыны Анархии / Sons of Anarchy"}
+      - {id: 98, cat: TV, desc: "Уилфред / Wilfred"}
+      - {id: 337, cat: TV, desc: "History"}
+      - {id: 91, cat: TV, desc: "Викинги / Vikings"}
+      - {id: 324, cat: TV, desc: "HULU"}
+      - {id: 246, cat: TV, desc: "11.22.63"}
+      - {id: 305, cat: TV, desc: "Беглецы / Runaways"}
+      - {id: 345, cat: TV, desc: "MTV, Sprike"}
+      - {id: 137, cat: TV, desc: "Оборотень / Teen Wolf"}
+      - {id: 237, cat: TV, desc: "Хроники Шаннары / The Shannara Chronicles"}
+      - {id: 319, cat: TV, desc: "NBC"}
+      - {id: 192, cat: TV, desc: "Водолей / Aquarius"}
+      - {id: 166, cat: TV, desc: "Ганнибал / Hannibal"}
+      - {id: 211, cat: TV, desc: "Герои: Возрождение / Heroes Reborn"}
+      - {id: 117, cat: TV, desc: "Гримм / Grimm"}
+      - {id: 285, cat: TV, desc: "Квантовый скачок / Quantum Leap"}
+      - {id: 245, cat: TV, desc: "Медики Чикаго / Chicago Med"}
+      - {id: 234, cat: TV, desc: "Мистер Робинсон / Mr. Robinson"}
+      - {id: 80, cat: TV, desc: "Пересекающиеся линии / Пересекая черту / Crossing Lines"}
+      - {id: 90, cat: TV, desc: "Пожарные Чикаго / Chicago Fire"}
+      - {id: 77, cat: TV, desc: "Полиция Чикаго / Chicago PD"}
+      - {id: 112, cat: TV, desc: "Революция / Revolution"}
+      - {id: 213, cat: TV, desc: "Слепое пятно / Blindspot"}
+      - {id: 93, cat: TV, desc: "Сообщество / Community"}
+      - {id: 273, cat: TV, desc: "Тайны Лауры / The Mysteries of Laura"}
+      - {id: 177, cat: TV, desc: "Черный список / The Blacklist"}
+      - {id: 321, cat: TV, desc: "NETFLIX"}
+      - {id: 281, cat: TV, desc: "Барыги / Narcos"}
+      - {id: 309, cat: TV, desc: "Видоизмененный углерод / Altered Carbon"}
+      - {id: 229, cat: TV, desc: "Джессика Джонс / Jessica Jones"}
+      - {id: 278, cat: TV, desc: "Загадочные события / Stranger Things"}
+      - {id: 301, cat: TV, desc: "Защитники / The Defenders"}
+      - {id: 306, cat: TV, desc: "Каратель / The Punisher"}
+      - {id: 174, cat: TV, desc: "Карточный домик / House of Cards"}
+      - {id: 130, cat: TV, desc: "Лиллехаммер / Lilyhammer"}
+      - {id: 294, cat: TV, desc: "Лемони Сникет: 33 несчастья / A Series of Unfortunate Events"}
+      - {id: 275, cat: TV, desc: "Оранжевый - хит сезона / Orange is the New Black"}
+      - {id: 194, cat: TV, desc: "Сорвиголова / Daredevil"}
+      - {id: 115, cat: TV, desc: "Чёрное зеркало / Black Mirror"}
+      - {id: 333, cat: TV, desc: "Showtime"}
+      - {id: 154, cat: TV, desc: "Блудливая Калифорния / Californication"}
+      - {id: 118, cat: TV, desc: "Веб терапия / Web Therapy"}
+      - {id: 176, cat: TV, desc: "Декстер / Dexter"}
+      - {id: 282, cat: TV, desc: "Дорожная команда / Roadies"}
+      - {id: 203, cat: TV, desc: "Как бы счастье / Happyish"}
+      - {id: 156, cat: TV, desc: "Мастера Секса / Masters of Sex"}
+      - {id: 244, cat: TV, desc: "Миллиарды / Billions"}
+      - {id: 58, cat: TV, desc: "Обитель лжи / House of Lies"}
+      - {id: 83, cat: TV, desc: "Родина / Homeland"}
+      - {id: 128, cat: TV, desc: "Рэй Донован / Ray Donovan"}
+      - {id: 191, cat: TV, desc: "Страшные сказки / Penny Dreadful"}
+      - {id: 330, cat: TV, desc: "STARZ"}
+      - {id: 204, cat: TV, desc: "Власть в ночном городе / Power"}
+      - {id: 271, cat: TV, desc: "Девушка по вызову / The Girlfriend Experience"}
+      - {id: 218, cat: TV, desc: "Плоть и кости / Flesh and Bone"}
+      - {id: 217, cat: TV, desc: "Эш против Зловещих мертвецов / Ash vs Evil Dead"}
+      - {id: 153, cat: TV, desc: "Спартак / Spartacus"}
+      - {id: 73, cat: TV, desc: "Черные Паруса / Black Sails"}
+      - {id: 326, cat: TV, desc: "SyFy"}
+      - {id: 86, cat: TV, desc: "12 Обезьян / 12 Monkeys"}
+      - {id: 228, cat: TV, desc: "Волшебники / The Magicians"}
+      - {id: 195, cat: TV, desc: "Киллджойс / Killjoys"}
+      - {id: 233, cat: TV, desc: "Конец детства / Childhood's End"}
+      - {id: 235, cat: TV, desc: "Пространство / The Expanse"}
+      - {id: 196, cat: TV, desc: "Тёмная материя / Dark Matter"}
+      - {id: 143, cat: TV, desc: "Хранилище 13 / Warehouse 13"}
+      - {id: 94, cat: TV, desc: "Хэйвен / Haven"}
+      - {id: 351, cat: TV, desc: "TBS"}
+      - {id: 334, cat: TV, desc: "TNT"}
+      - {id: 243, cat: TV, desc: "Библиотекари / The Librarians"}
+      - {id: 220, cat: TV, desc: "Восприятие / Perception"}
+      - {id: 136, cat: TV, desc: "Риццоли и Айлc / Rizzoli & Isles"}
+      - {id: 160, cat: TV, desc: "Рухнувшие Небеса / Falling Skies"}
+      - {id: 341, cat: TV, desc: "TV Land"}
+      - {id: 146, cat: TV, desc: "Красотки в Кливленде / Hot in Cleveland"}
+      - {id: 325, cat: TV, desc: "USA"}
+      - {id: 158, cat: TV, desc: "4400 / The 4400"}
+      - {id: 134, cat: TV, desc: "Белый воротничок / White Collar"}
+      - {id: 230, cat: TV, desc: "Колония / Colony"}
+      - {id: 291, cat: TV, desc: "Королева Юга / Queen of the South"}
+      - {id: 200, cat: TV, desc: "Мистер робот / Mr. Robot"}
+      - {id: 236, cat: TV, desc: "Полицейские на велосипедах / Pacific Blue"}
+      - {id: 168, cat: TV, desc: "Форс-мажоры / Костюмы / Suits"}
+      - {id: 352, cat: TV, desc: "YouTube"}
+      - {id: 370, cat: TV, desc: "Британские сериалы"}
+      - {id: 69, cat: TV, desc: "Мушкетеры / The Musketeers"}
+      - {id: 139, cat: TV, desc: "Острые козырьки / Peaky Blinders"}
+      - {id: 165, cat: TV, desc: "Лютер / Luther"}
+      - {id: 272, cat: TV, desc: "Поворот / TURN"}
+      - {id: 373, cat: TV, desc: "Датские и Шведские сериалы"}
+      - {id: 381, cat: TV, desc: "Ирландские сериалы"}
+      - {id: 367, cat: TV, desc: "Испанские сериалы"}
+      - {id: 380, cat: TV, desc: "Итальянские сериалы"}
+      - {id: 371, cat: TV, desc: "Канадские сериалы"}
+      - {id: 368, cat: TV, desc: "Немецкие сериалы"}
+      - {id: 376, cat: TV, desc: "Нидерландские сериалы"}
+      - {id: 379, cat: TV, desc: "Норвежские сериалы"}
+      - {id: 377, cat: TV, desc: "Российские сериалы"}
+      - {id: 369, cat: TV, desc: "Французкие сериалы"}
+      - {id: 374, cat: TV, desc: "Швейцарские сериалы"}
+      - {id: 382, cat: TV, desc: "Японские сериалы"}
+      - {id: 357, cat: TV, desc: "Сериалы только с субтитрами"}
+      - {id: 378, cat: TV, desc: "Сериалы производства нескольких стран"}
+      - {id: 88, cat: TV, desc: "Мультсериалы"}
      - {id: 101, cat: TV, desc: "Южный Парк / South Park"}
      - {id: 89, cat: TV, desc: "Спецагент Арчер / Archer"}
      - {id: 225, cat: TV, desc: "Стендап / Stand Up"}
-      - {id: 54, cat: TV, desc: "Особый раздел (Special section)"}
-      - {id: 100, cat: TV, desc: "Короткометражки (Short films)"}
-      - {id: 60, cat: TV, desc: "Документальные (Documentaries)"}
-      - {id: 159, cat: TV, desc: "Разное (Misc.)"}
-      - {id: 261, cat: TV, desc: "Спорт (Sport)"}
-      - {id: 262, cat: TV, desc: "Автомотоспорт (Autosport)"}
+      - {id: 54, cat: TV, desc: "Особый раздел"}
+      - {id: 100, cat: TV, desc: "Короткометражки"}
+      - {id: 60, cat: TV, desc: "Документальные и научно-популярные передачи"}
+      - {id: 159, cat: TV, desc: "Разное"}
+      - {id: 261, cat: TV, desc: "Спорт"}
+      - {id: 262, cat: TV, desc: "Автомотоспорт"}
      - {id: 263, cat: TV, desc: "Формула 1 / Formula 1"}
      - {id: 264, cat: TV, desc: "MotoGP / SBK"}
      - {id: 265, cat: TV, desc: "V8 supercars"}
-      - {id: 31, cat: TV, desc: "Пользователи (Users)"}
-      - {id: 188, cat: TV, desc: "Поздравления (Congratulations)"}
+      - {id: 31, cat: TV, desc: "Пользователи"}
+      - {id: 188, cat: TV, desc: "Поздравления"}
+
    modes:
      search: [q]
      tv-search: [q, season, ep]
      movie-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: "t"
+      options:
+        "t": "created"
+        "ts": "seeders"
+        "sz": "size"
+        "i": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "d"
+      options:
+        "d": "desc"
+        "a": "asc"
+
  login:
    path: ucp.php?mode=login
    method: form
@@ -251,22 +275,23 @@
      #https://casstudio.tv/search.php?tracker_search=torrent&keywords=star&terms=all&author=&sc=1&sf=titleonly&sr=topics&sk=t&sd=d&st=0&ch=300&t=0&submit=Search
      - path: search.php
    inputs:
-      tracker_search: "torrent"
-      keywords: "{{if .Keywords }}{{.Keywords}}{{else}}star{{end}}"
-      terms: "all"
+      tracker_search: torrent
+      keywords: "{{ if .Keywords }}{{ .Keywords }}{{else}}2019{{end}}"
+      terms: all
      author: ""
-      sc: "1"
-      sf: "titleonly"
-      sr: "topics"
-      sk: "t"
-      sd: "d"
-      st: "0"
-      ch: "300"
-      t: "0"
-      submit: "Search"
+      sc: 1
+      sf: titleonly
+      sr: topics
+      sk: "{{ .Config.sort }}"
+      sd: "{{ .Config.type }}"
+      st: 0
+      ch: 300
+      t: 0
+      submit: Search

    rows:
      selector: tr.row
+
    fields:
      title:
        selector: a.topictitle
@@ -334,6 +359,6 @@
          - name: dateparse
            args: "02 Jan 06, 15:04"
      downloadvolumefactor:
-        text: "1"
+        text: 1
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/src/Jackett.Common/Definitions/ccfbits.yml
@@ -47,9 +47,8 @@
      movie-search: [q]

  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
+    path: takelogin.php
+    method: post
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
@@ -63,13 +62,15 @@
      - path: browse.php
        method: get
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
-      incldead: "1"
-      d: DESC
+      incldead: 1
      sort: added
+      d: DESC
+
    rows:
      selector: table[border="1"][cellpadding="5"] > tbody > tr:has(a[href^="details.php?id="])
+
    fields:
      title:
        selector: a[title][href^="details.php?id="]
@@ -91,7 +92,7 @@
        attribute: href
      imdb:
        optional: true
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        attribute: href
      files:
        selector: a[href$="&filelist=1"]
@@ -116,12 +117,12 @@
            args: "2006-01-0215:04:05 -07:00"
      downloadvolumefactor:
        case:
-          "font[color=\"#C20603\"]:contains(\"免费\")": "0"
-          "font:has([src=\"/pic/arrowdown1.gif\"]):contains(\"0.5x\")": "0.5"
-          "*": "1"
+          "font[color=\"#C20603\"]:contains(\"免费\")": 0
+          "font:has([src=\"/pic/arrowdown1.gif\"]):contains(\"0.5x\")": 0.5
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
      description:
        selector: td:nth-child(2) > table > tbody > tr:nth-child(2)
        remove: a, img
--- a/src/Jackett.Common/Definitions/channelx.yml
+++ b/src/Jackett.Common/Definitions/channelx.yml
@@ -20,43 +20,68 @@
      tv-search: [q, season, ep, imdbid]
      movie-search: [q, imdbid]

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: login
    method: form
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
-      path: torrents
+      path: /
      selector: a[href$="/logout"]

  ratio:
-    path: torrents
+    path: /
    selector: li:has(i.fa-sync-alt)
    filters:
      - name: regexp
        args: "Ratio : (\\d+)"

-  download:
-    selector: a[href*="/download/"]
-
  search:
    paths:
-      - path: filterTorrents
+      - path: torrents/filter
    inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
      tmdb: ""
      mal: ""
-      sort: created_at
-      direction: desc
+      igdb: ""
+      sorting: "{{ .Config.sort }}"
+      sort: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
      qty: 100
    rows:
      selector: table > tbody > tr
@@ -66,11 +91,11 @@
        attribute: href
        filters:
          - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
      title:
        selector: a.view-torrent
      download:
-        selector: a[href*="/download_check/"]
+        selector: a[href*="/download/"]
        attribute: href
      details:
        selector: a.view-torrent
@@ -82,17 +107,20 @@
        filters:
          - name: replace
            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
        filters:
          - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
      imdb:
        optional: true
        selector: a[href*="www.imdb.com/title/tt"]
@@ -100,42 +128,45 @@
      date:
        selector: time
        filters:
-            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
          - name: re_replace
-            args: ["(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди)", "ago"]
+            args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди|前)", " ago"]
          - name: re_replace
-            args: ["(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
          - name: re_replace
-            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+            args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
          - name: re_replace
-            args: ["(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"]
+            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
          - name: re_replace
-            args: ["(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+            args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
          - name: re_replace
-            args: ["(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден)", "day"]
+            args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
          - name: re_replace
-            args: ["(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+            args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
          - name: re_replace
-            args: ["(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"]
+            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
          - name: re_replace
-            args: ["(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+            args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
          - name: re_replace
-            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+            args: ["(?i) (ay)", "month"]
          - name: re_replace
-            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+            args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand|个月)", " month"]
+          - name: re_replace
+            args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
-          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
-          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
-          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
-          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
-          "*": "1"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
-          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
-          "*": "1"
-# UNIT3D 1.9.2
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 2.2.5
--- a/src/Jackett.Common/Definitions/cinefilhd.yml
+++ b/src/Jackett.Common/Definitions/cinefilhd.yml
@@ -1,142 +0,0 @@
---
-  site: cinefilhd
-  name: CiNEFiLHD
-  description: "CiNEFiLHD is a Private Torrent Tracker for MOVIES / TV /  MUSIC"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.cinefilhd.org/
-
-  caps:
-    categorymappings:
-      - {id: 37, cat: Movies/HD, desc: " Internal/HD-1080p"}
-      - {id: 17, cat: Movies/HD, desc: " Internal/HD-720p"}
-      - {id: 30, cat: TV/HD, desc: " Internal/HDTV"}
-      - {id: 15, cat: Movies/HD, desc: " Internal/mHD"}
-      - {id: 40, cat: Movies, desc: " Internal/Mp4"}
-      - {id: 26, cat: Movies, desc: " Internal/Remux"}
-      - {id: 45, cat: Movies/WEBDL, desc: " Internal/WEB-DL"}
-      - {id: 25, cat: Movies/3D, desc: " Movies/3D-Ou"}
-      - {id: 16, cat: Movies/3D, desc: " Movies/3D-SbS"}
-      - {id: 5, cat: Movies/BluRay, desc: " Movies/BluRay"}
-      - {id: 38, cat: Movies/HD, desc: " Movies/HD-1080p"}
-      - {id: 10, cat: Movies/HD, desc: " Movies/HD-720p"}
-      - {id: 29, cat: Movies/HD, desc: " Movies/mHD"}
-      - {id: 41, cat: Movies, desc: " Movies/Mp4"}
-      - {id: 39, cat: Movies, desc: " Movies/Remux"}
-      - {id: 44, cat: Movies/WEBDL, desc: " Movies/WEB-DL"}
-      - {id: 23, cat: Audio/Lossless, desc: " Lossless"}
-      - {id: 14, cat: Audio/MP3, desc: " MP3-Packs"}
-      - {id: 22, cat: Audio/MP3, desc: " Music-MP3"}
-      - {id: 43, cat: Audio/Video, desc: " Music/1080p"}
-      - {id: 42, cat: Audio/Video, desc: " Music/720p"}
-      - {id: 12, cat: TV/HD, desc: " HDTV-Packs"}
-      - {id: 21, cat: TV/HD, desc: " Movies/HDTV"}
-
-    modes:
-      search: [q, imdbid]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      submitme: "LOGIN"
-      returnto: /
-    error:
-      - selector: h2:contains("failed")
-        message:
-          selector: td.colhead2
-    test:
-      path: browse.php
-      selector: :has(a[href^="logout.php?hash_please="])
-
-  ratio:
-    path: browse.php
-    selector: div div font:contains("Ratio:")
-    filters:
-      - name: regexp
-        args: "Ratio:\\s(.*?)\\s"
-
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      # title descr genre all
-      searchin: "{{ if .Query.IMDBID }}descr{{else}}title{{end}}"
-      # 0=active 1=incl dead 2=only dead
-      incldead: 1
-      # 0=no 1=yes
-      only_free: 0
-    rows:
-      selector: table.mainouter table > tbody > tr:has(a[href^="details.php?id="]), table.mainouter table > tbody > tr[id^="kdescr"]
-      after: 1
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
-      banner:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-            #  onmouseover="Tip('<img class=\'pup\' src=\'https://image.tmdb.org/t/p/original/x96AdPlpl4MjUP2DeUhRJifhCMd.jpg\' width=
-          - name: regexp
-            args: src=\\'(.*?)\\'
-      imdb:
-        optional: true
-        selector: a[href*="www.imdb.com/title/tt"]
-      files:
-        selector: td:nth-child(4)
-      # 2 flavours of dates
-      date:
-        # Today<br /> 10:20 AM
-        # Yesterday<br /> 08:03 PM
-        optional: true
-        selector: td:nth-child(6):contains("day")
-      date:
-        # Feb 14 2019<br /> 10:20 AM
-        optional: true
-        selector: td:nth-child(6):not(:contains("day"))
-        filters:
-          - name: dateparse
-            args: "Jan 2 2006 03:04 pm"
-      size:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: regexp
-            args: ([\d,]+)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      downloadvolumefactor:
-        case:
-          tr.freeleech_color: "0"
-          tr.highlight: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-# U-232 v3
--- a/src/Jackett.Common/Definitions/concen.yml
+++ b/src/Jackett.Common/Definitions/concen.yml
@@ -0,0 +1,82 @@
+---
+  site: concen
+  name: ConCen
+  description: "ConCen (Conspiracy Central) is a Public conspiracy related torrent index"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://concen.org/
+
+  caps:
+    categories:
+      1: Other
+
+    modes:
+      search: [q]
+
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created"
+      options:
+        "created": "created"
+        "seeds": "seeders"
+        "size": "size"
+        "title": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  search:
+    paths:
+      # https://concen.org/torrents?title_op=allwords&title=cbc+national&title_1_op=not&title_1=&seeds=1
+      - path: torrents
+    inputs:
+      title_op: allwords
+      title: "{{ .Keywords }}"
+      title_1_op: not
+      title_1: ""
+      seeds: All
+      order: "{{ .Config.sort }}"
+      sort: "{{ .Config.type }}"
+
+    rows:
+      selector: table  > tbody > tr:has(td.views-field-title)
+
+    fields:
+      title:
+        selector: td.views-field-title a
+      category:
+        text: 1
+      details:
+        selector: td.views-field-title a
+        attribute: href
+      download:
+        selector: td.views-field-field-torrent a
+        attribute: href
+      magnet:
+        selector: td.views-field-name a
+        attribute: href
+        filters:
+          - name: prepend
+            args: "magnet:"
+      date:
+        selector: td.views-field-created
+      size:
+        selector: td.views-field-size
+      seeders:
+        selector: td.views-field-seeds
+      leechers:
+        selector: td.views-field-peers 
+      grabs:
+        selector: td.views-field-completed 
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/concertos.yml
+++ b/src/Jackett.Common/Definitions/concertos.yml
@@ -0,0 +1,124 @@
+---
+  site: concertos
+  name: Concertos
+  description: "Concertos - Private site for Live Concerts with Strict Quality Control"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://concertos.live/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "Live Concert"}
+      - {id: 2, cat: Audio/Video, desc: "Music Video"}
+      - {id: 4, cat: TV, desc: "Music Documentary"}
+      - {id: 5, cat: Audio/Lossless, desc: "Pure Audio"}
+      - {id: 7, cat: TV, desc: "Opera"}
+      - {id: 8, cat: TV, desc: "Musical"}
+      - {id: 9, cat: Audio, desc: "Podcast"}
+
+    modes:
+      search: [q, imdbid]
+      tv-search: [q, imdbid]
+      movie-search: [q, imdbid]
+      music-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: on
+    error:
+      - selector: form[action$="/login"] .text-red
+    test:
+      path: /
+      selector: a[href$="/logout"]
+  ratio:
+    path: /
+    selector: span:has(i.fa-percent)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  search:
+    paths:
+      - path: torrents
+    inputs:
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      title: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      imdb: "{{ .Query.IMDBIDShort }}"
+      order_by: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
+
+    rows:
+      selector: table > tbody > tr
+
+    fields:
+      category:
+        selector: a[href*="?category_"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "category_(\\d+)"
+      title:
+        selector: a[href*="/torrent/"]
+      details:
+        selector: a[href*="/torrent/"]
+        attribute: href
+      download:
+        selector: a[href*="/torrent/"]
+        attribute: href
+        filters:
+          - name: append
+            args: "/download"
+      size:
+        selector: td.torrents__size
+      date:
+        selector: td.torrents__age
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      grabs:
+        selector: td:nth-last-child(1)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          i.fa-star: 0 # Freeleech
+          i.fa-certificate: 0 # Featured
+          "*": 1
+      uploadvolumefactor:
+        case:
+          i.fa-certificate: 2 # Featured
+          i.fa-gem: 2 # Double Upload
+          "*": 1
+# UNIT3D
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -7,7 +7,7 @@
  encoding: UTF-8
  followredirect: true
  links:
-    - https://www.cpasbien.vg/
+    - https://vww.cpasbien-fr.fr/
  legacylinks:
    - http://www.cpasbiens.cc/
    - http://www.cpabien.cm/
@@ -35,27 +35,38 @@
    - https://www.cpabien.link/
    - https://www.cpasbiens.cz/
    - https://www.cpasbiens.bz/
+    - https://www.cpasbien.vg/
+    - https://www.cpasbien.lol/
+    - https://www.gktorrent.biz/

  caps:
    categorymappings:
      - {id: films, cat: Movies, desc: "Movies"}
      - {id: series, cat: TV, desc: "TV"}
+      - {id: other, cat: Other, desc: "Other"}

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

  settings: []

  download:
-    selector: div.btn-download a
+    selector: a[href^="magnet:?xt="]
    attribute: href
+
  search:
    paths:
-      - path: "{{if .Keywords}}recherche/{{.Keywords}}{{else}}{{end}}"
+    # https://vww.cpasbien-fr.fr/index.php?do=search&subaction=search&story=dickinson%20s01e10
+      - path: "{{ if .Keywords }}index.php?do=search&subaction=search&story={{ .Keywords }}{{else}}{{end}}"
+
    rows:
      selector: div#gauche > table > tbody > tr:has(a)
+
    fields:
+      category:
+        text: other
      site_date:
        selector: a
        filters:
@@ -85,27 +96,8 @@
        attribute: href
      size:
        selector: div.poid
-        filters:
-          - name: re_replace
-            args: [ "\\.(\\d) Ko", "$1X00"]
-          - name: re_replace
-            args: [ " Ko", "000"]
-          - name: re_replace
-            args: [ "\\.(\\d) Mo", "$1X00000"]
-          - name: re_replace
-            args: [ " Mo", "000000"]
-          - name: re_replace
-            args: [ "\\.(\\d) Go", "$1X00000000"]
-          - name: re_replace
-            args: [ " Go", "000000000"]
-          - name: re_replace
-            args: [ "\\.(\\d) To", "$1X00000000000"]
-          - name: re_replace
-            args: [ " To", "000000000000"]
-          - name: replace
-            args: [ "X", "" ]
      date:
-        text: "now"
+        text: now
      seeders:
        text: 0
      seeders:
@@ -117,6 +109,6 @@
        selector: div.down
        optional: true
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/cpasbienclone.yml
+++ b/src/Jackett.Common/Definitions/cpasbienclone.yml
@@ -7,38 +7,52 @@
  encoding: UTF-8
  followredirect: true
  links:
-    - https://cpasbiens.cm/
+    - https://www1.cpasbiens.cm/
  legacylinks:
    - https://www1.cpasbiens.ws/
    - https://www2.cpasbiens.ws/
+    - https://cpasbiens.cm/

  caps:
    categorymappings:
      - {id: films, cat: Movies, desc: "Movies"}
      - {id: series, cat: TV, desc: "TV"}
-      - {id: musique, cat: Audio, desc: "Music"}
-      - {id: ebook, cat: Books, desc: "Ebook"}
-      - {id: logiciels, cat: PC, desc: "Software"}
-      - {id: jeux-pc, cat: PC/Games, desc: "PC Games"}
-      - {id: jeux-consoles, cat: Console, desc: "Console Games"}
+      - {id: other, cat: Other, desc: "Other"}

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

-  settings: []
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site (Only works for searches with Keywords)
+      default: "?trie-date-d"
+      options:
+        "?trie-date-d": "created desc"
+        "?trie-date-a": "created asc"
+        "?trie-seeds-d": "seeders desc"
+        "?trie-seeds-a": "seeders asc"
+        "?trie-poid-d": "size desc"
+        "?trie-poid-a": "size asc"
+        "?trie-nom-d": "title desc"
+        "?trie-nom-a": "title asc"

  download:
-    selector: div.btn-download a
+    selector: a[href^="magnet:"]
    attribute: href

  search:
    paths:
-      - path: "{{if .Keywords}}recherche/{{.Keywords}}{{else}}{{end}}"
+      - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ .Config.sort }}{{else}}{{end}}"
+
    rows:
      selector: table.table-corps > tbody > tr:has(a)
+
    fields:
+      category:
+        text: other
      site_date:
        selector: a
        filters:
@@ -87,8 +101,11 @@
            args: [ "To", "000000000000"]
          - name: replace
            args: [ "X", "" ]
+            # this is for the search with keywords which returns sizes nnnnn.n without unit indicator.
+          - name: re_replace
+            args: [ "(\\d+)\\.\\d", "$1 MB"]
      date:
-        text: "now"
+        text: now
      seeders:
        text: 0
      seeders:
@@ -100,6 +117,6 @@
        selector: div.down
        optional: true
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/crazyhd.yml
+++ b/src/Jackett.Common/Definitions/crazyhd.yml
@@ -0,0 +1,201 @@
+---
+  site: crazyhd
+  name: CrazyHD
+  description: "CrazyHD is a BANGLADESHI Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.crazyhd.com/
+
+  caps:
+    categorymappings:
+      # Movies
+      - {id:  16, cat: Movies/BluRay, desc: "Movies English Bluray"}
+      - {id:  11, cat: Movies/DVD, desc: "Movies English DVD-RIP"}
+      - {id:  14, cat: Movies, desc: "Movies English CAM"}
+      - {id:  60, cat: Movies/WEBDL, desc: "Movies English HD/WEBRIP"}
+      - {id:  19, cat: Movies/DVD, desc: "Movies Hindi DVDRIP"}
+      - {id:  52, cat: Movies/BluRay, desc: "Movies Hindi Blu Ray"}
+      - {id:  18, cat: Movies/DVD, desc: "Movies Hindi PreDVD"}
+      - {id:  17, cat: Movies, desc: "Movies Hindi CAM"}
+      - {id:  42, cat: Movies, desc: "Movies Tamil"}
+      - {id:  65, cat: Movies/WEBDL, desc: "Movies Hindi Webrip/HDrip"}
+      - {id:  24, cat: Movies, desc: "Movies UNRATED"}
+      - {id:  53, cat: Movies/Foreign, desc: "Movies Other Foreign"}
+      - {id:  64, cat: Movies, desc: "Movies Animated"}
+      - {id:  45, cat: Movies, desc: "Movies Trailers"}
+      - {id:  93, cat: Movies, desc: "Movies Dual Movies"}
+      - {id:  59, cat: Movies, desc: "Movies Pack"}
+      - {id:  94, cat: Movies/UHD, desc: "Movies 4k"}
+      - {id:  62, cat: Movies/3D, desc: "Movies 3D"}
+      # TV
+      - {id:  34, cat: TV, desc: "TV English Series"}
+      - {id:  57, cat: TV, desc: "TV Bangla series"}
+      - {id:  58, cat: TV, desc: "TV Hindi series"}
+      - {id:  28, cat: TV/Sport, desc: "TV Sports"}
+      - {id:  29, cat: TV/Documentary, desc: "TV Documentary"}
+      - {id:  95, cat: TV, desc: "TV Other Language"}
+      # Games
+      - {id:  3, cat: PC/Games, desc: "Games PC"}
+      - {id:  75, cat: PC/Phone-Android, desc: "Games Android"}
+      - {id:  77, cat: PC/Phone-IOS, desc: "Games Ipad/Iphone"}
+      - {id:  79, cat: PC/Phone-Other, desc: "Games Other Platforms"}
+      - {id:  61, cat: PC/Games, desc: "Games trailer"}
+      - {id:  90, cat: Console/PS4, desc: "Games Ps4"}
+      - {id:  86, cat: Console/PS3, desc: "Games xbox / ps3"}
+      - {id:  92, cat: PC/Games, desc: "Games nrated"}
+      # Software
+      - {id:  7, cat: PC/0day, desc: "Software Windows"}
+      - {id:  20, cat: PC/Phone-Android, desc: "Software Android Apps"}
+      - {id:  83, cat: PC/Phone-IOS, desc: "Software Iphone Apps"}
+      - {id:  39, cat: PC, desc: "Software Tutorials"}
+      - {id:  63, cat: PC, desc: "Software Linux"}
+      - {id:  89, cat: PC/Mac, desc: "Software MAC OSX"}
+      #Bangla
+      - {id:  56, cat: Movies, desc: "Movies Bangla"}
+      - {id:  35, cat: Movies, desc: "Movies Bangla Natok"}
+      - {id:  47, cat: Movies, desc: "Movies Indian Bangla"}
+      - {id:  46, cat: Movies, desc: "Movies Eid Natok"}
+      - {id:  67, cat: Audio, desc: "Radio program"}
+      # Anime Anime 
+      - {id:  36, cat: TV/Anime, desc: "Anime Cartoons"}
+      - {id:  40, cat: TV/Anime, desc: "Anime Subbed"}
+      - {id:  51, cat: TV/Anime, desc: "Anime Dubbed"}
+      - {id:  69, cat: TV/Anime, desc: "Anime Dual Audio"}
+      # Music
+      - {id:  25, cat: Audio/MP3, desc: "MP3 English"}
+      - {id:  26, cat: Audio/MP3, desc: "MP3 Bangla"}
+      - {id:  27, cat: Audio/MP3, desc: "MP3 Hindi"}
+      # Music Video
+      - {id:  48, cat: Audio/Video, desc: "MusicVideo English"}
+      - {id:  49, cat: Audio/Video, desc: "MusicVideo Bangla"}
+      - {id:  50, cat: Audio/Video, desc: "MusicVideo Hindi"}
+      # ETC
+      - {id:  6, cat: Books, desc: "Books"}
+      - {id:  4, cat: Other, desc: "Other"}
+      - {id:  44, cat: Other, desc: "Food & Recipes"}
+      - {id:  38, cat: Other, desc: "Pictures"}
+      - {id:  54, cat: Books/Magazines, desc: "Magazine"}
+      - {id:  88, cat: Books/Comics, desc: "Comics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+      music-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "3"
+      options:
+        "3": "created"
+        "5": "seeders"
+        "4": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+
+  login:
+    path: index.php?page=login
+    method: form
+    form: form[action^="index.php?page=login"]
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: tr td span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  ratio:
+    path: index.php
+    selector: span:contains("Ratio ")
+    filters:
+      - name: replace
+        args: ["Ratio ", ""]
+
+  search:
+    paths:
+      - path: index.php?page=searchlist
+        method: post
+    inputs:
+      page: searchlist
+      pages: 1
+      order: "{{ .Config.sort }}"
+      by: "{{ .Config.type }}"
+      # 0=mixed 1=no free 2=50%free 3=100%free 4=50%&100%free
+      gold: 0
+      # 0=filename 1=file&descr 2=descr 3=uploader
+      options: 0
+      # 0=all 1=onlyactive 2=onlydead
+      active: 0
+      category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
+      search: "{{ .Keywords }}"
+
+    rows:
+      selector: div.inf-table-row
+    fields:
+      title:
+        selector: div.list-name a.tlink
+        filters:
+           - name: re_replace
+             args: [" [\\(\\=\\!]+(50|100).*?[\\!\\=\\)]+", ""]
+      details:
+        selector: div.list-name a.tlink
+        attribute: href
+      category:
+        selector: div.torrent-cat small a
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      banner:
+        selector: div.list-name a.tlink
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) width="
+      download:
+        selector: div.list-name a.tlink
+        attribute: tfid
+        filters:
+          - name: prepend
+            args: "download.php?id="
+          - name: append
+            args: "&f={{ .Result.title }}.torrent"
+      size:
+        selector: div.torrent-size
+      date:
+        selector: div.torrent-time
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      seeders:
+        selector: div.torrent-seeder
+      leechers:
+        selector: div.torrent-peer
+      grabs:
+        selector: div.torrent-completed
+      downloadvolumefactor:
+        case:
+          img[src="gold/gold.gif"]: 0
+          img[src="gold/silver.gif"]: 0.5
+          "*": 1
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/crazyscorner.yml
+++ b/src/Jackett.Common/Definitions/crazyscorner.yml
@@ -0,0 +1,184 @@
+---
+  site: crazyscorner
+  name: Crazy's Corner
+  description: "Crazy's Corner is a Private Torrent Tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://crazys-corner.info/
+
+  caps:
+    categorymappings:
+      - {id: 34, cat: Movies/3D, desc: "MOVIES 3D"}
+      - {id: 52, cat: Movies/HD, desc: "MOVIES High Def Mkv/Mp4"}
+      - {id: 70, cat: Movies, desc: "MOVIES Animation"}
+      - {id: 97, cat: Movies, desc: "MOVIES DISNEY"}
+      - {id: 112, cat: Movies, desc: "MOVIES itunes"}
+      - {id: 78, cat: TV, desc: "MISC POD CASTS"}
+      - {id: 99, cat: Movies, desc: "MOVIES Cam Ratio Free"}
+      - {id: 11, cat: Movies/DVD, desc: "MOVIES DVD-R"}
+      - {id: 35, cat: Movies/BluRay, desc: "MOVIES Blu-Ray"}
+      - {id: 95, cat: Movies, desc: "MOVIES Classic picks"}
+      - {id: 100, cat: Movies/SD, desc: "MOVIES XVD"}
+      - {id: 105, cat: Movies/HD, desc: "MOVIES HD RIPS"}
+      - {id: 108, cat: Movies, desc: "MOVIES Musical"}
+      - {id: 107, cat: Movies, desc: "MOVIES Packs"}
+      - {id: 36, cat: Movies/DVD, desc: "MOVIES DvD-Rips"}
+      - {id: 37, cat: Movies, desc: "MOVIES Classic"}
+      - {id: 38, cat: Movies, desc: "MOVIES Classic-Kids"}
+      - {id: 47, cat: Movies/WEBDL, desc: "MOVIES Webrip/WEB-DL"}
+      - {id: 39, cat: Movies, desc: "MOVIES Packs"}
+      - {id: 5, cat: Movies, desc: "MOVIES Anime"}
+      - {id: 32, cat: XXX, desc: "MOVIES Adult"}
+      - {id: 33, cat: Movies/UHD, desc: "MOVIES 4K Ratio Free"}
+      - {id: 4, cat: Movies, desc: "MOVIES Misc"}
+      - {id: 79, cat: Audio/Audiobook, desc: "MISC AUDIO BOOKS"}
+      - {id: 81, cat: Audio/Other, desc: "MISC RADIO SHOWS"}
+      - {id: 43, cat: TV, desc: "TV Kids"}
+      - {id: 48, cat: Movies, desc: "SPORTS Misc"}
+      - {id: 110, cat: TV/Sport, desc: "MOVIES Christmas"}
+      - {id: 44, cat: PC/ISO, desc: "GAMES Pc-Iso"}
+      - {id: 45, cat: Console, desc: "GAMES All Console"}
+      - {id: 41, cat: TV, desc: "TV Episodes"}
+      - {id: 101, cat: TV, desc: "TV Soaps"}
+      - {id: 104, cat: TV, desc: "TV MISC"}
+      - {id: 103, cat: Audio, desc: "karaoke Misc"}
+      - {id: 111, cat: Audio, desc: "MUSIC Christmas"}
+      - {id: 42, cat: TV, desc: "VIP TV Packs"}
+      - {id: 84, cat: PC, desc: "APPS MISC"}
+      - {id: 2, cat: Audio, desc: "Music"}
+      - {id: 30, cat: Audio, desc: "Music Packs"}
+      - {id: 31, cat: Audio, desc: "Music Albums"}
+      - {id: 3, cat: PC/Games, desc: "Games Misc"}
+      - {id: 40, cat: TV, desc: "TV Single Seasons"}
+      - {id: 7, cat: PC/0day, desc: "Apps Win"}
+      - {id: 8, cat: PC, desc: "Apps Linux"}
+      - {id: 9, cat: PC/Mac, desc: "Apps Mac"}
+      - {id: 51, cat: Books/Ebook, desc: "E Books Food/Cook-Books"}
+      - {id: 64, cat: Books/Ebook, desc: "E Books Book Packs"}
+      - {id: 26, cat: Books/Ebook, desc: "E Books Magazines"}
+      - {id: 29, cat: Books/Ebook, desc: "E Books Misc Books"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-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: "3"
+      options:
+        "3": "created"
+        "5": "seeders"
+        "4": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: index.php?page=login
+    method: post
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: tr td span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+    # http://crazys-corner.info/index.php?page=torrents&search=captain&category=0&uploader=0&options=0&active=0&gold=0
+      - path: index.php
+    inputs:
+      search: "{{ .Keywords }}"
+      page: torrents
+      category: "{{ range .Categories }}{{.}};{{end}}"
+      uploader: 0
+      # 0 filename 1 file&descr 2 descr
+      options: 0
+      # 0 all 1 active 2 deadonly
+      active: 0
+      # 0 all 1 classic 2 silver 3 gold 4 silver&gold
+      gold: 0
+      order: "{{ .Config.sort }}"
+      by: "{{ .Config.type }}"
+
+    rows:
+      selector: table.lista tr:has(a[onmouseover][href^="index.php?page=torrent-details&id="])
+
+    fields:
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      title:
+        selector: a[href^="index.php?page=torrent-details&id="]
+      details:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      banner:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?)  width"
+      size:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Size: (.+?)<"
+      date:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Added:(.+?)<"
+          - name: timeago
+      seeders:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Seeders: (\\d+)<"
+      leechers:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Leechers: (\\d+)<"
+      grabs:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Done: (\\d+)<"
+      downloadvolumefactor:
+        case:
+          img[src="images/freeleech.gif"]: 0
+          img[src="gold/gold.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
--- a/src/Jackett.Common/Definitions/crazyspirits.yml
+++ b/src/Jackett.Common/Definitions/crazyspirits.yml
@@ -0,0 +1,210 @@
+---
+  site: crazyspirits
+  name: CrazySpirits
+  description: "Crazy Spirits is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.crazyspirits.com/
+
+  caps:
+    categorymappings:
+      # Documentaire
+      - {id: 96, cat: TV/Documentary, desc: "Docus TV"}
+      # Films
+      - {id: 49, cat: Movies/3D, desc: "Films 3D"}
+      - {id: 1, cat: XXX, desc: "3X"}
+      - {id: 48, cat: XXX, desc: "3X  HD1080p"}
+      - {id: 47, cat: XXX, desc: "3X  HD720p"}
+      - {id: 50, cat: Movies/UHD, desc: "Films 4K"}
+      - {id: 51, cat: Movies/UHD, desc: "Films 4K UHDTV"}
+      - {id: 57, cat: Movies/BluRay, desc: "Films BDRip"}
+      - {id: 56, cat: Movies/BluRay, desc: "Films Blu-Ray"}
+      - {id: 58, cat: Movies/BluRay, desc: "Films BRRip"}
+      - {id: 66, cat: Movies, desc: "Films CamTS"}
+      - {id: 59, cat: Movies/DVD, desc: "Films DVDR"}
+      - {id: 60, cat: Movies/DVD, desc: "Films DVDRip"}
+      - {id: 98, cat: Movies, desc: "Films Film Animées"}
+      - {id: 65, cat: Movies, desc: "Films FSCR"}
+      - {id: 52, cat: Movies/HD, desc: "Films HD 720p"}
+      - {id: 53, cat: Movies/HD, desc: "Films HD1080p"}
+      - {id: 61, cat: Movies/HD, desc: "Films HDRip"}
+      - {id: 63, cat: Movies/HD, desc: "Films MHD"}
+      - {id: 67, cat: Movies, desc: "Films Pack Films"}
+      - {id: 64, cat: Movies, desc: "Films R5"}
+      - {id: 99, cat: Movies, desc: "Films Remux"}
+      - {id: 69, cat: Movies, desc: "Films VO"}
+      - {id: 68, cat: Movies, desc: "Films VostFR"}
+      - {id: 72, cat: Movies/WEBDL, desc: "Films WEB DL"}
+      - {id: 122, cat: Movies/WEBDL, desc: "Films Web-DL 1080P"}
+      - {id: 123, cat: Movies/WEBDL, desc: "Films WEB-DL 720p"}
+      - {id: 73, cat: Movies/WEBDL, desc: "Films Webrip"}
+      - {id: 70, cat: Movies/WEBDL, desc: "Films WebRip 1080p"}
+      - {id: 71, cat: Movies/WEBDL, desc: "Films WebRip 720p"}
+      # Jeux
+      - {id: 114, cat: PC/Games, desc: "Jeux PC"}
+      - {id: 115, cat: Console/PS3, desc: "Jeux PS3"}
+      - {id: 116, cat: Console/PSP, desc: "Jeux PSP- PSX"}
+      - {id: 117, cat: Console, desc: "Jeux Roms"}
+      - {id: 118, cat: Console, desc: "Jeux Switch"}
+      - {id: 119, cat: Console/Wii, desc: "Jeux Wii"}
+      - {id: 120, cat: Console/WiiU, desc: "Jeux WiiU"}
+      - {id: 121, cat: Console/Xbox, desc: "Jeux Xbox"}
+      # Livre
+      - {id: 100, cat: Audio/Audiobook, desc: "Livre Audio"}
+      - {id: 101, cat: Books/Ebook, desc: "Livre Epub"}
+      - {id: 102, cat: Books, desc: "Livre Mangas"}
+      - {id: 103, cat: Books, desc: "Livres BD"}
+      - {id: 104, cat: Books/Comics, desc: "Livres Comics"}
+      - {id: 105, cat: Books/Magazines, desc: "Livres Press"}
+      - {id: 106, cat: Books, desc: "Livres Romans"}
+      # Logiciel
+      - {id: 113, cat: PC/Phone-IOS, desc: "Logiciel Apple"}
+      - {id: 111, cat: PC, desc: "Logiciel Linux"}
+      - {id: 112, cat: PC/Phone-Other, desc: "Logiciel Smart Phone"}
+      - {id: 110, cat: PC/0day, desc: "Logiciel Windows"}
+      # Musiques
+      - {id: 108, cat: Audio/Lossless, desc: "Musiques FLAC"}
+      - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"}
+      - {id: 109, cat: Audio, desc: "Musiques WMA"}
+      # Séries
+      - {id: 78, cat: TV/HD, desc: "Series 1080p"}
+      - {id: 79, cat: TV/HD, desc: "Series 720p"}
+      - {id: 97, cat: TV/Anime, desc: "Series Animée"}
+      - {id: 76, cat: TV/HD, desc: "Series Blu-Ray"}
+      - {id: 80, cat: TV/SD, desc: "Series DvDR"}
+      - {id: 81, cat: TV/SD, desc: "Series DVDrip"}
+      - {id: 77, cat: TV/HD, desc: "Series HDTV"}
+      - {id: 82, cat: TV/HD, desc: "Series MHD"}
+      - {id: 88, cat: TV, desc: "Series Pack"}
+      - {id: 87, cat: TV, desc: "Series VO"}
+      - {id: 86, cat: TV, desc: "Series VosFR"}
+      - {id: 89, cat: TV, desc: "Series VOSTA"}
+      - {id: 85, cat: TV/WEB-DL, desc: "Series WEB"}
+      - {id: 83, cat: TV/WEB-DL, desc: "Series WebDL1080p"}
+      - {id: 84, cat: TV/WEB-DL, desc: "Series WebDL720p"}
+      # Spéctacle
+      - {id: 90, cat: TV/Other, desc: "Spectacle 1080p"}
+      - {id: 91, cat: TV/Other, desc: "Spectacle 720p"}
+      # Télévision
+      - {id: 94, cat: TV, desc: "TV Animation"}
+      - {id: 93, cat: TV/Documentary, desc: "TV Documentaires"}
+      - {id: 92, cat: TV/Other, desc: "TV Spectacles"}
+      - {id: 95, cat: TV/Sport, desc: "TV Sports"}
+      - {id: 74, cat: TV/HD, desc: "TV TVHD"}
+      - {id: 75, cat: TV, desc: "TV TVRip"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "id"
+      options:
+        "id": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+          
+  login:
+    method: cookie
+    inputs:
+      cookie: "{{ .Config.cookie }}"
+    test:
+      path: torrents-search.php
+      selector: a[href="account-logout.php"]
+
+  download:
+    before:
+      path: thanks.php
+      method: "get"
+      inputs:
+        id: "{{ .DownloadUri.Query.id }}"
+        to: "give"
+        torrent: "{{ .DownloadUri.Query.id }}"
+    selector: a:contains("Télécharger ce torrent")
+
+  search:
+    paths:
+    # http://crazyspirits.com/torrents-search.php?c101=1&c102=1&c103=1&c104=1&c105=1&c106=1&search=&cat=0&incldead=0&freeleech=0&lang=0
+      - path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+      freeleech: 0
+      lang: 0
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"
+
+    rows:
+      selector: table.border_table > tbody > tr.t-row
+
+    fields:
+      title:
+        selector: a[href^="torrents-details.php?id="] b
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      banner:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?)><"
+      grabs:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      size:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Taille : </b>(.*?)<br" 
+      date:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: " Le : </b>(.*?)<br" 
+          - name: dateparse
+            args: "02-01-2006"
+      downloadvolumefactor:
+        case:
+          img[src="images/Torrents/free.png"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
+# TT3.0
--- a/src/Jackett.Common/Definitions/crnaberza.yml
+++ b/src/Jackett.Common/Definitions/crnaberza.yml
@@ -54,18 +54,26 @@
    - name: password
      type: password
      label: Password
-    - name: incldead
-      type: select
-      label: "Search Torrents that are:"
-      default: "0"
-      options:
-        "0" : "Active"
-        "1": "Including Dead"
-        "2": "Only Dead"
    - name: info
      type: info
      label: Results Per Page
      default: For best results, change the 'Torrents per page' setting to 100 on your 'Personal Options' from the 'Personal' menu on the Crna Berza webpage.
+    - 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
@@ -74,7 +82,6 @@
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      submitme: "X"
    error:
      - selector: h2
        message:
@@ -92,13 +99,16 @@

  search:
    paths:
-    # http://www.crnaberza.com/browse.php?c52=1&c20=1&c73=1&c48=1&c29=1&c75=1&c77=1&c78=1&c30=1&c34=1&incldead=1&search=star+trek
+    # http://www.crnaberza.com/browse.php?c52=1&c20=1&c34=1&incldead=1&search=star+trek
      - path: browse.php      
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
-      searchin: "title"
-      incldead: "{{ .Config.incldead }}"
+      searchin: title
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"

    rows:
      selector: tr:has(td.trowtorrent)
@@ -121,16 +131,12 @@
        selector: td:nth-of-type(4)
      date:
        # Danas<br>08:10 AM
+        # Juče<br>06:44 PM
        optional: true
-        selector: td:nth-of-type(6):contains("Danas")
+        selector: td:nth-of-type(6):contains("Danas"), td:nth-of-type(6):contains("Juče")
        filters:
          - name: replace
            args: ["Danas", "Today"]
-      date:
-        # Juče<br>06:44 PM
-        optional: true
-        selector: td:nth-of-type(6):contains("Juče")
-        filters:
          - name: replace
            args: ["Juče", "Yesterday"]
      date:
@@ -146,14 +152,14 @@
        selector: td:nth-of-type(8) a
        filters:
          - name: regexp
-            args: "([\\d]+)"
+            args: ([\d]+)
      seeders:
        selector: td:nth-of-type(9)
      leechers:
        selector: td:nth-of-type(10)
      downloadvolumefactor:
        case:
-          "img[src$=\"/pic/freedownload.gif\"]": "0"
-          "*": "1"
+          "img[src$=\"/pic/freedownload.gif\"]": 0
+          "*": 1
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/cztorrent.yml
+++ b/src/Jackett.Common/Definitions/cztorrent.yml
@@ -39,18 +39,32 @@
      movie-search: [q]

  settings:
-    - name: cookie
+    - name: username
      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "7"
+      options:
+        "7": "created"
+        "2": "seeders"
+        "6": "size"
+        "5": "title"
+
  login:
-    method: cookie
+    path: login-page
+    method: form
+    form: form[action="/login?url=%2F"]
    inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      persistent_login: 1
+    error:
+      - selector: div.error
    test:
      path: torrents

@@ -58,11 +72,14 @@
    paths:
      - path: torrents
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      s: "{{ .Keywords }}"
-      t: "1"
+      t: 1
+      o: "{{ .Config.sort }}"
+
    rows:
      selector: tr.torr_hover
+
    fields:
      title:
        selector: td.detaily a
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -1,237 +0,0 @@
---
-  site: dark-shadow
-  name: Dark-Shadow
-  description: "Dark-Shadow is a German Private site for TV / MOVIES / GENERAL"
-  language: de-de
-  type: private
-  encoding: UTF-8
-  links:
-    - https://dark-shadow.ml/
-
-  caps:
-    categorymappings:
-      # Film
-      - {id: 32, cat: Movies/HD, desc: "Film HD"}
-      - {id: 28, cat: Movies/SD, desc: "Film SD"}
-      - {id: 119, cat: Movies/DVD, desc: "Film DVD"}
-      - {id: 114, cat: Movies/UHD, desc: "Film 4K/2160p"}
-      - {id: 26, cat: Movies/3D, desc: "Film 3D"}
-      # Serien
-      - {id: 57, cat: TV/HD, desc: "Serien HD"}
-      - {id: 60, cat: TV/SD, desc: "Serien SD"}
-      - {id: 59, cat: TV, desc: "Serien Pack"}
-      - {id: 122, cat: TV, desc: "Serien Show"}
-      - {id: 123, cat: TV/Documentary, desc: "Serien Doku"}
-      # Doku
-      - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
-      - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
-      # Spiele
-      - {id: 17, cat: PC/Games, desc: "Spiele PC"}
-      - {id: 24, cat: Console, desc: "Spiele Konsole"}
-      - {id: 121, cat: Console, desc: "Spiele Wimmelbild"}
-      - {id: 126, cat: Console/Other, desc: "Spiele Mobil"}
-      # Musik
-      - {id: 110, cat: Audio/MP3, desc: "Musik MP3"}
-      - {id: 52, cat: Audio, desc: "Musik Pack"}
-      - {id: 48, cat: Audio/Lossless, desc: "Musik Flac"}
-      - {id: 120, cat: Audio/Video, desc: "Musik Video"}
-      # App
-      - {id: 12, cat: PC/0day, desc: "App PC"}
-      - {id: 125, cat: PC/Mac, desc: "App MacOS"}
-      - {id: 11, cat: PC/Phone-Other, desc: "App Mobil"}
-      # Sport
-      - {id: 61, cat: TV/Sport, desc: "Sport HD"}
-      - {id: 62, cat: TV/Sport, desc: "Sport SD"}
-      #  Internal
-      - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-      - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
-      - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-      - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
-      - {id: 132, cat: Other, desc: "Internal Sonstiges"}
-      # Sonstiges
-      - {id: 64, cat: TV/Anime, desc: "Anime"}
-      - {id: 96, cat: Books/Ebook, desc: "e-Book"}
-      - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
-      - {id: 71, cat: Other, desc: "Anderes"}
-      # XXX
-      - {id: 73, cat: XXX/x264, desc: "XXX HD"}
-      - {id: 75, cat: XXX/Packs, desc: "XXX Pack"}
-      - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
-      - {id: 124, cat: XXX/Other, desc: "XXX Clips"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-    - name: pin
-      type: text
-      label: Pin
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="/login.php"]
-    cookies: ["JAVA=OK"] # avoid jscheck redirect
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      pin: "{{ .Config.pin }}"
-    error:
-      - selector: div#login_error
-    test:
-      path: selection.php
-
-  download:
-    before:
-      path: ajax_det_poll.php
-      method: "post"
-      inputs:
-        set_thanks: "thanks"
-        det_id: "{{ .DownloadUri.Query.torrent }}"
-        ajax: "yes"
-
-  search:
-    paths:
-      - path: selection.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
-      blah: "0"
-      orderby: "added"
-      sort: "desc"
-    rows:
-      selector: div.selection_wrap
-    fields:
-      download:
-        selector: a.selection_a
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
-      title:
-        selector: a.selection_a
-      details:
-        selector: a.selection_a
-        attribute: href
-      category:
-        selector: div.kat_cat_pic
-        case:
-          # Movies
-          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"4K/2160p\"))": "114"
-          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "119"
-          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "32"
-          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "28"
-          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "26"
-          # Serien
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "60"
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "57"
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "59"
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Show\"))": "122"
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Doku\"))": "123"
-          # Musik
-          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "48"
-          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": "110"
-          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
-          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": "120"
-          # Doku
-          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "15"
-          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "14"
-          # Games
-          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
-          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
-          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
-          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
-          # App
-          ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "12"
-          ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"MacOS\"))": "125"
-          ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "11"
-          # Sport
-          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "62"
-          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "61"
-          # Sonstiges
-          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
-          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
-          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": "63"
-          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "71"
-          # XXX
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "76"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "73"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Clips\"))": "124"
-          # Internal
-          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film HD\"))": "128"
-          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film SD\"))": "129"
-          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien HD\"))": "130"
-          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien SD\"))": "131"
-          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "132"
-      banner:
-        selector: div[id^="details"] img
-        attribute: src
-      size:
-        selector: div.selection_unter_ad
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      grabs:
-        selector: div.selection_unter_ae
-        filters:
-          - name: trim
-            args: "x"
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      seeders:
-        selector: div.selection_unter_aa
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      leechers:
-        selector: div.selection_unter_aaa
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      downloadvolumefactor:
-        case:
-          ":root:has(div.onlyup)": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-        # 2 flavours of dates
-      date:
-        # Heute 13:30:04
-        # Gestern 09:10:10
-        selector: div.selection_unter_ab:not(:contains("."))
-        optional: true
-        filters:
-          - name: replace
-            args: ["Heute", "Today"]
-          - name: replace
-            args: ["Gestern", "Yesterday"]
-      date:
-          # 30.02.2018 um 23:12:50
-        selector: div.selection_unter_ab:contains(".")
-        optional: true
-        filters:
-          - name: replace
-            args: [" um", ""]
-          - name: dateparse
-            args: "02.01.2006 15:04:05"
-      description:
-        selector: selection_unter_af
-        optional: true
--- a/src/Jackett.Common/Definitions/datascene.yml
+++ b/src/Jackett.Common/Definitions/datascene.yml
@@ -93,7 +93,7 @@
          - name: regexp
            args: src=([^\s]+)
      imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        optional: true
        attribute: href
      category:
--- a/src/Jackett.Common/Definitions/deildu.yml
+++ b/src/Jackett.Common/Definitions/deildu.yml
@@ -10,25 +10,49 @@

  caps:
    categorymappings:
-      - {id: 11, cat: Audio, desc: "Music"}
-      - {id: 6, cat: Movies, desc: "Movies"}
-      - {id: 5, cat: Movies/DVD, desc: "Movies DVDR"}
-      - {id: 8, cat: TV, desc: "TV shows"}
-      - {id: 12, cat: Movies/HD, desc: "HD Movies"}
-      - {id: 12, cat: TV/HD, desc: "HD TV"}
-      - {id: 9, cat: TV/Documentary, desc: "TV - Documentaries"}
-      - {id: 9, cat: Movies/Other, desc: "Movie - Documentaries"}
-      - {id: 2, cat: TV/Sport, desc: "Sports"}
-      - {id: 7, cat: Movies/Other, desc: "Cartoons"}
-      - {id: 14, cat: PC, desc: "Windows"}
-      - {id: 3, cat: PC/Mac, desc: "Mac"}
-      - {id: 10, cat: PC/Games, desc: "Games"}
-      - {id: 4, cat: XXX, desc: "XXX"}
+      - {id: 15, cat: TV/Anime, desc: "Anime"}
      - {id: 1, cat: Other, desc: "Other"}
+      - {id: 5, cat: Movies/DVD, desc: "Movies DVDR"}
+      - {id: 9, cat: TV/Documentary, desc: "TV - Documentaries"}
+      - {id: 12, cat: TV/HD, desc: "TV HD"}
+      - {id: 2, cat: TV/Sport, desc: "Sports"}
+      - {id: 6, cat: Movies, desc: "Movies"}
+      - {id: 10, cat: PC/Games, desc: "Games"}
+      - {id: 3, cat: PC/Mac, desc: "Mac"}
+      - {id: 7, cat: Movies/Other, desc: "Cartoons"}
+      - {id: 11, cat: Audio, desc: "Music"}
+      - {id: 14, cat: PC, desc: "Windows"}
+      - {id: 4, cat: XXX, desc: "XXX"}
+      - {id: 8, cat: TV, desc: "TV shows"}

    modes:
      search: [q]
      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  login:
    path: takelogin.php
@@ -37,7 +61,6 @@
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
      keeplogged: 1
-
  test:
      path: my.php

@@ -45,29 +68,33 @@
    paths:
      - path: browse.php
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
    rows:
      selector: table[class="torrentlist"] > tbody > tr:has(a[href*="details.php?id="])
      filters:
        - name: andmatch
          args: 55
+
    fields:
-      download:
-        selector: a[href^="download.php"]
+      category:
+        selector: a[href^="browse.php?cat="]
        attribute: href
+        filters:
+          - name: querystring
+            args: cat
      title:
        selector: td:nth-child(2)
-#      category:
-#        selector: a[href^="browse.php?cat="]
-#        attribute: href
-#        filters:
-#          - name: querystring
-#            args: cat
      details:
        selector: a[href^="details.php?id="]
        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
      size:
        selector: td:nth-child(7)
      files:
@@ -87,8 +114,6 @@
          - name: dateparse
            args: "2006-01-0215:04:05"
      downloadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
      uploadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -0,0 +1,348 @@
+---
+  site: demonoid
+  name: Demonoid
+  description: "Demonoid is a Public torrent site for MOVIES / TV / GENERAL"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.demonoid.is/
+  legacylinks:
+    - https://www.dnoid.to/
+
+  caps:
+    categorymappings:
+      # Applications
+      - {id: 1, cat: PC/Phone-Android, desc: "Applications Android"}
+      - {id: 2, cat: PC/Phone-IOS, desc: "Applications Iphone / Ipod touch"}
+      - {id: 3, cat: PC, desc: "Applications Linux"}
+      - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
+      - {id: 5, cat: PC/Phone-Other, desc: "Applications Mobile phone"}
+      - {id: 6, cat: PC, desc: "Applications PocketPC"}
+      - {id: 7, cat: PC/0day, desc: "Applications Windows"}
+      # Audio Books
+      - {id: 8, cat: Audio/Audiobook, desc: "Audio Books Action"}
+      - {id: 9, cat: Audio/Audiobook, desc: "Audio Books Adventure"}
+      - {id: 10, cat: Audio/Audiobook, desc: "Audio Books Biography"}
+      - {id: 11, cat: Audio/Audiobook, desc: "Audio Books Childrens"}
+      - {id: 12, cat: Audio/Audiobook, desc: "Audio Books Computers and Technology"}
+      - {id: 13, cat: Audio/Audiobook, desc: "Audio Books Contemporary"}
+      - {id: 14, cat: Audio/Audiobook, desc: "Audio Books Cooking"}
+      - {id: 15, cat: Audio/Audiobook, desc: "Audio Books Crafts and Hobbies"}
+      - {id: 16, cat: Audio/Audiobook, desc: "Audio Books Educational"}
+      - {id: 17, cat: Audio/Audiobook, desc: "Audio Books Fantasy"}
+      - {id: 18, cat: Audio/Audiobook, desc: "Audio Books Fiction"}
+      - {id: 19, cat: Audio/Audiobook, desc: "Audio Books General"}
+      - {id: 20, cat: Audio/Audiobook, desc: "Audio Books History"}
+      - {id: 21, cat: Audio/Audiobook, desc: "Audio Books Horror"}
+      - {id: 22, cat: Audio/Audiobook, desc: "Audio Books Humor"}
+      - {id: 23, cat: Audio/Audiobook, desc: "Audio Books Literary"}
+      - {id: 24, cat: Audio/Audiobook, desc: "Audio Books Magazine"}
+      - {id: 25, cat: Audio/Audiobook, desc: "Audio Books Mainstream"}
+      - {id: 26, cat: Audio/Audiobook, desc: "Audio Books Medicine and Health"}
+      - {id: 27, cat: Audio/Audiobook, desc: "Audio Books Mystery and Suspense"}
+      - {id: 28, cat: Audio/Audiobook, desc: "Audio Books Newspaper"}
+      - {id: 29, cat: Audio/Audiobook, desc: "Audio Books Nonfiction"}
+      - {id: 30, cat: Audio/Audiobook, desc: "Audio Books Other"}
+      - {id: 31, cat: Audio/Audiobook, desc: "Audio Books Paranormal"}
+      - {id: 32, cat: Audio/Audiobook, desc: "Audio Books Religion"}
+      - {id: 33, cat: Audio/Audiobook, desc: "Audio Books Romance"}
+      - {id: 34, cat: Audio/Audiobook, desc: "Audio Books RPG"}
+      - {id: 35, cat: Audio/Audiobook, desc: "Audio Books Sci-Fi"}
+      - {id: 36, cat: Audio/Audiobook, desc: "Audio Books Self-help"}
+      - {id: 37, cat: Audio/Audiobook, desc: "Audio Books Suspense"}
+      - {id: 38, cat: Audio/Audiobook, desc: "Audio Books Textbook"}
+      - {id: 39, cat: Audio/Audiobook, desc: "Audio Books Thriller"}
+      - {id: 40, cat: Audio/Audiobook, desc: "Audio Books Western"}
+      - {id: 41, cat: Audio/Audiobook, desc: "Audio Books Young Adult"}
+      # Books
+      - {id: 42, cat: Books/Ebook, desc: "Books Action and Adventure"}
+      - {id: 43, cat: Books/Ebook, desc: "Books Biography"}
+      - {id: 44, cat: Books/Ebook, desc: "Books Childrens"}
+      - {id: 45, cat: Books/Ebook, desc: "Books Computers and Technology"}
+      - {id: 46, cat: Books/Ebook, desc: "Books Contemporary"}
+      - {id: 47, cat: Books/Ebook, desc: "Books Cooking"}
+      - {id: 48, cat: Books/Ebook, desc: "Books Crafts and Hobbies"}
+      - {id: 49, cat: Books/Ebook, desc: "Books Educational"}
+      - {id: 50, cat: Books/Ebook, desc: "Books Fantasy"}
+      - {id: 51, cat: Books/Ebook, desc: "Books Fiction"}
+      - {id: 52, cat: Books/Ebook, desc: "Books General"}
+      - {id: 53, cat: Books/Ebook, desc: "Books History"}
+      - {id: 54, cat: Books/Ebook, desc: "Books Horror"}
+      - {id: 55, cat: Books/Ebook, desc: "Books Humor"}
+      - {id: 56, cat: Books/Ebook, desc: "Books Literary"}
+      - {id: 57, cat: Books/Magazines, desc: "Books Magazine"}
+      - {id: 58, cat: Books/Ebook, desc: "Books Mainstream"}
+      - {id: 59, cat: Books/Ebook, desc: "Books Medicine and Health"}
+      - {id: 60, cat: Books/Ebook, desc: "Books Mystery and Suspense"}
+      - {id: 61, cat: Books/Ebook, desc: "Books Newspaper"}
+      - {id: 62, cat: Books/Ebook, desc: "Books Nonfiction"}
+      - {id: 63, cat: Books/Ebook, desc: "Books Other"}
+      - {id: 64, cat: Books/Ebook, desc: "Books Paranormal"}
+      - {id: 65, cat: Books/Ebook, desc: "Books Religion"}
+      - {id: 66, cat: Books/Ebook, desc: "Books Romance"}
+      - {id: 67, cat: Books/Ebook, desc: "Books RPG"}
+      - {id: 68, cat: Books/Ebook, desc: "Books Sci-Fi"}
+      - {id: 69, cat: Books/Ebook, desc: "Books Self-help"}
+      - {id: 70, cat: Books/Ebook, desc: "Books Suspense"}
+      - {id: 71, cat: Books/Ebook, desc: "Books Textbook"}
+      - {id: 72, cat: Books/Ebook, desc: "Books Thriller"}
+      - {id: 73, cat: Books/Ebook, desc: "Books Western"}
+      - {id: 74, cat: Books/Ebook, desc: "Books Young Adult"}
+      # Comics
+      - {id: 75, cat: Books/Comics, desc: "Comics Action / Adventure"}
+      - {id: 76, cat: Books/Comics, desc: "Comics Crime"}
+      - {id: 77, cat: Books/Comics, desc: "Comics Drama"}
+      - {id: 78, cat: Books/Comics, desc: "Comics Fantasy"}
+      - {id: 79, cat: Books/Comics, desc: "Comics Historical fiction"}
+      - {id: 80, cat: Books/Comics, desc: "Comics Horror"}
+      - {id: 81, cat: Books/Comics, desc: "Comics Illustrated novel"}
+      - {id: 82, cat: Books/Comics, desc: "Comics Manga"}
+      - {id: 83, cat: Books/Comics, desc: "Comics Other"}
+      - {id: 84, cat: Books/Comics, desc: "Comics Real-Life"}
+      - {id: 85, cat: Books/Comics, desc: "Comics Sci-Fi"}
+      - {id: 86, cat: Books/Comics, desc: "Comics Super Hero"}
+      # Games
+      - {id: 87, cat: PC, desc: "Games DOS"}
+      - {id: 88, cat: Console/Other, desc: "Games Dreamcast"}
+      - {id: 89, cat: Console/Other, desc: "Games Emulators"}
+      - {id: 90, cat: Console/Other, desc: "Games GameBoy"}
+      - {id: 91, cat: Console/Other, desc: "Games GameCube"}
+      - {id: 92, cat: PC, desc: "Games Linux"}
+      - {id: 93, cat: PC/Mac, desc: "Games Mac"}
+      - {id: 94, cat: PC/Phone-Other, desc: "Games Mobile phone"}
+      - {id: 95, cat: Console/NDS, desc: "Games Nintendo DS"}
+      - {id: 96, cat: Console/Other, desc: "Games Palm"}
+      - {id: 97, cat: Console/PS3, desc: "Games Playstation"}
+      - {id: 98, cat: Console/Other, desc: "Games PocketPC"}
+      - {id: 99, cat: Console/PSP, desc: "Games PSP"}
+      - {id: 100, cat: Console/Wii, desc: "Games Wii / Wii U"}
+      - {id: 101, cat: PC/Games, desc: "Games Windows"}
+      - {id: 102, cat: Console/Xbox, desc: "Games XBox"}
+      # Anime
+      - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
+      - {id: 103, cat: TV/Anime, desc: "Anime Action"}
+      - {id: 104, cat: TV/Anime, desc: "Anime Adventure"}
+      - {id: 105, cat: TV/Anime, desc: "Anime Comedy"}
+      - {id: 106, cat: TV/Anime, desc: "Anime Drama"}
+      - {id: 107, cat: TV/Anime, desc: "Anime Fantasy"}
+      - {id: 108, cat: TV/Anime, desc: "Anime Horror"}
+      - {id: 109, cat: TV/Anime, desc: "Anime Other"}
+      - {id: 157, cat: TV/Anime, desc: "Anime Romance"}
+      # Movies
+      - {id: 151, cat: Movies, desc: "Movies Action"}
+      - {id: 110, cat: Movies, desc: "Movies Adventure"}
+      - {id: 236, cat: Movies, desc: "Movies Animation"}
+      - {id: 111, cat: Movies, desc: "Movies Biography"}
+      - {id: 152, cat: Movies, desc: "Movies Comedy"}
+      - {id: 112, cat: Movies, desc: "Movies Concerts"}
+      - {id: 113, cat: Movies, desc: "Movies Crime"}
+      - {id: 114, cat: Movies, desc: "Movies Documentary"}
+      - {id: 115, cat: Movies, desc: "Movies Drama"}
+      - {id: 116, cat: Movies, desc: "Movies Family"}
+      - {id: 153, cat: Movies, desc: "Movies Fantasy"}
+      - {id: 117, cat: Movies, desc: "Movies Horror"}
+      - {id: 118, cat: Movies, desc: "Movies Musical"}
+      - {id: 119, cat: Movies, desc: "Movies Mystery"}
+      - {id: 120, cat: Movies, desc: "Movies Other"}
+      - {id: 121, cat: Movies, desc: "Movies Romance"}
+      - {id: 154, cat: Movies, desc: "Movies Sci-Fi"}
+      - {id: 159, cat: Movies, desc: "Movies Short-Film"}
+      - {id: 160, cat: Movies, desc: "Movies Sports"}
+      - {id: 161, cat: Movies, desc: "Movies Thriller"}
+      - {id: 162, cat: Movies, desc: "Movies Trailers"}
+      - {id: 163, cat: Movies, desc: "Movies War"}
+      - {id: 164, cat: Movies, desc: "Movies Western"}
+      # Music
+      - {id: 122, cat: Audio, desc: "Music Alternative"}
+      - {id: 123, cat: Audio, desc: "Music Bluegrass"}
+      - {id: 124, cat: Audio, desc: "Music Blues"}
+      - {id: 125, cat: Audio, desc: "Music Childrens"}
+      - {id: 126, cat: Audio, desc: "Music Christian"}
+      - {id: 127, cat: Audio, desc: "Music Classical"}
+      - {id: 128, cat: Audio, desc: "Music Comedy"}
+      - {id: 129, cat: Audio, desc: "Music Contemporary African"}
+      - {id: 130, cat: Audio, desc: "Music Country"}
+      - {id: 131, cat: Audio, desc: "Music Dance / Disco"}
+      - {id: 132, cat: Audio, desc: "Music Drum and Bass"}
+      - {id: 133, cat: Audio, desc: "Music Electro / Techno"}
+      - {id: 134, cat: Audio, desc: "Music Folk"}
+      - {id: 165, cat: Audio, desc: "Music Gospel"}
+      - {id: 166, cat: Audio, desc: "Music Grunge"}
+      - {id: 167, cat: Audio, desc: "Music Hip-Hop / Rap"}
+      - {id: 168, cat: Audio, desc: "Music Indie"}
+      - {id: 169, cat: Audio, desc: "Music Industrial"}
+      - {id: 170, cat: Audio, desc: "Music J-Pop"}
+      - {id: 171, cat: Audio, desc: "Music Jazz"}
+      - {id: 172, cat: Audio, desc: "Music Latin American"}
+      - {id: 173, cat: Audio, desc: "Music Melodic"}
+      - {id: 174, cat: Audio, desc: "Music Metal"}
+      - {id: 175, cat: Audio, desc: "Music Other"}
+      - {id: 176, cat: Audio, desc: "Music Pop"}
+      - {id: 177, cat: Audio, desc: "Music Punk"}
+      - {id: 178, cat: Audio, desc: "Music Radio Show"}
+      - {id: 179, cat: Audio, desc: "Music Reggae"}
+      - {id: 180, cat: Audio, desc: "Music Rhythm and blues"}
+      - {id: 181, cat: Audio, desc: "Music Rock"}
+      - {id: 182, cat: Audio, desc: "Music Soul"}
+      - {id: 183, cat: Audio, desc: "Music Soundtrack"}
+      - {id: 184, cat: Audio, desc: "Music Trance"}
+      - {id: 185, cat: Audio, desc: "Music Trip Hop"}
+      # Music Videos
+      - {id: 135, cat: Audio/Video, desc: "Music Videos Alternative"}
+      - {id: 136, cat: Audio/Video, desc: "Music Videos Bluegrass"}
+      - {id: 137, cat: Audio/Video, desc: "Music Videos Blues"}
+      - {id: 138, cat: Audio/Video, desc: "Music Videos Childrens"}
+      - {id: 139, cat: Audio/Video, desc: "Music Videos Christian"}
+      - {id: 186, cat: Audio/Video, desc: "Music Videos Classical"}
+      - {id: 187, cat: Audio/Video, desc: "Music Videos Comedy"}
+      - {id: 188, cat: Audio/Video, desc: "Music Videos Contemporary African"}
+      - {id: 189, cat: Audio/Video, desc: "Music Videos Country"}
+      - {id: 190, cat: Audio/Video, desc: "Music Videos Dance / Disco"}
+      - {id: 191, cat: Audio/Video, desc: "Music Videos Drum and Bass"}
+      - {id: 192, cat: Audio/Video, desc: "Music Videos Electro / Techno"}
+      - {id: 193, cat: Audio/Video, desc: "Music Videos Folk"}
+      - {id: 194, cat: Audio/Video, desc: "Music Videos Gospel"}
+      - {id: 195, cat: Audio/Video, desc: "Music Videos Grunge"}
+      - {id: 196, cat: Audio/Video, desc: "Music Videos Hip-Hop / Rap"}
+      - {id: 197, cat: Audio/Video, desc: "Music Videos Indie"}
+      - {id: 198, cat: Audio/Video, desc: "Music Videos Industrial"}
+      - {id: 199, cat: Audio/Video, desc: "Music Videos J-Pop"}
+      - {id: 200, cat: Audio/Video, desc: "Music Videos Jazz"}
+      - {id: 201, cat: Audio/Video, desc: "Music Videos Latin American"}
+      - {id: 202, cat: Audio/Video, desc: "Music Videos Melodic"}
+      - {id: 203, cat: Audio/Video, desc: "Music Videos Metal"}
+      - {id: 204, cat: Audio/Video, desc: "Music Videos Other"}
+      - {id: 205, cat: Audio/Video, desc: "Music Videos Pop"}
+      - {id: 206, cat: Audio/Video, desc: "Music Videos Punk"}
+      - {id: 207, cat: Audio/Video, desc: "Music Videos Radio Show"}
+      - {id: 208, cat: Audio/Video, desc: "Music Videos Reggae"}
+      - {id: 209, cat: Audio/Video, desc: "Music Videos Rhythm and blues"}
+      - {id: 210, cat: Audio/Video, desc: "Music Videos Rock"}
+      - {id: 211, cat: Audio/Video, desc: "Music Videos Soul"}
+      - {id: 212, cat: Audio/Video, desc: "Music Videos Soundtrack"}
+      - {id: 213, cat: Audio/Video, desc: "Music Videos Trance"}
+      - {id: 214, cat: Audio/Video, desc: "Music Videos Trip Hop"}
+      # Pictures
+      - {id: 140, cat: Other, desc: "Pictures Art"}
+      - {id: 141, cat: Other, desc: "Pictures Commercial"}
+      - {id: 142, cat: Other, desc: "Pictures Glamour"}
+      - {id: 215, cat: Other, desc: "Pictures Other"}
+      - {id: 216, cat: Other, desc: "Pictures Photojournalism"}
+      - {id: 217, cat: Other, desc: "Pictures Snapshots"}
+      - {id: 218, cat: Other, desc: "Pictures Sports"}
+      - {id: 219, cat: Other, desc: "Pictures Wildlife"}
+      # TV
+      - {id: 155, cat: TV, desc: "TV Action"}
+      - {id: 143, cat: TV, desc: "TV Adventure"}
+      - {id: 144, cat: TV, desc: "TV Biography"}
+      - {id: 145, cat: TV, desc: "TV Cartoons"}
+      - {id: 146, cat: TV, desc: "TV Comedy"}
+      - {id: 147, cat: TV, desc: "TV Concerts"}
+      - {id: 148, cat: TV, desc: "TV Crime"}
+      - {id: 149, cat: TV, desc: "TV Documentary"}
+      - {id: 156, cat: TV, desc: "TV Drama"}
+      - {id: 220, cat: TV, desc: "TV Family"}
+      - {id: 221, cat: TV, desc: "TV Fantasy"}
+      - {id: 222, cat: TV, desc: "TV Horror"}
+      - {id: 223, cat: TV, desc: "TV Musical"}
+      - {id: 224, cat: TV, desc: "TV Mystery"}
+      - {id: 225, cat: TV, desc: "TV Other"}
+      - {id: 226, cat: TV, desc: "TV Reality"}
+      - {id: 227, cat: TV, desc: "TV Romance"}
+      - {id: 228, cat: TV, desc: "TV Sci-Fi"}
+      - {id: 229, cat: TV, desc: "TV Short film"}
+      - {id: 230, cat: TV, desc: "TV Sports"}
+      - {id: 231, cat: TV, desc: "TV Talk show"}
+      - {id: 232, cat: TV, desc: "TV Thriller"}
+      - {id: 233, cat: TV, desc: "TV Trailers"}
+      - {id: 234, cat: TV, desc: "TV War"}
+      - {id: 235, cat: TV, desc: "TV Western"}
+      # cat misc has no subcats
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    paths:
+      # https://www.demonoid.is/files/?c154&language=0&quality=0&seeded=2&query=world&to=on&sort=
+      # https://www.demonoid.is/files/?seeded=2&language=0&quality=0&to=on&query=world
+      - path: files/
+    inputs:
+      $raw: "{{ range .Categories }}c{{.}}&{{end}}"
+      # 0 seeded 1 unseeded 2 both
+      seeded: 2
+      # 0 all 1 English etc
+      language: 0
+      # 0 all
+      quality: 0
+      # search in titles only
+      to: on
+      query: "{{ .Keywords }}"
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"
+
+    rows:
+      selector: table.font_12px tr:has(td[class^="tone_1"])
+      after: 1
+      dateheaders:
+        selector: tr td.added_today:not(:contains("Sponsored links"))
+        filters:
+          - name: replace
+            args: ["Added ", ""]
+          - name: replace
+            args: ["on  ", ""]
+
+    fields:
+      title:
+        selector: a[href^="/files/details/"]
+        attribute: title
+      category:
+        selector:  a[href*="&subcategory="]
+        attribute: href
+        optional: true
+        filters:
+          - name: querystring
+            args: subcategory
+      details:
+        selector: a[href^="/files/details/"]
+        attribute: href
+      download:
+        selector: a[href^="/files/details/"]
+        attribute: href
+      description:
+        selector: td:nth-last-child(9)
+      size:
+        selector: td:nth-last-child(6)
+      grabs:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/desireleasers.yml
+++ b/src/Jackett.Common/Definitions/desireleasers.yml
@@ -14,6 +14,7 @@
      - {id: 2, cat: TV, desc: "TV"}
      - {id: 3, cat: Audio, desc: "Music"}
      - {id: 4, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 5, cat: Console, desc: "Game"}

    modes:
      search: [q]
@@ -21,25 +22,46 @@
      movie-search: [q, imdbid]

  settings:
-    - name: cookie
+    - name: username
      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
-    method: cookie
+    path: login
+    method: form
    inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: on
+    error:
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
-    test:
-      path: torrents
+      path: /
      selector: a[href$="/logout"]

  ratio:
-    path: torrents
+    path: /
    selector: li:has(i.fa-sync-alt)
    filters:
      - name: regexp
@@ -47,28 +69,32 @@

  search:
    paths:
-      - path: filterTorrents
+      - path: torrents/filter
    inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
      tmdb: ""
      mal: ""
-      sort: created_at
-      direction: desc
-      qty: 100
+      igdb: ""
+      sorting: "{{ .Config.sort }}"
+      sort: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
+      qty: 50
+
    rows:
      selector: table > tbody > tr
+
    fields:
      category:
        selector: a[href*="/categories/"]
        attribute: href
        filters:
          - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
      title:
        selector: a.view-torrent
      download:
@@ -81,17 +107,23 @@
        optional: true
        selector: div.torrent-poster img
        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
        filters:
          - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
      imdb:
        optional: true
        selector: a[href*="www.imdb.com/title/tt"]
@@ -99,42 +131,45 @@
      date:
        selector: time
        filters:
-            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
          - name: re_replace
-            args: ["(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди)", "ago"]
+            args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди|前)", " ago"]
          - name: re_replace
-            args: ["(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
          - name: re_replace
-            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+            args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
          - name: re_replace
-            args: ["(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"]
+            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
          - name: re_replace
-            args: ["(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+            args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
          - name: re_replace
-            args: ["(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден)", "day"]
+            args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
          - name: re_replace
-            args: ["(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+            args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
          - name: re_replace
-            args: ["(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"]
+            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
          - name: re_replace
-            args: ["(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+            args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
          - name: re_replace
-            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+            args: ["(?i) (ay)", "month"]
          - name: re_replace
-            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+            args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand|个月)", " month"]
+          - name: re_replace
+            args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
-          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
-          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
-          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
-          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
-          "*": "1"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
-          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
-          "*": "1"
-# UNIT3D 1.9.1
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 2.2.7
--- a/src/Jackett.Common/Definitions/diablotorrent.yml
+++ b/src/Jackett.Common/Definitions/diablotorrent.yml
@@ -125,7 +125,7 @@
            args: src='(.*?)' 
      imdb:
        optional: true
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        attribute: href
      description:
        selector: div.torrent_row_magyarcim
--- a/src/Jackett.Common/Definitions/digbt.yml
+++ b/src/Jackett.Common/Definitions/digbt.yml
@@ -1,74 +0,0 @@
---
-  site: digbt
-  name: DIGBT
-  description: "DIGBT is a Public BitTorrent DHT search engine"
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - https://www.digbt.org/
-
-  caps:
-    categories:
-    # DIGBT does not support categories
-      1: Other
-
-    modes:
-      search: [q]
-
-  settings: []
-
-  search:
-  # DIGBT does not support a default empty search or provide trending/latest/new pages
-  # attempt to fetch up to 50 results (10 per page)
-    paths:
-      - path: "search/{{if .Keywords}}{{.Keywords}}{{else}}test{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-2/{{else}}test-time-2/{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-3/{{else}}test-time-3/{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-4/{{else}}test-time-4/{{end}}?c=&s=time&u=y"
-      - path: "search/{{if .Keywords}}{{.Keywords}}-time-5/{{else}}test-time-5/{{end}}?c=&s=time&u=y"
-    rows:
-      selector: tr td.x-item
-    fields:
-      title:
-        selector: div a
-      category:
-        text: "1"
-      details:
-        selector: div a
-        attribute: href
-      download:
-        selector: div.tail a[href^="magnet:?"]
-        attribute: href
-      magnet:
-        selector: div.tail a[href^="magnet:?"]
-        attribute: href
-      date:
-        selector: div span.ctime
-        filters:
-          - name: replace
-            args: ["yesterday", "1 day"]
-          - name: timeago
-      size:
-        selector: div.tail
-        filters:
-          - name: regexp
-            args: "Size: (.+?) Downloads:"
-      files:
-        selector: div.tail
-        filters:
-          - name: regexp
-            args: "Files: (.+?) Size:"
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      grabs:
-        selector: div.tail
-        filters:
-          - name: regexp
-            args: "Downloads: (.+?) Updated:"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -56,17 +56,37 @@
      tv-search: [q, season, ep]
      movie-search: [q]

+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "3"
+      options:
+        "3": "created"
+        "5": "seeders"
+        "4": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+          
  login:
-    path: index.php?page=login
-    method: post
+    method: cookie
    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: div#login-alert
+      cookie: "{{ .Config.cookie }}"
    test:
      path: index.php
-      selector: a[href="logout.php"]

  search:
    paths:
@@ -74,13 +94,16 @@
      - path: index.php
    inputs:
      page: "torrents"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      search: "{{if .Keywords }}{{.Keywords}}{{else}}{{end}}"
+      category: "{{ range .Categories }}{{.}};{{end}}"
+      search: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
      active: 0
      options: 0
+      order: "{{ .Config.sort }}"
+      by: "{{ .Config.type }}"

    rows:
      selector: table.table.table-bordered > tbody > tr:has(a[href^="download.php?id="])
+
    fields:
      download:
        selector: a[href^="download.php?id="]
@@ -117,13 +140,13 @@
        selector: td:nth-last-child(2)
      downloadvolumefactor:
        case:
-          img[src="images/gold.png"]: "0"
-          img[src="images/silver.png"]: "0.5"
-          "*": "1"
+          img[src="images/gold.png"]: 0
+          img[src="images/silver.png"]: 0.5
+          "*": 1
      uploadvolumefactor:
        case:
-          img[src="images/2x.png"]: "2"
-          img[src="images/3x.png"]: "3"
-          img[src="images/4x.png"]: "4"
-          img[src="images/5x.png"]: "5"
-          "*": "1"
+          img[src="images/2x.png"]: 2
+          img[src="images/3x.png"]: 3
+          img[src="images/4x.png"]: 4
+          img[src="images/5x.png"]: 5
+          "*": 1
--- a/src/Jackett.Common/Definitions/dmhy.yml
+++ b/src/Jackett.Common/Definitions/dmhy.yml
@@ -0,0 +1,80 @@
+---
+  site: dmhy
+  name: dmhy
+  description: "dmhy is a TAIWANESE Public magnet tracker for ANIME"
+  language: zh-TW
+  type: public
+  encoding: UTF-8
+  links:
+    - https://share.dmhy.org/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: TV/Anime, desc: "動畫 (Anime)"}
+      - {id: 31, cat: TV/Anime, desc: "季度全集 (Quarterly Complete)"}
+      - {id: 3, cat: Books/Comics, desc: "漫畫 (Manga)"}
+      - {id: 41, cat: TV, desc: "港台原版 (Hong Kong and Taiwan original)"}
+      - {id: 42, cat: TV, desc: "日文原版 (Japanese original)"}
+      - {id: 4, cat: Audio, desc: "音樂 (Music)"}
+      - {id: 43, cat: Audio, desc: "動漫音樂 (Anime Music)"}
+      - {id: 44, cat: Audio, desc: "同人音樂 (Fan Music)"}
+      - {id: 15, cat: Audio, desc: "流行音樂 (Pop Music)"}
+      - {id: 6, cat: TV, desc: "日劇 (Japanese TV drama)"}
+      - {id: 7, cat: TV/Anime, desc: "RAW"}
+      - {id: 9, cat: PC/Games, desc: "遊戲 (games)"}
+      - {id: 17, cat: PC/Games, desc: "電腦遊戲 (computer games)"}
+      - {id: 18, cat: Console, desc: "電視遊戲 (video games)"}
+      - {id: 19, cat: Console, desc: "掌機遊戲 (console games)"}
+      - {id: 20, cat: Console, desc: "網絡遊戲 (online games)"}
+      - {id: 21, cat: Console, desc: "遊戲周邊 (game periphery)"}
+      - {id: 12, cat: Other/Misc, desc: "特攝 (special photo)"}
+      - {id: 1, cat: Other, desc: "其他 (other)"}
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: topics/list
+    inputs:
+    # https://share.dmhy.org/topics/list?keyword=one+piece&sort_id=0&team_id=0&order=date-desc
+      keyword: "{{ .Keywords }}"
+      sort_id: 0
+      order: date-desc
+      team_id: 0
+    rows:
+      selector: table tbody tr:has(a[href^="magnet:?"])
+    fields:
+      date:
+        selector: td:nth-child(1) span
+        filters:
+          - name: dateparse
+            args: "2006/01/02 15:04"
+      category:
+        selector: td:nth-child(2) a
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\/(\\d+)$"
+      title:
+        selector: a[href^="/topics/view/"]
+      details:
+        selector: a[href^="/topics/view/"]
+        attribute: href
+      download:
+        selector: a[href^="magnet:?"]
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/documentarytorrents.yml
+++ b/src/Jackett.Common/Definitions/documentarytorrents.yml
@@ -76,6 +76,30 @@
      search: [q]
      tv-search: [q, season, ep]

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "id"
+      options:
+        "is": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: account-login.php
    method: form
@@ -98,12 +122,14 @@
    # http://documentarytorrents.com/torrents.php?c123=1&c69=1&c67=1&c89=1&c88=1&search=grow+old&cat=0&incldead=1&freeleech=0&lang=0
      - path: torrents.php
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
      cat: 0
      incldead: 1
      freeleech: 0
      lang: 0
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"

    rows:
      selector: table.ttable_headinner tr.t-row
@@ -135,8 +161,8 @@
          text: now
      downloadvolumefactor:
        case:
-          img[src="images/freeleech_star.gif"]: "0"
-          "*": "1"
+          img[src="images/freeleech_star.gif"]: 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
--- a/src/Jackett.Common/Definitions/dreamteam.yml
+++ b/src/Jackett.Common/Definitions/dreamteam.yml
@@ -1,231 +0,0 @@
---
-  site: dreamteam
-  name: Dream Team
-  description: "Dream Team is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
-  language: el-gr
-  type: private
-  encoding: UTF-8
-  links:
-    - http://dream-team.ga/
-  legacylinks:
-    - http://dream-team.ml/
-
-  caps:
-    categorymappings:
-#      - {id: 115, cat: , desc: ""}
-      - {id: 115, cat: Movies, desc: "One foreign films external subtitles"}
-      - {id: 130, cat: Movies, desc: "CAM / TS / TC"}
-      - {id: 131, cat: Movies, desc: "DVDSCR / PPVRiP / WebRip / R5"}
-      - {id: 132, cat: Movies, desc: "DVDRrip"}
-      - {id: 133, cat: Movies, desc: "BDRip / BRRip / HDRip"}
-      - {id: 134, cat: Movies, desc: "MicroHD"}
-      - {id: 135, cat: Movies, desc: "HD - WEB-DL"}
-      - {id: 136, cat: Movies, desc: "HD - 480p"}
-      - {id: 137, cat: Movies, desc: "HD - 720p"}
-      - {id: 138, cat: Movies, desc: "HD - 1080p"}
-      - {id: 139, cat: Movies, desc: "9.01 3D HD 720p Half SBS & OU"}
-      - {id: 140, cat: Movies, desc: "9.2 3D HD 1080p Half SBS & OU"}
-      - {id: 141, cat: Movies, desc: "9.3 3D Bluray Disc HD 720p / 1080p"}
-      - {id: 142, cat: Movies, desc: "9.4 3D MicroHD 720p / 1080p"}
-      - {id: 144, cat: Movies, desc: "9.5 packages"}
-      - {id: 145, cat: Movies, desc: "9.6 filmography"}
-      - {id: 143, cat: Movies, desc: "9.7 Tv Movies"}
-      - {id: 116, cat: Movies, desc: "Two foreign films integrated subtitles"}
-      - {id: 146, cat: Movies, desc: "CAM / TS / TC"}
-      - {id: 147, cat: Movies, desc: "DVDSCR / PPVRiP / WebRip / R5"}
-      - {id: 148, cat: Movies, desc: "DVDRrip"}
-      - {id: 149, cat: Movies, desc: "BDRip / BRRip / HDRip"}
-      - {id: 150, cat: Movies, desc: "MicroHD"}
-      - {id: 151, cat: Movies, desc: "HD - WEB-DL"}
-      - {id: 152, cat: Movies, desc: "Tv Movies"}
-      - {id: 153, cat: Movies, desc: "Packages"}
-      - {id: 154, cat: Movies, desc: "filmography"}
-      - {id: 243, cat: Movies, desc: "HD 1080p"}
-      - {id: 244, cat: Movies, desc: "HD 480p"}
-      - {id: 117, cat: Movies, desc: "???????e? ?a???e?"}
-      - {id: 155, cat: Movies, desc: "CAM / TS / TC"}
-      - {id: 156, cat: Movies, desc: "SCR / PPVRiP / Webrip / R5"}
-      - {id: 157, cat: Movies, desc: "DVDRrip 3"}
-      - {id: 158, cat: Movies, desc: "BDRip / BRRip / HDRip"}
-      - {id: 159, cat: Movies, desc: "MicroHD 5"}
-      - {id: 160, cat: Movies, desc: "HD - 480p"}
-      - {id: 161, cat: Movies, desc: "6.1 HD - 720p"}
-      - {id: 162, cat: Movies, desc: "HD 6.2 - 1080"}
-      - {id: 163, cat: Movies, desc: "TV Movies"}
-      - {id: 164, cat: Movies, desc: "?a?eta 8"}
-      - {id: 165, cat: Movies, desc: "F??µ???af?e?"}
-      - {id: 118, cat: TV, desc: "Foreign Television external subtitles"}
-      - {id: 166, cat: TV, desc: "SD"}
-      - {id: 167, cat: TV, desc: "720p"}
-      - {id: 168, cat: TV, desc: "1080p"}
-      - {id: 169, cat: TV, desc: "Sport"}
-      - {id: 170, cat: TV, desc: "documentaries"}
-      - {id: 171, cat: TV, desc: "Packages"}
-      - {id: 119, cat: TV, desc: "foreign Television integrated subtitles"}
-      - {id: 172, cat: TV, desc: "SD"}
-      - {id: 173, cat: TV, desc: "720p"}
-      - {id: 174, cat: TV, desc: "1080p"}
-      - {id: 175, cat: TV, desc: "Sport"}
-      - {id: 176, cat: TV, desc: "documentaries"}
-      - {id: 177, cat: TV, desc: "Tv Rips"}
-      - {id: 178, cat: TV, desc: "Packages"}
-      - {id: 120, cat: TV, desc: "Greek Television"}
-      - {id: 179, cat: TV, desc: "SD"}
-      - {id: 180, cat: TV, desc: "720p"}
-      - {id: 181, cat: TV, desc: "1080p"}
-      - {id: 182, cat: TV, desc: "Sport"}
-      - {id: 183, cat: TV, desc: "five documentaries"}
-      - {id: 184, cat: TV, desc: "six Tv Rips"}
-      - {id: 185, cat: TV, desc: "Packages"}
-      - {id: 122, cat: Audio, desc: "?e?? ???s???"}
-      - {id: 216, cat: Audio, desc: "1. DJs Stuff & Promos"}
-      - {id: 217, cat: Audio, desc: "2. DJs Stuff & Promos (Flac)"}
-      - {id: 218, cat: Audio, desc: "3. Singles"}
-      - {id: 219, cat: Audio, desc: "4. Singles (Flac)"}
-      - {id: 220, cat: Audio, desc: "5. ??s????af?e?"}
-      - {id: 221, cat: Audio, desc: "6. ??s????af?e? (Flac)"}
-      - {id: 222, cat: Audio, desc: "7. ??af??e? S?????e?"}
-      - {id: 223, cat: Audio, desc: "8. ??af??e? S?????e? (Flac)"}
-      - {id: 224, cat: Audio, desc: "9. SoundTracks"}
-      - {id: 225, cat: Audio, desc: "9.1 Varius Artist"}
-      - {id: 226, cat: Audio, desc: "9.2 Compact Disc Club"}
-      - {id: 227, cat: Audio, desc: "9.3 ???s??a Video Clips"}
-      - {id: 123, cat: Audio, desc: "???????? ???s???"}
-      - {id: 228, cat: Audio, desc: "1. DJs Stuff & Promos"}
-      - {id: 229, cat: Audio, desc: "2. DJs Stuff & Promos (Flac)"}
-      - {id: 230, cat: Audio, desc: "3. Singles"}
-      - {id: 231, cat: Audio, desc: "4. Singles (Flac)"}
-      - {id: 232, cat: Audio, desc: "5. ??s????af?e?"}
-      - {id: 233, cat: Audio, desc: "6. ??s????af?e? (Flac)"}
-      - {id: 234, cat: Audio, desc: "7. ??af??e? S?????e?"}
-      - {id: 235, cat: Audio, desc: "8. ??af??e? S?????e? (Flac)"}
-      - {id: 236, cat: Audio, desc: "9. ?a?d??a"}
-      - {id: 237, cat: Audio, desc: "9.1 SoundTracks"}
-      - {id: 238, cat: Audio, desc: "9.2 Varius Artist"}
-      - {id: 239, cat: Audio, desc: "9.3 Compact Disc Club"}
-      - {id: 240, cat: Audio, desc: "9.4 ???s??a Video Clips"}
-      - {id: 121, cat: Movies, desc: "children"}
-      - {id: 186, cat: Movies, desc: "children's films external subtitles"}
-      - {id: 187, cat: Movies, desc: "two children's films integrated subtitles"}
-      - {id: 188, cat: Movies, desc: "three children's films Metaglotismenes"}
-      - {id: 189, cat: Movies, desc: "four cartoon series external subtitles"}
-      - {id: 190, cat: Movies, desc: "five children's series integrated subtitles"}
-      - {id: 191, cat: Movies, desc: "six children's series Metaglotismenes"}
-      - {id: 192, cat: Movies, desc: "Anime external subtitles"}
-      - {id: 193, cat: Movies, desc: "Anime integrated subtitles"}
-      - {id: 194, cat: Movies, desc: "Anime Metaglotismenes"}
-      - {id: 128, cat: Console, desc: "9.1 ?a????d?a"}
-      - {id: 195, cat: Console, desc: "Windows Games"}
-      - {id: 196, cat: Console, desc: "Nintendo DS"}
-      - {id: 197, cat: Console, desc: "Sony PS1"}
-      - {id: 198, cat: Console, desc: "Sony PS2"}
-      - {id: 199, cat: Console, desc: "Sony PS3"}
-      - {id: 200, cat: Console, desc: "Sony PSP"}
-      - {id: 201, cat: Console, desc: "Wii"}
-      - {id: 202, cat: Console, desc: "XboX 360"}
-      - {id: 124, cat: PC, desc: "9.2 Applications"}
-      - {id: 203, cat: PC, desc: "Applications Windows"}
-      - {id: 204, cat: PC, desc: "Applications Mac"}
-      - {id: 205, cat: PC, desc: "Linux Applications"}
-      - {id: 126, cat: Books, desc: "9.3 Electronic Books"}
-      - {id: 206, cat: Books, desc: "Electronic books"}
-      - {id: 207, cat: Books, desc: "Magazines"}
-      - {id: 208, cat: Books, desc: "Comic Books"}
-      - {id: 125, cat: Other, desc: "9.4 Gallery"}
-      - {id: 209, cat: Other, desc: "Gallery"}
-      - {id: 210, cat: Other, desc: "Gallery HD"}
-      - {id: 211, cat: Other, desc: "Photos 3D"}
-      - {id: 212, cat: Other, desc: "Wallpapers"}
-      - {id: 213, cat: Other, desc: "Screensavers"}
-      - {id: 127, cat: PC/Phone-Other, desc: "9.5 Mobile / Miscellaneous"}
-      - {id: 214, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 215, cat: PC/Phone-Other, desc: "Miscellaneous"}
-      - {id: 129, cat: Other, desc: "9.6 Blocked DREAM TEAM"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-  
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td:contains("remaining tries")
-    test:
-      path: browse.php
-      selector: a[href*="/logout.php"]
-
-  download:
-    before:
-      path: takethanks.php
-      method: "post"
-      inputs:
-        torrentid: "{{ .DownloadUri.Query.id }}"
-      
-  search:
-    paths:
-      - path: browse.php
-    keywordsfilters:
-      # remove words <= 3 characters and surrounding special characters
-      - name: re_replace
-        args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
-    inputs:
-      do: "search"
-      keywords: "{{ .Keywords }}"
-      search_type: "t_name"
-      category: "0" # multi cat search not supported
-      include_dead_torrents: "yes"
-    rows:
-      selector: table#sortabletable > tbody > tr:has(a[href*="/details.php?id="])
-      filters:
-        - name: andmatch
-          args: 66
-    fields:
-      download:
-        selector: a[href*="/download.php?id="]
-        attribute: href
-      title:
-        selector: a[href*="/details.php?id="]
-      title:
-        optional: true
-        selector: div.tooltip-content > div
-      details:
-        selector: a[href*="/details.php?id="]
-        attribute: href
-      category:
-        selector: a[href*="/browse.php?category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      banner:
-        optional: true
-        selector: div.tooltip-content > img
-        attribute: src
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          img[alt^="Free Torrent "]: "0"
-          img[alt^="Silver Torrent "]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      date:
-        selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])"
-        remove: span
-        filters:
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "02-01-2006 15:04 -07:00"
--- a/src/Jackett.Common/Definitions/dxdhd.yml
+++ b/src/Jackett.Common/Definitions/dxdhd.yml
@@ -1,7 +1,7 @@
 ---
  site: dxdhd
  name: DXDHD
-  description: "General Tracker"
+  description: "DXDHD is a Private General Tracker"
  language: en-us
  type: private
  encoding: UTF-8
@@ -13,34 +13,62 @@
      - {id: 1, cat: Movies, desc: "Movies"}
      - {id: 2, cat: TV, desc: "TV"}
      - {id: 3, cat: Audio, desc: "Music"}
-      - {id: 4, cat: TV/Anime, desc: "Anime"}
+      - {id: 4, cat: TV/Anime, desc: "Anime-TV"}
      - {id: 5, cat: PC/0day, desc: "Apps"}
-      - {id: 6, cat: Books, desc: "eBooks"}
+      - {id: 6, cat: Books/Ebook, desc: "eBooks"}
      - {id: 7, cat: PC/Games, desc: "Games"}
      - {id: 8, cat: TV/Sport, desc: "Sports"}
      - {id: 9, cat: Other, desc: "Others"}
      - {id: 10, cat: XXX, desc: "XXX"}
+      - {id: 11, cat: Books/Comics, desc: "Comics"}
+      - {id: 12, cat: TV/Anime, desc: "Anime-Movie"}

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

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: login
    method: form
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
-      path: torrents
+      path: /
      selector: a[href$="/logout"]

  ratio:
-    path: torrents
+    path: /
    selector: li:has(i.fa-sync-alt)
    filters:
      - name: regexp
@@ -48,28 +76,32 @@

  search:
    paths:
-      - path: filterTorrents
+      - path: torrents/filter
    inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
      tmdb: ""
      mal: ""
-      sort: "created_at"
-      direction: "desc"
+      igdb: ""
+      sorting: "{{ .Config.sort }}"
+      sort: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
      qty: 100
+
    rows:
      selector: table > tbody > tr
+
    fields:
      category:
        selector: a[href*="/categories/"]
        attribute: href
        filters:
          - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
      title:
        selector: a.view-torrent
      download:
@@ -85,17 +117,20 @@
        filters:
          - name: replace
            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
        filters:
          - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
      imdb:
        optional: true
        selector: a[href*="www.imdb.com/title/tt"]
@@ -103,42 +138,45 @@
      date:
        selector: time
        filters:
-            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
          - name: re_replace
-            args: ["(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди)", "ago"]
+            args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди|前)", " ago"]
          - name: re_replace
-            args: ["(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
          - name: re_replace
-            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+            args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
          - name: re_replace
-            args: ["(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"]
+            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
          - name: re_replace
-            args: ["(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+            args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
          - name: re_replace
-            args: ["(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден)", "day"]
+            args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
          - name: re_replace
-            args: ["(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+            args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
          - name: re_replace
-            args: ["(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"]
+            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
          - name: re_replace
-            args: ["(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+            args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
          - name: re_replace
-            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+            args: ["(?i) (ay)", "month"]
          - name: re_replace
-            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+            args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand|个月)", " month"]
+          - name: re_replace
+            args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
-          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
-          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
-          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
-          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
-          "*": "1"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
-          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
-          "*": "1"
-# UNIT3D 1.9.2
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 2.2.7
--- a/src/Jackett.Common/Definitions/dxp.yml
+++ b/src/Jackett.Common/Definitions/dxp.yml
@@ -0,0 +1,137 @@
+---
+  site: dxp
+  name: DXP
+  description: "Deaf Experts (DXP) is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV with Russian Subtitles."
+  language: ru-ru
+  type: semi-private
+  encoding: windows-1251
+  links:
+    - https://dxp.ru/
+
+  caps:
+    categorymappings:
+      - {id: 14, cat: Movies/HD, desc: "Фильмы HDTV"}
+      - {id: 15, cat: Movies/DVD, desc: "Фильмы DVD"}
+      - {id: 13, cat: Movies/SD, desc: "Фильмы XviD"}
+      - {id: 12, cat: Movies/Other, desc: "Мультфильмы"}
+      - {id: 9, cat: TV/Documentary, desc: "Документальные"}
+      - {id: 11, cat: TV, desc: "Сериалы"}
+
+      - {id: 10, cat: Audio, desc: "Музыка"}
+      - {id: 16, cat: Books, desc: "Книги"}
+      - {id: 22, cat: Other, desc: "Картинки"}
+
+      - {id: 1, cat: PC, desc: "Приложения Windows"}
+      - {id: 3, cat: PC, desc: "Приложения Unix/Linux"}
+      - {id: 4, cat: PC/Mac, desc: "Приложения Mac"}
+      - {id: 2, cat: PC/Phone-Other, desc: "Приложения PDA"}
+
+      - {id: 5, cat: PC/Games, desc: "Игры PC"}
+      - {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"}
+      - {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"}
+      - {id: 7, cat: Console/Xbox, desc: "Игры X-Box"}
+      - {id: 8, cat: Console/PSP, desc: "Игры PSP"}
+
+      - {id: 18, cat: Other, desc: "Эксклюзивы"}
+      - {id: 21, cat: Other, desc: "Лавка субтитров"}
+      - {id: 20, cat: Other, desc: "DEMO"}
+      - {id: 17, cat: Other/Misc, desc: "VIP"}
+      - {id: 24, cat: Other/Misc, desc: "SuperVIP"}
+
+    modes:
+      search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      login: submit
+    error:
+      - selector: div.error
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  download:
+    selector: a[href^="download.php?id="]
+
+  search:
+    # https://dxp.ru/torrents.php?search=&sort=4&type=desc
+    paths:
+      - path: torrents.php
+    inputs:
+      search: "{{ .Keywords }}"
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
+    rows:
+      selector: table#loading-table tbody#highlighted tr:has(a[href^="torrents.php?cat="]), table#loading-table tbody#highlighted tr:has(a[href^="details.php?id="])
+      after: 1
+
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="torrent-"]
+        attribute: href
+      title:
+        selector: a[href^="torrent-"]
+      details:
+        selector: a[href^="torrent-"]
+        attribute: href
+      date:
+        selector: i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      files:
+        selector: td:nth-child(4)
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-child(7)
+        filters:
+          - name: split
+            args: ["|", 1]
+      downloadvolumefactor:
+        case:
+          a[href="torrents.php?cat=17"]: 1 # vip 
+          a[href="torrents.php?cat=24"]: 1 # super vip 
+          "*": 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/ebookparadijs.yml
+++ b/src/Jackett.Common/Definitions/ebookparadijs.yml
@@ -0,0 +1,142 @@
+---
+  site: ebookparadijs
+  name: EbookParadijs
+  description: "EbookParadijs is a DUTCH Private Tracker for EBOOKS"
+  language: nl-NL
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.ebookparadijs.org/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: Books/Ebook, desc: "Roman"}
+      - {id: 3, cat: Books/Ebook, desc: "Thriller"}
+      - {id: 4, cat: Books/Ebook, desc: "Diverse"}
+      - {id: 7, cat: Books/Ebook, desc: "Jeugd"}
+      - {id: 8, cat: Books/Ebook, desc: "Oorlog"}
+      - {id: 9, cat: Books/Ebook, desc: "Luisterboeken"}
+      - {id: 10, cat: Books/Ebook, desc: "Stripboeken"}
+      - {id: 11, cat: Books/Ebook, desc: "Crime"}
+      - {id: 13, cat: Books/Ebook, desc: "Detective"}
+      - {id: 15, cat: Books/Ebook, desc: "erothiek"}
+      - {id: 16, cat: Books/Ebook, desc: "tijdschriften"}
+      - {id: 17, cat: Books/Ebook, desc: "hobby"}
+      - {id: 19, cat: Books/Ebook, desc: "medisch"}
+      - {id: 21, cat: Books/Ebook, desc: "sport"}
+      - {id: 50, cat: Books/Ebook, desc: "Kookboeken"}
+      - {id: 51, cat: Books/Ebook, desc: "Fantasy"}
+      - {id: 52, cat: Books/Ebook, desc: "Kerst"}
+      - {id: 53, cat: Books/Ebook, desc: "Waargebeurd"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table[border="0"][cellspacing="0"][cellpadding="10"] tr td font[color="orange"]
+    test:
+      path: /
+      selector: :has(a[href="logout.php"])
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+
+    rows:
+      selector: table.mainouter
+      filters:
+        - name: andmatch
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      banner:
+        selector: img[src*="/covers/"]
+        attribute: src
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details", "download"]
+      size:
+        selector: td:nth-child(4) table tr td:nth-child(2)
+        filters:
+          - name: regexp
+            args: "(.+?) in"
+      files:
+        selector: td:nth-child(4) table tr td:nth-child(2)
+        filters:
+          - name: regexp
+            args: "in (\\d+) bestan"
+      grabs:
+        selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
+        filters:
+          - name: regexp
+            args: (\d+)
+      date:
+        selector: td:nth-child(4) table tr:nth-child(2) td:last-child
+        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: dateparse
+            args: "2 January 2006 15:04:05"
+      seeders:
+        text: 0
+      seeders:
+        optional: true
+        selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5)  font b
+      leechers:
+        text: 0
+      leechers:
+        optional: true
+        selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
+      downloadvolumefactor:
+        case:
+          img[src="pic/freedlfsu.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/ebooks-shares.yml
+++ b/src/Jackett.Common/Definitions/ebooks-shares.yml
@@ -0,0 +1,354 @@
+---
+  site: ebooks-shares
+  name: Ebooks-Shares
+  description: "Ebooks-Shares is a Private Torrent Tracker for EBOOKS / AUDIOBOOKS"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://ebooks-shares.org/
+
+  caps:
+    categorymappings:
+      - {id: 274, cat: Audio/Audiobook, desc: "Audio: Poetry"}
+      - {id: 1, cat: Audio/Audiobook, desc: "Audio: Adventure"}
+      - {id: 2, cat: Audio/Audiobook, desc: "Audio: Radio Programs ie Dramas, Talk"}
+      - {id: 3, cat: Audio/Audiobook, desc: "Audio: Non English"}
+      - {id: 42, cat: Audio/Audiobook, desc: "Audio: Biography/Memoirs"}
+      - {id: 4, cat: Audio/Audiobook, desc: "Audio: Business"}
+      - {id: 5, cat: Audio/Audiobook, desc: "Audio: Childrens"}
+      - {id: 7, cat: Audio/Audiobook, desc: "Audio: Classics"}
+      - {id: 41, cat: Audio/Audiobook, desc: "Audio: Comedy"}
+      - {id: 9, cat: Audio/Audiobook, desc: "Audio: Crime/Mystery/Thriller"}
+      - {id: 10, cat: Audio/Audiobook, desc: "Audio: Factual"}
+      - {id: 11, cat: Audio/Audiobook, desc: "Audio: Graphic Audio Books"}
+      - {id: 43, cat: Audio/Audiobook, desc: "Audio: Historical Fiction"}
+      - {id: 12, cat: Audio/Audiobook, desc: "Audio: History/Military"}
+      - {id: 269, cat: Audio/Audiobook, desc: "Audio: History"}
+      - {id: 14, cat: Audio/Audiobook, desc: "Audio: Horror"}
+      - {id: 15, cat: Audio/Audiobook, desc: "Audio: Medical"}
+      - {id: 16, cat: Audio/Audiobook, desc: "Audio: Music"}
+      - {id: 45, cat: Audio/Audiobook, desc: "Audio: Non-Fict/Ref"}
+      - {id: 46, cat: Audio/Audiobook, desc: "Audio: Novels"}
+      - {id: 17, cat: Audio/Audiobook, desc: "Audio: General"}
+      - {id: 22, cat: Audio/Audiobook, desc: "Audio: Philosophy/Belief"}
+      - {id: 23, cat: Audio/Audiobook, desc: "Audio: Romance"}
+      - {id: 24, cat: Audio/Audiobook, desc: "Audio: Sci-Fi/Fantasy"}
+      - {id: 25, cat: Audio/Audiobook, desc: "Audio: Self-Improvement"}
+      - {id: 26, cat: Audio/Audiobook, desc: "Audio: Mod. Scholar/TTC"}
+      - {id: 27, cat: Audio/Audiobook, desc: "Audio: Travel"}
+      - {id: 33, cat: Audio/Audiobook, desc: "Audio: Tutorials"}
+      - {id: 34, cat: Audio/Audiobook, desc: "Audio: Western"}
+      - {id: 35, cat: Audio/Audiobook, desc: "Audio: Young Adult"}
+      - {id: 275, cat: Audio/Audiobook, desc: "Audio: Language"}
+      - {id: 276, cat: Audio/Audiobook, desc: "Audio: Military Fiction"}
+      - {id: 299, cat: Audio/Audiobook, desc: "Audio: Magazines"}
+      - {id: 301, cat: Audio/Audiobook, desc: "Audio: Collections"}
+      - {id: 47, cat: Books/Ebook, desc: "Children's: Adventure"}
+      - {id: 48, cat: Books/Ebook, desc: "Children's: Novels"}
+      - {id: 49, cat: Books/Ebook, desc: "Children's: Collections"}
+      - {id: 50, cat: Books/Ebook, desc: "Children's: Educational"}
+      - {id: 51, cat: Books/Ebook, desc: "Children's: Games"}
+      - {id: 52, cat: Books/Ebook, desc: "Children's: General"}
+      - {id: 283, cat: Books/Ebook, desc: "Children's: Sci-Fi/Fantasy"}
+      - {id: 284, cat: Books/Ebook, desc: "Children's: Mystery"}
+      - {id: 286, cat: Books/Ebook, desc: "Children's: Early Years / Picture"}
+      - {id: 295, cat: Books/Ebook, desc: "Children's: Nonfiction"}
+      - {id: 296, cat: Books/Ebook, desc: "Children's: Leveled / Decodable Readers"}
+      - {id: 288, cat: Books/Ebook, desc: "Collections: Same Author"}
+      - {id: 289, cat: Books/Ebook, desc: "Collections: Same Series"}
+      - {id: 291, cat: Books/Ebook, desc: "Collections: Fiction"}
+      - {id: 292, cat: Books/Ebook, desc: "Collections: Non Fiction"}
+      - {id: 220, cat: Books/Comics, desc: "Comics: Archie"}
+      - {id: 222, cat: Books/Comics, desc: "Comics: Books & Mags - Comics"}
+      - {id: 225, cat: Books/Comics, desc: "Comics: ComicStrip Collection"}
+      - {id: 228, cat: Books/Comics, desc: "Comics: DC"}
+      - {id: 244, cat: Books/Comics, desc: "Comics: Manga"}
+      - {id: 245, cat: Books/Comics, desc: "Comics: Marvel"}
+      - {id: 258, cat: Books/Comics, desc: "Comics: Other Pub - Humor/Satire"}
+      - {id: 262, cat: Books/Comics, desc: "Comics: Other Pub - Educational"}
+      - {id: 264, cat: Books/Comics, desc: "Comics: Independent Publishers"}
+      - {id: 265, cat: Books/Comics, desc: "Comics: General/Misc"}
+      - {id: 281, cat: Books/Technical, desc: "Computer: Tutorials"}
+      - {id: 38, cat: Books/Technical, desc: "Computer: Applications"}
+      - {id: 55, cat: Books/Technical, desc: "Computer: Gaming "}
+      - {id: 56, cat: Books/Technical, desc: "Computer: General"}
+      - {id: 57, cat: Books/Technical, desc: "Computer: Graphics"}
+      - {id: 58, cat: Books/Technical, desc: "Computer: Internet-WWW"}
+      - {id: 59, cat: Books/Technical, desc: "Computer: Networking"}
+      - {id: 60, cat: Books/Technical, desc: "Computer: OS/Mac"}
+      - {id: 61, cat: Books/Technical, desc: "Computer: OS/Other"}
+      - {id: 62, cat: Books/Technical, desc: "Computer: OS/Windows"}
+      - {id: 63, cat: Books/Technical, desc: "Computer: Programming "}
+      - {id: 66, cat: Books/Ebook, desc: "Doc/Vid/Tut: Computer"}
+      - {id: 67, cat: Books/Ebook, desc: "Doc/Vid/Tut: Crafts"}
+      - {id: 68, cat: Books/Ebook, desc: "Doc/Vid/Tut: Educational"}
+      - {id: 69, cat: Books/Ebook, desc: "Doc/Vid/Tut: General"}
+      - {id: 70, cat: Books/Ebook, desc: "Doc/Vid/Tut: History"}
+      - {id: 71, cat: Books/Ebook, desc: "Doc/Vid/Tut: Medical/Health"}
+      - {id: 72, cat: Books/Ebook, desc: "Doc/Vid/Tut: Military"}
+      - {id: 73, cat: Books/Ebook, desc: "Doc/Vid/Tut: Modelling"}
+      - {id: 74, cat: Books/Ebook, desc: "Doc/Vid/Tut: Sciences"}
+      - {id: 75, cat: Books/Ebook, desc: "Doc/Vid/Tut: Transportation"}
+      - {id: 76, cat: Books/Ebook, desc: "Doc/Vid/Tut: Woodworking"}
+      - {id: 287, cat: Books/Ebook, desc: "Doc/Vid/Tut: Martial Arts/Boxing/Wrestling"}
+      - {id: 121, cat: Books/Ebook, desc: "Educational: Arts"}
+      - {id: 122, cat: Books/Ebook, desc: "Educational: Astronomy/Cosmology"}
+      - {id: 123, cat: Books/Ebook, desc: "Educational: Biology & Genetics"}
+      - {id: 124, cat: Books/Ebook, desc: "Educational: Chemistry"}
+      - {id: 125, cat: Books/Ebook, desc: "Educational: Culture/Languages"}
+      - {id: 126, cat: Books/Ebook, desc: "Educational: Earth Sciences"}
+      - {id: 127, cat: Books/Ebook, desc: "Educational:  Educational"}
+      - {id: 128, cat: Books/Ebook, desc: "Educational: Engineering & Technology "}
+      - {id: 129, cat: Books/Ebook, desc: "Educational: Environmental Studies"}
+      - {id: 130, cat: Books/Ebook, desc: "Educational: General Science Titles"}
+      - {id: 131, cat: Books/Ebook, desc: "Educational: Literature / Writing"}
+      - {id: 132, cat: Books/Ebook, desc: "Educational: Mathematics and Statistics"}
+      - {id: 133, cat: Books/Ebook, desc: "Educational: Medical Texts"}
+      - {id: 134, cat: Books/Ebook, desc: "Educational: Military History"}
+      - {id: 135, cat: Books/Ebook, desc: "Educational: Non-Military History"}
+      - {id: 136, cat: Books/Ebook, desc: "Educational: Paleontology"}
+      - {id: 137, cat: Books/Ebook, desc: "Educational: Physics"}
+      - {id: 138, cat: Books/Ebook, desc: "Educational: Psychology"}
+      - {id: 139, cat: Books/Ebook, desc: "Educational: Student Reference"}
+      - {id: 297, cat: Books/Ebook, desc: "Educational: Life Sciences/Evolution/Human "}
+      - {id: 77, cat: Books/Ebook, desc: "Fiction: Adventure"}
+      - {id: 78, cat: Books/Ebook, desc: "Fiction: Classics"}
+      - {id: 79, cat: Books/Ebook, desc: "Fiction: Collections"}
+      - {id: 80, cat: Books/Ebook, desc: "Fiction: Comedy/Humorous  "}
+      - {id: 81, cat: Books/Ebook, desc: "Fiction: Crime/Mystery/Thriller"}
+      - {id: 302, cat: Books/Ebook, desc: "Fiction: Cozy Mysteries"}
+      - {id: 82, cat: Books/Ebook, desc: "Fiction: General Fiction"}
+      - {id: 83, cat: Books/Ebook, desc: "Fiction: Horror"}
+      - {id: 84, cat: Books/Ebook, desc: "Fiction: Military & Historic"}
+      - {id: 86, cat: Books/Ebook, desc: "Fiction: Romance"}
+      - {id: 87, cat: Books/Ebook, desc: "Fiction: Sci-Fi/Fantasy"}
+      - {id: 88, cat: Books/Ebook, desc: "Fiction: Westerns"}
+      - {id: 270, cat: Books/Ebook, desc: "Fiction: Historical "}
+      - {id: 312, cat: Books/Ebook, desc: "Fiction: Various Authors"}
+      - {id: 303, cat: Books/Ebook, desc: "Fiction: Poetry"}
+      - {id: 140, cat: Books/Ebook, desc: "Hobby/Pastime: Art"}
+      - {id: 141, cat: Books/Ebook, desc: "Hobby/Pastime: Boating"}
+      - {id: 142, cat: Books/Ebook, desc: "Hobby/Pastime: Crafts/Knitting/Sewing"}
+      - {id: 143, cat: Books/Ebook, desc: "Hobby/Pastime: Food & Drink"}
+      - {id: 144, cat: Books/Ebook, desc: "Hobby/Pastime: Games/RPG/Gaming"}
+      - {id: 145, cat: Books/Ebook, desc: "Hobby/Pastime: General Pastimes"}
+      - {id: 146, cat: Books/Ebook, desc: "Hobby/Pastime: Graphic Arts and Design"}
+      - {id: 147, cat: Books/Ebook, desc: "Hobby/Pastime: Health/Lifestyle"}
+      - {id: 148, cat: Books/Ebook, desc: "Hobby/Pastime: Home/Gardening"}
+      - {id: 149, cat: Books/Ebook, desc: "Hobby/Pastime: Metalworking"}
+      - {id: 150, cat: Books/Ebook, desc: "Hobby/Pastime: Modelling"}
+      - {id: 151, cat: Books/Ebook, desc: "Hobby/Pastime: Pets/Vet Science"}
+      - {id: 152, cat: Books/Ebook, desc: "Hobby/Pastime: Photography"}
+      - {id: 153, cat: Books/Ebook, desc: "Hobby/Pastime: Quiz and Crossword Books"}
+      - {id: 154, cat: Books/Ebook, desc: "Hobby/Pastime: Sports"}
+      - {id: 155, cat: Books/Ebook, desc: "Hobby/Pastime: Travel"}
+      - {id: 156, cat: Books/Ebook, desc: "Hobby/Pastime: Woodworking"}
+      - {id: 157, cat: Books/Ebook, desc: "Language Learn: Arabic"}
+      - {id: 158, cat: Books/Ebook, desc: "Language Learn: Chinese"}
+      - {id: 159, cat: Books/Ebook, desc: "Language Learn: English"}
+      - {id: 160, cat: Books/Ebook, desc: "Language Learn: French"}
+      - {id: 161, cat: Books/Ebook, desc: "Language Learn: German"}
+      - {id: 162, cat: Books/Ebook, desc: "Language Learn: Italian"}
+      - {id: 163, cat: Books/Ebook, desc: "Language Learn: Japanese"}
+      - {id: 164, cat: Books/Ebook, desc: "Language Learn: Latin"}
+      - {id: 165, cat: Books/Ebook, desc: "Language Learn: Nordic Lang"}
+      - {id: 166, cat: Books/Ebook, desc: "Language Learn: Oriental Lang"}
+      - {id: 167, cat: Books/Ebook, desc: "Language Learn: Russian"}
+      - {id: 168, cat: Books/Ebook, desc: "Language Learn: Spanish"}
+      - {id: 169, cat: Books/Ebook, desc: "Language Learn: Other Lang"}
+      - {id: 310, cat: Books/Magazines, desc: "Magazines: Woodworking"}
+      - {id: 311, cat: Books/Magazines, desc: "Magazines: Sewing, Knitting and Quilting"}
+      - {id: 170, cat: Books/Magazines, desc: "Magazines : Computer"}
+      - {id: 171, cat: Books/Magazines, desc: "Magazines: Current Events"}
+      - {id: 172, cat: Books/Magazines, desc: "Magazines: Business/Finance "}
+      - {id: 173, cat: Books/Magazines, desc: "Magazines: Electronics"}
+      - {id: 174, cat: Books/Magazines, desc: "Magazines: General/Misc"}
+      - {id: 175, cat: Books/Magazines, desc: "Magazines: Military"}
+      - {id: 176, cat: Books/Magazines, desc: "Magazines: Photography"}
+      - {id: 177, cat: Books/Magazines, desc: "Magazines: Sciences "}
+      - {id: 178, cat: Books/Magazines, desc: "Magazines: Sports"}
+      - {id: 179, cat: Books/Magazines, desc: "Magazines: Technology"}
+      - {id: 180, cat: Books/Magazines, desc: "Magazines: Transportation"}
+      - {id: 181, cat: Books/Ebook, desc: "Military: Aircraft"}
+      - {id: 182, cat: Books/Ebook, desc: "Military: Armour"}
+      - {id: 183, cat: Books/Ebook, desc: "Military: General Military"}
+      - {id: 184, cat: Books/Ebook, desc: "Military: Miscellaneous"}
+      - {id: 185, cat: Books/Ebook, desc: "Military: Naval"}
+      - {id: 186, cat: Books/Foreign, desc: "Non English Bks: Dutch"}
+      - {id: 187, cat: Books/Foreign, desc: "Non English Bks: French"}
+      - {id: 188, cat: Books/Foreign, desc: "Non English Bks: German"}
+      - {id: 189, cat: Books/Foreign, desc: "Non English Bks: Greek"}
+      - {id: 190, cat: Books/Foreign, desc: "Non English Bks: Hungarian"}
+      - {id: 191, cat: Books/Foreign, desc: "Non English Bks: Italian"}
+      - {id: 192, cat: Books/Foreign, desc: "Non English Bks: Japanese"}
+      - {id: 194, cat: Books/Foreign, desc: "Non English Bks: Other"}
+      - {id: 193, cat: Books/Foreign, desc: "Non English Bks: Polish"}
+      - {id: 195, cat: Books/Foreign, desc: "Non English Bks: Romanian"}
+      - {id: 196, cat: Books/Foreign, desc: "Non English Bks: Russian"}
+      - {id: 197, cat: Books/Foreign, desc: "Non English Bks: Scandinavian"}
+      - {id: 198, cat: Books/Foreign, desc: "Non English Bks: Serbian"}
+      - {id: 199, cat: Books/Foreign, desc: "Non English Bks: Spanish"}
+      - {id: 89, cat: Books/Ebook, desc: "Non Fict/Ref: Agricultural"}
+      - {id: 90, cat: Books/Ebook, desc: "Non Fict/Ref: Alt. Therapies"}
+      - {id: 95, cat: Books/Ebook, desc: "Non Fict/Ref: Architecture"}
+      - {id: 91, cat: Books/Ebook, desc: "Non Fict/Ref: Auto & Repair"}
+      - {id: 92, cat: Books/Ebook, desc: "Non Fict/Ref: Aviation"}
+      - {id: 94, cat: Books/Ebook, desc: "Non Fict/Ref: Biographies and Memoirs"}
+      - {id: 96, cat: Books/Ebook, desc: "Non Fict/Ref: Business/Finance"}
+      - {id: 97, cat: Books/Ebook, desc: "Non Fict/Ref: Comedy/Humorous"}
+      - {id: 98, cat: Books/Ebook, desc: "Non Fict/Ref: Crime"}
+      - {id: 99, cat: Books/Ebook, desc: "Non Fict/Ref: Criminology"}
+      - {id: 100, cat: Books/Ebook, desc: "Non Fict/Ref: Economics & Math"}
+      - {id: 102, cat: Books/Ebook, desc: "Non Fict/Ref: Electronics"}
+      - {id: 103, cat: Books/Ebook, desc: "Non Fict/Ref: Enc/Dict/Atlas,s"}
+      - {id: 104, cat: Books/Ebook, desc: "Non Fict/Ref: Entertainment"}
+      - {id: 105, cat: Books/Ebook, desc: "Non Fict/Ref: General Ref"}
+      - {id: 106, cat: Books/Ebook, desc: "Non Fict/Ref: Geo & Archaeology"}
+      - {id: 107, cat: Books/Ebook, desc: "Non Fict/Ref: Journ/Current Affairs "}
+      - {id: 108, cat: Books/Ebook, desc: "Non Fict/Ref: Legal"}
+      - {id: 109, cat: Books/Ebook, desc: "Non Fict/Ref: Medical/Health"}
+      - {id: 110, cat: Books/Ebook, desc: "Non Fict/Ref: Motorcycle"}
+      - {id: 111, cat: Books/Ebook, desc: "Non Fict/Ref:  Music"}
+      - {id: 112, cat: Books/Ebook, desc: "Non Fict/Ref: Parenting/Family"}
+      - {id: 113, cat: Books/Ebook, desc: "Non Fict/Ref: Philosophy & Belief"}
+      - {id: 114, cat: Books/Ebook, desc: "Non Fict/Ref: Literature / Writing"}
+      - {id: 115, cat: Books/Ebook, desc: "Non Fict/Ref: Political Science"}
+      - {id: 116, cat: Books/Ebook, desc: "Non Fict/Ref: Project Management"}
+      - {id: 117, cat: Books/Ebook, desc: "Non Fict/Ref: Self-Improvement"}
+      - {id: 118, cat: Books/Ebook, desc: "Non Fict/Ref: Sht Music-Tablatures"}
+      - {id: 119, cat: Books/Ebook, desc: "Non Fict/Ref: Sociology/Politics"}
+      - {id: 120, cat: Books/Ebook, desc: "Non Fict/Ref: Transportation"}
+      - {id: 266, cat: Books/Ebook, desc: "Non Fict/Ref: Technology Books"}
+      - {id: 267, cat: Books/Ebook, desc: "Non Fict/Ref: History Books"}
+      - {id: 271, cat: Books/Ebook, desc: "Non Fict/Ref: Collections"}
+      - {id: 272, cat: Books/Ebook, desc: "Non Fict/Ref: DIY (Do It Yourself)"}
+      - {id: 273, cat: Books/Ebook, desc: "Non Fict/Ref: Archaeology"}
+      - {id: 278, cat: Books/Ebook, desc: "Non Fict/Ref: Conspiracy Theory/UFO/Alien Bk"}
+      - {id: 279, cat: Books/Ebook, desc: "Non Fict/Ref: Psychology"}
+      - {id: 280, cat: Books/Ebook, desc: "Non Fict/Ref: Education"}
+      - {id: 282, cat: Books/Ebook, desc: "Non Fict/Ref: Martial Arts/Boxing/Wrestling"}
+      - {id: 293, cat: Books/Ebook, desc: "Non Fict/Ref: Zoology & Veterinary Science"}
+      - {id: 294, cat: Books/Ebook, desc: "Non Fict/Ref: True Stories"}
+      - {id: 300, cat: Books/Ebook, desc: "Non Fict/Ref: Maritime Books (Building,navig"}
+      - {id: 200, cat: Books/Ebook, desc: "Teens: Collections"}
+      - {id: 201, cat: Books/Ebook, desc: "Teens: Educational"}
+      - {id: 202, cat: Books/Ebook, desc: "Teens: Fiction"}
+      - {id: 203, cat: Books/Ebook, desc: "Teens: Non Fiction"}
+      - {id: 285, cat: Books/Ebook, desc: "Teens: Sci-Fi/Fantasy"}
+      - {id: 305, cat: Books/Other, desc: "VIP: Science Fiction"}
+      - {id: 307, cat: Books/Other, desc: "VIP: Thriller"}
+      - {id: 306, cat: Books/Other, desc: "VIP: Mystery"}
+      - {id: 308, cat: Books/Other, desc: "VIP: Crime"}
+      - {id: 309, cat: Books/Other, desc: "VIP: Fantasy "}
+      - {id: 204, cat: Books/Other, desc: "VIP: Collections "}
+      - {id: 205, cat: Books/Other, desc: "VIP: Audiobooks"}
+      - {id: 206, cat: Books/Other, desc: "VIP: Comics"}
+      - {id: 207, cat: Books/Other, desc: "VIP: Computers"}
+      - {id: 208, cat: Books/Other, desc: "VIP: Documentaries"}
+      - {id: 209, cat: Books/Other, desc: "VIP: Educational"}
+      - {id: 210, cat: Books/Other, desc: "VIP: Fiction"}
+      - {id: 211, cat: Books/Other, desc: "VIP: Hobby/Craft"}
+      - {id: 212, cat: Books/Other, desc: "VIP: Literature"}
+      - {id: 213, cat: Books/Other, desc: "VIP: Medical"}
+      - {id: 214, cat: Books/Other, desc: "VIP: Military"}
+      - {id: 215, cat: Books/Other, desc: "VIP: Music"}
+      - {id: 216, cat: Books/Other, desc: "VIP: Non Fiction"}
+      - {id: 217, cat: Books/Other, desc: "VIP: Original Content"}
+      - {id: 218, cat: Books/Other, desc: "VIP: RPG"}
+
+    modes:
+      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: "id"
+      options:
+        "id": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.panel:contains("Access Denied")
+    test:
+      path: index.php
+
+  download:
+    selector: a[href^="download.php?id="]
+
+  search:
+    paths:
+      - path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{if .Keywords}}\"{{.Keywords}}\"{{else}}{{end}}"
+      # 0 only active 1 incl dead 2 only dead
+      incldead: 0
+      # 0 all 1 not freeleech 2 only freeleech
+      freeleech: 0
+      # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
+      lang: 0
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"
+
+    rows:
+      selector: tr.t-row
+
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      seeders:
+        selector: td:nth-child(4)
+      leechers:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(6)
+      description:
+        selector: td:nth-child(7)
+        filters:
+          - name: prepend
+            args: "wait: "
+      date:
+        text: now
+      downloadvolumefactor:
+        case:
+          img[src="images/free.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
--- a/src/Jackett.Common/Definitions/efectodoppler.yml
+++ b/src/Jackett.Common/Definitions/efectodoppler.yml
@@ -0,0 +1,119 @@
+---
+  site: efectodoppler
+  name: Efecto Doppler
+  description: "Efecto Doppler is a SPANISH Private Torrent Tracker for MUSIC"
+  language: es-es
+  type: private
+  encoding: UTF-8
+  links:
+    - https://efectodoppler.pw/
+
+  caps:
+    categories:
+      1: Audio
+
+    modes:
+      search: [q]
+      music-search: [q, album, artist, label, year]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "time"
+      options:
+        "time": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+    error:
+      - selector: form > span.warning
+    test:
+      path: index.php
+      selector: a[href^="logout.php?auth="]
+
+  ratio:
+    path: index.php
+    selector: li#stats_ratio span.stat span
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      artistname: "{{ if .Query.Artist }}{{ .Query.Artist }}{{else}}{{end}}"
+      groupname: "{{ if .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+      order_by: "{{ .Config.sort }}"
+      order_way: "{{ .Config.type }}"
+
+    rows:
+      selector: tr.torrent
+
+    fields:
+      category:
+        text: 1
+      artist:
+        text: "Varios artistas"
+      artist:
+        selector: a[href^="artist.php?id="]
+        optional: true
+      title:
+        selector: a[href^="torrents.php?id="]
+        filters:
+          - name: prepend
+            args: "{{.Result.artist}} - "
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      banner:
+        selector: div.group_image img
+        attribute: src
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.torrent_info
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4) span
+        attribute: title
+        filters:
+          - name: dateparse
+            args: "Jan 02 2006, 15:04"
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          strong.torrent_label[title*="Neutral"]: 0
+          strong.torrent_label[title*="Oro"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          strong.torrent_label[title*="Neutral"]: 0
+          "*": 1
--- a/src/Jackett.Common/Definitions/elitehd.yml
+++ b/src/Jackett.Common/Definitions/elitehd.yml
@@ -1,100 +0,0 @@
---
-  site: elitehd
-  name: EliteHD
-  description: "EliteHD (HDClub) is a RUSSIAN Private Torrent Tracker for HD MOVIES / TV / GENERAL"
-  language: ru-ru
-  type: private
-  encoding: windows-1251
-  links:
-    - https://elitehd.org/
-
-  caps:
-    categorymappings:
-      - {id: 70, cat: Movies, desc: "Animation"}
-      - {id: 71, cat: Movies, desc: "Movie"}
-      - {id: 81, cat: Audio, desc: "HD Audio"}
-      - {id: 78, cat: TV/Documentary, desc: "Documentary"}
-      - {id: 68, cat: Audio/Video, desc: "Music Video"}
-      - {id: 64, cat: TV, desc: "TV Show"}
-      - {id: 62, cat: TV/Sport, desc: "Sport"}
-      - {id: 82, cat: Other, desc: "Demo"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      selector: img#captcha
-      input: imagestring
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded > div.error
-    test:
-      path: browse.php
-      selector: td.main_bottom
-      
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      dsearch: ""
-      stype: "or"
-      incldead: "1"
-      webdl: "0"
-      3d: "0"
-    rows:
-      selector: tbody#highlighted > tr
-    fields:
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php", "download.php"]
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      date:
-        selector: div#frame > div#cleft > font
-        filters:
-          - name: append
-            args: " +02:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      seeders:
-        selector: td:nth-child(5)
-      leechers:
-        selector: td:nth-child(6)
-      grabs:
-        selector: td:nth-child(7) b
-        filters:
-          - name: regexp
-            args: ([\d,]+)
-      size:
-        selector: td:nth-child(7)
-        remove: a, br, b
-      downloadvolumefactor:
-        case:
-          img[src="pic/freedownload.gif"]: "0"
-          img[src="pic/silver.gif"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
--- a/src/Jackett.Common/Definitions/elitetorrent-biz.yml
+++ b/src/Jackett.Common/Definitions/elitetorrent-biz.yml
@@ -6,9 +6,13 @@
  type: public
  encoding: UTF-8
  links:
-    - https://www.elitetorrent.io/
+    - https://www.elitetorrent.tv/
  legacylinks:
    - https://www.elitetorrent.biz/
+    - https://www.elitetorrent.io/
+    - https://www.elitetorrent.one/
+    - https://www.elitetorrent.is/
+    - https://www.elitetorrent.nu/

  caps:
    categories:
@@ -41,15 +45,20 @@
    inputs:
      s: "{{ .Keywords }}"
      $raw: "&x=0&y=0"
-    error:
-      - selector: "#principal div.not_results"
    rows:
      selector: "#principal .miniboxs-ficha li"
+      filters:
+      - name: andmatch
    fields:
      title:
        selector: .meta a
+        attribute: href
        # normalize to SXXEYY format
        filters:
+          - name: re_replace
+            args: [".*/([^/]*)/$", "$1"]
+          - name: replace
+            args: ["-", " "]
          - name: re_replace
            args: ["(\\d{2})×(\\d{2})", "S$1E$2"]
          - name: re_replace
--- a/src/Jackett.Common/Definitions/elittracker.yml
+++ b/src/Jackett.Common/Definitions/elittracker.yml
@@ -1,190 +0,0 @@
---
-  site: elittracker
-  name: Elit Tracker
-  description: "Elit Tracker (ET) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
-  language: hu-hu
-  type: private
-  encoding: iso-8859-2
-  links:
-    - http://elittorent.us/
-
-  caps:
-    categorymappings:
-      - {id: 35, cat: Movies, desc: "BluRay-Egyéb (BluRay Other)"}
-      - {id: 30, cat: Movies, desc: "BluRay-Hun"}
-      - {id: 34, cat: Movies, desc: "Cam-Egyéb (Cam Other)"}
-      - {id: 33, cat: Movies, desc: "Cam-Hun"}
-      - {id: 36, cat: Movies, desc: "DVD-Egyéb (DVD Other)"}
-      - {id: 2, cat: Movies, desc: "DVD-Eng"}
-      - {id: 3, cat: Movies, desc: "DVD-Hun"}
-      - {id: 6, cat: Other, desc: "Egyéb (Other)"}
-      - {id: 10, cat: Console, desc: "Játék-Konzol (Games Console)"}
-      - {id: 7, cat: Console, desc: "Játék-PC (Games PC)"}
-      - {id: 8, cat: Console, desc: "Játék-PS (Games PS)"}
-      - {id: 9, cat: Console, desc: "Játék-Xbox (Games Xbox)"}
-      - {id: 11, cat: Other, desc: "Klip (Clips)"}
-      - {id: 4, cat: Books, desc: "Könyv-Eng (Book Eng)"}
-      - {id: 5, cat: Books, desc: "Könyv-Hun (Book Hun)"}
-      - {id: 12, cat: Books, desc: "Mese-Eng (Tale Eng)"}
-      - {id: 13, cat: Books, desc: "Mese-Hun (Tale Hun)"}
-      - {id: 14, cat: PC, desc: "Mobil (Mobile)"}
-      - {id: 15, cat: PC, desc: "Program (Software)"}
-      - {id: 16, cat: PC, desc: "Program-Linux (Software Linux)"}
-      - {id: 17, cat: TV, desc: "Sorozat-Eng (TV Eng)"}
-      - {id: 18, cat: TV, desc: "Sorozat-Hun (TV Hun)"}
-      - {id: 37, cat: Movies, desc: "XviD-Egyéb (Xvid Other)"}
-      - {id: 19, cat: Movies, desc: "XviD-Eng"}
-      - {id: 20, cat: Movies, desc: "XviD-Hun"}
-      - {id: 21, cat: XXX, desc: "XXX"}
-      - {id: 22, cat: XXX, desc: "XXX-Képek (XXX Pics)"}
-      - {id: 32, cat: Audio, desc: "Zene-Egyéb (Msuci Other)"}
-      - {id: 23, cat: Audio, desc: "Zene-Eng (Music Eng)"}
-      - {id: 24, cat: Audio, desc: "Zene-Hun (Music Hun)"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-    - name: category
-      type: select
-      label: Category
-      default: "0"
-      options:
-        "0" : "toate categoriile (All)"
-        "35" : "BluRay-Egyéb (BluRay Other)"
-        "30" : "BluRay-Hun"
-        "34" : "Cam-Egyéb (Cam Other)"
-        "33" : "Cam-Hun"
-        "36" : "DVD-Egyéb (DVD OTher)"
-        "2" : "DVD-Eng"
-        "3" : "DVD-Hun"
-        "6" : "Egyéb (Other)"
-        "10" : "Játék-Konzol (Games Console)"
-        "7" : "Játék-PC (Games PC)"
-        "8" : "Játék-PS (Games PS)"
-        "9" : "Játék-Xbox (Games Xbox)"
-        "11" : "Klip (Clips)"
-        "4" : "Könyv-Eng (Book Eng)"
-        "5" : "Könyv-Hun (Book Hun)"
-        "12" : "Mese-Eng (Tale Eng)"
-        "13" : "Mese-Hun (Tale Hun)"
-        "14" : "Mobil (Mobile)"
-        "15" : "Program (Software)"
-        "16" : "Program-Linux (Software Linux)"
-        "17" : "Sorozat-Eng (TV Eng)"
-        "18" : "Sorozat-Hun (TV Hun)"
-        "37" : "XviD-Egyéb (Xvid Other)"
-        "19" : "XviD-Eng"
-        "20" : "XviD-Hun"
-        "21" : "XXX"
-        "22" : "XXX-Képek (XXX Pics)"
-        "32" : "Zene-Egyéb (XXX Other)"
-        "23" : "Zene-Eng (Music Eng)"
-        "24" : "Zene-Hun (Music Hun)"
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td:contains("Hiba:")
-    test:
-      path: browse.php
-
-  search:
-    paths:
-      - path: browse.php
-        method: post
-    inputs:
-      do: "search"
-      keywords: "{{ .Keywords }}"
-      search_type: "t_name"
-      # multi cat is not supported
-      category: "{{ .Config.category }}"
-
-    rows:
-      selector: table > tbody > tr:has(img[src*="/pic/categories/"])
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        # using attribute title from td(3) because the text from td(2) a(2) can be abbreviated
-        selector: td:nth-of-type(3) a
-        attribute: title
-        filters:
-          - name: replace
-            args: ["Torrent letöltése: ", ""]
-      details:
-        selector: td:nth-of-type(2) > a[href$=".ts"]
-        attribute: href
-      banner:
-        selector: td:nth-of-type(2) a:nth-of-type(2)
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=([^\s]+)
-      download:
-        selector: td:nth-of-type(3) a
-        attribute: href
-      category:
-        selector: td:nth-of-type(1) > a
-        attribute: href
-        filters:
-          - name: regexp
-            args: -c-(\d+)\.ts
-      date:
-        selector: td:nth-of-type(2)
-        remove: b
-        filters:
-          - name: split
-            args: ["\xA0", 0]
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "2006 2, January, 15:04:05 -07:00"
-      files:
-        selector: td:nth-of-type(4)
-      seeders:
-        selector: td:nth-of-type(6)
-      leechers:
-        selector: td:nth-of-type(7)
-      grabs:
-        selector: td:nth-of-type(9):has(a[href*="/viewsnatches.php?id="]) a b
-        optional: true
-        filters:
-          - name: replace
-            args: ["x", ""]
-      grabs:
-        selector: td:nth-of-type(9):not(a[href*="/viewsnatches.php?id="]) b
-        optional: true
-        filters:
-          - name: replace
-            args: ["x", ""]
-      size:
-        selector: td:nth-of-type(9)
-        remove: a, b
-        filters:
-          - name: replace
-            args: ["x", ""]
-      downloadvolumefactor:
-        case:
-          img[src$="pic/external.gif"]: "0"
-          img[src$="pic/freedownload.gif"]: "0"
-          img[src$="pic/silverdownload.gif"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[src$="pic/external.gif"]: "0"
-          img[src$="pic/x2.gif"]: "2"
-          "*": "1"
--- a/src/Jackett.Common/Definitions/empornium.yml
+++ b/src/Jackett.Common/Definitions/empornium.yml
@@ -95,7 +95,7 @@
      selector: table#torrent_table > tbody > tr[class^="torrent row"]
    fields:
      download:
-        selector: a[href^="torrents.php?action=download&id="]
+        selector: a[href^="/torrents.php?action=download&id="]
        attribute: href
      description:
        selector: div.tags
@@ -140,6 +140,7 @@
        selector: td:nth-child(9)
      downloadvolumefactor:
        case:
+          span.icon[title*="Freeleech"]: 0
          "img[alt=\"Freeleech\"]": "0"
          "*": "1"
      uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/src/Jackett.Common/Definitions/eniahd.yml
@@ -0,0 +1,184 @@
+---
+  site: eniahd
+  name: EniaHD
+  description: "EniaHD is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://eniahd.com/
+
+  caps:
+    categorymappings:
+      # Cinema
+      - {id: 13, cat: Movies/HD, desc: "Зарубежное кино HD"}
+      - {id: 11, cat: Movies, desc: "Зарубежное кино"}
+      - {id: 12, cat: Movies, desc: "Наше кино"}
+      # TV
+      - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+      - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
+      - {id: 22, cat: TV, desc: "Зарубежные сериалы HEVC"}
+      - {id: 3, cat: TV, desc: "Зарубежные сериалы"}
+      - {id: 14, cat: TV, desc: "Русские сериалы"}
+      - {id: 10, cat: TV, desc: "Звуковые дорожки"}
+      # Cartoons
+      - {id: 24, cat: TV, desc: "Мультфильмы"}
+      - {id: 25, cat: TV, desc: "Мультсериалы"}
+      # Documentary
+      - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
+      - {id: 21, cat: TV/Documentary, desc: "Документальные"}
+      - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
+      # Miscellaneous
+      - {id: 8, cat: Other, desc: "Разное (раздачи)"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "1"
+      options:
+        "1": "created"
+        "10": "seeders"
+        "7": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      redirect: "/index.php"
+      autologin: 1
+    error:
+      - selector: table.error
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to сезон 1
+        args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+      - name: re_replace # S01E01 to сезон 1 серии 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+      prev_allw: 0
+      prev_a: 0
+      prev_dla: 0
+      prev_dlc: 0
+      prev_dld: 0
+      prev_dlw: 0
+      prev_my: 0
+      prev_new: 0
+      prev_sd: 0
+      prev_da: 1
+      prev_dc: 0
+      prev_df: 1
+      prev_ds: 0
+      prev_tor_type: 0
+      o: "{{ .Config.sort }}"
+      s: "{{ .Config.type }}"
+      # show category
+      dc: 0
+      # show forum
+      df: 1
+      # show author
+      da: 1
+      # show speed
+      ds: 0
+      # -1=all time
+      tm: -1
+      # seed not seen -1=disregard
+      sns: -1
+      # group releases -1=not selected
+      srg: -1
+      # title search
+      nm: "{{ .Keywords }}"
+      # find a username
+      pn: ""
+      # search by partial word
+      allw: 0
+
+    rows:
+      selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
+
+    fields:
+      title:
+        selector: a.tLink
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\:\\-\\/\\|]", " "]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a.tLink
+        attribute: href
+      download:
+        selector: a[href^="./dl.php?id="]
+        attribute: href
+      magnet:
+        optional: true
+        selector: a[href^="magnet:?xt="]      
+        attribute: href
+      category:
+        selector: a.gen
+        attribute: href
+        filters:
+          - name: querystring
+            args: f
+      size:
+        selector: td:nth-child(6) > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      grabs:
+        selector: td:nth-child(9)
+      date:
+        selector: td:last-child > u
+      downloadvolumefactor:
+        text: 1
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/esharenet.yml
+++ b/src/Jackett.Common/Definitions/esharenet.yml
@@ -0,0 +1,199 @@
+---
+  site: esharenet
+  name: eShareNet
+  description: "eShareNet is a Private Tracker for Brittish MOVIE / TV"
+  language: en
+  type: private
+  encoding: UTF-8
+  links:
+    - https://esharenet.eu/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: TV, desc: "Comedy"}
+      - {id: 4, cat: TV, desc: "Entertainment"}
+      - {id: 5, cat: TV, desc: "Game Shows"}
+      - {id: 6, cat: TV, desc: "Motoring"}
+      - {id: 7, cat: TV, desc: "News and Current Affairs"}
+      - {id: 8, cat: TV, desc: "Sci-Fi"}
+      - {id: 9, cat: TV, desc: "Talkshow"}
+      - {id: 10, cat: TV, desc: "Advertisements - Continuity"}
+      - {id: 11, cat: TV, desc: "Comedy-Drama"}
+      - {id: 12, cat: TV, desc: "Fantasy"}
+      - {id: 13, cat: TV, desc: "Home and Property"}
+      - {id: 14, cat: Movies, desc: "Movies"}
+      - {id: 15, cat: Other, desc: "Other"}
+      - {id: 16, cat: TV, desc: "Soaps"}
+      - {id: 17, cat: TV, desc: "Trains and Planes"}
+      - {id: 18, cat: TV, desc: "Animation"}
+      - {id: 19, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 20, cat: TV, desc: "Food and Cooking"}
+      - {id: 21, cat: TV, desc: "Horror"}
+      - {id: 22, cat: Audio, desc: "Music"}
+      - {id: 23, cat: Audio, desc: "Radio"}
+      - {id: 24, cat: TV/Sport, desc: "Sport"}
+      - {id: 25, cat: TV, desc: "True Crime"}
+      - {id: 26, cat: Audio/Audiobook, desc: "Audiobook and E-book"}
+      - {id: 27, cat: TV, desc: "Drama"}
+      - {id: 28, cat: TV, desc: "Kids"}
+      - {id: 29, cat: TV, desc: "Mystery and Crime Fiction"}
+      - {id: 30, cat: TV, desc: "Reality"}
+      - {id: 31, cat: TV, desc: "Subtitles - english subs"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "created_at"
+      options:
+        "created_at": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: on
+    error:
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
+    test:
+      path: /
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: /
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  search:
+    paths:
+      - path: filterTorrents
+    inputs:
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
+      uploader: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tvdb: ""
+      tmdb: ""
+      mal: ""
+      igdb: ""
+      sorting: "{{ .Config.sort }}"
+      sort: "{{ .Config.sort }}"
+      direction: "{{ .Config.type }}"
+      qty: 50
+
+    rows:
+      selector: table > tbody > tr
+
+    fields:
+      category:
+        selector: a[href*="/categories/"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+      title:
+        selector: a.view-torrent
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.view-torrent
+        attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
+      size:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      grabs:
+        selector: td:nth-last-child(1)
+        filters:
+          - name: regexp
+            args: (\d+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      date:
+        selector: time
+        filters:
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+          - name: re_replace
+            args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди|前)", " ago"]
+          - name: re_replace
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          - name: re_replace
+            args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          - name: re_replace
+            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          - name: re_replace
+            args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          - name: re_replace
+            args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          - name: re_replace
+            args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          - name: re_replace
+            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          - name: re_replace
+            args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          - name: re_replace
+            args: ["(?i) (ay)", "month"]
+          - name: re_replace
+            args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand|个月)", " month"]
+          - name: re_replace
+            args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+      downloadvolumefactor:
+        case:
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
+      uploadvolumefactor:
+        case:
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.4
--- a/src/Jackett.Common/Definitions/estone.yml
+++ b/src/Jackett.Common/Definitions/estone.yml
@@ -36,6 +36,30 @@
    modes:
      search: [q]
      tv-search: [q, season, ep]
+      movie-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: "feltoltve"
+      options:
+        "feltoltve": "created"
+        "feltoltok": "seeders"
+        "meret": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "DESC"
+      options:
+        "DESC": "desc"
+        "ASC": "asc"

  login:
    path: login.php
@@ -60,10 +84,12 @@
      - path: letoltes.php
        method: get
    inputs:
-      $raw: "{{range .Categories}}kat[]={{.}}&{{end}}"
-      kereses_nev: "{{ .Query.Keywords }}"
+      $raw: "{{ range .Categories }}kat[]={{.}}&{{end}}{{ .Config.sort }}={{ .Config.type }}"
+      kereses_nev: "{{ .Keywords }}"
+
    rows:
      selector: body > div[id^="torrent_"]
+
    fields:
      title:
        selector: a[title]
@@ -110,12 +136,12 @@
            args: "2006-01-02 15:04:05 -07:00"
      downloadvolumefactor:
        case:
-          img[src="pic/free.png"]: "0"
-          "*": "1"
+          img[src="pic/free.png"]: 0
+          "*": 1
      uploadvolumefactor:
        case:
-          img[src="pic/dupla_up.png"]: "2"
-          "*": "1"
+          img[src="pic/dupla_up.png"]: 2
+          "*": 1
      description:
        selector: div:nth-child(2)
        remove: a
--- a/src/Jackett.Common/Definitions/estrenosdtl.yml
+++ b/src/Jackett.Common/Definitions/estrenosdtl.yml
@@ -0,0 +1,75 @@
+---
+  site: estrenosdtl
+  name: EstrenosDTL
+  description: "EstrenosDTL is a SPANISH Public tracker for MOVIES"
+  language: es-es
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.estrenosdtl.la/
+
+  caps:
+    categories:
+      "1080p": Movies/HD
+      "720p": Movies/HD
+      "BR-RIP": Movies/BluRay
+      "BR-SCREENER": Movies/Other
+      "DVDRip": Movies/DVD
+      "DVDScreener": Movies/Other
+      "HC HDRip": Movies/HD
+      "HD-RIP": Movies/HD
+      "HD-TC": Movies/HD
+      "HD-TS": Movies/HD
+      "HDRip": Movies/HD
+      "HDTC-SCREENER": Movies/Other
+      "HDTV-SCREENER": Movies/Other
+      "HQ-TC": Movies
+      "MKV": Movies
+      "TeleCine": Movies
+      "TS-HQ": Movies
+      "TS-Screener": Movies/Other
+      "V.O. Subtituladas": Movies
+      "VHS-Screener": Movies/Other
+      "Web DL": Movies/WEBDL
+      "WEB-RIP": Movies/WEBDL
+      "WEB-Screener": Movies/Other
+      "WEB-SCREENER HC": Movies/Other
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  download:
+    selector: a.linktorrent
+
+  search:
+    paths:
+      - path: /
+    inputs:
+      s: "{{ .Keywords }}"
+    rows:
+      selector: div.new_post
+    fields:
+      title:
+        selector: div.nombre_big1 a
+      details:
+        selector: div.nombre_big1 a
+        attribute: href
+      category:
+        selector: div.nombre_big1 p b
+        optional: true
+      download:
+        selector: div.nombre_big1 a
+        attribute: href
+      date:
+        selector: div.fecha p
+        filters:
+          - name: dateparse
+            args: "02-01-2006"
+      size:
+        selector: div.tamanio p
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -6,27 +6,20 @@
  type: public
  encoding: UTF-8
  links:
+    - https://www.ettv.to/
+  legacylinks:
    - https://www.ettv.tv/

  caps:
    categorymappings:
-      - {id: 49, cat: Movies/3D, desc: "Movies - 3D"}
-      - {id: 1, cat: Movies/HD, desc: "Movies - HD 1080p"}
-      - {id: 2, cat: Movies/HD, desc: "Movies - HD 720p"}
-      - {id: 3, cat: Movies/UHD, desc: "Movies - UltraHD/4K"}
-      - {id: 47, cat: Movies/SD, desc: "Movies - X264/H264"}
-      - {id: 76, cat: Movies/SD, desc: "Movies - HEVC/x265"}
-      - {id: 42, cat: Movies/SD, desc: "Movies - XviD"}
-      - {id: 65, cat: Movies, desc: "Movies - CAM/TS"}
-      - {id: 51, cat: Movies, desc: "Movies - Dubs/Dual Audio"}
-      - {id: 67, cat: Movies/DVD, desc: "Movies - DVDR"}
-      - {id: 66, cat: Movies/BluRay, desc: "Movies - BluRay Disc/Remux"}
-      - {id: 41, cat: TV/HD, desc: "TV - HD/X264/H264"}
-      - {id: 5, cat: TV/SD, desc: "TV - SD/X264/H264"}
-      - {id: 77, cat: TV/SD, desc: "TV - HEVC/x265"}
-      - {id: 50, cat: TV/SD, desc: "TV - SD/XVID"}
-      - {id: 7, cat: TV, desc: "TV - TV Packs"}
-      - {id: 72, cat: TV/Sport, desc: "TV - Sport"}
+      - {id: 88, cat: XXX, desc: "Adult - Books"}
+      - {id: 84, cat: XXX, desc: "Adult - Games"}
+      - {id: 82, cat: XXX, desc: "Adult - HD-Movies"}
+      - {id: 83, cat: XXX, desc: "Adult - Hentai"}
+      - {id: 86, cat: XXX, desc: "Adult - Magazines"}
+      - {id: 81, cat: XXX, desc: "Adult - Movies"}
+      - {id: 87, cat: XXX, desc: "Adult - Other"}
+      - {id: 85, cat: XXX, desc: "Adult - Pictures"}
      - {id: 74, cat: TV/Anime, desc: "Anime - Dubbed/Subbed"}
      - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
      - {id: 75, cat: TV/Anime, desc: "Anime - Others"}
@@ -38,14 +31,38 @@
      - {id: 58, cat: PC/Games, desc: "Games - Android"}
      - {id: 71, cat: PC/Games, desc: "Games - Others"}
      - {id: 57, cat: PC/Games, desc: "Games - Windows"}
+      - {id: 49, cat: Movies/3D, desc: "Movies - 3D"}
+      - {id: 66, cat: Movies/BluRay, desc: "Movies - BluRay Disc/Remux"}
+      - {id: 91, cat: Movies, desc: "Movies - Bollywood"}
+      - {id: 65, cat: Movies, desc: "Movies - CAM/TS"}
+      - {id: 80, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 51, cat: Movies, desc: "Movies - Dubs/Dual Audio"}
+      - {id: 67, cat: Movies/DVD, desc: "Movies - DVDR"}
+      - {id: 1, cat: Movies/HD, desc: "Movies - HD 1080p"}
+      - {id: 2, cat: Movies/HD, desc: "Movies - HD 720p"}
+      - {id: 76, cat: Movies/HD, desc: "Movies - HEVC/x265"}
+      - {id: 47, cat: Movies/HD, desc: "Movies - X264/H264"}
+      - {id: 3, cat: Movies/UHD, desc: "Movies - UltraHD/4K"}
+      - {id: 42, cat: Movies/SD, desc: "Movies - XviD"}
      - {id: 60, cat: Audio/Lossless, desc: "Music - FLAC"}
      - {id: 59, cat: Audio/MP3, desc: "Music - MP3"}
      - {id: 61, cat: Audio/Video, desc: "Music - Music Videos"}
      - {id: 69, cat: Audio/Other, desc: "Music - Others"}
+      - {id: 95, cat: Other/Misc, desc: "Others - Misc"}
+      - {id: 78, cat: Other, desc: "Others - Unsorted"}
      - {id: 63, cat: PC/Phone-Android, desc: "Software - Android"}
      - {id: 64, cat: PC/Mac, desc: "Software - Mac"}
      - {id: 70, cat: PC, desc: "Software - Others"}
      - {id: 62, cat: PC/0Day, desc: "Software - Windows"}
+      - {id: 94, cat: Books, desc: "Tutorials - Tutorials"}
+      - {id: 79, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 41, cat: TV/HD, desc: "TV - HD/X264/H264"}
+      - {id: 77, cat: TV/HD, desc: "TV - HEVC/x265"}
+      - {id: 5, cat: TV/HD, desc: "TV - SD/X264/H264"}
+      - {id: 50, cat: TV/SD, desc: "TV - SD/XVID"}
+      - {id: 72, cat: TV/Sport, desc: "TV - Sport"}
+      - {id: 7, cat: TV, desc: "TV - TV Packs"}
+      - {id: 89, cat: TV/UHD, desc: "TV - UltraHD/4K"}

    modes:
      search: [q]
@@ -60,18 +77,34 @@
      options:
        "https://etorrent.click/" : "eTorrent.click"
        "magnet:": "magnet"
+    - 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"
  
  download:
    selector: a[href^="{{ .Config.downloadlink }}"]

  search:
-    path: "{{if .Keywords}}torrents-search.php{{else}}torrents.php{{end}}"
+    path: "{{ if .Keywords }}torrents-search.php{{else}}torrents.php{{end}}"
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
-      sort: "id"
-      order: "desc"
-      incldead: "1"
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"
+      incldead: 1
    keywordsfilters:
      - name: replace
        args: ["-", " "] # remove special search character (negative search)
@@ -81,10 +114,12 @@
        args: ["(\\w+)", " +$1"] # prepend + to each word
      - name: re_replace
        args: ["\\s+", " "] # clean up whitespaces (multiple consecutive spaces confuses the search engine)
+
    rows:
      selector: div.myFrame-content > div > table > tbody > tr[class]
      filters:
        - name: andmatch # they ignore keywords <= characters, so we still andmatch it, see https://www.ettv.tv/forum/view/topic/and-search-operator-broken--70
+
    fields:
      download:
        selector: a[href^="/torrent/"]
@@ -110,6 +145,6 @@
      leechers:
        selector: td:nth-child(7)
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 1
--- a/src/Jackett.Common/Definitions/extratorrent-ag.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-ag.yml
@@ -957,6 +957,9 @@
      download:
        selector: td a[href^="magnet:?xt="]
        attribute: href
+        filters:
+          - name: replace # temp fix for #5372
+            args: ["%E2%AD%90", ""]
      date:
        selector: td:nth-last-of-type(5)
        filters:
--- a/src/Jackett.Common/Definitions/exttorrents.yml
+++ b/src/Jackett.Common/Definitions/exttorrents.yml
@@ -0,0 +1,80 @@
+---
+  site: exttorrents
+  name: EXT Torrents
+  description: "EXT Torrents is a Public torrent site for MOVIES / TV / GENERAL"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://ext.to/
+
+  caps:
+    categories:
+      "/anime/": TV/Anime
+      "/applications/": PC
+      "/books/": Books
+      "/games/": PC/Games
+      "/movies/": Movies
+      "/music/": Audio
+      "/other/": Other
+      "/tv/": TV
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "age"
+      options:
+        "age": "created"
+        "seed": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    paths:
+      - path: "{{ if .Keywords }}search/?order={{ .Config.sort }}&sort={{ .Config.type }}&q={{ .Keywords }}{{ else }}latest/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ end }}"
+
+    rows:
+      selector: table.table-striped > tbody > tr
+
+    fields:
+      category:
+        selector: td:nth-child(1) div div a
+        attribute: href
+      title:
+        selector: td:nth-child(1) div a
+      details:
+        selector: td:nth-child(1) div a
+        attribute: href
+      download:
+        selector: td:nth-child(1) div a
+        attribute: href
+      size:
+        selector: td:nth-child(2)
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -9,8 +9,10 @@
  links:
    - https://eztv.io/
  legacylinks:
-    - https://eztv.ag/
-    - https://eztv.re/
+    - https://eztv.ag/ # redirects to .io 
+    - https://eztv.re/ # redirects to .io 
+    - https://eztv.it/ # redirects to .io 
+    - https://eztv.ch/ # redirects to .io 

  caps:
    categories:
@@ -23,7 +25,7 @@

  search:
    paths:
-      - path: "{{if .Keywords}}search/{{ .Keywords}}{{else}}/{{end}}"
+      - path: "{{ if .Keywords }}search/{{ .Keywords }}{{else}}/{{end}}"
    keywordsfilters: 
      - name: re_replace
        args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
@@ -62,6 +64,6 @@
      seeders:
        selector: td:nth-child(6)
      downloadvolumefactor:
-        text: "0"
+        text: 0
      uploadvolumefactor:
-        text: "1"
+        text: 0
--- a/src/Jackett.Common/Definitions/fanoin.yml
+++ b/src/Jackett.Common/Definitions/fanoin.yml
@@ -99,7 +99,7 @@
          - name: replace
            args: ["details.php", "download.php"]
      imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        attribute: href
      size:
        selector: td:nth-child(5)
--- a/Show More
+++ b/Show More