add evolutionpalace a private site. resolves #5713

remove nyoo. site gone. resolves #5722
remove b2s-share. site gone. #1562
2025-12-25 23:24:52 +01:00 · 2019-07-25 15:54:23 +12:00 · 2019-07-25 09:42:49 +12:00 · 2019-07-25 08:06:10 +12:00 · 2019-07-25 08:02:19 +12:00 · 2019-07-25 07:59:11 +12:00
122 changed files with 6733 additions and 2001 deletions
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * ConCen
 * cpasbien
 * cpasbienClone
+ * Demonoid
 * DIGBT
 * ETTV
 * EliteTorrent.biz
@@ -41,23 +42,28 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * EZTV
 * Frozen Layer
 * GkTorrent
+ * Hon3yHD.net
 * Horrible Subs
 * Il Corsaro Nero <!-- maintained by bonny1992 -->
 * Il Corsaro Blu
 * Isohunt2
+ * iTorrent
 * KATcrs
 * KickAssTorrent (KATcr)
 * KickAssTorrent (thekat.se clone)
 * KikiBT
+ * LePorno
 * LimeTorrents
 * MacTorrents
 * MagnetDL
 * MejorTorrent <!-- maintained by ivandelabeldad -->
+ * MkvCage
 * Monova
+ * MovCr
 * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
 * Nyaa.si
 * Nyaa-Pantsu
- * Nyoo
+ * OxTorrent
 * ProStyleX
 * QXR
 * RARBG
@@ -77,24 +83,30 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * TorrentGalaxy.org (TGx)
 * TorrentKitty
 * TorrentProject2
+ * TorrentQuest
 * Torrents.csv
 * Torrent9
 * Torernt9 clone (torrents9.ch)
 * Torrentz2
 * World Wide Torrents
+ * YourBittorrent
 * YTS.ag
 * Zooqle

 ### Supported Semi-Private Trackers
 * 7tor
 * Alein
+ * AniDUB
 * ArenaBG
+ * BaibaKo
+ * Crazy's Corner
 * CzTorrent
 * Deildu
 * Film-Paleis
 * Gay-Torrents.net
 * Gay-Torrents.org
 * GDF76
+ * HamsterStudio
 * Kinozal
 * LostFilm.tv
 * Metal Tracker
@@ -108,6 +120,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Sharewood
 * SkTorrent
 * SoundPark
+ * Toloka.to
 * Torrents-Local
 * Union Fansub
 * Vanila
@@ -130,6 +143,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Anthelion
 * AOX (Chippu)
 * Araba Fenice (Phoenix)
+ * Asgaard (AG)
 * AsianCinema
 * AsianDVDClub
 * AST4u
@@ -138,7 +152,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Awesome-HD (AHD)
 * AVG (Audio Video Games)
 * Avistaz (AsiaTorrents)
- * B2S-Share
 * Back-ups
 * BakaBT
 * BaconBits (bB)
@@ -159,7 +172,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BJ-Share (BJ)
 * BlueBird
 * Blutopia (BLU)
- * Brasil Tracker
 * BroadcastTheNet (BTN)
 * BrokenStones
 * BTGigs (TG)
@@ -172,11 +184,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * CGPeers
 * CHDBits
 * ChannelX
- * CiNEFiLHD
 * Cinemageddon
 * Cinematik
 * CinemaZ (EuTorrents)
 * Classix
+ * CrazySpirits
 * CrnaBerza
 * DanishBits (DB)
 * Dark-Shadow
@@ -193,13 +205,16 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Dragonworld Reloaded
 * Dream Team
 * DXDHD
+ * Ebooks-Shares
 * EfectoDoppler
 * EliteHD (HDClub) [![(invite needed)][inviteneeded]](#)
 * Elit Tracker (ET)
 * Elite-Tracker
 * Empornium (EMP)
+ * eShareNet
 * eStone (XiDER, BeLoad)
 * Ethor.net (Thor's Land)
+ * EvolutionPalace
 * FANO.IN
 * FileList (FL)
 * Femdomcult
@@ -211,6 +226,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Fuzer (FZ)
 * GAYtorrent.ru
 * GazelleGames (GGn)
+ * Generation-Free
 * GFXNews
 * GFXPeers
 * GigaTorrents
@@ -249,20 +265,25 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * JPopsuki
 * Kapaki
 * Karagarga
+ * LaPauseTorrents
+ * Le Chaudron
 * Le Saloon
+ * LearnFlakes
+ * LibraNet (LN)
 * LinkoManija
 * LosslessClub
 * M-Team TP (MTTP)
 * Magico (Trellas)
 * Majomparádé (TurkDepo)
- * Manicomio Share
 * Mega-Bliz
 * Mononoké-BT
 * MoreThanTV (MTV)
+ * Music-Master
 * MyAnonamouse (MAM)
 * myAmity
 * MySpleen
 * NCore
+ * NBTorrents
 * Nebulance (NBL) (TransmiTheNet)
 * New Real World
 * Norbits
@@ -290,6 +311,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * PThome
 * PuntoTorrent
 * PWTorrents (PWT)
+ * R3V WTF!
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
 * Redacted (PassTheHeadphones)
@@ -297,23 +319,25 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * RetroFlix
 * RevolutionTT
 * RGU
+ * RocketHD
 * RoDVD (Cinefiles)
 * Romanian Metal Torrent (RMT)
+ * RPTorrents
 * SceneFZ
 * SceneHD
+ * ScenePalace (SP)
 * SceneReactor
 * SceneRush
 * SceneTime
 * SDBits
 * Secret Cinema
+ * SeedFile (SF)
 * Shareisland
 * ShareSpaceDB
- * Sharingue
 * Shazbat
 * Shellife (SL)
 * SiamBIT
 * SpaceTorrent
- * Speed-Share
 * SpeedCD
 * SpeedTorrent Reloaded
 * SportHD
@@ -322,9 +346,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * TakeaByte
 * Tapochek
 * Tasmanit
- * TBPlus
 * TeamHD
+ * TeamOS
+ * TellyTorrent
 * TenYardTorrents (TYT)
+ * TheAudioScene
 * TheEmpire (TE)
 * The Geeks
 * The Horror Charnel (THC)
@@ -361,9 +387,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * TV Chaos UK (TVCUK)
 * TV-Vault
 * TVstore
+ * Twilight Torrents
 * u-torrents (SceneFZ)
 * UHDBits
 * Ultimate Gamer Club (UGC)
+ * UnionGang
 * Vizuk
 * Waffles
 * World-In-HD
@@ -383,7 +411,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.
@@ -460,7 +488,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)

@@ -481,6 +509,9 @@ Logs are stored as usual under `~/.config/Jackett/log.txt`.
 ### Run without installing as a service
 Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.

+### upgrading from mono
+If you were previously using the Mono flavour of Jackett then you should shutdown the service from a terminal with with the command `systemctl stop jackett.service` and then remove the startup script at `/etc/systemd/system/jackett.service` and delete the content of the `/Applications/Jackett` folder, prior to performing this install.
+

 ## Installation using Docker
 Detailed instructions are available at [LinuxServer.io Jackett Docker](https://hub.docker.com/r/linuxserver/jackett/). The Jackett Docker is highly recommended, especially if you are having Mono stability issues or having issues running Mono on your system eg. QNAP, Synology. Thanks to [LinuxServer.io](https://linuxserver.io)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,10 @@ image:
 environment:
  APPVEYOR_YML_DISABLE_PS_LINUX: true
 configuration: Release
+install:
+  #Remove once .NET Core 2.2.5 is deployed to Appveyor
+  - sh: sudo apt-get update
+  - sh: sudo apt-get -y install dotnet-sdk-2.2
 assembly_info:
  patch: true
  file: '**\AssemblyInfo.*'
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -110,11 +110,18 @@
      default: "magnet:"
      options:
        "http://itorrents.org/" : "iTorrents.org"
+        "http://torrage.info/" : "Torrage.info"
+        "http://btcache.me/" : "BTcache.me"
        "magnet:": "magnet"

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

  search:
    paths:
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -29,6 +29,8 @@
      - {id: 74, cat: XXX, desc: "Adultos: XXX"}
      - {id: 75, cat: XXX, desc: "Adultos: Hentai"}
      - {id: 69, cat: TV/Anime, desc: "Anime: Anime"}
+      - {id: 118, cat: TV/Anime, desc: "Anime: Séries"}
+      - {id: 116, cat: TV/Anime, desc: "Anime: Filmes"}
      - {id: 21, cat: PC/0day, desc: "Aplicativos: Windows"}
      - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"}
      - {id: 23, cat: PC/Phone-Android, desc: "Aplicativos: Android"}
@@ -40,28 +42,11 @@
      - {id: 72, cat: Books, desc: "Apostila: Apostila"}
      - {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: 112, cat: Books, desc: "Ebook: HQs"}
+      - {id: 119, cat: Movies, desc: "Filmes:"}
      - {id: 70, cat: XXX, desc: "Fotos: XXX"}
      - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"}
+      - {id: 109, cat: Console, desc: "Jogos: Emulação"}
      - {id: 47, cat: PC/Games, desc: "Jogos: Pc"}
      - {id: 61, cat: Console, desc: "Jogos: Emuladores e Roms"}
      - {id: 48, cat: PC/Mac, desc: "Jogos: Mac"}
@@ -69,17 +54,15 @@
      - {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: 54, cat: Console/Xbox 360, desc: "Jogos: Xbox360"}
      - {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: 82, cat: Console/PSP, desc: "Jogos: PSP"}
      - {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"}
@@ -88,7 +71,7 @@
      - {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: 41, cat: Audio, desc: "Musica: Erudita"}
      - {id: 42, cat: Audio, desc: "Musica: Forró"}
      - {id: 43, cat: Audio, desc: "Musica: Dubstep"}
@@ -97,6 +80,8 @@
      - {id: 77, cat: Audio, desc: "Musica: Outros"}
      - {id: 76, cat: Audio, desc: "Musica: Reggae"}
      - {id: 83, cat: Audio, desc: "Musica: Gospel"}
+      - {id: 115, cat: Audio, desc: "Musica: POP"}
+      - {id: 114, cat: Audio, desc: "Musica: MPB"}
      - {id: 84, cat: Audio, desc: "Musica: Game (OST)"}
      - {id: 88, cat: TV, desc: "Series: Musical"}
      - {id: 86, cat: TV, desc: "Series: Guerra"}
@@ -168,7 +153,7 @@
          page: 4
    inputs:
      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
      incldead: 1
      freeleech: 0
      lang: 0
@@ -177,8 +162,30 @@
    rows:
      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
@@ -206,43 +213,47 @@
         "[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$=\"/POP.png\"]": "115"
+         "[src$=\"/MPB.png\"]": "114"
+         "[src$=\"/OST.png\"]": "84"
         "[src$=\"/Musical.png\"]": "88"
         "[src$=\"/Guerra.png\"]": "86"
         "[src$=\"/Biografia.png\"]": "105"
@@ -268,28 +279,9 @@
         "[src$=\"/Aventura.png\"]": "87"
         "[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
      size:
@@ -298,6 +290,8 @@
        selector: div.list-group-item-controls a:nth-child(1)
      leechers:
        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"
--- a/src/Jackett.Common/Definitions/asgaard.yml
+++ b/src/Jackett.Common/Definitions/asgaard.yml
@@ -0,0 +1,170 @@
+---
+  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: 13, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 14, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 56, cat: Movies/HD, desc: "Movies x265"}
+      - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
+      - {id: 16, cat: Movies, desc: "Movies Remux"}
+      - {id: 17, cat: Movies/BluRay, desc: "Movies Bluray Disc"}
+      - {id: 53, 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 720p"}
+      - {id: 19, cat: TV/HD, desc: "TV 1080p"}
+      - {id: 60, cat: TV/HD, desc: "TV Bluray Disc"}
+      - {id: 20, cat: TV, desc: "TV Boxset"}
+      - {id: 50, cat: TV, desc: "TV No Nordic Subs"}
+      - {id: 59, cat: TV/UHD, desc: "TV 4K"}
+      - {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: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: info
+      type: info
+      label: "About the Username field"
+      default: "Enter your <b>Email address</b> in the username field."
+
+  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: 4
+      type: desc
+    rows:
+      selector: table.table-striped > tbody > tr:has(a[href*="details.php?id="])
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: div.torrent-name
+        filters:
+        # need to remove the tooltip text
+          - name: regexp
+            args: "(.+?)\\n"
+      details:
+        selector: a[href*="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href*="browse.php?"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: cats\[\]=(\d+)$
+      banner:
+        optional: true
+        selector: img.tooltip-poster
+        attribute: src
+      download:
+        selector: a[href*="download.php?torrent="]
+        attribute: href
+      files:
+        selector: td:nth-last-child(8)
+      date:
+        selector: td:nth-last-child(6)
+        filters:
+          - name: dateparse
+            args: "2 Jan 2006 15:04:05"
+      size:
+        selector: td:nth-last-child(5)
+      grabs:
+        selector: td:nth-last-child(4)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-last-child(2)
+      leechers:
+        selector: td:nth-last-child(1)
+      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
@@ -39,6 +39,9 @@
      - name: regexp
        args: "Ratio : (\\d+)"

+  download:
+    selector: a[href*="/download/"]
+
  search:
    paths:
      - path: filterTorrents
@@ -66,7 +69,7 @@
      title:
        selector: a.view-torrent
      download:
-        selector: a[href*="/download/"]
+        selector: a[href*="/download_check/"]
        attribute: href
      details:
        selector: a.view-torrent
@@ -124,7 +127,7 @@
          "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=\"Global Freeleech\"]": "0" # Global Freeleech
          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
          "*": "1"
--- a/src/Jackett.Common/Definitions/awesomehd.yml
+++ b/src/Jackett.Common/Definitions/awesomehd.yml
@@ -18,21 +18,18 @@
      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>"
-          
  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:
--- 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,149 @@
+---
+  site: baibako
+  name: BaibaKo
+  description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: 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
+
+  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"
+    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.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd.yml
@@ -46,12 +46,15 @@
    rows:
      selector: table > tbody > tr
    fields:
-      category:
+      _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:
@@ -85,17 +88,13 @@
        attribute: href
      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 Torrent\"]": "0" # Featured Torrent
+          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:
-          "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 Torrent\"]": "2" # Featured Torrent
          "*": "1"
 # UNIT3D
--- a/src/Jackett.Common/Definitions/bigtower.yml
+++ b/src/Jackett.Common/Definitions/bigtower.yml
@@ -140,21 +140,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/blutopia.yml
+++ b/src/Jackett.Common/Definitions/blutopia.yml
@@ -27,9 +27,12 @@
      password: "{{ .Config.password }}"
      remember: 1
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
      path: torrents
+      selector: a[href$="/logout"]

  search:
    paths:
@@ -71,13 +74,13 @@
          - name: replace
            args: ["https://via.placeholder.com/600x900", ""]
      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\.]+)
@@ -116,7 +119,7 @@
          "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=\"Global Freeleech\"]": "0" # Global Freeleech
          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
          "*": "1"
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -29,9 +29,10 @@
  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}}?search={{ .Keywords}}&sort=time&page=2{{else}}recent?page=2{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=3{{else}}recent?page=3{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=4{{else}}recent?page=4{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=5{{else}}recent?page=5{{end}}"
    rows:
      selector: li[class$="item"]
    fields:
@@ -52,6 +53,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:
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -18,7 +18,7 @@
    - 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."

  caps:
    categorymappings:
--- a/src/Jackett.Common/Definitions/channelx.yml
+++ b/src/Jackett.Common/Definitions/channelx.yml
@@ -28,7 +28,9 @@
      password: "{{ .Config.password }}"
      remember: 1
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
      path: torrents
      selector: a[href$="/logout"]
@@ -83,13 +85,13 @@
          - name: replace
            args: ["https://via.placeholder.com/600x900", ""]
      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\.]+)
@@ -128,7 +130,7 @@
          "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=\"Global Freeleech\"]": "0" # Global Freeleech
          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
          "*": "1"
--- 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/cpasbienclone.yml
+++ b/src/Jackett.Common/Definitions/cpasbienclone.yml
@@ -30,7 +30,7 @@
  settings: []

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

  search:
@@ -87,6 +87,9 @@
            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"
      seeders:
--- a/src/Jackett.Common/Definitions/crazyscorner.yml
+++ b/src/Jackett.Common/Definitions/crazyscorner.yml
@@ -0,0 +1,176 @@
+---
+  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: 11, cat: Movies/DVD, desc: "VIP MOVIES DVD-R"}
+      - {id: 34, cat: Movies/3D, desc: "VIP MOVIES 3D-Movies"}
+      - {id: 46, cat: Movies, desc: "VIP MOVIES VENOM-Packs"}
+      - {id: 52, cat: Movies/HD, desc: "VIP MOVIES High Def Mkv/Mp4"}
+      - {id: 70, cat: Movies, desc: "VIP MOVIES Movies Animation"}
+      - {id: 78, cat: TV, desc: "MISC POD CASTS"}
+      - {id: 35, cat: Movies/BluRay, desc: "VIP MOVIES Blu-Ray Movies"}
+      - {id: 36, cat: Movies/DVD, desc: "VIP MOVIES DvD-Rips"}
+      - {id: 37, cat: Movies, desc: "VIP MOVIES Classic-Movies"}
+      - {id: 38, cat: Movies, desc: "VIP MOVIES Classic-Kids-Movies"}
+      - {id: 47, cat: Movies/WEBDL, desc: "VIP MOVIES Webrip/WEB-DL"}
+      - {id: 39, cat: Movies, desc: "VIP MOVIES Movie-Packs"}
+      - {id: 1, cat: Movies, desc: "VIP MOVIES Movies"}
+      - {id: 5, cat: Movies, desc: "VIP MOVIES Anime"}
+      - {id: 32, cat: XXX, desc: "VIP MOVIES Adult-Movies"}
+      - {id: 33, cat: Movies/UHD, desc: "VIP MOVIES 4K-Movies"}
+      - {id: 4, cat: Movies, desc: "VIP MOVIES Misc-Torrents"}
+      - {id: 79, cat: Audio/Audiobook, desc: "MISC AUDIO BOOKS"}
+      - {id: 81, cat: Audio/Other, desc: "MISC RADIO SHOWS"}
+      - {id: 43, cat: TV, desc: "VIP TV Kids-tv"}
+      - {id: 48, cat: TV/Sport, desc: "VIP SPORTS Sport-Misc"}
+      - {id: 97, cat: Movies, desc: "DISNEY Movies"}
+      - {id: 44, cat: PC/ISO, desc: "VIP GAMES Games-Pc-Iso"}
+      - {id: 45, cat: Console, desc: "VIP GAMES All Console Games"}
+      - {id: 41, cat: TV, desc: "VIP TV Tv Episodes"}
+      - {id: 91, cat: Movies, desc: "U.B.D Movies"}
+      - {id: 92, cat: Audio, desc: "U.B.D Music"}
+      - {id: 93, cat: TV, desc: "U.B.D MISC TV"}
+      - {id: 94, cat: Other, desc: "U.B.D MISC"}
+      - {id: 95, cat: Movies, desc: "U.B.D.Classic picks"}
+      - {id: 42, cat: TV, desc: "VIP TV Tv Packs"}
+      - {id: 84, cat: PC, desc: "VIP APPS MISC"}
+      - {id: 2, cat: Audio, desc: "VIP Music"}
+      - {id: 30, cat: Audio, desc: "VIP Music-Packs"}
+      - {id: 31, cat: Audio, desc: "VIP Music-Albums"}
+      - {id: 3, cat: PC/Games, desc: "VIP Misc Games"}
+      - {id: 40, cat: TV, desc: "VIP TV Tv  Single Seasons"}
+      - {id: 7, cat: PC/0day, desc: "VIP Apps Win"}
+      - {id: 8, cat: PC, desc: "VIP Apps Linux"}
+      - {id: 9, cat: PC/Mac, desc: "VIP Apps Mac"}
+      - {id: 15, cat: Books/Ebook, desc: "E Books Adventure"}
+      - {id: 55, cat: Books/Ebook, desc: "E Books Sci-Fi"}
+      - {id: 51, cat: Books/Ebook, desc: "E Books Food/Cook-Books"}
+      - {id: 56, cat: Books/Ebook, desc: "E Books Fantasy/Paranormal"}
+      - {id: 57, cat: Books/Ebook, desc: "E Books Science"}
+      - {id: 58, cat: Books/Ebook, desc: "E Books Wildlife & Pets"}
+      - {id: 59, cat: Books/Ebook, desc: "E Books Hobbies"}
+      - {id: 60, cat: Books/Ebook, desc: "E Books Arts & Crafts"}
+      - {id: 61, cat: Books/Ebook, desc: "E Books Reference/Manuals"}
+      - {id: 62, cat: Books/Ebook, desc: "E Books Outdoors/Gardening"}
+      - {id: 63, cat: Books/Ebook, desc: "E Books Romance"}
+      - {id: 64, cat: Books/Ebook, desc: "E Books Book Packs"}
+      - {id: 65, cat: Books/Ebook, desc: "E Books Thriller"}
+      - {id: 66, cat: Books/Ebook, desc: "E Books Travel"}
+      - {id: 71, cat: Books/Ebook, desc: "E Books Children's Books"}
+      - {id: 16, cat: Books/Ebook, desc: "E Books Biography"}
+      - {id: 17, cat: Books/Ebook, desc: "E Books Fiction & Literature"}
+      - {id: 18, cat: Books/Ebook, desc: "E Books Gay/Lesbian"}
+      - {id: 19, cat: Books/Ebook, desc: "E Books Ghost Stories"}
+      - {id: 20, cat: Books/Ebook, desc: "E Books Health"}
+      - {id: 21, cat: Books/Ebook, desc: "E Books History"}
+      - {id: 22, cat: Books/Ebook, desc: "E Books Horror"}
+      - {id: 23, cat: Books/Ebook, desc: "E Books Humor"}
+      - {id: 24, cat: Books/Ebook, desc: "E Books Nature"}
+      - {id: 26, cat: Books/Ebook, desc: "E Books Magazines"}
+      - {id: 27, cat: Books/Ebook, desc: "E Books War & Crime"}
+      - {id: 28, cat: Books/Ebook, desc: "E Books Comics"}
+      - {id: 29, cat: Books/Ebook, desc: "E Books Misc Books"}
+      - {id: 12, cat: Books/Ebook, desc: "E Books Adult"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  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
+    rows:
+      selector: table.lista tr:has(a[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[title][href^="index.php?page=torrent-details&id="]
+      details:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      banner:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?)  width"
+      size:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Size: (.+?)<"
+      date:
+        selector: a[title][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,191 @@
+---
+  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>"
+          
+  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
+
+    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/cztorrent.yml
+++ b/src/Jackett.Common/Definitions/cztorrent.yml
@@ -38,19 +38,16 @@
      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>"
-          
  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

--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -0,0 +1,236 @@
+---
+  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.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 4K / UHD"}
+      - {id: 103, cat: TV/Anime, desc: "Anime DVD Quality"}
+      - {id: 104, cat: TV/Anime, desc: "Anime HD 1080p / 1080i"}
+      - {id: 105, cat: TV/Anime, desc: "Anime HD 720p"}
+      - {id: 106, cat: TV/Anime, desc: "Anime HEVC / x265"}
+      - {id: 107, cat: TV/Anime, desc: "Anime Other Quality"}
+      - {id: 108, cat: TV/Anime, desc: "Anime TV Quality"}
+      - {id: 109, cat: TV/Anime, desc: "Anime VHS Quality"}
+      - {id: 157, cat: TV/Anime, desc: "Anime WEBRip"}
+      # Movies
+      - {id: 151, cat: Movies/UHD, desc: "Movies 4K / UHD"}
+      - {id: 110, cat: Movies/BluRay, desc: "Movies Blu-ray"}
+      - {id: 111, cat: Movies/3D, desc: "Movies Blu-ray 3D"}
+      - {id: 152, cat: Movies/BluRay, desc: "Movies Blu-ray Rip"}
+      - {id: 112, cat: Movies, desc: "Movies Cam"}
+      - {id: 113, cat: Movies/DVD, desc: "Movies DVD Full"}
+      - {id: 114, cat: Movies/DVD, desc: "Movies DVD Rip"}
+      - {id: 115, cat: Movies/HD, desc: "Movies HD 1080p / 1080i"}
+      - {id: 116, cat: Movies/HD, desc: "Movies HD 720p"}
+      - {id: 153, cat: Movies/HD, desc: "Movies HDRip"}
+      - {id: 117, cat: Movies/HD, desc: "Movies HEVC / x265"}
+      - {id: 118, cat: Movies/SD, desc: "Movies Other Quality"}
+      - {id: 119, cat: Movies, desc: "Movies Remux"}
+      - {id: 120, cat: Movies/SD, desc: "Movies Screener VHS"}
+      - {id: 121, cat: Movies/SD, desc: "Movies VHS Rip"}
+      - {id: 154, cat: Movies/WEBDL, desc: "Movies WEBRip"}
+      # Music
+      - {id: 122, cat: Audio, desc: "Music AAC"}
+      - {id: 123, cat: Audio/Lossless, desc: "Music Loseless"}
+      - {id: 124, cat: Audio/MP3, desc: "Music MP3/128Kbps"}
+      - {id: 125, cat: Audio/MP3, desc: "Music MP3/192Kbps"}
+      - {id: 126, cat: Audio/MP3, desc: "Music MP3/256Kbps"}
+      - {id: 127, cat: Audio/MP3, desc: "Music MP3/64Kbps"}
+      - {id: 128, cat: Audio/MP3, desc: "Music MP3/Over 256Kbps"}
+      - {id: 129, cat: Audio/MP3, desc: "Music MP3/Surround"}
+      - {id: 130, cat: Audio/MP3, desc: "Music MP3/Variable"}
+      - {id: 131, cat: Audio, desc: "Music MPC"}
+      - {id: 132, cat: Audio, desc: "Music OGG"}
+      - {id: 133, cat: Audio, desc: "Music Other Quality"}
+      - {id: 134, cat: Audio, desc: "Music WMA"}
+      # Music Videos
+      - {id: 135, cat: Audio/Video, desc: "Music Videos DVD Quality"}
+      - {id: 136, cat: Audio/Video, desc: "Music Videos HEVC / x265"}
+      - {id: 137, cat: Audio/Video, desc: "Music Videos Other Quality"}
+      - {id: 138, cat: Audio/Video, desc: "Music Videos TV Quality"}
+      - {id: 139, cat: Audio/Video, desc: "Music Videos VHS Quality"}
+      # Pictures
+      - {id: 140, cat: Other, desc: "Pictures Hi-Res"}
+      - {id: 141, cat: Other, desc: "Pictures Low-Res"}
+      - {id: 142, cat: Other, desc: "Pictures Mixed Quality"}
+      # TV
+      - {id: 155, cat: TV/UHD, desc: "TV 4K / UHD"}
+      - {id: 143, cat: TV/SD, desc: "TV DVD Quality"}
+      - {id: 144, cat: TV/HD, desc: "TV HD 1080p / 1080i"}
+      - {id: 145, cat: TV/HD, desc: "TV HD 720p"}
+      - {id: 146, cat: TV/HD, desc: "TV HEVC / x265"}
+      - {id: 147, cat: TV/SD, desc: "TV Other Quality"}
+      - {id: 148, cat: TV/HD, desc: "TV TV Quality"}
+      - {id: 149, cat: TV/SD, desc: "TV VHS Quality"}
+      - {id: 156, cat: TV/WEB-DL, desc: "TV WEBRip"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    paths:
+      # https://www.dnoid.to/files/?c118=1&c115=1&lang=0&incldead=0&search=&sort=id&order=desc
+      - path: files/
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      lang: 0
+      incldead: 0
+      search: "{{.Keywords}}"
+      sort: id
+      order: desc
+    rows:
+      selector: table.ttable_headinner tr:has(td[class^="tone_"])
+      after: 1
+    fields:
+      title:
+        selector: a[href^="/files/details/"]
+      category:
+        selector:  a[href^="/files/?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="/files/details/"]
+        attribute: href
+      download:
+        selector: a[href^="/files/details/"]
+        attribute: href
+      date:
+        selector: td:nth-last-child(7)
+        filters:
+          - name: timeago
+      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
@@ -20,20 +20,15 @@
      tv-search: [q, season, ep, imdbid]
      movie-search: [q, imdbid]

-  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>"
-          
  login:
-    method: cookie
+    path: login
+    method: form
    inputs:
-      cookie: "{{ .Config.cookie }}"
-    test:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: form[action$="/login"] span strong
    test:
      path: torrents
      selector: a[href$="/logout"]
@@ -127,7 +122,7 @@
          "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=\"Global Freeleech\"]": "0" # Global Freeleech
          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
          "*": "1"
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -56,17 +56,21 @@
      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>"
+          
  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:
--- a/src/Jackett.Common/Definitions/dxdhd.yml
+++ b/src/Jackett.Common/Definitions/dxdhd.yml
@@ -34,7 +34,9 @@
      password: "{{ .Config.password }}"
      remember: 1
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
      path: torrents
      selector: a[href$="/logout"]
@@ -86,13 +88,13 @@
          - name: replace
            args: ["https://via.placeholder.com/600x900", ""]
      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\.]+)
@@ -131,7 +133,7 @@
          "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=\"Global Freeleech\"]": "0" # Global Freeleech
          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
          "*": "1"
--- a/src/Jackett.Common/Definitions/ebooks-shares.yml
+++ b/src/Jackett.Common/Definitions/ebooks-shares.yml
@@ -0,0 +1,323 @@
+---
+  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 &amp; 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 &amp; 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 &amp; 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 &amp; 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 &amp; 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 &amp; 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 &amp; 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 &amp; 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 &amp; 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 &amp; 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]
+
+  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
+
+  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
+    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^="download.php?id="]
+        attribute: href
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      size:
+        selector: td:nth-child(7)
+      description:
+        selector: td:nth-child(8)
+        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/elitetorrent-biz.yml
+++ b/src/Jackett.Common/Definitions/elitetorrent-biz.yml
@@ -6,9 +6,10 @@
  type: public
  encoding: UTF-8
  links:
-    - https://www.elitetorrent.io/
+    - https://www.elitetorrent.one/
  legacylinks:
    - https://www.elitetorrent.biz/
+    - https://www.elitetorrent.io/

  caps:
    categories:
--- a/src/Jackett.Common/Definitions/esharenet.yml
+++ b/src/Jackett.Common/Definitions/esharenet.yml
@@ -0,0 +1,165 @@
+---
+  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]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
+    test:
+      path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: torrents
+    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: ""
+      sort: "created_at"
+      direction: "desc"
+      qty: 100
+    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", ""]
+      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|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+          - name: re_replace
+            args: ["(ö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"]
+          - name: re_replace
+            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          - name: re_replace
+            args: ["(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"]
+          - name: re_replace
+            args: ["(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"]
+          - name: re_replace
+            args: ["(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"]
+          - name: re_replace
+            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+          - name: re_replace
+            args: [" (ay|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"
+      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.3
--- a/src/Jackett.Common/Definitions/evolutionpalace.yml
+++ b/src/Jackett.Common/Definitions/evolutionpalace.yml
@@ -0,0 +1,144 @@
+---
+  site: evolutionpalace
+  name: Evolution-Palace
+  description: "Evolution-Palace is a Private site for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://evolution-palace.net/
+
+  caps:
+    categorymappings:
+      - {id: 43, cat: Movies/UHD, desc: "4K/BluRay"}
+      - {id: 42, cat: Movies/UHD, desc: "BluRay/4K"}
+      - {id: 30, cat: PC/0day, desc: "App/ODAY"}
+      - {id: 28, cat: PC/Mac, desc: "Appz/Mac"}
+      - {id: 27, cat: PC, desc: "Appz/misc"}
+      - {id: 32, cat: Books/Magazines, desc: "Book//Mags"}
+      - {id: 29, cat: Books/Ebook, desc: "Ebooks"}
+      - {id: 47, cat: TV/HD, desc: "Tv/HD"}
+      - {id: 51, cat: TV, desc: "Tv/Packs"}
+      - {id: 49, cat: TV/SD, desc: "Tv/SD"}
+      - {id: 48, cat: TV/WEB-DL, desc: "Tv/WebRip"}
+      - {id: 50, cat: TV/HD, desc: "Tv/X265"}
+      - {id: 7, cat: Console/Other, desc: "Games/Dreamcast"}
+      - {id: 8, cat: PC/Games, desc: "Games/PC ISO"}
+      - {id: 9, cat: Console/PSP, desc: "Games/PS1"}
+      - {id: 11, cat: Console/PSP, desc: "Games/PS2"}
+      - {id: 22, cat: Console/PSP, desc: "Games/PS2"}
+      - {id: 10, cat: Console/PS3, desc: "Games/PS3"}
+      - {id: 19, cat: Console/PS4, desc: "Games/PS4"}
+      - {id: 26, cat: Console/Wii, desc: "Games/Wii"}
+      - {id: 31, cat: Console/Xbox, desc: "Games/Xbox"}
+      - {id: 45, cat: Movies/3D, desc: "Movies/3D"}
+      - {id: 25, cat: TV/Anime, desc: "Movies/Anime"}
+      - {id: 12, cat: Movies/BluRay, desc: "Movies/Bluray"}
+      - {id: 13, cat: Movies, desc: "Movies/Cam"}
+      - {id: 14, cat: Movies, desc: "Movies/Classic"}
+      - {id: 20, cat: Movies/DVD, desc: "Movies/Dvdr"}
+      - {id: 15, cat: Movies/HD, desc: "Movies/HD"}
+      - {id: 24, cat: Movies, desc: "Movies/Packs"}
+      - {id: 18, cat: Movies, desc: "Movies/Remux"}
+      - {id: 16, cat: Movies/SD, desc: "Movies/SD"}
+      - {id: 17, cat: Movies/WEBDL, desc: "Movies/WebRip"}
+      - {id: 21, cat: Movies/SD, desc: "Movies/Xvid"}
+      - {id: 3, cat: Audio, desc: "Music Audio"}
+      - {id: 33, cat: Audio, desc: "Music/Audio"}
+      - {id: 34, cat: Audio, desc: "Music/Packs"}
+      - {id: 35, cat: Audio/Video, desc: "Music/Video"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: h2
+        message:
+          selector: table tr td.text
+    test:
+      path: index.php
+      selector: a[href^="logout.php?hash_please="]
+
+  search:
+    paths:
+      - path: browse.php      
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      searchin: "title"
+      incldead: 1
+      only_free: 0
+
+    rows:
+      selector: tr.browse_color, tr.freeleech_color
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: split
+            args: [">", "1"]
+          - name: replace
+            args: ["</b", ""]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      banner:
+        selector: a[href^="details.php?id="]
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=\\\\'(.+?)\\\\'"
+      files:
+        selector: td:nth-last-child(8)
+      date:
+        # Today<br /> 10:20 AM
+        # Yesterday<br /> 08:03 PM
+        optional: true
+        selector: td:nth-last-child(6):contains("day")
+      date:
+        # Feb 14 2019<br /> 10:20 AM
+        optional: true
+        selector: td:nth-last-child(6):not(:contains("day"))
+        filters:
+          - name: dateparse
+            args: "Jan 2 2006 03:04 pm"
+      size:
+        selector: td:nth-last-child(5)
+      grabs:
+        selector: td:nth-last-child(4)
+        filters:
+          - name: regexp
+            args: ([\d]+)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          font.freeleech: 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1
+# U-232 V3
--- a/src/Jackett.Common/Definitions/extratorrent-ag.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-ag.yml
@@ -957,6 +957,11 @@
      download:
        selector: td a[href^="magnet:?xt="]
        attribute: href
+        # temp fix for #5372
+        filters: 
+          - name: urldecode
+          - name: replace
+            args: [" ⭐", ""]
      date:
        selector: td:nth-last-of-type(5)
        filters:
--- a/src/Jackett.Common/Definitions/freetorrent.yml
+++ b/src/Jackett.Common/Definitions/freetorrent.yml
@@ -23,6 +23,7 @@
      - {id: 11, cat: PC/Phone-Android, desc: "Android ROMs"}
      - {id: 12, cat: TV/Documentary, desc: "Documentaries"}
      - {id: 13, cat: TV, desc: "Shows"}
+      - {id: 14, cat: Audio/Video, desc: "Music clips"}

    modes:
      search: [q]
@@ -36,7 +37,9 @@
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
    error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
      path: torrents

@@ -46,6 +49,7 @@
    inputs:
      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
@@ -71,20 +75,27 @@
      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", ""]
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
        filters:
          - name: regexp
            args: ([\d\.]+)
      imdb:
        optional: true
-        selector: a[href^="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        attribute: href
      date:
        selector: time
@@ -114,13 +125,17 @@
            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "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"
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "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
+# UNIT3D 1.9.2
--- a/src/Jackett.Common/Definitions/generationfree.yml
+++ b/src/Jackett.Common/Definitions/generationfree.yml
@@ -0,0 +1,208 @@
+---
+  site: generationfree
+  name: Generation-Free
+  description: "Generation-Free is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://generation-free.biz/
+
+  caps:
+    categorymappings:
+      - {id: 10, cat: TV/HD, desc: "Animation: HD720P"}
+      - {id: 11, cat: TV/HD, desc: "Animation: HD1080P"}
+      - {id: 56, cat: TV/SD, desc: "Animation: DVDRip"}
+      - {id: 13, cat: TV/SD, desc: "Animation: DVD"}
+      - {id: 105, cat: TV/HD, desc: "Animation: Bluray"}
+      - {id: 106, cat: TV/HD, desc: "Animation: HDTV"}
+      - {id: 108, cat: TV/WEB-DL, desc: "Animation: WEBDL"}
+      - {id: 109, cat: TV/WEB-DL, desc: "Animation: WEBRIP"}
+      - {id: 18, cat: PC/0day, desc: "Applications: PC"}
+      - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
+      - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"}
+      - {id: 38, cat: PC/Phone-Other, desc: "Applications: Mobile Phone"}
+      - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
+      - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
+      - {id: 40, cat: PC, desc: "Applications: Linux"}
+      - {id: 67, cat: TV/OTHER, desc: "Autres: Emission TV"}
+      - {id: 118, cat: TV/Documentary, desc: "Documentaires: Sport"}
+      - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
+      - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
+      - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
+      - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
+      - {id: 51, cat: Books/Ebook, desc: "E-Books: BD"}
+      - {id: 50, cat: Books/Ebook, desc: "E-Books: Manuel Français"}
+      - {id: 49, cat: Books/Ebook, desc: "E-Books: Manuel Anglais"}
+      - {id: 36, cat: Books/Ebook, desc: "E-Books: Livres Français"}
+      - {id: 53, cat: Books/Ebook, desc: "E-Books: Livre Anglais"}
+      - {id: 52, cat: Books/Ebook, desc: "E-Books: Revue - Journaux"}
+      - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
+      - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
+      - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
+      - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
+      - {id: 89, cat: Movies/BluRay, desc: "Films: BD/BR Rip"}
+      - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
+      - {id: 94, cat: Movies/DVD, desc: "Films: DVDscreen"}
+      - {id: 91, cat: Movies, desc: "Films: RemuX"}
+      - {id: 104, cat: Movies/BluRay, desc: "Films: Film-BDRip"}
+      - {id: 110, cat: Movies/WEBDL, desc: "Films: WEBRip"}
+      - {id: 111, cat: Movies/WEBDL, desc: "Films: WEBRip-720p-P"}
+      - {id: 95, cat: Movies/BluRay, desc: "Films: bluray"}
+      - {id: 102, cat: Movies/WEBDL, desc: "Films: WEB-DL 720P"}
+      - {id: 101, cat: Movies/WEBDL, desc: "Films: WEB-DL 1080P"}
+      - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
+      - {id: 100, cat: Movies/UHD, desc: "Films: 4KLight"}
+      - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
+      - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
+      - {id: 65, cat: TV, desc: "Films: VO"}
+      - {id: 72, cat: TV/HD, desc: "Films: TVRip/HDTV"}
+      - {id: 96, cat: Movies/HD, desc: "Films: HDlight"}
+      - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
+      - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
+      - {id: 57, cat: TV, desc: "Films: TS/CAM"}
+      - {id: 59, cat: TV, desc: "Films: Spectacle"}
+      - {id: 87, cat: XXX, desc: "Films: XXX"}
+      - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
+      - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
+      - {id: 1, cat: Movies/HD, desc: "Films: HD720P"}
+      - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
+      - {id: 90, cat: Movies/HD, desc: "Films: HD X265"}
+      - {id: 112, cat: Movies/WEBDL, desc: "Films: WEBrip-1080-P"}
+      - {id: 77, cat: PC/Phone-Other, desc: "GPS: Cartes"}
+      - {id: 78, cat: PC/Phone-Other, desc: "GPS: Radars"}
+      - {id: 125, cat: TV/Anime, desc: "Mangas: DVDRip"}
+      - {id: 124, cat: TV/Anime, desc: "Mangas: HD720P"}
+      - {id: 97, cat: Audio, desc: "Musique: Podcast"}
+      - {id: 98, cat: Audio, desc: "Musique: karaoké"}
+      - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
+      - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
+      - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
+      - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
+      - {id: 115, cat: Audio/MP3, desc: "Musique: Coffret mp3"}
+      - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
+      - {id: 116, cat: Audio/Lossless, desc: "Musique: Coffret flac"}
+      - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+      - {id: 58, cat: Audio, desc: "Musique: Concert"}
+      - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
+      - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
+      - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
+      - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
+      - {id: 113, cat: TV, desc: "Serie TV: Episode QC"}
+      - {id: 114, cat: TV, desc: "Serie TV: Saison QC"}
+      - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
+      - {id: 74, cat: TV/HD, desc: "Serie TV: TVRip/HDTV"}
+      - {id: 12, cat: TV, desc: "Serie TV: Animation"}
+      - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
+      - {id: 120, cat: TV/HD, desc: "Serie TV: Episode Bluray 1080p"}
+      - {id: 121, cat: TV/HD, desc: "Serie TV: Saison Bluray 720p"}
+      - {id: 122, cat: TV/HD, desc: "Serie TV: Saison Bluray 1080p"}
+      - {id: 119, cat: TV/HD, desc: "Serie TV: Episode Bluray 720p"}
+
+    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: multilang
+      type: checkbox
+      label: Replace MULTI by another language in release name
+      default:  false
+    - name: multilanguage
+      type: select
+      label: Replace MULTI by this language
+      default: VOSTFR
+      options:
+        FRENCH : "FRENCH"
+        "MULTI FRENCH": "MULTI FRENCH"
+        ENGLISH: "ENGLISH"
+        "MULTI ENGLISH": "MULTI ENGLISH"
+        VOSTFR: "VOSTFR"
+        "MULTI VOSTFR": "MULTI VOSTFR"
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+    - selector: td.tboxhead
+    test:
+      path: torrents-search.php
+      selector: a[href="account-logout.php"]
+
+  download:
+    before:
+      path: "list_thanks.php"
+      method: "get"
+      inputs:
+        id: "{{ .DownloadUri.Query.id }}"
+        to: "give"
+        torrent: "{{ .DownloadUri.Query.id }}"
+    selector: a[href^="download.php?id="]
+
+  search:
+    paths:
+    # 40 results per page
+      - path: torrents-search.php
+      - path: torrents-search.php
+        inputs:
+          page: 1
+    inputs:
+#      multi cats unsupported, defaulting to all
+      cat: 0
+      search: "{{ .Keywords }}"
+      incldead: 1
+      freeleech: 0
+      inclexternal: 0
+      lang: 0
+      sort: id
+      order: desc
+
+    rows:
+      selector: table.ttable_headinner > tbody > tr.t-row
+    fields:
+      title_original:
+        selector: a[href^="torrents-details.php?id="] b
+      title_multilang:
+        text: "{{ .Result.title_original }}"
+        filters:
+          - name: re_replace
+            args: ["\\s[Mm][Uu][Ll][Tt][Ii]\\s", " {{ .Config.multilanguage }} "]
+      title:
+        text: "{{if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_original }}{{end}}"
+      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
+      size:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      date:
+        text: now
+      downloadvolumefactor:
+        case:
+          img[src="images/fl.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/hachede.yml
+++ b/src/Jackett.Common/Definitions/hachede.yml
@@ -63,22 +63,23 @@
      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>"
+
  login:
-    path: ajax/login.php
-    method: post
+    method: cookie
    headers:
      user-agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.104 Safari/537.36"
-    form: form
    inputs:
-      loginbox_membername: "{{ .Config.username }}"
-      loginbox_password: "{{ .Config.password }}"
-      action: "login"
-      loginbox_remember: "true"
-    error:
-      - selector: div.error
+      cookie: "{{ .Config.cookie }}"
    test:
      path: ?p=home&pid=1
-      selector: div#member_info_bar

  search:
    path: /
--- a/src/Jackett.Common/Definitions/hamsterstudio.yml
+++ b/src/Jackett.Common/Definitions/hamsterstudio.yml
@@ -0,0 +1,345 @@
+---
+  site: hamsterstudio
+  name: HamsterStudio
+  description: "HamsterStudio is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - http://hamsterstudio.org/
+
+  caps:
+    categorymappings:
+    - {id: 23, cat: Movies, desc: "Кино"}
+    - {id: 18, cat: TV/WEB-DL, desc: "Веб-сериалы"}
+    - {id: 19, cat: TV/OTHER, desc: "Разные сериалы"}
+    - {id: 10, cat: Audio, desc: "Музыка"}
+    - {id: 29, cat: TV, desc: "Лечение (Пациенты)"}
+    - {id: 37, cat: TV, desc: "Сериалы с ТВ"}
+    - {id: 21, cat: TV, desc: "Полуночный зверь"}
+    - {id: 11, cat: TV, desc: "Милые обманщицы"}
+    - {id: 27, cat: TV, desc: "Девочки"}
+    - {id: 20, cat: TV, desc: "Умерь Свой Пыл"}
+    - {id: 24, cat: TV, desc: "Ийон Тихий, космический пилот"}
+    - {id: 25, cat: TV, desc: "Красный карлик"}
+    - {id: 22, cat: TV, desc: "Тримей"}
+    - {id: 26, cat: TV, desc: "На дне"}
+    - {id: 38, cat: TV, desc: "Галактика: Кровь и Хром"}
+    - {id: 39, cat: TV, desc: "Супертюрьма"}
+    - {id: 40, cat: TV, desc: "Семерка Блэйка"}
+    - {id: 42, cat: TV, desc: "Западное крыло"}
+    - {id: 43, cat: TV, desc: "Убойный Отдел: Уличные Будни"}
+    - {id: 47, cat: TV, desc: "Это Англия"}
+    - {id: 48, cat: TV, desc: "Бенидорм"}
+    - {id: 49, cat: TV, desc: "Сайнфелд"}
+    - {id: 51, cat: TV, desc: "Вице"}
+    - {id: 52, cat: TV, desc: "За кадром о кадре"}
+    - {id: 54, cat: TV, desc: "Хемлок Гроув"}
+    - {id: 56, cat: TV, desc: "Семейное древо"}
+    - {id: 57, cat: TV, desc: "Мэрон"}
+    - {id: 59, cat: TV, desc: "Спецнах"}
+    - {id: 60, cat: TV, desc: "Работа не волк"}
+    - {id: 64, cat: TV, desc: "Дивизион "}
+    - {id: 66, cat: TV, desc: "Кошмары Фредди"}
+    - {id: 67, cat: TV, desc: "Все дома"}
+    - {id: 69, cat: TV, desc: "Бездельницы"}
+    - {id: 70, cat: TV, desc: "Реальные люди"}
+    - {id: 71, cat: TV, desc: "Трофеи Вавилона"}
+    - {id: 72, cat: TV, desc: "Постфактум"}
+    - {id: 73, cat: TV, desc: "Детектив Босх"}
+    - {id: 74, cat: TV, desc: "В девятом номере"}
+    - {id: 75, cat: TV, desc: "Верь"}
+    - {id: 76, cat: TV, desc: "Семь дней"}
+    - {id: 77, cat: TV, desc: "Красная дорога"}
+    - {id: 78, cat: TV, desc: "Борджиа"}
+    - {id: 79, cat: TV, desc: "Вдовец"}
+    - {id: 80, cat: TV, desc: "Безумцы"}
+    - {id: 81, cat: TV, desc: "Убийство первой степени"}
+    - {id: 82, cat: TV, desc: "Мистер Слоун"}
+    - {id: 83, cat: TV, desc: "Путеводитель по семейной жизни"}
+    - {id: 84, cat: TV, desc: "Агенты"}
+    - {id: 85, cat: TV, desc: "Блюз Хилл-Стрит"}
+    - {id: 86, cat: TV, desc: "В погоне за тенями"}
+    - {id: 87, cat: TV, desc: "Константин"}
+    - {id: 88, cat: TV, desc: "Готэм"}
+    - {id: 89, cat: TV, desc: "Клей"}
+    - {id: 90, cat: TV, desc: "Скорострел"}
+    - {id: 91, cat: TV, desc: "Водитель"}
+    - {id: 92, cat: TV, desc: "Очевидное"}
+    - {id: 93, cat: TV, desc: "Красные дубы"}
+    - {id: 94, cat: TV, desc: "Жизнь начинается в 18"}
+    - {id: 95, cat: TV, desc: "Безрассудный"}
+    - {id: 96, cat: TV, desc: "Пропавший без вести"}
+    - {id: 97, cat: TV, desc: "Взгляд в прошлое"}
+    - {id: 98, cat: TV, desc: "Королевская семья"}
+    - {id: 99, cat: TV, desc: "Одиночки с причудами"}
+    - {id: 101, cat: TV, desc: "CSI: Киберпространство"}
+    - {id: 102, cat: TV, desc: "Сорвиголова"}
+    - {id: 103, cat: TV, desc: "Осадок"}
+    - {id: 104, cat: TV, desc: "Призраки Энфилда"}
+    - {id: 105, cat: TV, desc: "Ошибки прошлого"}
+    - {id: 106, cat: TV, desc: "Восьмое чувство"}
+    - {id: 107, cat: TV, desc: "Вызов"}
+    - {id: 108, cat: TV, desc: "Настоящий детектив"}
+    - {id: 109, cat: TV, desc: "Звездный охотник"}
+    - {id: 110, cat: TV, desc: "Это не моя жизнь"}
+    - {id: 111, cat: TV, desc: "Человек в высоком замке"}
+    - {id: 112, cat: TV, desc: "Бойтесь Ходячих мертвецов"}
+    - {id: 113, cat: TV, desc: "Стражи галактики"}
+    - {id: 114, cat: TV, desc: "Герои: Возрождение"}
+    - {id: 115, cat: TV, desc: "Заключенный"}
+    - {id: 116, cat: TV, desc: "Родина"}
+    - {id: 117, cat: TV, desc: "Фарго"}
+    - {id: 118, cat: TV, desc: "Американская история ужасов"}
+    - {id: 119, cat: TV, desc: "Оставленные"}
+    - {id: 121, cat: TV, desc: "Любовники"}
+    - {id: 122, cat: TV, desc: "Агенты Щит"}
+    - {id: 123, cat: TV, desc: "Эш против зловещих мертвецов"}
+    - {id: 124, cat: TV, desc: "Ходячие мертвецы"}
+    - {id: 125, cat: TV, desc: "Демоны Да Винчи"}
+    - {id: 120, cat: TV, desc: "Сонная лощина"}
+    - {id: 126, cat: TV, desc: "Джекил и Хайд"}
+    - {id: 127, cat: TV, desc: "Джессика Джонс"}
+    - {id: 128, cat: TV, desc: "Лондонский шпион"}
+    - {id: 129, cat: TV, desc: "Мост"}
+    - {id: 130, cat: TV, desc: "Хроники Франкенштейна"}
+    - {id: 131, cat: TV, desc: "Пространство"}
+    - {id: 132, cat: TV, desc: "Конец детства"}
+    - {id: 133, cat: TV, desc: "Путь к выздоровлению"}
+    - {id: 134, cat: TV, desc: "Старость не радость"}
+    - {id: 135, cat: TV, desc: "Пьяная история"}
+    - {id: 136, cat: TV, desc: "Хроники Шаннары"}
+    - {id: 137, cat: TV, desc: "Сумеречные охотники"}
+    - {id: 138, cat: TV, desc: "Клоун (Баскетс)"}
+    - {id: 139, cat: TV, desc: "Черные паруса"}
+    - {id: 140, cat: TV, desc: "Секретные материалы"}
+    - {id: 141, cat: TV, desc: "Изгои"}
+    - {id: 143, cat: TV, desc: "Куку"}
+    - {id: 144, cat: TV, desc: "Долл и Эм"}
+    - {id: 145, cat: TV, desc: "Банши "}
+    - {id: 146, cat: TV, desc: " Шоу Джимма Гаффигана"}
+    - {id: 147, cat: TV, desc: "Все кувырком"}
+    - {id: 148, cat: TV, desc: "Сожители"}
+    - {id: 149, cat: TV, desc: "Внутри Эми Шумер"}
+    - {id: 150, cat: TV, desc: "С чистого листа"}
+    - {id: 151, cat: TV, desc: "Хофф в записи"}
+    - {id: 152, cat: TV, desc: "Жевательная резинка"}
+    - {id: 153, cat: TV, desc: "Охотники"}
+    - {id: 154, cat: TV, desc: "Даркнет"}
+    - {id: 155, cat: TV, desc: "Бонг для путешествий во времен"}
+    - {id: 156, cat: TV, desc: "Бульварные ужасы"}
+    - {id: 157, cat: TV, desc: "Флауэрсы"}
+    - {id: 158, cat: TV, desc: "Грейс и Фрэнки "}
+    - {id: 159, cat: TV, desc: "Проповедник"}
+    - {id: 142, cat: TV, desc: "Принц из Беверли Хиллз"}
+    - {id: 160, cat: TV, desc: "Сосны"}
+    - {id: 161, cat: TV, desc: "Истории Нила Геймана"}
+    - {id: 162, cat: TV, desc: "Подчинение"}
+    - {id: 163, cat: TV, desc: "Обвиняемая"}
+    - {id: 164, cat: TV, desc: "Безмозглые"}
+    - {id: 165, cat: TV, desc: "Гастролеры"}
+    - {id: 166, cat: TV, desc: "Завучи"}
+    - {id: 167, cat: TV, desc: "Отжиг"}
+    - {id: 169, cat: TV, desc: "Человек-клещ"}
+    - {id: 168, cat: TV, desc: "Трагедия в Кеттеринге"}
+    - {id: 170, cat: TV, desc: "Я люблю Дика"}
+    - {id: 171, cat: TV, desc: "Жан-Клод Ван Джонсон "}
+    - {id: 173, cat: TV, desc: "Небезопасно для работы"}
+    - {id: 174, cat: TV, desc: "Граница "}
+    - {id: 175, cat: TV, desc: "Дрянь"}
+    - {id: 176, cat: TV, desc: "Сложные люди"}
+    - {id: 177, cat: TV, desc: "Девочки Гилмор"}
+    - {id: 178, cat: TV, desc: "Возвращение  в Миссисипи "}
+    - {id: 179, cat: TV, desc: "В хлам"}
+    - {id: 180, cat: TV, desc: "Бунтарь"}
+    - {id: 182, cat: TV, desc: "Слепое пятно"}
+    - {id: 183, cat: TV, desc: "Королевы крика"}
+    - {id: 184, cat: TV, desc: "Черный список"}
+    - {id: 185, cat: TV, desc: "Однажды в сказке"}
+    - {id: 186, cat: TV, desc: "Звездные войны: повстанцы"}
+    - {id: 187, cat: TV, desc: "Скорпион"}
+    - {id: 188, cat: TV, desc: "Безбашенные"}
+    - {id: 189, cat: TV, desc: "Черное зеркало"}
+    - {id: 190, cat: TV, desc: "Стэн против сил зла"}
+    - {id: 191, cat: TV, desc: "Удалённые"}
+    - {id: 192, cat: TV, desc: "Сирены"}
+    - {id: 193, cat: TV, desc: "По ту сторону"}
+    - {id: 194, cat: TV, desc: "ОА"}
+    - {id: 195, cat: TV, desc: "Табу"}
+    - {id: 196, cat: TV, desc: "Колония"}
+    - {id: 197, cat: TV, desc: "Волшебники"}
+    - {id: 198, cat: TV, desc: "24 часа"}
+    - {id: 199, cat: TV, desc: "Миллиарды"}
+    - {id: 200, cat: TV, desc: "Большая маленькая ложь"}
+    - {id: 201, cat: TV, desc: "Легион"}
+    - {id: 202, cat: TV, desc: "Сан рекордз"}
+    - {id: 203, cat: TV, desc: "Заложница"}
+    - {id: 204, cat: TV, desc: "Убийство на пляже"}
+    - {id: 205, cat: TV, desc: "Подземка"}
+    - {id: 206, cat: TV, desc: "Любовь"}
+    - {id: 207, cat: TV, desc: "Преступление по-американски "}
+    - {id: 208, cat: TV, desc: "Большой куш"}
+    - {id: 209, cat: TV, desc: "Побег"}
+    - {id: 210, cat: TV, desc: "Я Зомби"}
+    - {id: 211, cat: TV, desc: "Лучше звоните Солу"}
+    - {id: 212, cat: TV, desc: "Арчер"}
+    - {id: 213, cat: TV, desc: "Дорогие белые"}
+    - {id: 214, cat: TV, desc: "Американские боги"}
+    - {id: 215, cat: TV, desc: "Брокмайр"}
+    - {id: 216, cat: TV, desc: "Энджи Трайбека"}
+    - {id: 217, cat: TV, desc: "Уэнтуорт "}
+    - {id: 218, cat: TV, desc: "Звери."}
+    - {id: 219, cat: TV, desc: "Упадок и разрушение"}
+    - {id: 220, cat: TV, desc: "Просто парочка"}
+    - {id: 221, cat: TV, desc: "Твин Пикс"}
+    - {id: 222, cat: TV, desc: "Умираю со смеху"}
+    - {id: 223, cat: TV, desc: "По волчьим законам"}
+    - {id: 224, cat: TV, desc: "Карточный домик"}
+    - {id: 225, cat: TV, desc: "Приключения Тедди Ракспина"}
+    - {id: 226, cat: TV, desc: "Темная материя"}
+    - {id: 227, cat: TV, desc: "Вайнона Эрп"}
+    - {id: 228, cat: TV, desc: "Киллджойс"}
+    - {id: 229, cat: TV, desc: "Кровавая гонка"}
+    - {id: 230, cat: TV, desc: "Сшиватели"}
+    - {id: 231, cat: TV, desc: "Ночная смена"}
+    - {id: 232, cat: TV, desc: "Мгла"}
+    - {id: 233, cat: TV, desc: "Зверинец"}
+    - {id: 234, cat: TV, desc: "Снегопад"}
+    - {id: 235, cat: TV, desc: "Спасение"}
+    - {id: 236, cat: TV, desc: "По болезни"}
+    - {id: 237, cat: TV, desc: "Кастлвания"}
+    - {id: 238, cat: TV, desc: "Штамм"}
+    - {id: 239, cat: TV, desc: "Игра престолов"}
+    - {id: 240, cat: TV, desc: "Мстители"}
+    - {id: 241, cat: TV, desc: "Комната 104"}
+    - {id: 242, cat: TV, desc: "Миднайт, Техас"}
+    - {id: 243, cat: TV, desc: "Человек-паук"}
+    - {id: 244, cat: TV, desc: "Рэй Донован"}
+    - {id: 245, cat: TV, desc: "Мистер Мерседес"}
+    - {id: 246, cat: TV, desc: "Эпизоды"}
+    - {id: 247, cat: TV, desc: "Охота на Унабомбера "}
+    - {id: 248, cat: TV, desc: "Защитники"}
+    - {id: 249, cat: TV, desc: "Раскосяченные"}
+    - {id: 250, cat: TV, desc: "Двойка"}
+    - {id: 251, cat: TV, desc: "Нарко"}
+    - {id: 252, cat: TV, desc: "Ты — воплощение порока"}
+    - {id: 253, cat: TV, desc: "Конь БоДжек"}
+    - {id: 254, cat: TV, desc: "Орвилл"}
+    - {id: 256, cat: TV, desc: "Южный парк"}
+    - {id: 257, cat: TV, desc: "Звездный путь: Дискавери"}
+    - {id: 258, cat: TV, desc: "Мик"}
+    - {id: 259, cat: TV, desc: "Морская полиция"}
+    - {id: 260, cat: TV, desc: "Смертельное оружие"}
+    - {id: 261, cat: TV, desc: "Сверхлюди"}
+    - {id: 262, cat: TV, desc: "Одарённые"}
+    - {id: 263, cat: TV, desc: "Полиция Чикаго"}
+    - {id: 264, cat: TV, desc: "Это Мы"}
+    - {id: 265, cat: TV, desc: "Империя"}
+    - {id: 266, cat: TV, desc: "Мыслить как преступник"}
+    - {id: 267, cat: TV, desc: "Экзорцист"}
+    - {id: 268, cat: TV, desc: "Люцифер"}
+    - {id: 269, cat: TV, desc: "Нация Z"}
+    - {id: 270, cat: TV, desc: "Сверхестественое"}
+    - {id: 273, cat: TV, desc: "Доктор Шанс"}
+    - {id: 271, cat: TV, desc: "Мистер Робот"}
+    - {id: 272, cat: TV, desc: "Очень странные дела"}
+    - {id: 274, cat: TV, desc: "Стрела"}
+    - {id: 275, cat: TV, desc: "Флэш"}
+    - {id: 276, cat: TV, desc: "Супердевушка"}
+    - {id: 277, cat: TV, desc: "Легенды завтрашнего дня "}
+    - {id: 278, cat: TV, desc: "Суеверие"}
+    - {id: 279, cat: TV, desc: "Конец ёбанного мира"}
+    - {id: 280, cat: TV, desc: "Спецназ"}
+    - {id: 281, cat: TV, desc: "Бесстыдники "}
+    - {id: 282, cat: TV, desc: "Проклятая нация"}
+    - {id: 283, cat: TV, desc: "Человек будущего"}
+    - {id: 284, cat: TV, desc: "Каратель"}
+    - {id: 285, cat: TV, desc: "Фантастика"}
+    - {id: 286, cat: TV, desc: "Ужасы/триллер"}
+    - {id: 287, cat: TV, desc: "Драма"}
+    - {id: 288, cat: TV, desc: "Комедия"}
+    - {id: 289, cat: TV, desc: "Боевик"}
+    - {id: 290, cat: TV, desc: "Детектив"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: browse.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incdead 2 onlydead 3 gold 4 seedfree
+      incldead: "1"
+    rows:
+      selector: table.embedded > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          - name: re_replace
+            args: ["\\b(\\d)\\b", "0$1"]
+          - name: re_replace
+            args: [".+Сезон\\s+(\\d+)(?:.+Серия\\s+(\\d+))*[\\s\\S]*\\/\\s+(.+)\\s+\\(\\d+\\)\\s+(\\S*)\\s*(\\w*\\d*).*", "$3 - S$1E$2 - rus $5 $4 newstudio"]
+          - name: replace
+            args: ["WEBDLRip","WEBDL"]
+          - name: replace
+            args: ["HDTVRip","HDTV"]
+          - name: replace
+            args: ["E -","E01-99 -"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(5)
+      date:
+        selector: i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      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/diamond.png"]: "0"
+          img[src="pic/freedownload.gif"]: "0"
+          img[src="pic/silver.gif"]: "0.5"
+          img[src="pic/bronze.gif"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="pic/diamond.png"]: "2"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/hd4free.yml
+++ b/src/Jackett.Common/Definitions/hd4free.yml
@@ -14,9 +14,10 @@
      - {id: 2, cat: TV, desc: "TV"}
      - {id: 3, cat: Audio, desc: "Music"}
      - {id: 4, cat: Books, desc: "Books"}
-      - {id: 5, cat: PC/Mac, desc: "Apps"}
+      - {id: 5, cat: PC, desc: "Apps"}
      - {id: 6, cat: Other, desc: "Other"}
      - {id: 7, cat: PC/Games, desc: "Games"}
+      - {id: 8, cat: TV/Sport, desc: "Sports"}


    modes:
@@ -41,6 +42,7 @@
    inputs:
      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
@@ -106,10 +108,12 @@
      downloadvolumefactor:
        case:
          "i[data-original-title=\"100% Free\"]": "0"
-          "i[data-original-title=\"Global FreeLeech\"]": "0"
+          "i[data-original-title=\"Global Freeleech\"]": "0"
+          "i[data-original-title=\"Featured\"]": "0"
          "*": "1"
      uploadvolumefactor:
        case:
+          "i[data-original-title=\"Featured\"]": "2"
          "i[data-original-title=\"Double upload\"]": "2"
          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
          "*": "1"
--- a/src/Jackett.Common/Definitions/hdspain.yml
+++ b/src/Jackett.Common/Definitions/hdspain.yml
@@ -58,13 +58,28 @@
        filters:
          - name: querystring
            args: cat
+      extras:
+        text: ""
+      extras:
+        optional: true
+        selector: td.titulo a[class]
+        filters:
+          - name: prepend
+            args: "["
+          - name: append
+            args: "]"
      title:
        selector: td.titulo a[id]
        filters:
+          - name: prepend
+            args: "{{ .Result.extras }} "
          - name: append
-            args: " [spanish]"
+            args: " [Spanish]"
      details:
-        selector: td.titulo a
+        selector: td.titulo a[id]
+        attribute: href
+      comments:
+        selector: td.foro a
        attribute: href
      size:
        selector: td.tamano
@@ -142,3 +157,10 @@
        filters:
          - name: replace
            args: ["Freeleech X2", "2"]
+      minimumratio:
+        text: "1.0"
+      minimumseedtime:
+        text: "345600"
+      description:
+        optional: true
+        selector: td.titulo a[class]
--- a/src/Jackett.Common/Definitions/hon3yhd-net.yml
+++ b/src/Jackett.Common/Definitions/hon3yhd-net.yml
@@ -0,0 +1,124 @@
+---
+  site: hon3yhd-net
+  name: Hon3yHD-net
+  description: "Hon3yHD.net is a Public INDIAN site for MOVIES / TV / MUSIC"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://hon3yhd.net/
+
+  caps:
+    categorymappings:
+      - {id: 84, cat: PC/Games, desc: "Games: PC"}
+      - {id: 85, cat: Console, desc: "Games: Consoles"}
+      - {id: 47, cat: Movies/BluRay, desc: "Movies: 1080P Bluray"}
+      - {id: 48, cat: Movies/BluRay, desc: "Movies: 720P Bluray"}
+      - {id: 49, cat: Movies/3D, desc: "Movies: 3D"}
+      - {id: 51, cat: Movies/BluRay, desc: "Movies: BD50"}
+      - {id: 50, cat: Movies/BluRay, desc: "Movies: BD25"}
+      - {id: 52, cat: Movies/DVD, desc: "Movies: DVD5"}
+      - {id: 53, cat: Movies/DVD, desc: "Movies: DVD9"}
+      - {id: 54, cat: Movies/DVD, desc: "Movies: DVDRips"}
+      - {id: 55, cat: Movies/HD, desc: "Movies: HDRips"}
+      - {id: 56, cat: Movies/HD, desc: "Movies: HEVC"}
+      - {id: 57, cat: Movies, desc: "Movies: Bollywood"}
+      - {id: 58, cat: Movies, desc: "Movies: Hollywood Dub"}
+      - {id: 59, cat: Movies, desc: "Movies: Bengali"}
+      - {id: 60, cat: Movies, desc: "Movies: Malayalam"}
+      - {id: 61, cat: Movies, desc: "Movies: Pakistani"}
+      - {id: 62, cat: Movies, desc: "Movies: Punjabi"}
+      - {id: 63, cat: Movies, desc: "Movies: Tamil"}
+      - {id: 64, cat: Movies, desc: "Movies: Telugu"}
+      - {id: 68, cat: Movies/SD, desc: "Movies: Xvid"}
+      - {id: 73, cat: Movies/WEBDL, desc: "Movies: WEB-HD"}
+      - {id: 74, cat: Movies, desc: "Movies: Remux"}
+      - {id: 75, cat: Movies/UHD, desc: "Movies: 4K/UHD"}
+      - {id: 76, cat: Movies, desc: "Movies: Pre-Releases"}
+      - {id: 82, cat: Movies, desc: "Movies: South Dub"}
+      - {id: 90, cat: Movies, desc: "Movies: Packs"}
+      - {id: 78, cat: Audio/MP3, desc: "Music: MP3"}
+      - {id: 79, cat: Audio, desc: "Music: WAV"}
+      - {id: 80, cat: Audio/Lossless, desc: "Music: FLAC"}
+      - {id: 81, cat: Audio/Video, desc: "Music: Videos"}
+      - {id: 91, cat: Audio, desc: "Music: Bollywood"}
+      - {id: 65, cat: Other, desc: "Other: Ebooks"}
+      - {id: 66, cat: Other, desc: "Other: Religious"}
+      - {id: 67, cat: Other, desc: "Other: Tutorial"}
+      - {id: 83, cat: Other, desc: "Other: Animation"}
+      - {id: 86, cat: Other, desc: "Other: Software"}
+      - {id: 69, cat: TV, desc: "TV: Pakistani"}
+      - {id: 70, cat: TV, desc: "TV: Indian"}
+      - {id: 71, cat: TV/HD, desc: "TV: HDTV"}
+      - {id: 72, cat: TV/WEB-DL, desc: "TV: WEB-HD"}
+      - {id: 77, cat: TV/Sport, desc: "TV: Sports"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="download.php?id="]
+
+  search:
+    paths:
+    # 20 results per page
+      - path: torrents-search.php
+      - path: torrents-search.php
+        inputs:
+          page: 1
+      - path: torrents-search.php
+        inputs:
+          page: 2
+      - path: torrents-search.php
+        inputs:
+          page: 3
+      - path: torrents-search.php
+        inputs:
+          page: 4
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{.Keywords}}"
+      # 0 only active 1 incl dead 2 only dead
+      incldead: 0
+      # 0 all 1 not freeleech 2 only freeleech
+      freeleech: 0
+      # 0 both 1 local only 2 external only
+      inclexternal: 0
+      # 0 all 1 English 2 French 3 German 4 Italian 5 Japanese 6 Spanish 7 Russian 8 Hindi 9 Gujarati 10 Punjabi 11 Telugu 12 Bengali 13 Malayalam 14 Urdu 15 Tamil 16 Kannada 17 Marathi 18 Chinese 19 Korean
+      lang: 0
+    rows:
+      selector: tr.t-row
+      filters:
+        - name: andmatch
+    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
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        text: now
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/hon3yhd.yml
+++ b/src/Jackett.Common/Definitions/hon3yhd.yml
@@ -50,21 +50,37 @@
      search: [q]
      tv-search: [q, season, ep]

+  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>"
+          
  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
+    method: cookie
    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      use_ssl: "1"
-      perm_ssl: "1"
-    error:
-      - selector: tbody:has(td.colhead > span:contains("Error"))
-      - selector: tbody:has(td.colhead > span:contains("failed"))
+      cookie: "{{ .Config.cookie }}"
    test:
      path: browse.php

+#  login:
+#    path: login.php
+#    method: form
+#    form: form[action="takelogin.php"]
+#    inputs:
+#      username: "{{ .Config.username }}"
+#      password: "{{ .Config.password }}"
+#      use_ssl: "1"
+#      perm_ssl: "1"
+#    error:
+#      - selector: tbody:has(td.colhead > span:contains("Error"))
+#      - selector: tbody:has(td.colhead > span:contains("failed"))
+#    test:
+#      path: browse.php
+
  search:
    paths:
      - path: browse.php
--- a/src/Jackett.Common/Definitions/hush.yml
+++ b/src/Jackett.Common/Definitions/hush.yml
@@ -28,10 +28,14 @@
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
+      remember: 1
    error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
      path: torrents
+      selector: a[href$="/logout"]

  search:
    paths:
@@ -39,6 +43,7 @@
    inputs:
      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
@@ -65,13 +70,13 @@
        selector: a.view-torrent
        attribute: href
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
        filters:
          - name: regexp
            args: ([\d\.]+)
@@ -103,12 +108,17 @@
            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "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"
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload          
+          "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
+# UNIT3D 1.9.2
--- a/src/Jackett.Common/Definitions/isohunt2.yml
+++ b/src/Jackett.Common/Definitions/isohunt2.yml
@@ -48,6 +48,9 @@
      - name: querystring
        args: url
      - name: urldecode
+      # temp fix for #5372
+      - name: replace
+        args: [" ⭐", ""]

  search:
    paths:
--- a/src/Jackett.Common/Definitions/itorrent.yml
+++ b/src/Jackett.Common/Definitions/itorrent.yml
@@ -0,0 +1,80 @@
+---
+  site: itorrent
+  name: iTorrent
+  description: "iTorrent is a Public HUNGARIAN site"
+  language: hu
+  type: public
+  encoding: UTF-8
+  links:
+    - https://itorrent.ws/
+
+  caps:
+    categories:
+      "Apps": PC
+      "book": Books
+      "Games": PC/Games
+      "Movies": Movies
+      "Music": Audio
+      "XXX": XXX
+      "TV": TV
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/torrentfiles/"]
+
+  search:
+    paths:
+      - path: "torrentek/title/{{ .Keywords}}/"
+    rows:
+      selector: tr.gradeX
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: td:nth-child(1) i
+        attribute: class
+        filters:
+        # patch. books are "fa fa-book" while all the other categories are "ico-list-*"
+          - name: replace
+            args: [" ", "-"]
+          - name: split
+            args: ["-", 2]
+      title:
+        selector: td:nth-child(2) a
+      details:
+        selector: td:nth-child(2) a
+        attribute: href
+      download:
+        selector: td:nth-child(2) a
+        attribute: href
+      date:
+        selector: td:nth-child(4) span
+        optional: true
+        attribute: title
+        filters:
+          - name: dateparse
+            args: "2006.01.02 15:04"
+      date:
+        selector: td:nth-child(4):not(span)
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006.01.02"
+      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:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/katcrs.yml
+++ b/src/Jackett.Common/Definitions/katcrs.yml
@@ -64,6 +64,11 @@
      magnet:
        selector: td:nth-child(1) div div a[data-nop=""]
        attribute: href
+        # temp fix for #5372
+        filters: 
+          - name: urldecode
+          - name: replace
+            args: [" ⭐", ""]
      size:
        selector: td:nth-child(2)
      date:
--- a/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
@@ -56,6 +56,9 @@
          - name: querystring
            args: url
          - name: urldecode
+          # temp fix for #5372
+          - name: replace
+            args: [" ⭐", ""]
      size:
        selector: td:nth-child(2)
        filters:
--- a/src/Jackett.Common/Definitions/kickasstorrent.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrent.yml
@@ -87,19 +87,7 @@
      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>"
-
-  login:
-    method: cookie
-    test:
-      path: category/latest/page/1
+  settings: []

  search:
    paths:
--- a/src/Jackett.Common/Definitions/lapausetorrents.yml
+++ b/src/Jackett.Common/Definitions/lapausetorrents.yml
@@ -0,0 +1,293 @@
+---
+  site: lapausetorrents
+  name: Lapausetorrents
+  description: "Lapausetorrents is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://tempsdepause.eu/
+
+  caps:
+    categorymappings:
+      - {id: 4, cat: Movies/UHD, desc: "Animations -  4K Remux"}
+      - {id: 1, cat: Movies/3D, desc: "Animations - 3D"}
+      - {id: 3, cat: Movies/UHD, desc: "Animations - 4K Light"}
+      - {id: 2, cat: Movies/UHD, desc: "Animations - 4K UHD"}
+      - {id: 5, cat: Movies/UHD, desc: "Animations - 4K UHD Bluray"}
+      - {id: 6, cat: Movies/BluRay, desc: "Animations - BDRip-BRRIP"}
+      - {id: 7, cat: Movies/BluRay, desc: "Animations - BluRay-R"}
+      - {id: 8, cat: Movies, desc: "Animations - Coffret Films"}
+      - {id: 9, cat: Movies/DVD, desc: "Animations - DVD-R"}
+      - {id: 10, cat: Movies/DVD, desc: "Animations - DVDRip"}
+      - {id: 11, cat: Movies/HD, desc: "Animations - HD 1080P"}
+      - {id: 12, cat: Movies/HD, desc: "Animations - HD 720P"}
+      - {id: 13, cat: Movies/HD, desc: "Animations - HDRiP"}
+      - {id: 16, cat: Movies/HD, desc: "Animations - HDTV"}
+      - {id: 14, cat: Movies/HD, desc: "Animations - HDTV 1080p"}
+      - {id: 15, cat: Movies/HD, desc: "Animations - HDTV 720p"}
+      - {id: 17, cat: Movies, desc: "Animations - Jap-Animation"}
+      - {id: 18, cat: Movies/HD, desc: "Animations - M-HD 1080p"}
+      - {id: 19, cat: Movies/HD, desc: "Animations - M-HD 720p"}
+      - {id: 20, cat: Movies, desc: "Animations - Remux"}
+      - {id: 21, cat: Movies/WEBDL, desc: "Animations - TVRip"}
+      - {id: 24, cat: Movies/WEBDL, desc: "Animations - WEB-DL"}
+      - {id: 22, cat: Movies,/WEBDL desc: "Animations - WEB-DL 1080p"}
+      - {id: 23, cat: Movies/WEBDL, desc: "Animations - WEB-DL 720p"}
+      - {id: 25, cat: Movies/WEBDL, desc: "Animations - WEBRip"}
+      - {id: 26, cat: Movies/HD, desc: "Animations - X265"}
+      - {id: 49, cat: TV/Documentary, desc: "Documentaires - Doc-Spectacle"}
+      - {id: 48, cat: TV/Documentary, desc: "Documentaires - Emission TV"}
+      - {id: 51, cat: TV/Documentary, desc: "Documentaires - Film"}
+      - {id: 50, cat: TV/Sport, desc: "Documentaires - Sport"}
+      - {id: 57, cat: Movies/3D, desc: "Films - 3D"}
+      - {id: 59, cat: Movies/UHD, desc: "Films - 4K Light"}
+      - {id: 60, cat: Movies/UHD, desc: "Films - 4K Remux"}
+      - {id: 61, cat: Movies/UHD, desc: "Films - 4K UHD"}
+      - {id: 58, cat: Movies/UHD, desc: "Films - 4K UHD Bluray"}
+      - {id: 62, cat: Movies/BluRay, desc: "Films - BDRip-BRRIP"}
+      - {id: 63, cat: Movies/BluRay, desc: "Films - BluRay-R"}
+      - {id: 64, cat: Movies, desc: "Films - Coffret Films"}
+      - {id: 65, cat: Movies/DVD, desc: "Films - DVD-R"}
+      - {id: 66, cat: Movies/DVD, desc: "Films - DVDRip"}
+      - {id: 67, cat: Movies/HD, desc: "Films - HD 1080P"}
+      - {id: 68, cat: Movies/HD, desc: "Films - HD 720P"}
+      - {id: 69, cat: Movies/HD, desc: "Films - HDRiP"}
+      - {id: 72, cat: Movies/HD, desc: "Films - HDTV"}
+      - {id: 70, cat: Movies/HD, desc: "Films - HDTV 1080p"}
+      - {id: 71, cat: Movies/HD, desc: "Films - HDTV 720p"}
+      - {id: 73, cat: Movies/HD, desc: "Films - M-HD 1080p"}
+      - {id: 74, cat: Movies/HD, desc: "Films - M-HD 720p"}
+      - {id: 75, cat: Movies, desc: "Films - Remux"}
+      - {id: 76, cat: Movies/WEBDL, desc: "Films - TVRip"}
+      - {id: 77, cat: Movies/WEBDL, desc: "Films - WEB-DL"}
+      - {id: 78, cat: Movies/WEBDL, desc: "Films - WEB-DL 1080p"}
+      - {id: 79, cat: Movies/WEBDL, desc: "Films - WEB-DL 720p"}
+      - {id: 80, cat: Movies/WEBDL, desc: "Films - WEBRip"}
+      - {id: 81, cat: Movies/HD, desc: "Films - X265"}
+      - {id: 82, cat: Movies/3D, desc: "Films-VOSTFR - 3D"}
+      - {id: 84, cat: Movies/UHD, desc: "Films-VOSTFR - 4K Light"}
+      - {id: 85, cat: Movies/UHD, desc: "Films-VOSTFR - 4K Remux"}
+      - {id: 86, cat: Movies/UHD, desc: "Films-VOSTFR - 4K UHD"}
+      - {id: 83, cat: Movies/UHD, desc: "Films-VOSTFR - 4K UHD Bluray"}
+      - {id: 87, cat: Movies/BluRay, desc: "Films-VOSTFR - BDRip-BRRIP"}
+      - {id: 88, cat: Movies/BluRay, desc: "Films-VOSTFR - BluRay-R"}
+      - {id: 89, cat: Movies, desc: "Films-VOSTFR - Coffret Films"}
+      - {id: 90, cat: Movies/DVD, desc: "Films-VOSTFR - DVD-R"}
+      - {id: 91, cat: Movies/DVD, desc: "Films-VOSTFR - DVDRip"}
+      - {id: 92, cat: Movies/HD, desc: "Films-VOSTFR - HD 1080P"}
+      - {id: 93, cat: Movies/HD, desc: "Films-VOSTFR - HD 720P"}
+      - {id: 94, cat: Movies/HD, desc: "Films-VOSTFR - HDRiP"}
+      - {id: 97, cat: Movies/HD, desc: "Films-VOSTFR - HDTV"}
+      - {id: 95, cat: Movies/HD, desc: "Films-VOSTFR - HDTV 1080p"}
+      - {id: 96, cat: Movies/HD, desc: "Films-VOSTFR - HDTV 720p"}
+      - {id: 98, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 1080p"}
+      - {id: 99, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 720p"}
+      - {id: 100, cat: Movies, desc: "Films-VOSTFR - Remux"}
+      - {id: 101, cat: Movies/WEBDL, desc: "Films-VOSTFR - TVRip"}
+      - {id: 102, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEB-DL"}
+      - {id: 103, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEB-DL 1080p"}
+      - {id: 104, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEB-DL 720p"}
+      - {id: 105, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEBRip"}
+      - {id: 106, cat: Movies/HD, desc: "Films-VOSTFR - X265"}
+      - {id: 107, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
+      - {id: 108, cat: PC/Phone-IOS, desc: "Jeux - IOS-OSX"}
+      - {id: 109, cat: PC/Games, desc: "Jeux - PC"}
+      - {id: 110, cat: Console/PS3, desc: "Jeux - PS3 - PS4"}
+      - {id: 111, cat: Console/PSP, desc: "Jeux - PSP-PSX"}
+      - {id: 112, cat: Console/Wii, desc: "Jeux - WII"}
+      - {id: 113, cat: Console/WiiU, desc: "Jeux - WII-U"}
+      - {id: 114, cat: Console/Xbox, desc: "Jeux - XBOX"}
+      - {id: 52, cat: Books, desc: "Livres - BD"}
+      - {id: 56, cat: Audio/Audiobook, desc: "Livres - Livres Audio"}
+      - {id: 55, cat: Books/Comics, desc: "Livres - Mangas"}
+      - {id: 54, cat: Books/Magazines, desc: "Livres - Press"}
+      - {id: 53, cat: Books/Ebook, desc: "Livres - Romans"}
+      - {id: 115, cat: PC/Phone-Android, desc: "Logiciels - ANDROID"}
+      - {id: 118, cat: PC/Mac, desc: "Logiciels - APPLE"}
+      - {id: 116, cat: PC/Phone-IOS, desc: "Logiciels - IPHONE"}
+      - {id: 117, cat: PC, desc: "Logiciels - LINUX"}
+      - {id: 119, cat: PC/0day, desc: "Logiciels - WINDOWS"}
+      - {id: 120, cat: Audio/Lossless, desc: "Musiques - FLAC"}
+      - {id: 121, cat: Audio, desc: "Musiques - HQ"}
+      - {id: 122, cat: Audio/MP3, desc: "Musiques - MP3"}
+      - {id: 123, cat: Audio, desc: "Musiques - Spect/Concert"}
+      - {id: 27, cat: TV/HD, desc: "Series-Animee - BDRip-BRRIP"}
+      - {id: 28, cat: TV/HD, desc: "Series-Animee - BluRay-R"}
+      - {id: 29, cat: TV/SD, desc: "Series-Animee - DVD-R"}
+      - {id: 30, cat: TV/SD, desc: "Series-Animee - DVDRip"}
+      - {id: 32, cat: TV/HD, desc: "Series-Animee - HD 1080P"}
+      - {id: 31, cat: TV/HD, desc: "Series-Animee - HD 720P"}
+      - {id: 33, cat: TV/HD, desc: "Series-Animee - HDRiP"}
+      - {id: 34, cat: TV/HD, desc: "Series-Animee - HDTV"}
+      - {id: 35, cat: TV/HD, desc: "Series-Animee - HDTV 1080p"}
+      - {id: 36, cat: TV/HD, desc: "Series-Animee - HDTV 720p"}
+      - {id: 37, cat: TV/HD, desc: "Series-Animee - M-HD 1080p"}
+      - {id: 38, cat: TV/HD, desc: "Series-Animee - M-HD 720p"}
+      - {id: 47, cat: TV/Anime, desc: "Series-Animee - Pack Serie Animee"}
+      - {id: 39, cat: TV/Anime, desc: "Series-Animee - Remux"}
+      - {id: 46, cat: TV/Anime, desc: "Series-Animee - SERIE JAP-ANIM"}
+      - {id: 40, cat: TV/Anime, desc: "Series-Animee - TVRip"}
+      - {id: 41, cat: TV/Anime, desc: "Series-Animee - WEB-DL"}
+      - {id: 42, cat: TV/Anime, desc: "Series-Animee - WEB-DL 1080p"}
+      - {id: 43, cat: TV/Anime, desc: "Series-Animee - WEB-DL 720p"}
+      - {id: 44, cat: TV/Anime, desc: "Series-Animee - WEBRip"}
+      - {id: 45, cat: TV/HD, desc: "Series-Animee - X265"}
+      - {id: 124, cat: TV/HD, desc: "Series-FR - BDRip-BRRIP"}
+      - {id: 125, cat: TV/HD, desc: "Series-FR - BluRay-R"}
+      - {id: 126, cat: TV/SD, desc: "Series-FR - DVD-R"}
+      - {id: 127, cat: TV/SD, desc: "Series-FR - DVDRip"}
+      - {id: 128, cat: TV/HD, desc: "Series-FR - HD 1080P"}
+      - {id: 129, cat: TV/HD, desc: "Series-FR - HD 720P"}
+      - {id: 130, cat: TV/HD, desc: "Series-FR - HDRiP"}
+      - {id: 133, cat: TV/HD, desc: "Series-FR - HDTV"}
+      - {id: 131, cat: TV/HD, desc: "Series-FR - HDTV 1080p"}
+      - {id: 132, cat: TV/HD, desc: "Series-FR - HDTV 720p"}
+      - {id: 134, cat: TV/HD, desc: "Series-FR - M-HD 1080p"}
+      - {id: 135, cat: TV/HD, desc: "Series-FR - M-HD 720p"}
+      - {id: 136, cat: TV, desc: "Series-FR - Pack Serie"}
+      - {id: 137, cat: TV, desc: "Series-FR - Remux"}
+      - {id: 138, cat: TV/WEB-DL, desc: "Series-FR - TVRip"}
+      - {id: 141, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL"}
+      - {id: 139, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL 1080p"}
+      - {id: 140, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL 720p"}
+      - {id: 142, cat: TV/WEB-DL, desc: "Series-FR - WEBRip"}
+      - {id: 143, cat: TV/HD, desc: "Series-FR - X265"}
+      - {id: 144, cat: TV/HD, desc: "Series-VOSTFR - BDRip-BRRIP"}
+      - {id: 145, cat: TV/HD, desc: "Series-VOSTFR - BluRay-R"}
+      - {id: 146, cat: TV/SD, desc: "Series-VOSTFR - DVD-R"}
+      - {id: 147, cat: TV/SD, desc: "Series-VOSTFR - DVDRip"}
+      - {id: 148, cat: TV/HD, desc: "Series-VOSTFR - HD 1080P"}
+      - {id: 149, cat: TV/HD, desc: "Series-VOSTFR - HD 720P"}
+      - {id: 150, cat: TV/HD, desc: "Series-VOSTFR - HDRiP"}
+      - {id: 153, cat: TV/HD, desc: "Series-VOSTFR - HDTV"}
+      - {id: 151, cat: TV/HD, desc: "Series-VOSTFR - HDTV 1080p"}
+      - {id: 152, cat: TV/HD, desc: "Series-VOSTFR - HDTV 720p"}
+      - {id: 154, cat: TV/HD, desc: "Series-VOSTFR - M-HD 1080p"}
+      - {id: 155, cat: TV/HD, desc: "Series-VOSTFR - M-HD 720p"}
+      - {id: 156, cat: TV, desc: "Series-VOSTFR - Pack Serie"}
+      - {id: 157, cat: TV, desc: "Series-VOSTFR - Remux"}
+      - {id: 158, cat: TV/WEB-DL, desc: "Series-VOSTFR - TVRip"}
+      - {id: 161, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL"}
+      - {id: 159, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL 1080p"}
+      - {id: 160, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL 720p"}
+      - {id: 162, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEBRip"}
+      - {id: 163, cat: TV/HD, desc: "Series-VOSTFR - X265"}
+
+    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: torrentlanguage
+      type: select
+      label: Torrent Language
+      default: "11"
+      options:
+        "1": "Allemand"
+        "2": "Anglais(UK)"
+        "3": "Anglais(US)"
+        "4": "Arabe"
+        "5": "Bengali"
+        "6": "Cantonais"
+        "7": " Coréen"
+        "8": "Danois"
+        "9": "Espagnol"
+        "10": "Flamand"
+        "11": " Français"
+        "12": " Hébreu"
+        "13": "Hindi"
+        "14": "Italien"
+        "15": "Japonais"
+        "16": "Mandarin"
+        "17": "Multi"
+        "24": "Multi Truefrench"
+        "18": "Perse"
+        "19": "Portuguais"
+        "20": " Québécois"
+        "21": "Russe"
+        "22": " Suédois"
+        "23": "Ukrainien"
+
+  login:
+    path: TTV3/Connexion
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: font[color="red"]
+    test:
+      path: TTV3/Bienvenue
+      selector: a[href$="/TTV3/Deconnexion"]
+
+  download:
+    selector: a[href*="/Telechargement/"]
+
+  search:
+    paths:
+    # https://tempsdepause.eu/TTV3/Torrents/Recherche?recherche=voyez&type=exacte&endroit=nomtorrent&langue=11&tl=peuimporte
+    # categories for searching are unsupported
+      - path: TTV3/Torrents/Recherche
+    inputs:
+      recherche: "{{ .Keywords }}"
+      # searchtype un (one word) tout (all words) exacte (exact expression)
+      type: "tout"
+      # searchin  nomtorrent (name) or desctorrent (descr)
+      endroit: "nomtorrent"
+      # language 11 french 17 multi 
+      langue: "{{ .Config.torrentlanguage }}"
+      # freeleech oui (yes) non (no) peuimporte (ignore)
+      tl: "peuimporte"
+
+    rows:
+      selector: table.sortable tbody tr
+    fields:
+      category:
+        selector: a[href*="/SousCategories/"]
+        attribute: href
+        filters:        
+          - name: regexp
+            args: (\d+)$
+      title:
+        selector: a[onmouseover]
+      details:
+        selector: a[onmouseover]
+        attribute: href
+      download:
+        selector: a[onmouseover]
+        attribute: href
+      banner:
+        selector: a[onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src= (.*?)><"
+      size:
+        selector: td:nth-last-child(6)
+      grabs:
+        selector: td:nth-last-child(5)
+      seeders:
+        selector: td:nth-last-child(4)
+      leechers:
+        selector: td:nth-last-child(3)
+      date:
+        selector: td:nth-last-child(1)
+        filters:
+          - name: dateparse
+            args: "02-01-2006 15:04:05"
+      downloadvolumefactor:
+        case:
+          img[src$="/images/Torrents/TLibre.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+# TT3.00 FRENCH
--- a/src/Jackett.Common/Definitions/learnflakes.yml
+++ b/src/Jackett.Common/Definitions/learnflakes.yml
@@ -0,0 +1,145 @@
+---
+  site: learnflakes
+  name: LearnFlakes
+  description: "LearnFlakes is a Private Torrent Tracker for CERTIFICATE / TRAINING E-LEARNING"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://learnflakes.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Books, desc: "LearnFlakes"}
+      - {id: 14, cat: Books, desc: "EMC"}
+      - {id: 16, cat: Books, desc: "SANS"}
+      - {id: 17, cat: Books, desc: "MOC "}
+      - {id: 31, cat: Books, desc: "CareerAcademy"}
+      - {id: 32, cat: Books, desc: "CBTNuggets"}
+      - {id: 33, cat: Books, desc: "INE"}
+      - {id: 34, cat: Books, desc: "Symantec"}
+      - {id: 35, cat: Books, desc: "Infiniteskills"}
+      - {id: 36, cat: Books, desc: "IPExpert"}
+      - {id: 37, cat: Books, desc: "Tuts+"}
+      - {id: 38, cat: Books, desc: "Pluralsight"}
+      - {id: 39, cat: Books/Ebook, desc: "E-Books"}
+      - {id: 40, cat: Books, desc: "CBT-Videos"}
+      - {id: 41, cat: Books, desc: "Linux-CBT"}
+      - {id: 42, cat: Books, desc: "VTC"}
+      - {id: 43, cat: Books, desc: "Lynda"}
+      - {id: 44, cat: Books, desc: "TrainSignal"}
+      - {id: 50, cat: Books, desc: "LiveLessons"}
+      - {id: 47, cat: Books, desc: "Health"}
+      - {id: 48, cat: Books/Magazines, desc: "Magazines"}
+      - {id: 49, cat: Books, desc: "CourseWare"}
+      - {id: 51, cat: Books, desc: "Programming"}
+      - {id: 52, cat: Books, desc: "Graphic & Design"}
+      - {id: 53, cat: Books, desc: "Udemy"}
+      - {id: 45, cat: Books/Other, desc: "Others"}
+      - {id: 54, cat: Books, desc: "SAP"}
+      - {id: 46, cat: Books, desc: "LF VIP"}
+      - {id: 55, cat: Books, desc: "Exclusive"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: ?p=home&pid=1
+    method: form
+    form: form#loginbox_form
+    submitpath: ajax/login.php
+    inputs:
+      action: "login"
+      loginbox_membername: "{{ .Config.username }}"
+      loginbox_password: "{{ .Config.password }}"
+      loginbox_remember: 1
+    selectorinputs:
+      securitytoken:
+        selector: "script:contains(\"stKey: \")"
+        filters:
+          - name: regexp
+            args: "stKey: \"(.+?)\","
+    error:
+      - selector: div.error
+      - selector: :contains("-ERROR-")
+    test:
+      path: ?p=home&pid=1
+      selector: div#member_info_bar
+
+  search:
+    paths:
+    # 15 results per page
+      - path: /
+        inputs:
+          page: "1"
+      - path: /
+        inputs:
+          page: "2"
+      - path: /
+        inputs:
+          page: "3"
+    inputs:
+      p: "torrents"
+      pid: "10"
+      $raw: "{{range .Categories}}&cid[]={{.}}{{end}}"
+      keywords: "{{ .Keywords }}"
+      # name description both uploader
+      search_type: "name"
+    rows:
+      selector: div.torrent-box[id^="torrent_"]
+    fields:
+      title:
+        selector: a[href*="?p=torrents&pid=10&action=details&tid="]
+      details:
+        selector: a[href*="?p=torrents&pid=10&action=details&tid="]
+        attribute: href
+      category:
+        selector:  a[href*="?p=torrents&pid=10&cid="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cid
+      download:
+        selector: a[href*="?p=torrents&pid=10&action=download&tid="]
+        attribute: href
+      banner:
+        optional: true
+        selector: a[href*="data/torrents/torrent_images/"]
+        attribute: href
+      size:
+        selector: a[rel="torrent_size"]
+      grabs:
+        selector: a[rel="times_completed"]
+      seeders:
+        selector: a[rel="torrent_seeders"]
+      leechers:
+        selector: a[rel="torrent_leechers"]
+      date:
+        selector: div.torrentOwner abbr
+        optional: true
+        attribute: data-time
+      date:
+        selector: div.torrentOwner:contains("day")
+        optional: true
+        filters:
+          - name: regexp
+            args: "Uploaded (.+?) by"
+          - name: replace
+            args: [" at ", " "]
+      date:
+        selector: div.torrentOwner:contains("-")
+        optional: true
+        filters:
+          - name: regexp
+            args: "Uploaded (.+?) by"
+          - name: dateparse
+            args: "02-01-2006 15:04"
+      downloadvolumefactor:
+        case:
+          img[src$="/torrent_free.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/lechaudron.yml
+++ b/src/Jackett.Common/Definitions/lechaudron.yml
@@ -0,0 +1,228 @@
+---
+  site: lechaudron
+  name: LeChaudron
+  description: "Le Chaudron is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://lechaudron.nl/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: XXX, desc: "Adultes - BD Erotique"}
+      - {id: 4, cat: XXX, desc: "Adultes - Doujin (Manga X)"}
+      - {id: 2, cat: XXX, desc: "Adultes - eBook XXX"}
+      - {id: 3, cat: XXX, desc: "Adultes - Film XXX"}
+      - {id: 5, cat: XXX, desc: "Adultes - Hentai"}
+      - {id: 6, cat: TV/Anime, desc: "Animations - 3D"}
+      - {id: 7, cat: TV/Anime, desc: "Animations - 4K Light"}
+      - {id: 8, cat: TV/Anime, desc: "Animations - 4K UHD"}
+      - {id: 9, cat: TV/Anime, desc: "Animations - BDRIP-BRRIP"}
+      - {id: 10, cat: TV/Anime, desc: "Animations - BluRay-R"}
+      - {id: 11, cat: TV/Anime, desc: "Animations - DVD-R"}
+      - {id: 12, cat: TV/Anime, desc: "Animations - DVDRIP"}
+      - {id: 13, cat: TV/Anime, desc: "Animations - Film Jap-Anim"}
+      - {id: 14, cat: TV/Anime, desc: "Animations - HD 1080P"}
+      - {id: 15, cat: TV/Anime, desc: "Animations - HD 720p"}
+      - {id: 16, cat: TV/Anime, desc: "Animations - HDRIP"}
+      - {id: 17, cat: TV/Anime, desc: "Animations - HDTV"}
+      - {id: 18, cat: TV/Anime, desc: "Animations - HDTV 1080p"}
+      - {id: 19, cat: TV/Anime, desc: "Animations - HDTV 720p"}
+      - {id: 20, cat: TV/Anime, desc: "Animations - MHD 1080p"}
+      - {id: 21, cat: TV/Anime, desc: "Animations - MHD 720p"}
+      - {id: 22, cat: TV/Anime, desc: "Animations - REMUX"}
+      - {id: 23, cat: TV/Anime, desc: "Animations - Serie Animee"}
+      - {id: 24, cat: TV/Anime, desc: "Animations - Serie Jap-Anim"}
+      - {id: 25, cat: TV/Anime, desc: "Animations - TVRIP"}
+      - {id: 26, cat: TV/Anime, desc: "Animations - WEB-DL"}
+      - {id: 27, cat: TV/Anime, desc: "Animations - WEB-DL 1080p"}
+      - {id: 28, cat: TV/Anime, desc: "Animations - WEB-DL 720p"}
+      - {id: 29, cat: TV/Anime, desc: "Animations - WEBRIP"}
+      - {id: 31, cat: TV/Documentary, desc: "Documentaires - Emission TV"}
+      - {id: 32, cat: TV/Documentary, desc: "Documentaires - Film Documentaire"}
+      - {id: 33, cat: TV/Documentary, desc: "Documentaires - Spectacle"}
+      - {id: 34, cat: TV/Documentary, desc: "Documentaires - Sport"}
+      - {id: 41, cat: Movies/3D, desc: "Films - 3D"}
+      - {id: 42, cat: Movies/UHD, desc: "Films - 4K Light"}
+      - {id: 43, cat: Movies/UHD, desc: "Films - 4K UHD"}
+      - {id: 44, cat: Movies/BluRay, desc: "Films - BDRIP-BRRIP"}
+      - {id: 45, cat: Movies/BluRay, desc: "Films - BluRay-R"}
+      - {id: 46, cat: Movies, desc: "Films - Coffret"}
+      - {id: 47, cat: Movies/DVD, desc: "Films - DVD-R"}
+      - {id: 48, cat: Movies/DVD, desc: "Films - DVDRIP"}
+      - {id: 49, cat: Movies/HD, desc: "Films - HD 1080P"}
+      - {id: 50, cat: Movies/HD, desc: "Films - HD 720p"}
+      - {id: 51, cat: Movies/HD, desc: "Films - HDRIP"}
+      - {id: 52, cat: Movies/HD, desc: "Films - HDTV"}
+      - {id: 53, cat: Movies/HD, desc: "Films - HDTV 1080p"}
+      - {id: 54, cat: Movies/HD, desc: "Films - HDTV 720p"}
+      - {id: 55, cat: Movies/HD, desc: "Films - MHD 1080p"}
+      - {id: 56, cat: Movies/HD, desc: "Films - MHD 720p"}
+      - {id: 57, cat: Movies, desc: "Films - REMUX"}
+      - {id: 58, cat: Movies, desc: "Films - TVRIP"}
+      - {id: 59, cat: Movies/WEBDL, desc: "Films - WEB-DL"}
+      - {id: 60, cat: Movies/WEBDL, desc: "Films - WEB-DL 1080p"}
+      - {id: 61, cat: Movies/WEBDL, desc: "Films - WEB-DL 720p"}
+      - {id: 62, cat: Movies/WEBDL, desc: "Films - WEBRIP"}
+      - {id: 64, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
+      - {id: 65, cat: PC/Phone-IOS, desc: "Jeux - IOS-OSX"}
+      - {id: 66, cat: PC/Games, desc: "Jeux - PC"}
+      - {id: 67, cat: Console/PSP, desc: "Jeux - PS-PSP-X"}
+      - {id: 68, cat: Console/Wii, desc: "Jeux - Wii - Wii-U"}
+      - {id: 69, cat: Console/Xbox, desc: "Jeux - XBOX"}
+      - {id: 35, cat: Audio/Audiobook, desc: "Livres - Audio-Book"}
+      - {id: 36, cat: Books, desc: "Livres - BD"}
+      - {id: 37, cat: Books/Magazines, desc: "Livres - Magazine"}
+      - {id: 38, cat: Books/Comics, desc: "Livres - MANGAS"}
+      - {id: 39, cat: Books, desc: "Livres - Presse"}
+      - {id: 40, cat: Books/Ebook, desc: "Livres - Roman"}
+      - {id: 70, cat: PC/Phone-Android, desc: "Logiciels - ANDROID"}
+      - {id: 71, cat: PC/Mac, desc: "Logiciels - APPLE"}
+      - {id: 72, cat: PC/Phone-IOS, desc: "Logiciels - IPHONE"}
+      - {id: 73, cat: PC, desc: "Logiciels - LINUX"}
+      - {id: 74, cat: PC/0day, desc: "Logiciels - WINDOWS"}
+      - {id: 75, cat: TV, desc: "Pack - 3D"}
+      - {id: 76, cat: TV/UHD, desc: "Pack - 4K Light"}
+      - {id: 77, cat: TV/UHD, desc: "Pack - 4KUHD"}
+      - {id: 78, cat: TV/HD, desc: "Pack - BDRIP-BRRIP"}
+      - {id: 79, cat: TV/HD, desc: "Pack - BluRay-R"}
+      - {id: 80, cat: TV/SD, desc: "Pack - DVD-R"}
+      - {id: 81, cat: TV/SD, desc: "Pack - DVDRIP"}
+      - {id: 82, cat: TV/HD, desc: "Pack - HD 1080P"}
+      - {id: 83, cat: TV/HD, desc: "Pack - HD 720p"}
+      - {id: 84, cat: TV/HD, desc: "Pack - HDRIP"}
+      - {id: 85, cat: TV/HD, desc: "Pack - HDTV"}
+      - {id: 86, cat: TV/HD, desc: "Pack - HDTV 1080p"}
+      - {id: 87, cat: TV/HD, desc: "Pack - HDTV 720p"}
+      - {id: 88, cat: TV/HD, desc: "Pack - MHD 1080p"}
+      - {id: 89, cat: TV/HD, desc: "Pack - MHD 720p"}
+      - {id: 90, cat: TV, desc: "Pack - REMUX"}
+      - {id: 91, cat: TV, desc: "Pack - TVRIP"}
+      - {id: 92, cat: TV/WEB-DL, desc: "Pack - WEB-DL"}
+      - {id: 93, cat: TV/WEB-DL, desc: "Pack - WEB-DL 1080p"}
+      - {id: 94, cat: TV/WEB-DL, desc: "Pack - WEB-DL 720p"}
+      - {id: 95, cat: TV/WEB-DL, desc: "Pack - WEBRIP"}
+      - {id: 97, cat: TV, desc: "Series - 3D"}
+      - {id: 98, cat: TV/UHD, desc: "Series - 4K Light"}
+      - {id: 99, cat: TV/UHD, desc: "Series - 4KUHD"}
+      - {id: 100, cat: TV/HD, desc: "Series - BDRIP-BRRIP"}
+      - {id: 101, cat: TV/HD, desc: "Series - BluRay-R"}
+      - {id: 102, cat: TV/SD, desc: "Series - DVD-R"}
+      - {id: 103, cat: TV/SD, desc: "Series - DVDRIP"}
+      - {id: 104, cat: TV/HD, desc: "Series - HD 1080P"}
+      - {id: 105, cat: TV/HD, desc: "Series - HD 720p"}
+      - {id: 106, cat: TV/HD, desc: "Series - HDRIP"}
+      - {id: 107, cat: TV/HD, desc: "Series - HDTV"}
+      - {id: 108, cat: TV/HD, desc: "Series - HDTV 1080p"}
+      - {id: 109, cat: TV/HD, desc: "Series - HDTV 720p"}
+      - {id: 110, cat: TV/HD, desc: "Series - MHD 1080p"}
+      - {id: 111, cat: TV/HD, desc: "Series - MHD 720p"}
+      - {id: 112, cat: TV, desc: "Series - REMUX"}
+      - {id: 113, cat: TV, desc: "Series - TVRIP"}
+      - {id: 114, cat: TV/WEB-DL, desc: "Series - WEB-DL"}
+      - {id: 115, cat: TV/WEB-DL, desc: "Series - WEB-DL 1080p"}
+      - {id: 116, cat: TV/WEB-DL, desc: "Series - WEB-DL 720p"}
+      - {id: 117, cat: TV/WEB-DL, desc: "Series - WEBRIP"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: TTV3/Connexion
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: font[color="red"]
+    test:
+      path: TTV3/Bienvenue
+      selector: a[href$="/TTV3/Deconnexion"]
+
+  search:
+    paths:
+    # https://lechaudron.nl/TTV3/Torrents/Recherche?recherche=viva+maria&type=exacte&endroit=nomtorrent&langue=0&tl=peuimporte
+    # categories for searching are unsupported
+      - path: TTV3/Torrents/Recherche
+    inputs:
+      recherche: "{{ .Keywords }}"
+      # searchtype un (one word) tout (all words) exacte (exact expression)
+      type: "tout"
+      # searchin  nomtorrent (name) or desctorrent (descr)
+      endroit: "nomtorrent"
+      # language 0 all 2 english 
+      langue: 0
+      # freeleech oui (yes) non (no) peuimporte (ignore)
+      tl: "peuimporte"
+
+    rows:
+      selector: tr.t-row
+    fields:
+      category:
+        selector: a[href*="/SousCategories/"]
+        attribute: href
+        filters:        
+          - name: regexp
+            args: (\d+)$
+      title:
+        selector: a[onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "<b>(.*?)</b>"
+      details:
+        selector: a[onmouseover]
+        attribute: href
+      download:
+        selector: a[href*="/Telechargement/"]
+        attribute: href
+      date:
+        selector: a[onmouseover] font[color="#F2F2F2"]
+        filters:
+          - name: regexp
+            args: "Il y a (.*?)\\s-" 
+          - name: replace
+            args: ["heures", "hours"]
+          - name: replace
+            args: ["heure", "hour"]
+          - name: replace
+            args: ["Jours", "days"]
+          - name: replace
+            args: ["Jour", "day"]
+          - name: replace
+            args: ["Semaines", "weeks"]
+          - name: replace
+            args: ["Semaine", "week"]
+          - name: replace
+            args: ["Mois", "months"]
+          - name: replace
+            args: ["Ans", "years"]
+          - name: replace
+            args: ["An", "year"]
+          - name: append
+            args: " ago"
+      banner:
+        selector: a[onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src= (.*?)><"
+      size:
+        selector: td:nth-last-child(5)
+      grabs:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          img[src$="/images/Torrents/freeleech.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+# TT3.00 FRENCH
--- a/src/Jackett.Common/Definitions/leporno.yml
+++ b/src/Jackett.Common/Definitions/leporno.yml
@@ -0,0 +1,66 @@
+---
+  site: leporno
+  name: LePorno
+  description: "LePorno is a Public Tracker for 3X"
+  language: en
+  type: public
+  encoding: UTF-8
+  links:
+    - http://leporno.org/
+
+  settings: []
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  download:
+    selector: a[href*="/dl.php?id="]
+
+  search:
+    paths:
+      - path: tracker.php#results
+        method: post
+    inputs:
+      "f[]": -1
+      o: 1
+      s: 2
+      tm: -1
+      sns: -1
+      srg: -1
+      df: 1
+      da: 1
+      pn: ""
+      nm: "{{ .Keywords }}"
+      allw: 1
+      submit: "Search"
+    rows:
+      selector: table#tor-tbl tr[id^="tor_"]
+    fields:
+      title:
+        selector: a[href^="./viewtopic.php?t="]
+      details:
+        selector: a[href^="./viewtopic.php?t="]
+        attribute: href
+      download:
+        selector: a[href^="./viewtopic.php?t="]
+        attribute: href
+      category:
+        text: 1
+      size:
+        selector: td:nth-child(6) u
+      date:
+        selector: td:nth-child(10) u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      downloadvolumefactor:
+          text: 0
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/libranet.yml
+++ b/src/Jackett.Common/Definitions/libranet.yml
@@ -0,0 +1,107 @@
+---
+  site: libranet
+  name: LibraNet
+  description: "LibraNet (LN) is a HUNGARIAN Private Torrent Tracker for EBOOKS / LOSSLESS MUSIC"
+  language: hu
+  type: private
+  encoding: ISO-8859-2
+  links:
+    - https://libranet.org/
+
+  caps:
+    categorymappings:
+      - {id: 50, cat: Movies, desc: "Film"}
+      - {id: 51, cat: Movies, desc: "Film/Hun"}
+      - {id: 3, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+      - {id: 4, cat: Audio/Audiobook, desc: "Hangoskönyv/Hun"}
+      - {id: 1, cat: Books/Ebook, desc: "Könyv"}
+      - {id: 2, cat: Books/Ebook, desc: "Könyv/Hun"}
+      - {id: 56, cat: Audio/Lossless, desc: "LossLess"}
+      - {id: 57, cat: Audio/Lossless, desc: "LossLess/Hun"}
+      - {id: 48, cat: Books/Magazines, desc: "Magazin"}
+      - {id: 49, cat: Books/Magazines, desc: "Magazin/Hun"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.text:contains("Error")
+        message:
+          selector: td.text
+    test:
+      path: /
+      selector: a[href="/logout.php"]
+
+  search:
+    paths:
+    # http://libranet.org/browse.php?cat56=1&cat57=1&search=&searchwhere=&subcat=&musicstyle=&format=
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{.Keywords}}"
+      searchwhere: ""
+      subcat: ""
+      musicstyle: ""
+      format: ""
+
+    rows:
+      selector: table.rounded 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="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details", "download"]
+          - name: replace
+            args: ["&hit=1", ""]
+      description:
+        selector: img[width="60"]   
+        attribute: title
+      banner:
+        selector: a[onmouseover]  
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) width"
+      date:
+        selector: td:nth-last-child(7)
+        filters:
+          - name: dateparse
+            args: "2006-01-0215:04:05"
+      size:
+        selector: td:nth-last-child(6)
+      grabs:
+        selector: td:nth-last-child(5)
+        filters:
+          - name: regexp
+            args: "(\\d+) x"
+      seeders:
+        selector: td:nth-last-child(4)
+      leechers:
+        selector: td:nth-last-child(3)
+      downloadvolumefactor:
+        case:
+          img[src$="/pic/freeleech.gif"]: 0
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/limetorrents.yml
+++ b/src/Jackett.Common/Definitions/limetorrents.yml
@@ -41,7 +41,7 @@

  search:
    paths:
-      - path: "{{if .Keywords}}search/all/{{ .Keywords}}/{{else}}/index.php?page=latest100{{end}}"
+      - path: "{{if .Keywords}}search/all/{{ .Keywords}}/date/1/{{else}}/index.php?page=latest100{{end}}"
    keywordsfilters:
      - name: re_replace
        args: ["S[0-9]{2}([^E]|$)", ""] #remove season tag without episode
--- a/src/Jackett.Common/Definitions/mactorrents.yml
+++ b/src/Jackett.Common/Definitions/mactorrents.yml
@@ -6,7 +6,10 @@
  type: public
  encoding: UTF-8
  links:
+    - https://mac-torrents.io/
+  legacylinks:
    - https://mac-torrents.com/
+    - https://www.mac-torrents.com/

  caps:
    categories:
@@ -29,11 +32,11 @@
      title:
        selector: div.blog-content h3 a
      category:
-        selector: a[href*="/category/"]
+        selector: a[href*="/mac-os-"]
        attribute: href
        filters:
          - name: split
-            args: ["/", 4]
+            args: ["/", 3]
      details:
        selector: div.blog-content h3 a
        attribute: href
@@ -44,7 +47,7 @@
        selector: div.blog-media p a img
        attribute: data-src
      date:
-        selector: div.blog-content div.entry-meta time
+        selector: time
        attribute: datetime
        filters:
          - name: replace
--- a/src/Jackett.Common/Definitions/magnetdl.yml
+++ b/src/Jackett.Common/Definitions/magnetdl.yml
@@ -39,33 +39,34 @@
    paths:
      # return movie results if there are no search parms supplied (for use with the TEST button)
      # http://www.magnetdl.com/m/midnight-texas-s01e10/
-      # using "invalid-cat" in the default case (empty keywords) causes no category limitation
-      - path: "{{if .Keywords}}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/invalid-cat/{{end}}"     
+      - path: "{{if .Keywords}}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}"     
    rows:
-      selector: tr:has(td[class="m"])
+      selector: tr:has(td.m)
    fields:
      title:
-        selector: td[class="n"] a
+        selector: td.n a
        attribute: title
      category:
        optional: true
        selector:  td[class^="t"]
      details:
-        selector: td[class="n"] a
+        selector: td.n a
        attribute: href
      magnet:
-        selector: td[class="m"] a
+        selector: td.m a
        attribute: href
      date:
        selector: td:nth-child(3)
        filters:
          - name: timeago
+      files:
+        selector: td:nth-child(5)
      size:
        selector: td:nth-child(6)
      seeders:
-        selector: td[class="s"]
-      files:
-        selector: td[class="l"]
+        selector: td.s
+      leechers:
+        selector: td.l
      downloadvolumefactor:
        text: "0"
      uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/manicomioshare.yml
+++ b/src/Jackett.Common/Definitions/manicomioshare.yml
@@ -1,287 +0,0 @@
---
-  site: manicomioshare
-  name: Manicomio Share
-  description: "Manicomio Share is a Brazilian Private site for TV / MOVIES / GENERAL"
-  language: pt-br
-  type: private
-  encoding: iso-8859-1
-  links:
-    - https://www.manicomio-share.com/
-
-  caps:
-    categorymappings:
-      #XXX
-      - {id: 80, cat: XXX, desc: "Adulto: [XXX] - Filmes"}
-      - {id: 157, cat: XXX, desc: "Adulto: [XXX] - Blu-Ray"}
-      - {id: 159, cat: XXX, desc: "Adulto: [XXX] - DVD-R"}
-      - {id: 160, cat: XXX, desc: "Adulto: [XXX] - DVD-R 9"}
-      - {id: 161, cat: XXX, desc: "Adulto: [XXX] - Eróticos"}
-      - {id: 162, cat: XXX, desc: "Adulto: [XXX] - HD"}
-      - {id: 188, cat: XXX, desc: "Adulto: [XXX] - 4K"}
-      - {id: 112, cat: XXX/Other, desc: "Adulto: [XXX] - Fotos"}
-      - {id: 113, cat: XXX/Other, desc: "Adulto: [XXX] - Hentai"}
-      - {id: 131, cat: XXX/Other, desc: "Adulto: [XXX] - Jogos"}
-      
-      #ANIME
-      - {id: 21, cat: TV/Anime, desc: "Anime: Anime"}
-      - {id: 155, cat: TV/Anime, desc: "Anime: Anime DVD-R"}
-      - {id: 156, cat: TV/Anime, desc: "Anime: Anime HD"}
-      
-      #PC APPS
-      - {id: 22, cat: PC, desc: "Aplicativos: Linux"}
-      - {id: 23, cat: PC, desc: "Aplicativos: Mac OS"}
-      - {id: 24, cat: PC, desc: "Aplicativos: Windows"}
-      
-      #BOOKLET
-      - {id: 25, cat: Other, desc: "Apostila: Apostila e Textos"}
-      - {id: 169, cat: Other, desc: "Apostila: Cursos e Video Aula"}
-      
-      #MOBILE
-      - {id: 26, cat: Other, desc: "Celular: Aplicativos"}
-      - {id: 184, cat: Other, desc: "Celular: Jogos"}
-      
-      #TV-CHILD
-      - {id: 88, cat: TV/Other, desc: "Desenhos: Desenhos"}
-      - {id: 165, cat: TV/Other, desc: "Desenhos: Desenhos DVD-R"}
-      - {id: 166, cat: TV/Other, desc: "Desenhos: Desenhos HD"}
-      - {id: 83, cat: TV/Other, desc: "Diversos: Diversos"}
-      - {id: 84, cat: TV/Other, desc: "Educativos: Infantil"}
-      
-      #TV-SPORTS
-      - {id: 105, cat: TV/Sport, desc: "Eventos: Esportivos"}
-      - {id: 153, cat: TV/Sport, desc: "Eventos: Esportivos DVD-R"}
-      - {id: 154, cat: TV/Sport, desc: "Eventos: Esportivos HD"}
-      
-      #MOVIES
-      - {id: 189, cat: Movies, desc: "Filmes: 4K"}
-      - {id: 132, cat: Movies/BluRay, desc: "Filmes: Blu-Ray"}
-      - {id: 152, cat: Movies/BluRay, desc: "Filmes: Blu-Ray Nacionais"}
-      - {id: 141, cat: Movies/BluRay, desc: "Filmes: Blu-Ray 3D"}
-      - {id: 142, cat: Movies/BluRay, desc: "Filmes: Blu-Ray BD25"}
-      - {id: 182, cat: Movies/BluRay, desc: "Filmes: Blu-Ray BD25 Nacionais"}
-      - {id: 183, cat: Movies/BluRay, desc: "Filmes: Blu-Ray BD25 3D"}
-      - {id: 143, cat: Movies/BluRay, desc: "Filmes: Blu-Ray Remux"}
-      - {id: 34, cat: Movies/SD, desc: "Filmes: DVD-R"}
-      - {id: 134, cat: Movies/SD, desc: "Filmes: DVD-R Nacionais"}
-      - {id: 144, cat: Movies/SD, desc: "Filmes: DVD-R 9"}
-      - {id: 145, cat: Movies/Other, desc: "Filmes: Documentarios DVD-R"}
-      - {id: 151, cat: Movies/Other, desc: "Filmes: Documentarios HD"}
-      - {id: 127, cat: Movies/HD, desc: "Filmes: HD"}
-      - {id: 148, cat: Movies/Foreign, desc: "Filmes: HD Nacionais"}
-      - {id: 147, cat: Movies/3D, desc: "Filmes: HD 3D"}
-      - {id: 128, cat: Movies/Foreign, desc: "Filmes: Nacionais"}
-      - {id: 27, cat: Movies, desc: "Filmes: Ação"}
-      - {id: 95, cat: Movies, desc: "Filmes: Animação"}
-      - {id: 28, cat: Movies, desc: "Filmes: Aventura"}
-      - {id: 29, cat: Movies, desc: "Filmes: Biografia"}
-      - {id: 30, cat: Movies, desc: "Filmes: Classicos"}
-      - {id: 31, cat: Movies, desc: "Filmes: Comédia"}
-      - {id: 32, cat: Movies, desc: "Filmes: Documentarios"}
-      - {id: 33, cat: Movies, desc: "Filmes: Drama"}
-      - {id: 35, cat: Movies, desc: "Filmes: Esportes"}
-      - {id: 185, cat: Movies, desc: "Filmes: Fantasia"}
-      - {id: 36, cat: Movies, desc: "Filmes: Ficção"}
-      - {id: 85, cat: Movies, desc: "Filmes: Guerra"}
-      - {id: 37, cat: Movies, desc: "Filmes: Infantil"}
-      - {id: 118, cat: Movies, desc: "Filmes: Musicais"}
-      - {id: 104, cat: Movies, desc: "Filmes: Policial"}
-      - {id: 40, cat: Movies, desc: "Filmes: Suspense"}
-      - {id: 38, cat: Movies, desc: "Filmes: Religiosos"}
-      - {id: 39, cat: Movies, desc: "Filmes: Romance"}
-      - {id: 41, cat: Movies, desc: "Filmes: Terror"}
-      - {id: 107, cat: Movies, desc: "Filmes: Western"}
-      
-      #GAMES
-      - {id: 97, cat: Console, desc: "Jogos: Dreamcast"}
-      - {id: 44, cat: PC/Games, desc: "Jogos: Emuladores e Rom"}
-      - {id: 101, cat: Console, desc: "Jogos: Game Cube"}
-      - {id: 140, cat: PC/Mac, desc: "Jogos: Mac OS"}
-      - {id: 119, cat: Console/NDS, desc: "Jogos: Nintendo DS"}
-      - {id: 45, cat: PC/Games, desc: "Jogos: Pc"}
-      - {id: 87, cat: Console, desc: "Jogos: PS1"}
-      - {id: 46, cat: Console, desc: "Jogos: PS2"}
-      - {id: 120, cat: Console, desc: "Jogos: PS3"}
-      - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"}
-      - {id: 191, cat: Console, desc: "Jogos: PSVita"}
-      - {id: 47, cat: Console/XBox, desc: "Jogos: Xbox"}
-      - {id: 48, cat: Console/XBox 360, desc: "Jogos: Xbox 360"}
-      - {id: 100, cat: Console/Wii, desc: "Jogos: Wii"}
-      - {id: 187, cat: Console/Wii, desc: "Jogos: Wii-U"}
-      
-      #EBOOKS
-      - {id: 49, cat: Books/EBook, desc: "Livros: E-books"}
-      
-      #MUSIC
-      - {id: 50, cat: Audio, desc: "Músicas: Axé"}
-      - {id: 51, cat: Audio, desc: "Músicas: Blues"}
-      - {id: 52, cat: Audio, desc: "Músicas: Classica"}
-      - {id: 53, cat: Audio, desc: "Músicas: Coletânea"}
-      - {id: 103, cat: Audio, desc: "Músicas: Country"}
-      - {id: 102, cat: Audio, desc: "Músicas: Discografia"}
-      - {id: 54, cat: Audio, desc: "Músicas: Dance"}
-      - {id: 55, cat: Audio, desc: "Músicas: Eletronica"}
-      - {id: 135, cat: Audio, desc: "Músicas: Enka e Japonesa"}
-      - {id: 56, cat: Audio, desc: "Músicas: Forró"}
-      - {id: 57, cat: Audio, desc: "Músicas: Funk"}
-      - {id: 58, cat: Audio, desc: "Músicas: Gospel"}
-      - {id: 117, cat: Audio, desc: "Músicas: Hard Core"}
-      - {id: 59, cat: Audio, desc: "Músicas: Hard Rock"}
-      - {id: 61, cat: Audio, desc: "Músicas: Hip Hop"}
-      - {id: 90, cat: Audio, desc: "Músicas: House"}
-      - {id: 62, cat: Audio, desc: "Músicas: Infantil"}
-      - {id: 175, cat: Audio, desc: "Músicas: Instrumental"}
-      - {id: 86, cat: Audio, desc: "Músicas: Jazz"}
-      - {id: 60, cat: Audio, desc: "Músicas: Metal"}
-      - {id: 63, cat: Audio, desc: "Músicas: MPB"}
-      - {id: 64, cat: Audio, desc: "Músicas: New Age"}
-      - {id: 94, cat: Audio, desc: "Músicas: Oldies"}
-      - {id: 65, cat: Audio, desc: "Músicas: Pagode"}
-      - {id: 66, cat: Audio, desc: "Músicas: Pop"}
-      - {id: 109, cat: Audio, desc: "Músicas: Psychedelic"}
-      - {id: 67, cat: Audio, desc: "Músicas: Punk Rock"}
-      - {id: 89, cat: Audio, desc: "Músicas: Raízes"}
-      - {id: 68, cat: Audio, desc: "Músicas: Rap"}
-      - {id: 69, cat: Audio, desc: "Músicas: Reggae"}
-      - {id: 70, cat: Audio, desc: "Músicas: Regionais"}
-      - {id: 71, cat: Audio, desc: "Músicas: Religiosas"}
-      - {id: 72, cat: Audio, desc: "Músicas: Rock"}
-      - {id: 73, cat: Audio, desc: "Músicas: Samba"}
-      - {id: 74, cat: Audio, desc: "Músicas: Sertanejo"}
-      - {id: 98, cat: Audio, desc: "Músicas: Soul R&amp;B"}
-      - {id: 110, cat: Audio, desc: "Músicas: Surf Music"}
-      - {id: 92, cat: Audio, desc: "Músicas: Techno"}
-      - {id: 91, cat: Audio, desc: "Músicas: Trance"}
-      - {id: 75, cat: Audio, desc: "Músicas: Trilha Sonora"}
-      - {id: 93, cat: Audio, desc: "Músicas: Vocal"}
-      - {id: 111, cat: Audio, desc: "Músicas: World Music"}
-      
-      #TV-FOREIGN
-      - {id: 170, cat: TV/Foreign, desc: "Novelas: Novela"}
-      - {id: 171, cat: TV/Foreign, desc: "Novelas: Novela DVD-R"}
-      - {id: 172, cat: TV/Foreign, desc: "Novelas: Novela HD"}
-      - {id: 179, cat: TV/Other, desc: "Religião: Religião Diversos"}
-      - {id: 178, cat: TV/Other, desc: "Religião: Religião DVD-R"}
-      
-      #BOOKS
-      - {id: 96, cat: Books, desc: "Revistas: Revistas"}
-      - {id: 99, cat: Books/Comics, desc: "Revistas: HQ"}
-      - {id: 192, cat: Books/Comics, desc: "Revistas: Mangá"}
-      
-      #TV-SERIES
-      - {id: 76, cat: TV, desc: "Séries: Seriados"}
-      - {id: 122, cat: TV/HD, desc: "Séries: HD"}
-      - {id: 190, cat: TV, desc: "Séries: 4K"}
-      - {id: 186, cat: TV, desc: "Séries: Blu-Ray"}
-      - {id: 124, cat: TV/SD, desc: "Séries: DVD-R"}
-      - {id: 181, cat: TV/SD, desc: "Séries: DVD-R 9"}
-      - {id: 125, cat: TV/SD, desc: "Séries: DVDRip"}
-      - {id: 123, cat: TV/Other, desc: "Séries: Cartoon"}
-      - {id: 164, cat: TV/Other, desc: "Séries: Cartoon DVD-R"}
-      - {id: 163, cat: TV/Other, desc: "Séries: Cartoon HD"}
-      
-      #MUSIC SHOWS
-      - {id: 77, cat: Audio/Video, desc: "Shows: Shows"}
-      - {id: 133, cat: Audio/Video, desc: "Shows: Shows Blu-Ray"}
-      - {id: 130, cat: Audio/Video, desc: "Shows: Shows DVD-R"}
-      - {id: 180, cat: Audio/Video, desc: "Shows: Shows DVD-R 9"}
-      - {id: 129, cat: Audio/Video, desc: "Shows: Shows HD"}
-      
-      #TV-OTHER
-      - {id: 78, cat: TV, desc: "Televisão: Televisão"}
-      - {id: 136, cat: TV, desc: "Televisão: Televisão HDTV"}
-      - {id: 137, cat: TV, desc: "Televisão: Televisão HD"}
-      - {id: 139, cat: TV, desc: "Televisão: Televisão SDTV"}
-      
-      #MUSIC CLIPS
-      - {id: 79, cat: Audio/Video, desc: "Video: Video Clipes"}
-      - {id: 167, cat: Audio/Video, desc: "Video: Video Clipes DVD-R"}
-      - {id: 168, cat: Audio/Video, desc: "Video: Video Clipes HD"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: index.php
-    method: post
-    inputs:
-      dados: "ok"
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    test:
-      path: torrents.php
-      selector: div:has(a[href*="deslogar.php"])
-
-  search:
-    paths:
-      - path: pesquisa.php
-    keywordsfilters: 
-      # workaroud to remove year in search keywords
-      - name: re_replace
-        args: ["([1-2]\\d{3})", ""]    
-      - name: replace
-        args: ["Agents of SHIELD", "Agents of S.H.I.E.L.D."]
-      - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "%"]
-    inputs:
-      busca: "{{ .Keywords }}"
-    rows:
-      selector: table#tbltorrent > tbody > tr[data-id]
-    fields:
-      download:
-        selector: a[href*="/download.php?id="]
-        attribute: href
-      details:
-        selector: a[href*="/item/"]
-        attribute: href
-      category:
-        selector: a[href*="/torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      title:
-        selector: a[href*="/item/"]
-        remove: font[color^=green]
-        filters:
-          - name: replace
-            args: ["|", ""]
-          - name: replace
-            args: ["Ep. ","E"]
-          - name: re_replace
-            args: ["(\\d{2})[ºª°] Temporada( Completa)?", "S$1"]
-          - name: re_replace
-            args: ["(\\d{1})[ºª°] Temporada( Completa)?", "S0$1"]
-          # Workaround to add year to series that is an remake, since the year returned from the tracker isn't reliable, feel free to add more as needed.
-          - name: re_replace
-            args: ["^Doctor Who", "Doctor Who 2005"]
-          - name: re_replace
-            args: ["^Extinct", "Extinct 2017"]
-          - name: re_replace
-            args: ["^The Flash", "The Flash 2014"]
-          - name: replace
-            args: ["Nanatsu no Taizai - Imashime no Fukkatsu - E", "Nanatsu no Taizai - Imashime no Fukkatsu - S02E"]
-          - name: re_replace
-            args: ["^The Magicians", "The Magicians 2015"]
-          # Workaround to remove the translated name from the series, didn't found an better and reliable way to do this, feel free to add more as needed.
-          - name: replace
-            args: ["O Sócio - The Profit", "The Profit"]
-          - name: replace
-            args: ["Arquivo X - The X Files", "The X Files"]
-          - name: replace
-            args: ["Deuses Americanos - American Gods", "American Gods"]
-          
-      size:
-        selector: td:nth-child(4)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(5) > span:nth-child(1)
-      leechers:
-        selector: td:nth-child(5) > span:nth-child(2)
-      downloadvolumefactor:
-        case:
-          "span.h3t:contains(\"[livre]\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
--- a/src/Jackett.Common/Definitions/mkvcage.yml
+++ b/src/Jackett.Common/Definitions/mkvcage.yml
@@ -0,0 +1,79 @@
+---
+  site: mkvcage
+  name: MkvCage
+  description: "MkvCage is a Public torrent site for MOVIES / TV"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.mkvcage.com/
+
+  legacylinks:
+    - https://www.mkvcage.ws/
+    - https://mkvcage.com/
+
+  caps:
+    categories:
+      1: Movies
+      2: TV
+      3: Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="magnet:?"]
+  
+  search:
+    paths:
+    # 6 hits per page!?!?!
+      - path: "{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
+      - path: "page/2/{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
+      - path: "page/3/{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
+      - path: "page/4/{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
+      - path: "page/5/{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
+    rows:
+      selector: article
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: h2 a
+      category:
+        selector: span.cat-links
+        attribute: class
+        case:
+          a[href*="/category/movies/"]: "1"
+          a[href*="/category/tv-shows/"]: "2"
+          "*": "3"
+      details:
+        selector: h2 a
+        attribute: href
+      download:
+        selector: h2 a
+        attribute: href
+      description:
+        selector: pre
+      banner:
+        selector: div img
+        attribute: src
+      date:
+        selector: span.posted-on a time
+        attribute: datetime
+      size:
+        selector: h2 a
+        filters:
+          - name: re_replace
+            args: ["(.*?)(\\d+)\\.?\\d?([T|G|M|K]B)$", "$2 $3"]
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/movcr.yml
+++ b/src/Jackett.Common/Definitions/movcr.yml
@@ -0,0 +1,69 @@
+---
+  site: movcr
+  name: MovCr
+  description: "MovCr is an Indian Public torrent site"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://movcr.tv/
+
+  caps:
+    categories:
+      "other": Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/torrents/"]
+
+  search:
+    paths:
+      - path: "{{if .Keywords}}search/search.php?q={{ .Keywords}}{{else}}/{{end}}"
+    rows:
+      selector: tr:has(td.name a[href^="/download-"])
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        text: other
+      title:
+        selector: td.name a:nth-child(2)
+      details:
+        selector: td.name a
+        attribute: href
+      download:
+        selector: td.name a
+        attribute: href
+      date:
+        selector: td.seeds:contains("-")
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      date:
+        selector: td.seeds:not(:contains("-"))
+        optional: true
+        filters:
+          - name: timeago
+      size:
+        selector: td.leeches
+      seeders:
+        selector: td:nth-child(2)
+        filters:
+          - name: split
+            args: ["/", 0]
+      leechers:
+        selector: td:nth-child(2)
+        filters:
+          - name: split
+            args: ["/", 1]
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/mteamtp.yml
+++ b/src/Jackett.Common/Definitions/mteamtp.yml
@@ -6,6 +6,8 @@
  type: private
  encoding: UTF-8
  links:
+    - https://pt.m-team.cc/
+  legacylinks:
    - https://tp.m-team.cc/

  caps:
--- a/src/Jackett.Common/Definitions/music-master.yml
+++ b/src/Jackett.Common/Definitions/music-master.yml
@@ -0,0 +1,83 @@
+---
+  site: music-master
+  name: Music-Master
+  description: "Music-Master is a ROMANIAN Private Torrent Tracker for MUSIC"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://music-master.ro/
+
+  caps:
+    categories:
+      Music: Audio
+
+    modes:
+      search: [q]
+      music-search: [q, album, artist, label, year]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.text:contains("Error")
+        message:
+          selector: td.text
+    test:
+      path: my.php
+      selector: a[href="logout.php"]
+  
+  search:
+    paths:
+      - path: browse.php
+        method: get
+    inputs:
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+    rows:
+      selector: table.browser tr:has(a[href^="details.php?id="])
+    fields:
+      category:
+        text: "Music"
+      title:
+        selector: td a[href^="details.php?id="]
+      details:
+        selector: td a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: td a[href^="dwn.php?id="]
+        attribute: href
+      banner:
+        optional: true
+        selector: td a[href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?) width"
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: dateparse
+            args: "02-01-200615:04:05"
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+        filters:
+          - name: regexp
+            args: "([\\d]+)time"
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor: 
+        case:
+          img[src="pic/freedownload.png"]: "0" 
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/nbtorrents.yml
+++ b/src/Jackett.Common/Definitions/nbtorrents.yml
@@ -0,0 +1,121 @@
+---
+  site: nbtorrents
+  name: NBTorrents
+  description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.nbtorrents.com/
+
+  caps:
+    categorymappings:
+      - {id: 22, cat: TV/Anime, desc: "Anime"}
+      - {id: 26, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 1, cat: Movies/UHD, desc: "Movies UHD & BluRay"}
+      - {id: 3, cat: Movies/BluRay, desc: "Movies BDRips"}
+      - {id: 6, cat: Movies/DVD, desc: "Movies DVD"}
+      - {id: 7, cat: Movies/DVD, desc: "Movies DVDRip"}
+      - {id: 8, cat: Movies, desc: "Movies Pre"}
+      - {id: 2, cat: Movies, desc: "Movies Remux"}
+      - {id: 4, cat: Movies/WEBDL, desc: "Movies Web"}
+      - {id: 5, cat: Movies/WEBDL, desc: "Movies WebRip"}
+      - {id: 15, cat: Audio/Lossless, desc: "Music FLAC"}
+      - {id: 17, cat: Audio/MP3, desc: "Music MP3"}
+      - {id: 18, cat: Audio, desc: "Music Pack"}
+      - {id: 20, cat: Audio, desc: "Music Podcast"}
+      - {id: 19, cat: Audio/Video, desc: "Music Video"}
+      - {id: 16, cat: Audio, desc: "Music Web"}
+      - {id: 25, cat: TV/Sport, desc: "Sports"}
+      - {id: 10, cat: TV/UHD, desc: "TV UHD & BluRay"}
+      - {id: 11, cat: TV, desc: "TV BDRips"}
+      - {id: 14, cat: TV, desc: "TV packs"}
+      - {id: 12, cat: TV/WEB-DL, desc: "TV Web"}
+      - {id: 13, cat: TV/WEB-DL, desc: "TV WebRips"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      submitme: "X"
+    error:
+      - selector: td.colhead:contains("failed")
+        message:
+          selector: table tr td.text
+    test:
+      path: browse.php
+      selector: a[href*="logout.php?hash_insert="]
+
+  search:
+    paths:
+      - path: browse.php      
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      searchin: "title"
+      incldead: 1
+      "only_free": 0
+
+    rows:
+      selector: table.mainouter tr table tr:has(a[href^="download.php?torrent="])
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: td a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: td a[href^="details.php?id="]
+      details:
+        selector: td a[href^="details.php?id="]
+        attribute: href
+      banner:
+        selector: td a[href^="details.php?id="]
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=\\\\\'(.*?)\\\\\' "
+      download:
+        selector: td a[href^="download.php?torrent="]
+        attribute: href
+      imdb:
+        selector: td a[href*="www.imdb.com/title/tt"]
+        optional: true
+        attribute: href
+      files:
+        selector: td:nth-of-type(5)
+      date:
+        selector: td:nth-of-type(7)
+        filters:
+          - name: dateparse
+            args: "Jan 2 2006 03:04 PM"
+      size:
+        selector: td:nth-of-type(8)
+      grabs:
+        selector: td:nth-of-type(9)
+        filters:
+          - name: regexp
+            args: "([\\d]+)"
+      seeders:
+        selector: td:nth-of-type(10)
+      leechers:
+        selector: td:nth-of-type(11)
+      downloadvolumefactor:
+        case:
+          "img[title=\"Free Torrent\"]": "0" # torrent specific free leech (icon)?
+          "a.info:contains(\"Free\")": "0" # global freeleech note?
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/nyaasi.yml
+++ b/src/Jackett.Common/Definitions/nyaasi.yml
@@ -7,7 +7,7 @@
  encoding: UTF-8
  links:
    - https://nyaa.si/
-    
+
  settings:
    - name: filter-id
      type: select
@@ -35,6 +35,14 @@
        3_1: "Literature - English-translated"
        3_2: "Literature - Non-English-translated"
        3_3: "Literature - Lossy"
+        4_0: "Live Action"
+        4_1: "Live Action - English"
+        4_2: "Live Action - Idol/PV"
+        4_3: "Live Action - Non-English"
+        4_4: "Live Action - Raw"
+        5_0: "Pictures"
+        5_1: "Pictures  - Graphics"
+        5_2: "Pictures  - Photos"
        6_0: "Software"
        6_1: "Software - Applications"
        6_2: "Software - Games"
--- a/src/Jackett.Common/Definitions/nyoo.yml
+++ b/src/Jackett.Common/Definitions/nyoo.yml
@@ -1,77 +0,0 @@
-# Config'd by Quatroking, 07-05-2017
---
-  site: nyoo
-  name: Nyoo
-  description: "Nyoo is a mirror for Nyaa-Pantsu, a Public site for Asian ANIME"
-  language: en-en
-  type: public
-  encoding: UTF-8
-  links:
-    - https://nyoo.moe/
-    
-  settings: []
-
-  caps:
-    categorymappings:
-      # Anime
-      - {id: 3_12, cat: TV/Anime, desc: "Anime music videos"}
-      - {id: 3_5,  cat: TV/Anime, desc: "English subtitled animes"}
-      - {id: 3_13, cat: TV/Anime, desc: "Non-english subtitled animes"}
-      - {id: 3_6,  cat: TV/Anime, desc: "Raw animes"}
-      # Audio
-      - {id: 2_3,  cat: Audio, desc: "Lossless audio"}
-      - {id: 2_4,  cat: Audio, desc: "Lossy audio"}
-      # Literature
-      - {id: 4_7,  cat: Books, desc: "Literature english translated"}
-      - {id: 4_14, cat: Books, desc: "Literature non-english translated"}
-      - {id: 4_8,  cat: Books, desc: "Raw literature"}
-      # Software
-      - {id: 1_1,  cat: PC/ISO, desc: "Applications"}
-      - {id: 1_2,  cat: PC/Games, desc: "Games"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-
-  search:
-    paths:
-      - path: search
-    inputs:
-      page: "search"
-      q: "{{ .Query.Keywords}}"
-    rows:
-      selector: tr.torrent-info
-    fields:
-      title:
-        selector: td.tr-name a
-      category:
-        selector: td.tr-cat div.nyaa-cat a
-        attribute: href
-        filters:
-          - name: split
-            args: [ "=", -1 ]
-      details:
-        selector: td.tr-name a
-        attribute: href
-      download:
-        selector: a[title="Magnet Link"]
-        attribute: href
-      size:
-        selector: td.tr-size
-     # seeders:
-     #   text: 0
-     # seeders:
-     #   selector: td.tlistsn
-     #   optional: true
-     # leechers:
-     #   text: 0
-     # leechers:
-     #   selector: td.tlistln
-     #   optional: true
-     # grabs:
-     #   selector: td.tlistdn
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
--- a/src/Jackett.Common/Definitions/oxtorrent.yml
+++ b/src/Jackett.Common/Definitions/oxtorrent.yml
@@ -0,0 +1,86 @@
+---
+  site: oxtorrent
+  name: OxTorrent
+  description: "OxTorrent is a French Public site for TV / MOVIES / GENERAL"
+  language: fr-fr
+  type: public
+  encoding: UTF-8
+  followredirect: true
+  links:
+    - https://wwv.oxtorrent.com/
+
+  caps:
+    categorymappings:
+      - {id: movies, cat: Movies, desc: "Movies"}
+      - {id: tvshows, cat: TV, desc: "TV Shows"}
+      - {id: softwares, cat: PC, desc: "Softwares"}
+      - {id: music, cat: Audio, desc: "Music"}
+      - {id: console-games, cat: Console, desc: "Console Games"}
+      - {id: pc-games, cat: PC/Games, desc: "PC Games"}
+      - {id: books, cat: Books, desc: "Books"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/download/"]
+
+  search:
+    paths:
+      - path: "{{if .Keywords}}recherche/{{.Keywords}}{{else}}{{end}}"
+    rows:
+      selector: div.listing-torrent > table > tbody > tr:has(a)
+    fields:
+      site_date:
+        selector: td:nth-child(1) a
+        filters:
+          # date is at the end of the title, so we get it and name it site_date
+          - name: regexp
+            args: "(\\w+)$"
+      title:
+        selector: td:nth-child(1) a
+        filters:
+          # now we put the date at the right place according scene naming rules using .Result.site_date
+          - name: replace
+            args: [" FRENCH", " {{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["MULTI", "{{ .Result.site_date }} MULTI"]
+          - name: replace
+            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
+          - name: replace
+            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"]
+          # and we delete it at the end
+          - name: re_replace
+            args: ["(\\w+)$", ""]
+      details:
+        selector: td:nth-child(1) a
+        attribute: href
+      download:
+        selector: td:nth-child(1) a
+        attribute: href
+      size:
+        selector: td:nth-child(2)
+      seeders:
+        selector: td:nth-child(3)
+      leechers:
+        selector: td:nth-child(4)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
+      category:
+        selector: td:nth-child(1) div i
+        case:
+          .Films: "movies"
+          .Séries: "tvshows"
+          .Logiciels: "softwares"
+          .Musique: "music"
+          .Jeux-Consoles: "console-games"
+          .Jeux-PC: "pc-games"
+          .Ebook: "books"
+      date:
+        text: "now"
--- a/src/Jackett.Common/Definitions/pleasuredome.yml
+++ b/src/Jackett.Common/Definitions/pleasuredome.yml
@@ -92,12 +92,12 @@
      selector: table[width="100%"] > tbody tr:has(a[href^="download.php?id="])
    fields:
      title:
-        selector: td:nth-child(2) a
+        selector: a[href^="javascript:popdetails"]
        filters:
          - name: replace
            args: ["[FREE] ", ""]
      details:
-        selector: td:nth-child(2) a
+        selector: a[href^="javascript:popdetails"]
        attribute: href
        filters:
          - name: replace
@@ -105,29 +105,28 @@
          - name: replace
            args: [");'", ""]
      category:
-        selector: td:nth-child(1) a
+        selector: a[href^="torrents.php?category="]
        attribute: href
        filters:
          - name: querystring
            args: category
      download:
-        optional: true
-        selector: td:nth-child(4) a
+        selector: a[href^="download.php?id="]
        attribute: href
      date:
          # 19/01/2019
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(9)
        filters:
          - name: dateparse
            args: "02/01/2006"
      size:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(8)
      seeders:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(6)
      leechers:
-        selector: td:nth-child(9) a
+        selector: td:nth-last-child(5)
      grabs:
-        selector: td:nth-child(10)
+        selector: td:nth-last-child(4)
      downloadvolumefactor:
        case:
          "img[src=\"images/fdownload.gif\"]": "0"
--- a/src/Jackett.Common/Definitions/proaudiotorrents.yml
+++ b/src/Jackett.Common/Definitions/proaudiotorrents.yml
@@ -6,6 +6,8 @@
  type: private
  encoding: UTF-8
  links:
+    - https://proaudiotorrents.org/
+  legacylinks:
    - http://proaudiotorrents.org/

  caps:
@@ -36,21 +38,18 @@
    modes:
      search: [q]

-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<p>This site requires you to solve a ReCaptcha. It's no longer possible to solve the captcha in Jackett. Please enter the cookie for the site manually.</p><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>"
-        
  login:
-    method: cookie
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    submitpath: takelogin.php
    inputs:
-      cookie: "{{.Config.cookie}}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table tr td.text
    test:
-      path: index.php
+      path: my.php

  search:
    paths:
--- a/src/Jackett.Common/Definitions/pwtorrents.yml
+++ b/src/Jackett.Common/Definitions/pwtorrents.yml
@@ -32,6 +32,18 @@
    modes:
      search: [q]

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: seedbox
+      type: checkbox
+      label: "Use SeedBox Download Link"
+      default: false
+
  login:
    path: login.php
    method: form
@@ -72,30 +84,33 @@
            args: cat
      title:
        selector: a[href^="details.php?id="]
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
      details:
        selector: a[href^="details.php?id="]
        attribute: href
-      grabs:
-        selector: td:nth-child(6) a
-        filters:
-          - name: replace
-            args: ["times", ""]
-          - name: replace
-            args: ["time", ""]
-      size:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
+      download1:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      download2:
+        selector: a[href^="seeddownload.php?id="]
+        attribute: href
+      download:
+        text: "{{if .Config.seedbox}}{{ .Result.download2 }}{{else}}{{ .Result.download1 }}{{end}}"
      date:
        selector: td:nth-child(4)
        filters:
          - name: dateparse
            args: "2006-01-0215:04:05"
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
      downloadvolumefactor:
        case:
          "*": "1"
--- a/src/Jackett.Common/Definitions/r3vwtf.yml
+++ b/src/Jackett.Common/Definitions/r3vwtf.yml
@@ -0,0 +1,130 @@
+---
+  site: r3vwtf
+  name: R3V WTF!
+  description: "R3V WTF! is a Private site for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://r3vuk.wtf/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: PC, desc: "Apps"}
+      - {id: 39, cat: Other, desc: "AutoBoT"}
+      - {id: 36, cat: Movies/BluRay, desc: "Bluray"}
+      - {id: 34, cat: Audio/MP3, desc: "Carrow's MP3 Packs"}
+      - {id: 38, cat: Audio, desc: "DMC Music"}
+      - {id: 24, cat: Books/Ebook, desc: "EBOOK"}
+      - {id: 37, cat: Audio, desc: "Mastermix Music"}
+      - {id: 20, cat: Movies/DVD, desc: "Movies/Dvdr"}
+      - {id: 17, cat: Movies, desc: "Movies/Packs"}
+      - {id: 26, cat: Movies/HD, desc: "Movies/X264"}
+      - {id: 44, cat: Movies/HD, desc: "Movies/x265"}
+      - {id: 10, cat: Movies/SD, desc: "Movies/XviD"}
+      - {id: 46, cat: Movies/DVD, desc: "Multi DVD"}
+      - {id: 14, cat: Audio, desc: "Music"}
+      - {id: 40, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 22, cat: Audio/Lossless, desc: "Music/Flac"}
+      - {id: 51, cat: PC/Games, desc: "PC  GAMES"}
+      - {id: 52, cat: Other/Misc, desc: "ThE CoLLeCtiVe"}
+      - {id: 23, cat: TV, desc: "Tv/Packs"}
+      - {id: 16, cat: TV/HD, desc: "Tv/x264"}
+      - {id: 49, cat: TV/HD, desc: "Tv/X265"}
+      - {id: 15, cat: TV/SD, desc: "Tv/Xvid"}
+      - {id: 42, cat: Audio, desc: "VIP MUSIC"}
+      - {id: 50, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      submitme: "X"
+    error:
+      - selector: h2
+        message:
+          selector: table tr td.text
+    test:
+      path: index.php
+      selector: a[href*="logout.php?hash_please="]
+
+  search:
+    paths:
+    # https://r3vuk.wtf/browse.php?c1=1&c24=1&search=&searchin=title&incldead=0
+      - path: browse.php      
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # title descr genre all
+      searchin: "title"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 1 yes 0 no
+      "only_free": 0
+
+    rows:
+      selector: tr:has(a[href^="download.php?torrent="])
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      banner:
+        selector: a[href^="details.php?id="]
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=\\\\'(.+?)\\\\'"
+      files:
+        selector: td:nth-last-child(8)
+      date:
+      # Jul 4 2019 08:04 AM
+        selector: td:nth-last-child(6):not(:contains("day"))
+        optional: true
+        filters:
+          - name: dateparse
+            args: "Jan 2 2006 03:04 PM"
+      date:
+      # Today 02:40 PM
+      # Yesterday 09:10 AM
+        selector: td:nth-last-child(6):contains("day")
+        optional: true
+      size:
+        selector: td:nth-last-child(5)
+      grabs:
+        selector: td:nth-last-child(4)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          a.info:contains("Free"): 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          img[src="./pic/doubleseed.gif"]: 0
+          "*": 1
+# U-232v3
--- a/src/Jackett.Common/Definitions/racing4everyone.yml
+++ b/src/Jackett.Common/Definitions/racing4everyone.yml
@@ -41,6 +41,7 @@

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

  login:
    path: login
@@ -50,7 +51,9 @@
      password: "{{ .Config.password }}"
      remember: 1
    error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
      path: torrents
      selector: a[href$="/logout"]
@@ -67,10 +70,10 @@
      - path: filterTorrents
    inputs:
      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
      description: ""
      uploader: ""
-      imdb: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
      tmdb: ""
      sort: created_at
@@ -93,14 +96,21 @@
      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", ""]
      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\.]+)
@@ -135,7 +145,7 @@
          "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=\"Global Freeleech\"]": "0" # Global Freeleech
          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
          "*": "1"
--- a/src/Jackett.Common/Definitions/rockbox.yml
+++ b/src/Jackett.Common/Definitions/rockbox.yml
@@ -38,7 +38,7 @@
    inputs:
      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
    rows:
-      selector: body:nth-child(2) tbody tr td:nth-child(2) table.lista tbody tr:nth-child(2) table.lista tbody tr:has(a[href^="download.php?id="])
+      selector: table.lista[width="100%"] tbody tr:has(a[href^="download.php?id="])
    fields:
      title:
        selector: td a[href^="details.php?id="]
--- a/src/Jackett.Common/Definitions/sharingue.yml
+++ b/src/Jackett.Common/Definitions/sharingue.yml
@@ -1,19 +1,20 @@
 ---
-  site: sharingue
-  name: Sharingue
-  description: "Sharingue is a BRAZILIAN Private Tracker for TV / MOVIES / ANIME / MUSIC"
-  language: pt-br
+  site: rockethd
+  name: RocketHD
+  description: "RocketHD is a GERMAN Private Tracker for MOVIES / TV"
+  language: de-de
  type: private
  encoding: UTF-8
  links:
-    - https://www.sharingue.live/
+    - http://rocket-hd.me/
+  legacylinks:
+    - https://rocket-hd.me/

  caps:
    categorymappings:
-      - {id: 1, cat: Movies, desc: "Movies (Filmes)"}
-      - {id: 3, cat: Audio, desc: "Music (Músicas)"}
-      - {id: 4, cat: TV, desc: "TV (Séries)"}
-      - {id: 5, cat: TV/Anime, desc: "Anime (Animes)"}
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+      - {id: 3, cat: Movies, desc: "Collection"}

    modes:
      search: [q]
@@ -27,19 +28,17 @@
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
      remember: 1
-    selectorinputs:
-      _token:
-        selector: meta[name="csrf-token"]
-        attribute: content
    error:
-      - selector: form[action$="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
    test:
-      path: /
+      path: torrents
      selector: a[href$="/logout"]

  ratio:
-    path: /
-    selector: span:has(i.fa-sync-alt)
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
    filters:
      - name: regexp
        args: "Ratio : (\\d+)"
@@ -50,13 +49,14 @@
    inputs:
      $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
+      sort: "created_at"
+      direction: "desc"
      qty: 100
    rows:
      selector: table > tbody > tr
@@ -75,17 +75,28 @@
      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", ""]
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
      seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
      leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
      grabs:
-        selector: td:nth-child(6)
+        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:
@@ -114,12 +125,17 @@
            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global freeleech\"]": "0" # Global Freeleech
+          "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"
      uploadvolumefactor:
        case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "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
+# UNIT3D 1.9.3
--- a/src/Jackett.Common/Definitions/rptorrents.yml
+++ b/src/Jackett.Common/Definitions/rptorrents.yml
@@ -0,0 +1,103 @@
+---
+  site: rptorrents
+  name: RPTorrents
+  description: "RPTorrents is a Private tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://rptorrents.com/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: PC/Games, desc: "Games PC"}
+      - {id: 2, cat: PC/0day, desc: "Apps Windows"}
+      - {id: 3, cat: PC/Mac, desc: "Apps  Mac"}
+      - {id: 4, cat: PC, desc: "Apps Linux"}
+      - {id: 34, cat: PC/Phone-Other, desc: "Apps Mobile"}
+      - {id: 6, cat: TV/Anime, desc: "Movie Cartoons"}
+      - {id: 7, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
+      - {id: 32, cat: Movies/UHD, desc: "Movies 4k"}
+      - {id: 9, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 10, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 11, cat: Movies, desc: "Movies Pack"}
+      - {id: 12, cat: Movies/BluRay, desc: "Movies Bluray"}
+      - {id: 33, cat: Movies/BluRay, desc: "Movies  Bluray - Rips"}
+      - {id: 14, cat: TV/HD, desc: "TV HD"}
+      - {id: 15, cat: TV/WEB-DL, desc: "TV WEB-DL"}
+      - {id: 16, cat: TV/SD, desc: "TV SD"}
+      - {id: 17, cat: TV, desc: "TV Pack"}
+      - {id: 18, cat: TV/Documentary, desc: "TV Documentary"}
+      - {id: 19, cat: Audio/MP3, desc: "Music MP3"}
+      - {id: 20, cat: Audio/Lossless, desc: "Music Flac"}
+      - {id: 23, cat: Audio, desc: "Music Pack"}
+      - {id: 22, cat: Audio/Video, desc: "Music Video"}
+      - {id: 35, cat: PC/Games, desc: "Games Pack"}
+      - {id: 29, cat: XXX, desc: "Movie XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: "yes"
+    error:
+      - selector: div.myFrame-caption:contains("Access Denied")
+        message:
+          selector: div.myFrame-content
+    test:
+      path: torrents-search.php
+      selector: a[href="account-logout.php"]
+  search:
+    paths:
+      - path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 name & desc 1 name 2 desc 3 genre
+      incldesc: 1
+    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^="download.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: dateparse
+            args: "02.01.200615:04:05"
+      grabs:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          img[src="images/free.gif"]: "0"
+          img[src="images/t_extern.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="images/t_extern.png"]: "0"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/scenepalace.yml
+++ b/src/Jackett.Common/Definitions/scenepalace.yml
@@ -0,0 +1,105 @@
+---
+  site: scenepalace
+  name: ScenePalace
+  description: "ScenePalace (SP) is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://scenepalace.info/
+
+  caps:
+    categorymappings:
+      - {id: 14, cat: PC/0day, desc: "Apps"}
+      - {id: 12, cat: Books/Ebook, desc: "E-BOOKS"}
+      - {id: 7, cat: Console, desc: "Games/Console"}
+      - {id: 9, cat: Console/Other, desc: "Games/Handheld"}
+      - {id: 10, cat: PC/Mac, desc: "Games/Mac"}
+      - {id: 8, cat: PC/Games, desc: "Games/PC"}
+      - {id: 1, cat: Other/Misc, desc: "Misc"}
+      - {id: 2, cat: Movies, desc: "Movies"}
+      - {id: 16, cat: Movies/Foreign, desc: "Movies/Foriegn Non English"}
+      - {id: 18, cat: Movies, desc: "Movies/Pre - 2000"}
+      - {id: 4, cat: Audio, desc: "Music"}
+      - {id: 11, cat: TV, desc: "Packs"}
+      - {id: 17, cat: Movies, desc: "Rare"}
+      - {id: 15, cat: Other, desc: "Torrents needing modded"}
+      - {id: 5, cat: TV, desc: "TV"}
+      - {id: 6, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    submitpath: takelogin.php
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+      - selector: td.embedded:has(h2:contains("Error"))
+    test:
+      path: browse.php
+      selector: a[href^="./logout.php"]
+        
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+    rows:
+      selector: table[border="1"][cellpadding=5] > tbody > tr:has(a[href^="download.php?torrent="])
+    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^="download.php?torrent="]
+        attribute: href    
+      banner:
+        selector: a[href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=\\\'(.+?)\\\'"
+      files:
+        selector: td:nth-last-child(8)
+      date:
+        selector: td:nth-last-child(6)
+        filters:
+          - name: replace
+            args: ["<br />", ""]
+          - name: dateparse
+            args: "Jan 2 2006 03:04 PM"
+      size:
+        selector: td:nth-last-child(5)
+      grabs:
+        selector: td:nth-last-child(4)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          "img[src$=\"/free.jpg\"]": 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1
--- a/src/Jackett.Common/Definitions/seedfile.yml
+++ b/src/Jackett.Common/Definitions/seedfile.yml
@@ -0,0 +1,122 @@
+---
+  site: seedfile
+  name: SeedFile
+  description: "SeedFile (SF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
+  language: ro-ro
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.seedfile.ro/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Books/Magazines, desc: "Cărți/Reviste"}
+      - {id: 2, cat: Other, desc: "Desene SD"}
+      - {id: 3, cat: Other, desc: "Diverse n/a"}
+      - {id: 5, cat: Movies/BluRay, desc: "Filme Blu-Ray"}
+      - {id: 6, cat: Movies/DVD, desc: "Filme DVD"}
+      - {id: 7, cat: Movies/DVD, desc: "Filme DVD-RO"}
+      - {id: 8, cat: Movies/HD, desc: "Filme HD"}
+      - {id: 9, cat: Movies/HD, desc: "Filme HD-RO"}
+      - {id: 10, cat: Movies/SD, desc: "Filme SD"}
+      - {id: 11, cat: Movies/SD, desc: "Filme SD-RO"}
+      - {id: 12, cat: Other, desc: "Imagini"}
+      - {id: 13, cat: Console, desc: "Jocuri Console"}
+      - {id: 14, cat: PC/Games, desc: "Jocuri PC"}
+      - {id: 15, cat: Audio, desc: "Muzică"}
+      - {id: 16, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 17, cat: PC, desc: "Programe	"}
+      - {id: 18, cat: TV/HD, desc: "Seriale HD"}
+      - {id: 19, cat: TV/HD, desc: "Seriale HD-RO	"}
+      - {id: 20, cat: TV/SD, desc: "Seriale TV"}
+      - {id: 21, cat: TV/SD, desc: "Seriale TV-RO "}
+      - {id: 22, cat: TV/Sport, desc: "Sport "}
+      - {id: 23, cat: Audio/Video, desc: "Video Clip"}
+      - {id: 24, cat: XXX, desc: "Adult 18+"}
+      - {id: 36, cat: Movies/3D, desc: "Video 3D"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.recover-error2
+    test:
+      path: profile.php
+      
+  download:
+    selector: a[href^="download.php/"]
+
+  search:
+    paths:
+      - path: download-torrents
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead 3 freeleech
+      incldead: 1
+    rows:
+      selector: tr.browse
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-last-child(7)
+      date:
+        selector: td:nth-last-child(5)
+        filters:
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+          - name: re_replace
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+          - name: re_replace
+            args: ["(?i)(dakika|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)(saat|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)(gün|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)(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          - name: re_replace
+            args: ["(?i) (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+          - name: re_replace
+            args: ["(?i) (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          - name: append
+            args: " ago"
+      size:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          "img[src=\"./pic/freeleech.png\"]": 0
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/shareisland.yml
+++ b/src/Jackett.Common/Definitions/shareisland.yml
@@ -123,10 +123,12 @@
      filters:
        - name: andmatch
    fields:
-      download:
-        # selector: a[href^="index.php?page=downloadcheck&id="]
-        selector: a[href^="download.php?id="]
+      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="]
        filters:
@@ -151,49 +153,36 @@
            args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
          - name: re_replace # rimozioni varie
            args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
      details:
        selector: a[href^="index.php?page=torrent-details&id="]
        attribute: href
      banner:
        optional: true
-        selector: a[href^="index.php?page=torrent-details&id="][onmouseover]
+        selector: a[href^="index.php?page=torrent-details&id="]
        attribute: onmouseover
        filters:
          - name: regexp
            args: "src=(.+?) "
+      download:
+        # selector: a[href^="index.php?page=downloadcheck&id="]
+        selector: a[href^="download.php?id="]
+        attribute: href
      size:
-        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(2)
+        selector: td:nth-last-child(3)
+      grabs:
+        selector: td:nth-last-child(4)
        filters:
          - name: replace
-            args: [" \xA0 ", " "]
-          - name: regexp
-            args: "  (.*?)$"
-      date:
-        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(3)
-        filters:
-          - name: replace
-            args: ["\xA0 ", " "] 
-          - name: regexp
-            args: " (.*?)$"
-          - name: dateparse
-            args: "15:04:05 02/01/2006"
-      seeders:
-        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(4) a:nth-of-type(1)
-        filters:
+            args: ["---", "0"] 
      leechers:
-        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(4) a:nth-of-type(2)
+        selector: td:nth-last-child(5)
+      seeders:
+        selector: td:nth-last-child(6)
+      date:
+        selector: td:nth-last-child(7)
        filters:
-      grabs:
-        text: 0
-      grabs:
-        optional: true
-        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(4) a:nth-of-type(3)
+          - name: dateparse
+            args: "02/01/2006"
      downloadvolumefactor:
        case:
          img[alt="Free Leech"]: "0"
--- a/src/Jackett.Common/Definitions/sharewood.yml
+++ b/src/Jackett.Common/Definitions/sharewood.yml
@@ -62,7 +62,7 @@
      selector: div.table-responsive-line
    fields:
      category:
-        selector: i.torrent-icon
+        selector: img.torrent-icon
        attribute: data-original-title
      title:
        selector: a.view-torrent
--- a/src/Jackett.Common/Definitions/siambit.yml
+++ b/src/Jackett.Common/Definitions/siambit.yml
@@ -77,6 +77,15 @@
      path: nDonated.php
      selector: a[href="logout.php"]

+  download:
+    before:
+      path: ajax.php
+      method: get
+      inputs:
+        _action: "say_thank"
+        id: "{{ .DownloadUri.Query.id }}"
+    selector: a[href^="downloadnew.php?id="]
+
  search:
    paths:
      - path: viewno18.php
@@ -88,7 +97,7 @@
      search: "{{ .Keywords }}"
      searchin: 0
    rows:
-      selector: table[width="100%"][border="1"][cellspacing="0"][cellpadding="5"] > tbody > tr:has(a[href^="downloadnew.php?id="])
+      selector: table[width="100%"][border="1"][cellspacing="0"][cellpadding="5"] > tbody > tr:has(a[href*="hashinfo="])
    fields:
      title:
        selector: a[href^="details.php?id="]
@@ -102,7 +111,7 @@
          - name: querystring
            args: cat
      download:
-        selector: a[href^="downloadnew.php?id="]
+        selector: a[href^="details.php?id="]
        attribute: href
      imdb:
        optional: true
--- a/src/Jackett.Common/Definitions/soundpark.yml
+++ b/src/Jackett.Common/Definitions/soundpark.yml
@@ -6,8 +6,10 @@
  type: semi-private
  encoding: UTF-8
  links:
-    - https://soundpark-club.com/
+    - https://sound-park.world/
    - https://soundpark-club.casa/
+  legacylinks:
+    - https://soundpark-club.com/

  caps:
    categories:
--- a/src/Jackett.Common/Definitions/speed-share.yml
+++ b/src/Jackett.Common/Definitions/speed-share.yml
@@ -1,329 +0,0 @@
---
-  site: speed-share
-  name: Speed-Share
-  description: "Speed-Share is a Brazilian Private site for TV / MOVIES / GENERAL"
-  language: pt-br
-  type: private
-  encoding: utf-8
-  links:
-    - http://speed-share.org/
-
-  caps:
-    categorymappings:
-      #XXX
-      - {id: 239, cat: XXX, desc: "Adulto: HD 4K"}
-      - {id: 187, cat: XXX, desc: "Adulto: HD"}
-      - {id: 62, cat: XXX/DVD, desc: "Adulto: DVD"}
-      - {id: 63, cat: XXX, desc: "Adulto: Rip"}
-      - {id: 248, cat: XXX, desc: "Adulto: TV 4K"}
-      - {id: 141, cat: XXX, desc: "Adulto: TV"}
-      - {id: 249, cat: XXX, desc: "Adulto: WEB 4K"}
-      - {id: 225, cat: XXX, desc: "Adulto: WEB"}
-      - {id: 226, cat: XXX, desc: "Adulto: Autorado"}
-      - {id: 68, cat: XXX, desc: "Adulto: Qualidade Inferior"}
-      - {id: 101, cat: XXX/Imageset, desc: "Adulto : Revistas"}
-      - {id: 207, cat: XXX/Other, desc: "Adulto: Jogos"}
-
-      #ANIME
-      - {id: 240, cat: TV/Anime, desc: "Animês: HD 4K"}
-      - {id: 189, cat: TV/Anime, desc: "Animês: HD"}
-      - {id: 102, cat: TV/Anime, desc: "Animês: DVD"}
-      - {id: 103, cat: TV/Anime, desc: "Animês: Rip"}
-      - {id: 250, cat: TV/Anime, desc: "Animês: TV 4K"}
-      - {id: 144, cat: TV/Anime, desc: "Animês: TV"}
-      - {id: 251, cat: TV/Anime, desc: "Animês: WEB 4K"}
-      - {id: 227, cat: TV/Anime, desc: "Animês: WEB"}
-      - {id: 228, cat: TV/Anime, desc: "Animês: Autorado"}
-      - {id: 191, cat: TV/Anime, desc: "Animês: Qualidade Inferior"}
-
-      #OTHER
-      - {id: 167, cat: Other, desc: "Celular: Jogos"}
-      - {id: 168, cat: Other, desc: "Celular: Programa"}
-      - {id: 151, cat: Books/Ebook, desc: "Curso e Apostila: Apostila"}
-      - {id: 152, cat: Other, desc: "Curso e Apostila: Videoaula"}
-      - {id: 212, cat: Other/Misc, desc: "Raridades: Raridades"}
-
-      #CARTOON
-      - {id: 241, cat: TV/Other, desc: "Desenhos: HD 4K"}
-      - {id: 204, cat: TV/Other, desc: "Desenhos: HD"}
-      - {id: 169, cat: TV/Other, desc: "Desenhos: DVD"}
-      - {id: 171, cat: TV/Other, desc: "Desenhos: Rip"}
-      - {id: 252, cat: TV/Other, desc: "Desenhos: TV 4K"}
-      - {id: 146, cat: TV/Other, desc: "Desenhos: TV"}
-      - {id: 253, cat: TV/Other, desc: "Desenhos: WEB 4K"}
-      - {id: 229, cat: TV/Other, desc: "Desenhos: WEB"}
-      - {id: 230, cat: TV/Other, desc: "Desenhos: Autorado"}
-      - {id: 205, cat: TV/Other, desc: "Desenhos: Qualidade Inferior"}
-
-      #DOCUMENTARY
-      - {id: 242, cat: TV/Documentary, desc: "Documentários: HD 4K"}
-      - {id: 130, cat: TV/Documentary, desc: "Documentários: HD"}
-      - {id: 203, cat: TV/Documentary, desc: "Documentários: DVD"}
-      - {id: 99, cat: TV/Documentary, desc: "Documentários: Rip"}
-      - {id: 254, cat: TV/Documentary, desc: "Documentários: TV 4K"}
-      - {id: 147, cat: TV/Documentary, desc: "Documentários: TV"}
-      - {id: 255, cat: TV/Documentary, desc: "Documentários: WEB 4K"}
-      - {id: 223, cat: TV/Documentary, desc: "Documentários: WEB"}
-      - {id: 224, cat: TV/Documentary, desc: "Documentários: Autorado"}
-      - {id: 195, cat: TV/Documentary, desc: "Documentários: Outra Qualidade"}
-
-      #SPORTS
-      - {id: 243, cat: TV/Sport, desc: "Esportes: HD 4K"}
-      - {id: 232, cat: TV/Sport, desc: "Esportes: HD"}
-      - {id: 233, cat: TV/Sport, desc: "Esportes: DVD"}
-      - {id: 235, cat: TV/Sport, desc: "Esportes: Rip"}
-      - {id: 256, cat: TV/Sport, desc: "Esportes: TV 4K"}
-      - {id: 180, cat: TV/Sport, desc: "Esportes: TV"}
-      - {id: 257, cat: TV/Sport, desc: "Esportes: WEB 4K"}
-      - {id: 234, cat: TV/Sport, desc: "Esportes: WEB"}
-      - {id: 124, cat: TV/Sport, desc: "Esportes: Outra Qualidade"}
-
-      #MOVIES
-      - {id: 244, cat: Movies/HD, desc: "Filmes: HD 4K"}
-      - {id: 214, cat: Movies/HD, desc: "Filmes: HD"}
-      - {id: 215, cat: Movies/DVD, desc: "Filmes: DVD"}
-      - {id: 218, cat: Movies, desc: "Filmes: Rip"}
-      - {id: 258, cat: Movies, desc: "Filmes: TV 4K"}
-      - {id: 217, cat: Movies, desc: "Filmes: TV"}
-      - {id: 259, cat: Movies/WEBDL, desc: "Filmes: WEB 4K"}
-      - {id: 216, cat: Movies/WEBDL, desc: "Filmes: WEB"}
-      - {id: 220, cat: Movies, desc: "Filmes: Autorado"}
-      - {id: 219, cat: Movies/SD, desc: "Filmes: Qualidade Inferior"}
-
-      #GAMES
-      - {id: 64, cat: PC/Games, desc: "Jogos: PC"}
-      - {id: 47, cat: Console, desc: "Jogos: PS1"}
-      - {id: 48, cat: Console, desc: "Jogos: PS2"}
-      - {id: 49, cat: Console/PS3, desc: "Jogos: PS3"}
-      - {id: 236, cat: Console/PS4, desc: "Jogos: PS4"}
-      - {id: 52, cat: PC/Games, desc: "Jogos: Emuladores"}
-      - {id: 50, cat: Console/PSP, desc: "Jogos: PSP"}
-      - {id: 54, cat: Console/NDS, desc: "Jogos: Nintendo DS"}
-      - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"}
-      - {id: 57, cat: Console/Xbox 360, desc: "Jogos: Xbox 360"}
-      - {id: 237, cat: Console/PS Vita, desc: "Jogos: PS Vita"}
-      - {id: 238, cat: Console/Xbox One, desc: "Jogos: Xbox One"}
-      - {id: 53, cat: Console/Other, desc: "Jogos: Outros"}
-
-      #BOOKS
-      - {id: 131, cat: Books/Magazines, desc: "Livro e Revista: Revistas"}
-      - {id: 149, cat: Books/Comics, desc: "Livro e Revista: Mangá e HQ"}
-      - {id: 184, cat: Books/Ebook, desc: "Livro e Revista: Ebook e Audiobook"}
-
-      #MUSIC
-      - {id: 135, cat: Audio, desc: "Música: Discografia"}
-      - {id: 112, cat: Audio, desc: "Música: Axé"}
-      - {id: 163, cat: Audio, desc: "Música: Black Music"}
-      - {id: 115, cat: Audio, desc: "Música: Blues e Jazz"}
-      - {id: 164, cat: Audio, desc: "Música: Clássica"}
-      - {id: 110, cat: Audio, desc: "Música: Eletrônica"}
-      - {id: 113, cat: Audio, desc: "Música: Forró"}
-      - {id: 200, cat: Audio, desc: "Música: Funk"}
-      - {id: 108, cat: Audio, desc: "Música: Gospel"}
-      - {id: 117, cat: Audio, desc: "Música: Hip Hop"}
-      - {id: 116, cat: Audio, desc: "Música: Infantil"}
-      - {id: 114, cat: Audio, desc: "Música: Metal"}
-      - {id: 120, cat: Audio, desc: "Música: MPB"}
-      - {id: 119, cat: Audio, desc: "Música: New Age"}
-      - {id: 165, cat: Audio, desc: "Música: Pop"}
-      - {id: 118, cat: Audio, desc: "Música: Reggae"}
-      - {id: 109, cat: Audio, desc: "Música: Rock"}
-      - {id: 111, cat: Audio, desc: "Música: Samba e Pagode"}
-      - {id: 107, cat: Audio, desc: "Música: Sertaneja e Country"}
-      - {id: 133, cat: Audio, desc: "Música: Trilha Sonora"}
-      - {id: 201, cat: Audio, desc: "Música: Outros"}
-
-      #SERIES
-      - {id: 245, cat: TV/HD, desc: "Séries: HD 4K"}
-      - {id: 159, cat: TV/HD, desc: "Séries: HD"}
-      - {id: 158, cat: TV, desc: "Séries: DVD"}
-      - {id: 92, cat: TV, desc: "Séries: Rip"}
-      - {id: 260, cat: TV/HD, desc: "Séries: TV 4K"}
-      - {id: 208, cat: TV, desc: "Séries: TV"}
-      - {id: 261, cat: TV/WEB-DL, desc: "Séries: WEB 4K"}
-      - {id: 221, cat: TV/WEB-DL, desc: "Séries: WEB"}
-      - {id: 202, cat: TV, desc: "Séries: Autorado"}
-      - {id: 222, cat: TV/SD, desc: "Séries: Qualidade Inferior"}
-      
-      # TV
-      - {id: 231, cat: TV/HD, desc: "TV: HD"}
-      - {id: 142, cat: TV, desc: "TV: Rip"}
-
-      #MUSIC SHOWS
-      - {id: 246, cat: Audio/Video, desc: "Shows: HD 4K"}
-      - {id: 96, cat: Audio/Video, desc: "Shows: HD"}
-      - {id: 94, cat: Audio/Video, desc: "Shows: DVD"}
-      - {id: 95, cat: Audio/Video, desc: "Shows: Rip"}
-      - {id: 262, cat: Audio/Video, desc: "Shows: TV 4K"}
-      - {id: 206, cat: Audio/Video, desc: "Shows: TV"}
-      - {id: 263, cat: Audio/Video, desc: "Shows: WEB 4K"}
-      - {id: 157, cat: Audio/Video, desc: "Shows: WEB"}
-      - {id: 198, cat: Audio/Video, desc: "Shows: Autorado"}
-      - {id: 209, cat: Audio/Video, desc: "Shows: Video Clipe DVD"}
-      - {id: 150, cat: Audio/Video, desc: "Shows: Video Clipe Outros"}
-
-      #PC
-      - {id: 87, cat: PC, desc: "Softwares: Windows"}
-
-    modes:
-      search: [q]
-
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-    - name: info
-      type: info
-      label: ""
-      default: For the search to work properly you must configure the "Modelo da Home" option to "Sistema Lista de Torrents" in the Speed-Share user settings.
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    test:
-      path: torrents.php
-  search:
-    paths:
-      - path: buscar_tor.php?search={{ .Keywords }}&incldead=1
-        method: post
-    keywordsfilters: 
-      # workaroud to remove year in search keywords
-      - name: re_replace
-        args: ["([1-2]\\d{3})", ""]
-      - name: replace
-        args: ["Agents of SHIELD", "Agents of S.H.I.E.L.D."]
-    inputs:
-      number: 100
-      offset: 0
-
-    rows:
-      selector: table#torrentsTable tr:has(td.ttable_col1)
-    fields: 
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      is_anime:
-        optional: true
-        selector: >
-                  a[href^="torrents.php?cat=240"]
-                  ,a[href^="torrents.php?cat=189"]
-                  ,a[href^="torrents.php?cat=102"]
-                  ,a[href^="torrents.php?cat=103"]
-                  ,a[href^="torrents.php?cat=250"]
-                  ,a[href^="torrents.php?cat=144"]
-                  ,a[href^="torrents.php?cat=251"]
-                  ,a[href^="torrents.php?cat=227"]
-                  ,a[href^="torrents.php?cat=228"]
-                  ,a[href^="torrents.php?cat=191"]
-        attribute: href
-      title_anime:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-        - name: re_replace
-          args: ["(Ep[\\.]?[ ]?(\\d{1,3}))", "E$2"]
-      title_normal:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-        - name: re_replace
-          args: ["^(.*?) - ((S(\\d{1,2}))?E(\\d{1,3}))", "$1 $2"]
-          # Workaround to add year to series that is an remake, since the year returned from the tracker isn't reliable, feel free to add more as needed.
-        - name: re_replace
-          args: ["^Doctor Who", "Doctor Who 2005"]
-        - name: re_replace
-          args: ["^Extinct", "Extinct 2017"]
-        - name: re_replace
-          args: ["^The Flash", "The Flash 2014"]
-        - name: re_replace
-          args: ["^The Magicians", "The Magicians 2015"]
-      title:
-        text: "{{if .Result.is_anime }}{{ .Result.title_anime }}{{else}}{{ .Result.title_normal }}{{end}}"
-        filters:
-        - name: re_replace
-          args: ["^(\\[XXX]\\s)", ""]
-        - name: replace
-          args: [" - NOVO!", ""]
-        - name: re_replace
-          args: ["(\\d{2})[ºª°] a (\\d{2})[ºª°] Temporada", "S$1-$2"]
-        - name: re_replace
-          args: ["(\\d{1})[ºª°] a (\\d{1})[ºª°] Temporada", "S0$1-0$2"]
-        - name: re_replace
-          args: ["(\\d{1})[ºª°] a (\\d{2})[ºª°] Temporada", "S0$1-$2"]
-        - name: re_replace
-          args: ["(\\d{2})[ºª°] Temporada", "S$1"]
-        - name: re_replace
-          args: ["(\\d{1})[ºª°] Temporada", "S0$1"]
-      title|append:
-        optional: true
-        selector: td.label > div:contains("Qualidade:")
-        filters:
-        - name: replace
-          args: ["Qualidade:", ""]
-        - name: replace
-          args: ["Autorado", ""]
-      title|append:
-        optional: true
-        selector: td.label > div:contains("Resolução:")
-        filters:
-        - name: replace
-          args: ["Resolução:", ""]
-        - name: re_replace
-          args: ["(\\d{3,4})[ ]?[xX][ ]?(1[0-9][0-9][0-9])", "1080p"]
-        - name: re_replace
-          args: ["(\\d{3,4})[ ]?[xX][ ]?([2-9][0-9][0-9][0-9])", "2160p"]
-        - name: re_replace
-          args: ["(\\d{3,4})[ ]?[xX][ ]?([6-9][0-9][0-9])", "720p"]
-        - name: re_replace
-          args: ["(\\d{3,4})[ ]?[xX][ ]?([3-5][0-9][0-9])", "480p"]
-        - name: re_replace
-          args: ["(\\d{3,4})[ ]?[xX][ ]?([1-2][0-9][0-9])", "240p"]
-      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.label > div:contains("Lançado em:")
-        filters:
-          - name: replace
-            args: ["Lançado em: ", ""]
-          - name: dateparse
-            args: "02/01/2006 15:04:05"
-      size:
-        # seems size might be floating as the 4th or 5th td so lets try matching the size-unit
-        optional: true
-        selector: td.ttable_col2:contains(" GB")
-      size:
-        optional: true
-        selector: td.ttable_col2:contains(" MB")
-      size:
-        optional: true
-        selector: td.ttable_col2:contains(" kB")
-      size:
-        optional: true
-        selector: td.ttable_col2:contains(" B")
-      grabs:
-        selector: td.ttable_col1 > font[color^=orange]
-      seeders:
-        selector: td.ttable_col1 > b > font[color^=green]
-      leechers:
-        selector: td.ttable_col2 > font[color^=red]
-      downloadvolumefactor:
-        case:
-          img[src="images/free.gif"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
--- a/src/Jackett.Common/Definitions/sportscult.yml
+++ b/src/Jackett.Common/Definitions/sportscult.yml
@@ -13,11 +13,13 @@
      - {id: 47, cat: TV/Sport, desc: "EPL"}
      - {id: 41, cat: TV/Sport, desc: "American Football"}
      - {id: 17, cat: TV/Sport, desc: "Athletics"}
+      - {id: 51, cat: TV/Sport, desc: "Baseball"}
      - {id: 34, cat: TV/Sport, desc: "Bodybuilding/Fitness"}
+      - {id: 50, cat: TV/Sport, desc: "Golf"}
      - {id: 29, cat: TV/Sport, desc: "Boxing"}
      - {id: 19, cat: TV/Sport, desc: "BrainGames"}
      - {id: 36, cat: TV/Sport, desc: "BreakDance"}
-      - {id: 40, cat: TV/Sport, desc: "Cricet/Golf/Baseball"}
+      - {id: 40, cat: TV/Sport, desc: "Golf"}
      - {id: 23, cat: TV/Sport, desc: "Cycling"}
      - {id: 31, cat: TV/Sport, desc: "Documentary"}
      - {id: 1, cat: TV/Sport, desc: "European Basketball"}
@@ -55,6 +57,7 @@
      - {id: 16, cat: TV/Sport, desc: "WinterSport"}
      - {id: 33, cat: TV/Sport, desc: "Wrestling/Grapling"}
      - {id: 48, cat: TV/Sport, desc: "Uncategorised"}
+      - {id: 53, cat: TV/Sport, desc: "Cricket"}

    modes:
      search: [q]
@@ -71,9 +74,6 @@
    test:
      path: index.php

-  download:
-    selector: a[href^="download.php?id="]
-        
  search:
    paths:
      - path: index.php
@@ -95,12 +95,18 @@
      title:
        remove: span
        selector: td:nth-child(2)
+        filters:
+          # strip the upright bars in the title
+          - name: re_replace
+            args: ["( \\| )+", " "]
      download:
-        selector: a[href^="index.php?page=torrent-details&id="]
+ # download.php?id=fb27625a0543ed731f7b3505beebf4c8d530f8f9&f=IIHF+2019-05-26+%7C+Gold+Medal+%7C+Canada+vs+Finland+%7C+1080p+EN.torrent
+        selector: a[href^="download.php?id="]
        attribute: href
        filters:
-          - name: replace
-            args: ["index.php?page=torrent-details&id=", "download.php?id="]
+          # strip the upright bars in the title's filename
+          - name: re_replace
+            args: ["(\\+%7C\\+)+", "+"]
      details:
        selector: a[href^="index.php?page=torrent-details&id="]
        attribute: href
@@ -112,11 +118,11 @@
        selector: td:nth-child(7)
      grabs:
        selector: td:nth-child(8)
-      # date:
-      #   selector: td:nth-child(5)
-      #   filters:
-      #     - name: dateparse
-      #       args: "02/05/2017"
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
      downloadvolumefactor:
        case:
          "*": "1"
--- a/src/Jackett.Common/Definitions/tapochek.yml
+++ b/src/Jackett.Common/Definitions/tapochek.yml
@@ -6,6 +6,8 @@
  type: private
  encoding: windows-1251
  links:
+    - http://tapochek.net/
+  legacylinks:
    - https://tapochek.net/

  settings:
--- a/src/Jackett.Common/Definitions/tbplus.yml
+++ b/src/Jackett.Common/Definitions/tbplus.yml
@@ -1,133 +0,0 @@
---
-  site: tbplus
-  name: TBPlus
-  description: "TBPlus is a Spanish site of general content"
-  language: es-es
-  type: private
-  encoding: ISO-8859-1
-  links:
-    - https://tbplus.li/
-
-  caps:
-    categorymappings:
-      # Estrenos
-      - {id: 13, cat: Movies/SD, desc: "Ts - Estrenos"}
-      - {id: 15, cat: Movies/HD, desc: "DVD-BRscreener - Estrenos"}
-      - {id: 16, cat: Movies/HD, desc: "DVDScrn/BRScrn MKV - Estrenos"}
-      # Películas / Documentales
-      - {id: 18, cat: Movies/SD, desc: "Xvid/DVDRip MKV - Películas / Documentales"}
-      - {id: 19, cat: Movies/HD, desc: "HD - Películas / Documentales"}
-      - {id: 20, cat: Movies/HD, desc: "Dvd / Full Bluray - Películas / Documentales"}
-      - {id: 74, cat: Movies/HD, desc: "3D - Películas / Documentales"}
-      - {id: 69, cat: Movies/SD, desc: "MP4 - Películas / Documentales"}
-      - {id: 75, cat: Movies/HD, desc: "MicroHD - Películas / Documentales"}
-      # Series
-      - {id: 22, cat: TV/SD, desc: "Xvid/DVDRip MKV - Series"}
-      - {id: 23, cat: TV/HD, desc: "HD - Series"}
-      - {id: 24, cat: TV/HD, desc: "DVD / Full BluRay - Series"}
-      - {id: 71, cat: TV/SD, desc: "MP4 - Series"}
-      - {id: 76, cat: TV/HD, desc: "MicroHD - Series"}
-      # Deportes
-      - {id: 26, cat: TV/Sport, desc: "Xvid/DVDRip MKV - Deportes"}
-      - {id: 27, cat: TV/Sport, desc: "HD - Deportes"}
-      - {id: 28, cat: TV/Sport, desc: "DVD / Full Bluray - Deportes"}
-      - {id: 77, cat: TV/Sport, desc: "MicroHD - Deportes"}
-      # Anime / Animación
-      - {id: 30, cat: TV/Anime, desc: "Xvid/DVDRip MKV - Anime / Animación"}
-      - {id: 31, cat: TV/Anime, desc: "HD - Anime / Animación"}
-      - {id: 32, cat: TV/Anime, desc: "DVD / Full Bluray - Anime / Animación"}
-      - {id: 78, cat: TV/Anime, desc: "MicroHD - Anime / Animación"}
-      # VOSE
-      - {id: 34, cat: Movies/SD, desc: "Xvid/DVDRip MKV - VOSE"}
-      - {id: 35, cat: Movies/HD, desc: "HD - VOSE"}
-      - {id: 36, cat: Movies/HD, desc: "DVD / Full Bluray - VOSE"}
-      - {id: 79, cat: Movies/HD, desc: "MicroHD - VOSE"}
-      # Adulto (+18)
-      - {id: 38, cat: XXX, desc: "Xvid/DVDRip MKV - Adulto (+18)"}
-      - {id: 39, cat: XXX, desc: "HD - Adulto (+18)"}
-      - {id: 40, cat: XXX, desc: "DVD / Full Bluray - Adulto (+18)"}
-      - {id: 80, cat: XXX, desc: "MicroHD - Adulto (+18)"}
-      # Música
-      - {id: 42, cat: Audio/MP3, desc: "Mp3 / Varios - Música"}
-      - {id: 43, cat: Audio/Lossless, desc: "Flac - Música"}
-      - {id: 44, cat: Audio/Video, desc: "Videos Musicales - Música"}
-      # Móviles
-      - {id: 46, cat: PC/Phone-IOS, desc: "IOS - Móviles"}
-      - {id: 47, cat: PC/Phone-Android, desc: "Android - Móviles"}
-      - {id: 48, cat: PC/Phone-Other, desc: "Otros - Móviles"}
-      # Apps / Software
-      - {id: 50, cat: PC, desc: "OS - Windows - Apps / Software"}
-      - {id: 51, cat: PC, desc: "OS - Linux - Apps / Software"}
-      - {id: 52, cat: PC, desc: "OS - Mac - Apps / Software"}
-      - {id: 53, cat: PC, desc: "Herramientas Windows - Apps / Software"}
-      - {id: 54, cat: PC, desc: "Herramientas Linux - Apps / Software"}
-      - {id: 55, cat: PC/Mac, desc: "Herramientas Mac - Apps / Software"}
-      - {id: 56, cat: PC/ISO, desc: "Imagen Windows - Apps / Software"}
-      - {id: 57, cat: PC/ISO, desc: "Imagen Linux - Apps / Software"}
-      - {id: 58, cat: PC/ISO, desc: "Imagen Mac - Apps / Software"}
-      # Ebooks
-      - {id: 60, cat: Books/Ebook, desc: "Ebooks - Ebooks"}
-      - {id: 61, cat: Books/Ebook, desc: "Ebooks + 18 - Ebooks"}
-      - {id: 62, cat: Books, desc: "Audiolibros - Ebooks"}
-      # Juegos
-      - {id: 64, cat: PC/Games, desc: "Microsoft - Juegos"}
-      - {id: 65, cat: PC/Games, desc: "Sony - Juegos"}
-      - {id: 66, cat: PC/Games, desc: "PC - Juegos"}
-      - {id: 67, cat: PC/Games, desc: "Nintendo - Juegos"}
-      - {id: 68, cat: PC/Games, desc: "MAC - Juegos"}
-      # Subtítulos
-      - {id: 85, cat: Other, desc: "Subtítulos"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: index.php?page=login
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: .lista>span
-    test:
-      path: index.php
-      selector: form[name="jump1"]
-
-  search:
-    path: index.php
-    inputs:
-      page: "torrents"
-      $raw: "&category={{range .Categories}}{{.}};{{end}}"
-      active: "1"
-      search: "{{ .Query.Keywords }}"
-    rows:
-      selector: "#mcol .block-content-l table table.lista > tbody > tr:not(:first-child)"
-    fields:
-      category:
-        selector:  td:nth-child(1) a
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      title:
-        selector: td:nth-child(2) a
-      details:
-        selector: td:nth-child(2) a
-        attribute: href
-      size:
-        selector: td:nth-child(7) center
-      seeders:
-        selector: td:nth-child(8) a
-      leechers:
-        selector: td:nth-child(9) a
-      grabs:
-        selector: td:nth-child(10) a
-        optional: true
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: dateparse
-            args: "02/01/2006  15:04:05"
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
--- a/src/Jackett.Common/Definitions/teamos.yml
+++ b/src/Jackett.Common/Definitions/teamos.yml
@@ -0,0 +1,151 @@
+---
+  site: teamos
+  name: TeamOS
+  description: "Team OS is a Private Torrent Tracker for SOFTWARE"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.teamos-hkrg.com/
+
+  caps:
+    categorymappings:
+      - {id: 5, cat: PC, desc: "Special OS"}
+      - {id: 6, cat: PC, desc: "Special Release [Requested/Exclusive/Etc]"}
+      - {id: 19, cat: PC, desc: "Windows 7 Releases"}
+      - {id: 20, cat: PC, desc: "Windows 7 Releases 32 Bit"}
+      - {id: 21, cat: PC, desc: "Windows 7 Releases 64 Bit"}
+      - {id: 22, cat: PC, desc: "Windows 7 Releases  x86-x64 AIO"}
+      - {id: 23, cat: PC, desc: "Team OS Program"}
+      - {id: 24, cat: PC, desc: "Windows 8.1 Release"}
+      - {id: 25, cat: PC, desc: "Windows 8.1 Release 32 Bit"}
+      - {id: 26, cat: PC, desc: "Windows 8.1 Release 64 Bit"}
+      - {id: 27, cat: PC, desc: "Windows 8.1 Release x86-x64 AIO"}
+      - {id: 29, cat: PC, desc: "Windows XP"}
+      - {id: 30, cat: PC, desc: "Windows XP 32 Bit"}
+      - {id: 31, cat: PC, desc: "Windows XP 64 Bit"}
+      - {id: 32, cat: PC, desc: "Windows XP x86/64+AIO"}
+      - {id: 33, cat: PC, desc: "Windows 7"}
+      - {id: 34, cat: PC, desc: "Windows 7 32 Bit"}
+      - {id: 35, cat: PC, desc: "Windows 7 64 Bit"}
+      - {id: 36, cat: PC, desc: "Windows 7 x86/64+AIO"}
+      - {id: 37, cat: PC, desc: "Windows 8 & 8.1"}
+      - {id: 38, cat: PC, desc: "Windows 8 & 8.1 32 Bit"}
+      - {id: 39, cat: PC, desc: "Windows 8 & 8.1 64 Bit"}
+      - {id: 40, cat: PC, desc: "Windows 8 & 8.1 x86/64+AIO"}
+      - {id: 41, cat: PC, desc: "Linux/Unix/Mac/Others"}
+      - {id: 43, cat: PC, desc: "Windows 10 (x86)"}
+      - {id: 44, cat: PC, desc: "Windows 10 (x64)"}
+      - {id: 45, cat: PC, desc: "Windows 10 (x86 & x64)"}
+      - {id: 46, cat: PC/ISO, desc: "Windows 10 Untouched ISO(MSDN)"}
+      - {id: 47, cat: PC, desc: "Windows 7 Untouched (MSDN)"}
+      - {id: 48, cat: PC, desc: "Windows 7 32 Bit Untouched (MSDN)"}
+      - {id: 49, cat: PC, desc: "Windows 7 64 Bit Untouched (MSDN)"}
+      - {id: 50, cat: PC/ISO, desc: "Windows 7 x86/64+AIO Untouched ISO"}
+      - {id: 51, cat: PC, desc: "Windows 8&8.1 Untouched (MSDN)"}
+      - {id: 52, cat: PC, desc: "Windows 8&8.1 32 Bit Untouched (MSDN)"}
+      - {id: 53, cat: PC, desc: "Windows 8&8.1 64 Bit Untouched (MSDN)"}
+      - {id: 54, cat: PC/ISO, desc: "Windows 8&8.1 x86/64+AIO Untouched ISO"}
+      - {id: 55, cat: PC, desc: "Windows Server 2003 (Untouched)"}
+      - {id: 56, cat: PC, desc: "Windows Server 2003 32 Bit Untouched"}
+      - {id: 57, cat: PC, desc: "Windows Server 2003 64 Bit Untouched"}
+      - {id: 58, cat: PC/ISO, desc: "Microsoft Office Multi-lang Untouch ISO"}
+      - {id: 59, cat: PC/ISO, desc: "x86-x64 bit Untouched Iso"}
+      - {id: 61, cat: PC/0day, desc: "Antivirus"}
+      - {id: 62, cat: PC/Phone-Android, desc: "Android Apps"}
+      - {id: 63, cat: PC/0day, desc: "Download Managers"}
+      - {id: 64, cat: PC/0day, desc: "DVD Tools"}
+      - {id: 65, cat: PC/0day, desc: "Multimedia"}
+      - {id: 66, cat: PC/0day, desc: "Audio Apps"}
+      - {id: 67, cat: PC/0day, desc: "Video Apps"}
+      - {id: 68, cat: PC/0day, desc: "Photo Apps"}
+      - {id: 69, cat: PC/0day, desc: "Document Tools"}
+      - {id: 70, cat: PC/0day, desc: "Utility Tools"}
+      - {id: 71, cat: PC/0day, desc: "Activators/ Crack/ patch/ keygen"}
+      - {id: 72, cat: PC/0day, desc: "Other Softwares"}
+      - {id: 73, cat: PC/0day, desc: "Microsoft Office"}
+      - {id: 74, cat: PC/0day, desc: "Web Tools"}
+      - {id: 75, cat: PC/0day, desc: "Adobe Plugins"}
+      - {id: 76, cat: PC/0day, desc: "Customisation"}
+      - {id: 77, cat: PC/0day, desc: "Drivers and Necessary Tools"}
+      - {id: 78, cat: PC/0day, desc: "Security Tools"}
+      - {id: 79, cat: PC/0day, desc: "Recovery Tools"}
+      - {id: 80, cat: PC/0day, desc: "Windows Phone Apps"}
+      - {id: 81, cat: PC/0day, desc: "Developers"}
+      - {id: 82, cat: PC/0day, desc: "Designers"}
+      - {id: 83, cat: PC/0day, desc: "Silent Apps"}
+      - {id: 85, cat: PC/Games, desc: "Games"}
+      - {id: 86, cat: Books/Ebook, desc: "Ebooks"}
+      - {id: 87, cat: Other, desc: "Wallpapers, Themes & Screensavers"}
+      - {id: 88, cat: PC/Phone-Android, desc: "Android Games"}
+      - {id: 89, cat: PC, desc: "Other Releases"}
+      - {id: 107, cat: PC, desc: "Windows 10 Releases"}
+      - {id: 109, cat: PC, desc: "Windows 10 Releases 64 Bit"}
+      - {id: 110, cat: PC, desc: "Windows 10 Releases x86-x64 AIO"}
+      - {id: 111, cat: PC/0day, desc: "3D Modeling"}
+      - {id: 112, cat: PC/0day, desc: "Ghost Images"}
+      - {id: 113, cat: PC/0day, desc: "32 Bit Ghost Images"}
+      - {id: 114, cat: PC/0day, desc: "64 Bit Ghost Images"}
+      - {id: 125, cat: PC, desc: "Dead Torrents"}
+      - {id: 131, cat: PC/Mac, desc: "MAC OS X"}
+      - {id: 132, cat: PC/Phone-Other, desc: "Linux/Unix"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: index.php?login/login
+    method: post
+    inputs:
+      login: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: div.blockMessage--error
+    test:
+      path: index.php
+      selector: a[href="/index.php?conversations/"]
+
+  search:
+    paths:
+    # 25 results per page
+      - path: "index.php?torrents/&filename={{ .Keywords }}"
+      - path: "index.php?torrents/&filename={{ .Keywords }}&page=2"
+      - path: "index.php?torrents/&filename={{ .Keywords }}&page=3"
+      - path: "index.php?torrents/&filename={{ .Keywords }}&page=4"
+
+    rows:
+      selector: tr.dataList-row:has(td.download)
+    fields:
+      category:
+        selector: a[href^="/index.php?forums/"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\.(\\d+)\\/$"
+      title:
+        selector: a[href^="/index.php?threads/"]
+      details:
+        selector: a[href^="/index.php?threads/"]
+        attribute: href
+      download:
+        selector: td.download a
+        attribute: href
+      date:
+        selector: li.structItem-startDate a time
+        attribute: datetime
+      size:
+        selector: td:nth-last-child(4)
+      grabs:
+        selector: td:nth-last-child(3)
+      seeders:
+        selector: td:nth-last-child(2)
+      leechers:
+        selector: td:nth-last-child(1)
+      downloadvolumefactor:
+        case:
+          "span.label:contains(\"Freeleech\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/tellytorrent.yml
+++ b/src/Jackett.Common/Definitions/tellytorrent.yml
@@ -0,0 +1,144 @@
+---
+  site: tellytorrent
+  name: TellyTorrent
+  description: "TellyTorrent is an INDIAN Private Tracker for MOVIES / TV"
+  language: en
+  type: private
+  encoding: UTF-8
+  links:
+    - https://tellytorrent.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+      - {id: 3, cat: Audio, desc: "Music"}
+      - {id: 4, cat: Movies, desc: "Web Originals"}
+      - {id: 5, cat: PC/Games, desc: "Games"}
+      - {id: 6, cat: PC/0day, desc: "Application"}
+      - {id: 7, cat: PC/Phone-Other, desc: "Mobile App"}
+      - {id: 8, cat: Other, desc: "IPL 2019"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
+    test:
+      path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: torrents
+    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: ""
+      sort: "created_at"
+      direction: "desc"
+      qty: 100
+    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", ""]
+      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|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+          - name: re_replace
+            args: ["(ö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"]
+          - name: re_replace
+            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          - name: re_replace
+            args: ["(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"]
+          - name: re_replace
+            args: ["(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"]
+          - name: re_replace
+            args: ["(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"]
+          - name: re_replace
+            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+          - name: re_replace
+            args: [" (ay|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"
+      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.3
--- a/src/Jackett.Common/Definitions/theaudioscene.yml
+++ b/src/Jackett.Common/Definitions/theaudioscene.yml
@@ -0,0 +1,111 @@
+---
+  site: theaudioscene
+  name: TheAudioScene
+  description: "TheAudioScene is a Private Torrent Tracker for AUDIO SOFTWARE / SAMPLES / ETC"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://theaudioscene.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: PC, desc: "Tutorial"}
+      - {id: 2, cat: PC, desc: "Addon"}
+      - {id: 3, cat: PC, desc: "Hybrid Update"}
+      - {id: 4, cat: PC, desc: "Hybrid Win/Mac"}
+      - {id: 5, cat: PC/Mac, desc: "Mac App"}
+      - {id: 6, cat: PC/Mac, desc: "Mac Update"}
+      - {id: 7, cat: PC/Mac, desc: "Mac VST"}
+      - {id: 8, cat: PC/Mac, desc: "Mac VSTi"}
+      - {id: 9, cat: Other, desc: "Unknown"}
+      - {id: 10, cat: Audio, desc: "SampleCD"}
+      - {id: 11, cat: PC/0day, desc: "Win App"}
+      - {id: 12, cat: PC/0day, desc: "Win Update"}
+      - {id: 13, cat: PC/0day, desc: "Win VST"}
+      - {id: 14, cat: PC/0day, desc: "Win VSTi"}
+      - {id: 15, cat: PC/Phone-Other, desc: "Handheld App"}
+
+    modes:
+      search: [q]
+
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<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>"
+
+  login:
+    method: cookie
+    inputs:
+      cookie: "{{ .Config.cookie }}"
+    test:
+      path: usersettings/usermessages.php?mailbox=new
+
+  search:
+    paths:
+    # https://theaudioscene.net/torrentsettings/torrentbrowse.php?SrcCat=0&SrcDat=0&SrcEnd=0&search=
+      - path: torrentsettings/torrentbrowse.php
+    inputs:
+    # catalog 0 all
+      SrcCat: 0
+      # sort 0 added 1 name 2 size 3 added 4 rated 5 seeders 6 leechers 7 grabs
+      SrcDat: 0
+      # 0 new&old 1 new only 2 old only
+      SrcEnd: 0
+      search: "{{ .Keywords }}"
+
+    rows:
+      selector: table.tablewidthfixed tbody tr table:has(tr[onMouseOver])
+      dateheaders:
+        selector: td:contains("Added On ")
+        filters:
+          - name: replace
+            args: ["Added On ", ""]
+          - name: re_replace
+            args: ["(th|st|nd|rd)", ""]
+          - name: dateparse
+            args: "Jan 02 2006"
+    fields:
+      title:
+        selector: td[id$="_1"] a
+        attribute: title
+      details:
+        selector: td[id$="_1"] a
+        attribute: href
+      download:
+        selector: td[id$="_2"] a
+        attribute: href
+      category:
+        selector: img[src^="/images/categories/"]
+        case:
+          img[title="Tutorial"]: "1"
+          img[title="Addon"]: "2"
+          img[title="Hybrid Update"]: "3"
+          img[title="Hybrid Win/Mac"]: "4"
+          img[title="Mac App"]: "5"
+          img[title="Mac Update"]: "6"
+          img[title="Mac VST"]: "7"
+          img[title="Mac VSTi"]: "8"
+          img[title="Unknown"]: "9"
+          img[title="SampleCD"]: "10"
+          img[title="Win App"]: "11"
+          img[title="Win Update"]: "12"
+          img[title="Win VST"]: "13"
+          img[title="Win VSTi"]: "14"
+          img[title="Handheld App"]: "15"
+      size:
+        selector: td[id$="_6"]
+      seeders:
+        selector: td[id$="_10"]
+      leechers:
+        selector: td[id$="_11"]
+      grabs:
+        selector: td[id$="_12"]
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/theshinning.yml
+++ b/src/Jackett.Common/Definitions/theshinning.yml
@@ -20,6 +20,7 @@
      - {id: 5, cat: PC, desc: "Apps"}
      - {id: 6, cat: Other, desc: "Misc"}
      - {id: 7, cat: XXX, desc: "XXX"}
+      - {id: 8, cat: Movies, desc: "Kids"}

    modes:
      search: [q]
@@ -56,6 +57,7 @@
    inputs:
      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
@@ -81,17 +83,24 @@
      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/212121/FFFFFF/?text=NOCOVER", ""]
      size:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(4)
      grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
        filters:
          - name: regexp
            args: ([\d\.]+)
+      seeders:
+        selector: td:nth-last-child(2)
+      leechers:
+        selector: td:nth-last-child(1)
      date:
        selector: time
        filters:
@@ -120,12 +129,14 @@
            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
      downloadvolumefactor:
        case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
          "i[data-original-title=\"Global freeleech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured
          "*": "1"
      uploadvolumefactor:
        case:
          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured
          "*": "1"
 # UNIT3D
--- a/src/Jackett.Common/Definitions/tigers-dl.yml
+++ b/src/Jackett.Common/Definitions/tigers-dl.yml
@@ -98,6 +98,10 @@
    - name: password
      type: password
      label: Password
+    - name: info
+      type: info
+      label: Torrent list mode
+      default: This indexer only supports the torrent display in <b>list</b> mode.<br/> Set the option to <b>Torrents mode Liste</b> on the menu bar.

  login:
    path: index.php?page=login
@@ -170,7 +174,6 @@
            args: ["---", "0"]
      date:
        selector: td:nth-child(8)
-        filters:
        filters:
            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
          - name: re_replace
--- a/src/Jackett.Common/Definitions/torrent9.yml
+++ b/src/Jackett.Common/Definitions/torrent9.yml
@@ -7,7 +7,9 @@
  encoding: UTF-8
  followredirect: true
  links:
-    - https://www.torrent9.cat/
+    - https://ww1.torrent9.is/
+    - https://www.torrent09.uno/
+    - https://ww1.torrent9.to/

  legacylinks:
    - http://www.torrent9.ec/
@@ -27,6 +29,9 @@
    - https://wvw.torrent9.uno/
    - https://ww1.torrent9.uno/
    - https://wvw.t9.pe/
+    - https://www4.torrent9.to/
+    - https://www.torrent9.cat/
+    - https://www.torrent9.is/

  caps:
    categorymappings:
@@ -41,17 +46,21 @@
    modes:
      search: [q]
      tv-search: [q, season, ep]
+      movie-search: [q]

  settings: []

  download:
-    selector: a.download:contains("le Torrent")
+    selector: a[href^="magnet:?"]
+    attribute: href
      
  search:
    paths:
      - path: "{{ if .Keywords }}/search_torrent/{{ re_replace .Keywords \"[']+\" \"\" }}/page-0{{else}}/top_torrent.php{{end}}"
    rows:
      selector: div.table-responsive > table tbody tr
+      filters:
+        - name: andmatch
    fields:
      site_date:
        selector: td:nth-child(1) a
@@ -82,6 +91,7 @@
        case:
          i[class="fa fa-video-camera"]: films
          i[class="fa fa-desktop"]: series
+          i[class="fa fa-tv"]: series
          i[class="fa fa-music"]: musique
          i[class="fa fa-gamepad"]: jeux-pc
          i[class="fa fa-laptop"]: logiciels
@@ -112,6 +122,9 @@
            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"]
      seeders:
        text: 0
      seeders:
--- a/src/Jackett.Common/Definitions/torrent9clone.yml
+++ b/src/Jackett.Common/Definitions/torrent9clone.yml
@@ -7,7 +7,8 @@
  encoding: UTF-8
  followredirect: true
  links:
-    - https://wvw.torrent9.lol/
+    - https://ww6.torrent9.lol/
+
  legacylinks:
    - https://www.torrents9.pw/
    - https://www.torrent9.ch/
@@ -17,6 +18,10 @@
    - https://www.torrent9.vc/
    - https://wvw.torrent9.vc/
    - https://www.torrent9.lol/
+    - https://wvw.torrent9.lol/
+    - https://wwv.torrent9.lol/
+    - https://ww1.torrent9.lol/
+    - https://ww5.torrent9.lol/

  caps:
    categorymappings:
@@ -31,30 +36,9 @@
    modes:
      search: [q]
      tv-search: [q, season, ep]
+      movie-search: [q]

-  settings:
-    - name: category
-      type: select
-      label: Category Filter
-      default: "/"
-      options:
-        "/" : "All"
-        "/films/": "Movies"
-        "/films-french/": "Movies/French"
-        "/films-vostfr/": "Movies/VOSTFR"
-        "/films-dvdrip-x264/": "Movies/DVDRIP .x264"
-        "/720p/": "Movies/BluRay 720p"
-        "/1080p/": "Movies/BluRay 1080p"
-        "/series/": "TV/Series"
-        "/series-vostfr/": "TV/VOSTFR"
-        "/series-francaise/": "TV/French"
-        "/series-dvdrip/": "TV/DVDRIP"
-        "/spectacles/": "Shows"
-        "/musique/": "Music"
-        "/ebook/": "Ebooks"
-        "/logiciels/": "Software"
-        "/jeux-pc/": "PC Games"
-        "/jeux-consoles/": "Console Games"
+  settings: []

  download:
    selector: a[href^="magnet:?"]
@@ -96,7 +80,7 @@
          i[class="Films"]: films
          i[class="Séries"]: series
          i[class="Musique"]: musique
-          i[class=""Jeux-PC"]: jeux-pc
+          i[class="Jeux-PC"]: jeux-pc
          i[class="Logiciels"]: logiciels
          i[class="Ebook"]: ebook
      download:
@@ -106,25 +90,6 @@
          text: "now"
      size:
        selector: td:nth-child(2)
-        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", "" ]
      seeders:
        text: 0
      seeders:
--- a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml
+++ b/src/Jackett.Common/Definitions/torrentgalaxyorg.yml
@@ -63,7 +63,7 @@
      sort: "id"
      order: "desc"
    rows:
-      selector: div[class="tgxtablerow clickable-row click"]
+      selector: div[class="tgxtablerow"]
    fields:
      title:
        selector: div a[href^="/torrent/"]
@@ -77,9 +77,6 @@
      details:
        selector: div a[href^="/torrent/"]
        attribute: href
-      download:
-        selector: div a[href*="/get/"]
-        attribute: href
      magnet:
        selector: div a[href^="magnet:?"]
        attribute: href
--- a/src/Jackett.Common/Definitions/torrenting.yml
+++ b/src/Jackett.Common/Definitions/torrenting.yml
@@ -86,7 +86,7 @@
        text: "1"
      downloadvolumefactor:
        case:
-          "span:contains(\"Freeleech\")": "0"
+          "span:contains(\"FreeLeech\")": "0"
          "*": "1"
      uploadvolumefactor:
        case:
--- a/src/Jackett.Common/Definitions/torrentkitty.yml
+++ b/src/Jackett.Common/Definitions/torrentkitty.yml
@@ -6,10 +6,12 @@
  type: public
  encoding: UTF-8
  links:
-    - https://gotorrentkitty.cc/
+    - https://torrentkittyso.cc/
  legacylinks:
    - http://cntorrentkitty.com/
    - http://cntorrentkitty.xyz/
+    - https://gotorrentkitty.cc/
+    - http://gotorrentkitty.cc/

  settings:
    - name: category
--- a/src/Jackett.Common/Definitions/torrentlt.yml
+++ b/src/Jackett.Common/Definitions/torrentlt.yml
@@ -6,8 +6,11 @@
  type: private
  encoding: UTF-8
  links:
+    - https://torrent.ai/
+  legacylinks:
    - http://www.torrent.ai/
-
+  certificates:
+    - 87B5A1F83FEEA465EF81D582CF461B8F564AFE91
  caps:
    categorymappings:
      - {id: 27, cat: TV, desc: "Animacija"}
--- a/src/Jackett.Common/Definitions/torrentquest.yml
+++ b/src/Jackett.Common/Definitions/torrentquest.yml
@@ -0,0 +1,71 @@
+---
+  site: torrentquest
+  name: TorrentQuest
+  description: "TorrentQuest is a Public torrent Magnet Links search engine"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://torrentquest.com/
+
+  caps:
+    categories:
+      "TV": TV
+      "Movie": Movies
+      "Music": Audio
+      "E-Book": Books/Ebook
+      "Game": PC/Games
+      "Software": PC
+      "Other": Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  search:
+    headers:
+      # prevent redirect
+      Accept: ["text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"]
+    keywordsfilters:
+      # replace space between keywords with - to prevent 404 Not Found
+      - name: re_replace
+        args: [" ", "-"]
+      - name: tolower
+    paths:
+      # return movie results if there are no search parms supplied (for use with the TEST button)
+      # http://www.magnetdl.com/m/midnight-texas-s01e10/
+      - path: "{{if .Keywords}}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}"     
+    rows:
+      selector: tr:has(td.m)
+    fields:
+      title:
+        selector: td.n a
+        attribute: title
+      category:
+        optional: true
+        selector:  td[class^="t"]
+      details:
+        selector: td.n a
+        attribute: href
+      magnet:
+        selector: td.m a
+        attribute: href
+      date:
+        selector: td:nth-child(3)
+        filters:
+          - name: timeago
+      files:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td.s
+      leechers:
+        selector: td.l
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/torrentseeds.yml
+++ b/src/Jackett.Common/Definitions/torrentseeds.yml
@@ -10,32 +10,34 @@

  caps:
    categorymappings:
-      - {id: 13, cat: PC/0day, desc: "0DAY"}
-      - {id: 37, cat: TV/Anime, desc: "ANIME/HD"}
+      - {id: 13, cat: PC/0day, desc: "Apps/0DAY"}
+      - {id: 37, cat: TV/Anime, desc: "Anime/HD"}
      - {id: 9, cat: TV/Anime, desc: "Anime/SD"}
      - {id: 1, cat: PC/0day, desc: "Apps"}
      - {id: 27, cat: Books, desc: "Bookware"}
-      - {id: 32, cat: Books/Ebook, desc: "EBOOK"}
-      - {id: 47, cat: Console/Other, desc: "GAMES/NSW"}
-      - {id: 60, cat: Console/Other, desc: "GAMES/ATARI"}
-      - {id: 63, cat: Console/Other, desc: "GAMES/UPDATES"}
+      - {id: 32, cat: Books/Ebook, desc: "EBooks"}
+      - {id: 47, cat: Console/Other, desc: "Games/NSW"}
+      - {id: 60, cat: Console/Other, desc: "Games/ATARI"}
+      - {id: 63, cat: Console/Other, desc: "Games/UPDATES"}
      - {id: 2, cat: PC/Games, desc: "Games/PC"}
      - {id: 8, cat: Console/PS3, desc: "Games/PS3"}
-      - {id: 30, cat: Console/PS4, desc: "GAMES/PS4"}
+      - {id: 30, cat: Console/PS4, desc: "Games/PS4"}
      - {id: 7, cat: Console/PSP, desc: "Games/PSP"}
-      - {id: 16, cat: Console/Wii, desc: "GAMES/WII"}
-      - {id: 29, cat: Console/WiiU, desc: "GAMES/WIIU"}
-      - {id: 17, cat: Console/XBox 360, desc: "GAMES/XBOX360"}
+      - {id: 16, cat: Console/Wii, desc: "Games/WII"}
+      - {id: 29, cat: Console/WiiU, desc: "Games/WIIU"}
+      - {id: 17, cat: Console/XBox 360, desc: "Games/XBOX360"}
      - {id: 50, cat: Movies/BluRay, desc: "Movies/Bluray-UHD"}
-      - {id: 31, cat: Movies/BluRay, desc: "MOVIES/COMPLETE-BLURAY"}
-      - {id: 3, cat: Movies/DVD, desc: "MOVIES/DVDR"}
-      - {id: 39, cat: Movies/Foreign, desc: "MOVIES/HD-Foreign"}
-      - {id: 62, cat: Movies/Foreign, desc: "MOVIES/SD-Foreign"}
-      - {id: 19, cat: Movies/HD, desc: "MOVIES/X264"}
+      - {id: 31, cat: Movies/BluRay, desc: "Movies/COMPLETE-BLURAY"}
+      - {id: 3, cat: Movies/DVD, desc: "Movies/DVDR"}
+      - {id: 39, cat: Movies/Foreign, desc: "Movies/HD-Foreign"}
+      - {id: 62, cat: Movies/Foreign, desc: "Movies/SD-Foreign"}
+      - {id: 19, cat: Movies/HD, desc: "Movies/X264"}
      - {id: 49, cat: Movies/HD, desc: "Movies/X265"}
-      - {id: 25, cat: Movies/SD, desc: "MOVIES/XVID"}
-      - {id: 6, cat: XXX, desc: "MOVIES/XXX"}
+      - {id: 25, cat: Movies/SD, desc: "Movies/XVID"}
+      - {id: 6, cat: XXX, desc: "Movies/XXX"}
      - {id: 53, cat: XXX, desc: "Movies/XXX-HD"}
+      - {id: 57, cat: XXX, desc: "Movies/XXX-PAYSITE"}
+      - {id: 55, cat: XXX, desc: "Movies/XXX-DVDR"}
      - {id: 33, cat: Audio/Lossless, desc: "Music/FLAC"}
      - {id: 28, cat: Audio/Other, desc: "Music/MBluRay"}
      - {id: 34, cat: Audio/Other, desc: "Music/MDVDR"}
@@ -52,8 +54,8 @@
      - {id: 44, cat: TV/HD, desc: "P2P/TV-HD"}
      - {id: 51, cat: Movies/HD, desc: "P2P/X265"}
      - {id: 41, cat: Movies/SD, desc: "P2P/XVID"}
-      - {id: 35, cat: TV/Sport, desc: "SPORT"}
-      - {id: 36, cat: TV/Sport, desc: "SPORT-HD"}
+      - {id: 35, cat: TV/Sport, desc: "TV/SPORT"}
+      - {id: 36, cat: TV/Sport, desc: "TV/SPORT-HD"}
      - {id: 11, cat: TV/HD, desc: "TV/BluRay"}
      - {id: 23, cat: TV/SD, desc: "TV/DVDR"}
      - {id: 24, cat: TV/SD, desc: "TV/DVDRIP"}
@@ -75,22 +77,10 @@
    - 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: onlyfree
-      type: checkbox
-      label: Show only Free torrents
-      default: false
    - name: info
      type: info
      label: Results Per Page
-      default: For best results, change the 'Torrents per page' setting to 100 on your 'Torrent Options' from the 'Pers Tools > UserCP' menu on the TorrentSeeds webpage.
+      default: For best results, change the <b>Torrents per page</b> setting to <b>100</b> on your <b>Torrent</b> tab from the <b>Pers Tools > UserCP</b> menu on the TorrentSeeds webpage.

  login:
    path: login.php
@@ -108,86 +98,58 @@

  search:
    paths:
-      - path: browse.php      
+      - path: browse_elastic.php      
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
-      searchin: "title"
-      incldead: "{{ .Config.incldead }}"
-      "only_free": "{{ if .Config.onlyfree }}1{{else}}0{{end}}"
+      $raw: "{{range .Categories}}cat[{{.}}]=1&{{end}}"
+      query: "{{ .Keywords }}"
+      # name, descr, genre, all
+      search_in: name
+      # all, any
+      search_mode: all
+      # added, name, year, size, snatched, seeders, leechers, random
+      order_by: added
+      # desc, asc
+      order_way: desc
+      # advanced disabled
+      # scene: 1 yes 0 no
+      # freetorrent: 1 freeleech 2 neutral 3 either 0 normal
+      # uploader: 1 uploaded 0 member
+      # archived: 1 yes 0 no

    rows:
-      selector: tr.browse_color, tr[id^="kdescr"]
-      after: 1
-      filters:
-        - name: andmatch
+      selector: table.torrent-table tr[class]
    fields:
      category:
-        selector: a[href^="browse.php?cat="]
+        selector: a[href^="/browse_elastic.php?cat="]
        attribute: href
        filters:
          - name: querystring
            args: cat
-      title: # may be abbreviated
-        selector: a[href^="details.php?id="]
-      title: # full title if available
-        optional: true
-        selector: td:nth-of-type(2) a[onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: split
-            args: [">", "1"]
-          - name: replace
-            args: ["</b", ""]
+      title: 
+        selector: a[href^="/details.php?id="]
      details:
-        selector: a[href^="details.php?id="]
+        selector: a[href^="/details.php?id="]
        attribute: href
-      banner:
-        optional: true
-        selector: td:nth-of-type(2) > a[onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=\\\\'(.+?)\\\\'"
-          - name: replace
-            args: ["./pic/noposter.png", ""]
      download:
-        selector: a[href^="download.php?torrent="]
+        selector: a[href^="/download.php?torrent="]
        attribute: href
      files:
-        selector: td:nth-of-type(5)
-      # 2 flavours of dates
+        selector: td.torrent-table-files
      date:
-        # Today<br /> 10:20 AM
-        # Yesterday<br /> 08:03 PM
-        optional: true
-        selector: td:nth-child(7):contains("day")
-      date:
-        # Feb 14 2019<br /> 10:20 AM
-        optional: true
-        selector: td:nth-child(7):not(:contains("day"))
+        selector: td.torrent-table-added
        filters:
-          - name: dateparse
-            args: "Jan 2 2006 03:04 pm"
+          - name: timeago
      size:
-        selector: td:nth-of-type(8)
+        selector: td.torrent-table-size
      grabs:
-        selector: td:nth-of-type(9)
-        filters:
-          - name: regexp
-            args: "([\\d]+)"
+        selector: td.torrent-table-snatched
      seeders:
-        selector: td:nth-of-type(10)
+        selector: td.torrent-table-seeders
      leechers:
-        selector: td:nth-of-type(11)
-      description:
-        selector: td[colspan="14"]
-        filters:
-          - name: replace
-            args: ["\n", "<br>\n"]
+        selector: td.torrent-table-leechers
      downloadvolumefactor:
        case:
-          "img[alt=\"Free Torrent\"]": "0"
+          span.freeleech: "0"
          "*": "1"
      uploadvolumefactor:
        text: "1"
--- a/src/Jackett.Common/Definitions/twilight.yml
+++ b/src/Jackett.Common/Definitions/twilight.yml
@@ -0,0 +1,118 @@
+---
+  site: twilight
+  name: Twilight Torrents
+  description: "Twilight Torrents is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.twilightsdreams.com/
+
+  caps:
+    categorymappings:
+      - {id: 28, cat: Movies, desc: " Boxsets"}
+      - {id: 14, cat: PC, desc: "apps"}
+      - {id: 44, cat: Other, desc: "Bots no Cat yet"}
+      - {id: 46, cat: TV/Documentary, desc: "documentary-TV and Movies"}
+      - {id: 35, cat: Audio/Audiobook, desc: "E-books (audio)"}
+      - {id: 13, cat: Books/Ebook, desc: "E-Books (text)"}
+      - {id: 48, cat: Movies, desc: "Filled Requests"}
+      - {id: 6, cat: Console, desc: "Games/console"}
+      - {id: 7, cat: Console, desc: "Games/handheld"}
+      - {id: 19, cat: PC/Mac, desc: "Games/Mac"}
+      - {id: 2, cat: PC/Games, desc: "Games/PC/Linux"}
+      - {id: 45, cat: Movies, desc: "Holiday stuff"}
+      - {id: 26, cat: Movies, desc: "Kids/all-G-Rated"}
+      - {id: 15, cat: Other, desc: "Misc "}
+      - {id: 10, cat: Movies, desc: "Movies"}
+      - {id: 31, cat: Movies, desc: "Movies /Non English"}
+      - {id: 32, cat: Movies, desc: "Movies Retro/Pre  2000"}
+      - {id: 3, cat: Audio, desc: "Music"}
+      - {id: 4, cat: Audio/Video, desc: "Music/videos"}
+      - {id: 33, cat: TV/Sport, desc: "Sports"}
+      - {id: 36, cat: TV, desc: "Tv"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      perm_ssl: 1
+      submitme: "X"
+    error:
+      - selector: h2
+        message:
+          selector: table tr td.text
+    test:
+      path: browse.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: browse.php      
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead 3 freeleech
+      incldead: 1
+
+    rows:
+      selector: tr[class^="color"]
+#      filters:
+#        - name: andmatch
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: split
+            args: [">", "2"]
+          - name: replace
+            args: ["</b", ""]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      files:
+        selector: td:nth-of-type(6)
+      date:
+        selector: td:nth-of-type(8):contains("day")
+        optional: true
+      date:
+        selector: td:nth-of-type(8):not(:contains("day"))
+        optional: true
+        filters:
+          - name: dateparse
+            args: "Jan 2 2006 03:04 PM"
+      size:
+        selector: td:nth-of-type(9)
+      grabs:
+        selector: td:nth-of-type(10)
+        filters:
+          - name: regexp
+            args: "([\\d]+)"
+      seeders:
+        selector: td:nth-of-type(11)
+      leechers:
+        selector: td:nth-of-type(12)
+      downloadvolumefactor:
+        case:
+          img[src="free.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/uniongang.yml
+++ b/src/Jackett.Common/Definitions/uniongang.yml
@@ -0,0 +1,117 @@
+---
+  site: uniongang
+  name: UnionGang
+  description: "UnionGang is a RUSSIAN Private Torrent Tracker for MOVIES / GENERAL"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://www.uniongang.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies SATRip / DVDRip / HDRip"}
+      - {id: 21, cat: Movies/WEBDL, desc: "Movies WEB-DLRip / WEB-DL"}
+      - {id: 2, cat: Movies/HD, desc: "Movies x264"}
+      - {id: 3, cat: Movies/DVD, desc: "Movies DVD5"}
+      - {id: 4, cat: Movies/DVD, desc: "Movies DVD9"}
+      - {id: 5, cat: Movies/HD, desc: "Movies BDRemux / 720p / 1080p / Bl"}
+      - {id: 6, cat: TV, desc: "TV Сериал"}
+      - {id: 7, cat: TV/Documentary, desc: "TV Документальный"}
+      - {id: 19, cat: TV/Sport, desc: "TV Спорт"}
+      - {id: 8, cat: XXX, desc: "XXX Эротика"}
+      - {id: 9, cat: TV, desc: "Мультфильм"}
+      - {id: 10, cat: TV, desc: "КВН Юмор"}
+      - {id: 11, cat: PC, desc: "Игра PC"}
+      - {id: 13, cat: Audio, desc: "Музыка / Русская"}
+      - {id: 14, cat: Audio, desc: "Музыка / Зарубежная"}
+      - {id: 15, cat: Audio/Video, desc: "Видеоклип"}
+      - {id: 16, cat: Audio/Audiobook, desc: "Аудиокнига"}
+      - {id: 20, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 23, cat: Movies/UHD, desc: "Movies 4K"}
+
+    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
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: /
+      selector: a[href="/logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+      dsearch: ""
+    rows:
+      selector: table.embedded > tbody > tr:has(a[href^="download.php?id="])
+    fields:
+      title:
+        selector: a[href^="/torrent-"]
+        filters:
+          - name: re_replace
+            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+      details:
+        selector: a[href^="/torrent-"]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 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:
+          img[src="pic/freedownload.gif"]: "0"
+          img[src="pic/silverdownload.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+          text: "1"
--- a/src/Jackett.Common/Definitions/vizuk.yml
+++ b/src/Jackett.Common/Definitions/vizuk.yml
@@ -6,6 +6,8 @@
  type: private
  encoding: UTF-8
  links:
+    - http://torrent.vizuk.li/
+  legacylinks:
    - https://torrent.vizuk.li/

  caps:
--- a/src/Jackett.Common/Definitions/xktorrent.yml
+++ b/src/Jackett.Common/Definitions/xktorrent.yml
@@ -21,6 +21,8 @@
      - {id: 15, cat: Audio/Video, desc: "Concert"}
      - {id: 25, cat: PC, desc: "Logiciels"}
      - {id: 27, cat: TV, desc: "Spectacles"}
+      - {id: 28, cat: TV/Sport, desc: "Sports"}
+      - {id: 29, cat: XXX, desc: "XXX"}

    modes:
      search: [q]
--- a/src/Jackett.Common/Definitions/xwtorrents.yml
+++ b/src/Jackett.Common/Definitions/xwtorrents.yml
@@ -58,6 +58,8 @@
      - {id: 54, cat: TV/Sport, desc: "WWE Superstars HD"}
      - {id: 19, cat: TV/Sport, desc: "WWE Velocity"}
      - {id: 31, cat: TV/Sport, desc: "WWE Vintage"}
+      - {id: 74, cat: TV/Sport, desc: "AEW"}
+      - {id: 75, cat: TV/Sport, desc: "AEW HD"}

    modes:
      search: [q]
--- a/src/Jackett.Common/Definitions/yggtorrent.yml
+++ b/src/Jackett.Common/Definitions/yggtorrent.yml
@@ -140,10 +140,15 @@
      type: checkbox
      label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3)
      default: false
-    - name: sonarrv3hack
+# NEW SEARCH ENGINE MIGH BE BETTER THAN THAT
+#    - name: sonarrv3hack
+#      type: checkbox
+#      label: "REMOVED"
+#      default: false
+    - name: betasearchengine
      type: checkbox
-      label: "Enable Full season search hack: Sonarrv3 send 'Series Name SXX' but it won't match 'Series Name - Saison 01' for example so we remove the 'SXX' ==> 'Series Name'"
-      default: true
+      label: "Use Beta Search engine URL (Less restrictive) / SonarrV3 Full Series Search NEW"
+      default: false

  login:
    method: form
@@ -155,6 +160,15 @@
      submit: ""
    error:
      - selector: "#login_msg_pass[style=\"\"][style] > center"
+      - selector: "#ban_msg_login[style=\"\"][style] > center"
+      - selector: "#login_msg_mail[style=\"\"][style] > center"
+      - selector: a[href$="/user/disabled"]
+        message:
+          # Compte Inactif
+          selector: a[href$="/user/disabled"] strong
+          filters:
+            - name: append
+              args: " - Dès que vous passez en dessous d'un ratio inférieur à 1, Votre compte devient inactif et le site vous coupe les téléchargements."
    test:
      path: /
      selector: div#top_panel:contains("Déconnexion")
@@ -162,15 +176,19 @@
  search:
    followredirect: true
    keywordsfilters:
+# COMMENT THAT BECAUSE OF BETA SEARCH
      # Full season seach hack: Sonarrv3 send 'Series Name SXX' but it won't match 'Series Name - Saison 01' for example so we remove the 'SXX' ==> 'Series Name'
-      - name: re_replace
-        args: ["(.*)[sS](\\d{1,4})$", "{{ if .Config.sonarrv3hack }}$1{{else}}$1S$2{{end}}"]
+#      - name: re_replace
+#        args: ["(.*)[sS](\\d{1,4})$", "{{ if .Config.sonarrv3hack }}$1{{else}}$1S$2{{end}}"]
      - name: replace
        args: ["\"", ""]
      - name: trim
    paths:
-      - path: "https://{{ .Config.searchanddlurl }}/engine/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ .Keywords }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date"
-      - path: "https://{{ .Config.searchanddlurl }}/engine/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ .Keywords }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date&page=50"
+#      - path: "https://{{ .Config.searchanddlurl }}/{{if .Config.betasearchengine}}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ re_replace .Keywords \"\\s\" \"\"\"\" }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date"
+#      - path: "https://{{ .Config.searchanddlurl }}/{{if .Config.betasearchengine}}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ re_replace .Keywords \"\\s\" \"\"\"\" }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date&page=50"
+#CHANGED / REMOVED THE quotes around Keyword, seems not needed now / Added betasearch engine
+      - path: "https://{{ .Config.searchanddlurl }}/{{if .Config.betasearchengine}}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{ .Keywords }}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date"
+      - path: "https://{{ .Config.searchanddlurl }}/{{if .Config.betasearchengine}}new_search{{else}}engine{{end}}/search?category={{ .Config.category }}&name={{ .Keywords }}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date&page=50"
    rows:
      selector: "table.table > tbody > tr"
    fields:
@@ -217,8 +235,19 @@
        filters:
          - name: re_replace
            args: ["[\\.\\s\\[\\-][Vv][Oo][Ss][Tt][Ff][Rr][\\.\\s\\]\\-]", ".ENGLISH."]
-      title:
+          - name: re_replace
+            args: ["[\\.\\s\\[\\-][Ss][Uu][Bb][Ff][Rr][Ee][Nn][Cc][Hh][\\.\\s\\]\\-]", ".ENGLISH."]
+      title_phase3:
        text: "{{if .Config.vostfr }}{{ .Result.title_vostfr }}{{else}}{{ .Result.title_phase2 }}{{end}}"
+      title_anime:
+        text: "{{ .Result.title_phase3 }}"
+        filters:
+        # Sonarr need E in front of 3 digit number or else it thinks it is episode
+        # S01E10 for number 110 for example ==> enhancedAnime
+          - name: re_replace
+            args: ["(.*)(\\.| |\\-)(\\d{2,3})(\\.| |\\-)(.*)", "$1 E$3 $5"]
+      title:
+        text: "{{if .Config.enhancedAnime }}{{ .Result.title_anime }}{{else}}{{ .Result.title_phase3 }}{{end}}"
      details:
        selector: ":nth-child(2) > a"
        attribute: href
--- a/src/Jackett.Common/Definitions/yourbittorrent.yml
+++ b/src/Jackett.Common/Definitions/yourbittorrent.yml
@@ -0,0 +1,84 @@
+---
+  site: yourbittorrent
+  name: YourBittorrent
+  description: "YourBittorrent is a Public torrent index"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://yourbittorrent.com/
+
+  caps:
+    categories:
+      "Anime": TV/Anime
+      "Software": PC
+      "eBooks": Books
+      "XXX": XXX
+      "Games": PC/Games
+      "Movies": Movies
+      "Music": Audio
+      "Television": TV
+      "Other": Other
+      "Pictures": Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/down/"]
+
+  search:
+    paths:
+      - path: /
+    inputs:
+      v: ""
+      c: ""
+      q: "{{ .Keywords}}"
+    keywordsfilters:
+      - name: re_replace
+        args: ["[\\s]+", "-"]
+    rows:
+      selector: tr.table-default, tr.table-success
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: td:nth-child(1) a
+        attribute: title
+      title:
+        selector: td:nth-child(2) a
+      details:
+        selector: td:nth-child(2) a
+        attribute: href
+      download:
+        selector: td:nth-child(2) a
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      date:
+        selector: td:nth-child(5):not(:contains("/"))
+        optional: true
+        filters:
+          - name: replace
+            args: ["Today", "now"]
+          - name: replace
+            args: ["Yesterday", "1 day"]
+          - name: timeago
+      date:
+        selector: td:nth-child(5):contains("/")
+        optional: true
+        filters:
+          - name: dateparse
+            args: "02/01/06"
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/zamundanet.yml
+++ b/src/Jackett.Common/Definitions/zamundanet.yml
@@ -7,24 +7,51 @@
  encoding: windows-1251
  links:
    - http://zamunda.net/
+    - http://zamunda.ch/

  caps:
-    categories:
-      7: TV/SD
-      33: TV/HD
-      25: TV/Other
-      5: Movies/HD
-      19: Movies/SD
-      46: Movies/3D
-      42: Movies/BluRay
-      20: Movies/DVD
-      9: XXX
-      49: XXX/Other
-      6: Audio
-      30: Audio/Other
-      29: Audio/Other
-      51: Audio/Other
-      34: Audio/Lossless   
+    categorymappings:
+      - {id: 42, cat: Movies/BluRay, desc: "Movies Blu-ray"}
+      - {id: 25, cat: TV/Anime, desc: "TV Animation/Anime"}
+      - {id: 35, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 46, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 20, cat: Movies/DVD, desc: "Movies DVD-R"}
+      - {id: 19, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 5, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 24, cat: Movies, desc: "Movies BG"}
+      - {id: 31, cat: Movies, desc: "Movies Science"}
+      - {id: 28, cat: Movies, desc: "Movies Russia"}
+      - {id: 7, cat: TV/SD, desc: "TV SD"}
+      - {id: 33, cat: TV/HD, desc: "TV HD"}
+      - {id: 39, cat: PC/Mac, desc: "Games Mac"}
+      - {id: 4, cat: PC/ISO, desc: "Games ISO"}
+      - {id: 21, cat: PC/Games, desc: "Games PC Rip"}
+      - {id: 17, cat: Console/PS3, desc: "Games PS"}
+      - {id: 40, cat: Console/Xbox, desc: "Games Xbox"}
+      - {id: 12, cat: Console, desc: "Games Console"}
+      - {id: 54, cat: PC, desc: "Games Linux"}
+      - {id: 17, cat: Console/PS3, desc: "Games PS"}
+      - {id: 6, cat: Audio, desc: "Music"}
+      - {id: 30, cat: Audio/Other, desc: "Music DTS"}
+      - {id: 29, cat: Audio/Other, desc: "Music DVD-R"}
+      - {id: 51, cat: Audio/Other, desc: "Music Hi-Res/Vinyl"}
+      - {id: 34, cat: Audio/Lossless, desc: "Music Lossless"}
+      - {id: 38, cat: PC/Mac, desc: "Programs Mac"}
+      - {id: 1, cat: PC/ISO, desc: "Programs PC ISO"}
+      - {id: 22, cat: PC/Phone-Other, desc: "Programs Other"}
+      - {id: 43, cat: TV/Sport, desc: "Sport HD"}
+      - {id: 41, cat: TV/Sport, desc: "Sport SD"}
+      - {id: 36, cat: PC/Phone-Other, desc: "Programs Mobile/GSM"}
+      - {id: 52, cat: PC/Phone-Android, desc: "Android/Games"}
+      - {id: 53, cat: PC/Phone-Android, desc: "Android/Apps"}
+      - {id: 26, cat: Other, desc: "Other"}
+      - {id: 23, cat: Other, desc: "Clips"}
+      - {id: 32, cat: Books/Comics, desc: "Books Comics"}
+      - {id: 37, cat: Books/Technical, desc: "Books Dox"}
+      - {id: 9, cat: XXX, desc: "XXX"}
+      - {id: 48, cat: XXX, desc: "XXX 3D"}
+      - {id: 49, cat: XXX, desc: "XXX HD"}
+      - {id: 27, cat: TV/Anime, desc: "Hentai"}

    modes:
      search: [q]
--- a/src/Jackett.Common/Definitions/zelkaorg.yml
+++ b/src/Jackett.Common/Definitions/zelkaorg.yml
@@ -11,18 +11,48 @@

  caps:
    categories:
-      7: TV/SD
-      33: TV/HD
-      25: TV/Other
-      5: Movies/HD
-      53: Movies/HD
-      35: Movies/WEBDL
-      19: Movies/SD
-      46: Movies/3D
-      42: Movies/BluRay
-      20: Movies/DVD
-      9: XXX
-      49: XXX/Other
+    categorymappings:
+      - {id: 42, cat: Movies/BluRay, desc: "Movies Blu-ray"}
+      - {id: 25, cat: TV/Anime, desc: "TV Animation/Anime"}
+      - {id: 35, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 46, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 20, cat: Movies/DVD, desc: "Movies DVD-R"}
+      - {id: 19, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 5, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 24, cat: Movies, desc: "Movies BG"}
+      - {id: 31, cat: Movies, desc: "Movies Science"}
+      - {id: 28, cat: Movies, desc: "Movies Russia"}
+      - {id: 7, cat: TV/SD, desc: "TV SD"}
+      - {id: 33, cat: TV/HD, desc: "TV HD"}
+      - {id: 39, cat: PC/Mac, desc: "Games Mac"}
+      - {id: 4, cat: PC/ISO, desc: "Games ISO"}
+      - {id: 21, cat: PC/Games, desc: "Games PC Rip"}
+      - {id: 17, cat: Console/PS3, desc: "Games PS"}
+      - {id: 40, cat: Console/Xbox, desc: "Games Xbox"}
+      - {id: 12, cat: Console, desc: "Games Console"}
+      - {id: 54, cat: PC, desc: "Games Linux"}
+      - {id: 17, cat: Console/PS3, desc: "Games PS"}
+      - {id: 6, cat: Audio, desc: "Music"}
+      - {id: 30, cat: Audio/Other, desc: "Music DTS"}
+      - {id: 29, cat: Audio/Other, desc: "Music DVD-R"}
+      - {id: 51, cat: Audio/Other, desc: "Music Hi-Res/Vinyl"}
+      - {id: 34, cat: Audio/Lossless, desc: "Music Lossless"}
+      - {id: 38, cat: PC/Mac, desc: "Programs Mac"}
+      - {id: 1, cat: PC/ISO, desc: "Programs PC ISO"}
+      - {id: 22, cat: PC/Phone-Other, desc: "Programs Other"}
+      - {id: 43, cat: TV/Sport, desc: "Sport HD"}
+      - {id: 41, cat: TV/Sport, desc: "Sport SD"}
+      - {id: 36, cat: PC/Phone-Other, desc: "Programs Mobile/GSM"}
+      - {id: 52, cat: PC/Phone-Android, desc: "Android/Games"}
+      - {id: 53, cat: PC/Phone-Android, desc: "Android/Apps"}
+      - {id: 26, cat: Other, desc: "Other"}
+      - {id: 23, cat: Other, desc: "Clips"}
+      - {id: 32, cat: Books/Comics, desc: "Books Comics"}
+      - {id: 37, cat: Books/Technical, desc: "Books Dox"}
+      - {id: 9, cat: XXX, desc: "XXX"}
+      - {id: 48, cat: XXX, desc: "XXX 3D"}
+      - {id: 49, cat: XXX, desc: "XXX HD"}
+      - {id: 27, cat: TV/Anime, desc: "Hentai"}

    modes:
      search: [q]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Garfield69	e5bc386d95	add evolutionpalace a private site. resolves #5713	2019-07-25 15:54:23 +12:00
Garfield69	a9ddab3c80	remove nyoo. site gone. resolves #5722	2019-07-25 09:42:49 +12:00
Garfield69	30955bdb2e	remove b2s-share. site gone. #1562	2019-07-25 08:06:10 +12:00
Garfield69	3c40f6707b	remove brasiltracker. site gone.	2019-07-25 08:02:19 +12:00
Garfield69	b57e138442	remove speed-share. site gone. #2005	2019-07-25 07:59:11 +12:00
Garfield69	92c6c21001	remove manicomioshare. site gone. #1558	2019-07-25 07:57:47 +12:00
Garfield69	af231472b2	add leporno a public 3x site. resolves #5709	2019-07-24 18:52:06 +12:00
Garfield69	df14e595e9	add esharenet a privat ebritish tv site. resolves #5690	2019-07-24 17:29:38 +12:00
Garfield69	1075f451ba	baibako: add rus tag to title. #5673	2019-07-24 17:29:01 +12:00
Garfield69	2e9e1c0e87	amigosshare: strip non-english from title, add year, quality and type. resolves #5714	2019-07-24 15:26:12 +12:00
Garfield69	3f6ea699ed	baibako: fix SxxExx search. resolves #5673	2019-07-24 10:05:14 +12:00
Garfield69	ec23f8cf1f	add lapausetorrents a private french tracker. resolves #5674	2019-07-23 21:33:53 +12:00
Garfield69	747bd5878b	add BaibaKo a Russian semi-rpivate TV site. resolves #5673	2019-07-23 16:08:48 +12:00
Garfield69	74f427d98a	mteamtp: domain changed. resolves #5706	2019-07-23 08:08:09 +12:00
Garfield69	df2bdafc9a	add theaudioscene a private site. resolves #5669	2019-07-22 17:26:14 +12:00
Scott Cooper	eb0ed5444d	demonoid: fix one of the categories (#5701 )	2019-07-22 09:36:28 +12:00
Scott Cooper	95ce18d3a1	teamos: fix one of the categories (#5700 )	2019-07-22 09:01:17 +12:00
Garfield69	023b0e7e5c	torrent9: new doman .is resolves #5591 add andmatch add search results size fix adjust tv category match change dlownload link to magnet sinze the .torrent require an account	2019-07-22 08:50:36 +12:00
Garfield69	e85e3e2ee9	torrent9clone: new domain ww6. also drop category setting which is not used	2019-07-22 08:47:17 +12:00
Garfield69	fbfe537ac5	add learnflakes a private e-learning site. resolves #3575	2019-07-21 20:41:08 +12:00
Garfield69	3cfaae3c55	add r3vwtf a private tracker. resolves #5628	2019-07-21 10:15:27 +12:00
Garfield69	375db79c85	add demonoid a public tracker. resolves #5678	2019-07-20 19:12:40 +12:00
Garfield69	f7e81f9b0f	add scenepalace a Private tracker. resolves #5617	2019-07-20 17:42:54 +12:00
Garfield69	6b460d7598	add lechaudron a French Private site. resolves #5559	2019-07-20 13:49:41 +12:00
xfouloux	f13cdb6ffb	yggtorrent: fix year being prefixed with E (#5689 ) changed for animes when adding the E in front of numbers, was also adding E in front of years for movies.	2019-07-20 07:35:38 +12:00
Garfield69	3779aa655e	add crazy's corner, a private site. resolves #5604	2019-07-19 20:28:59 +12:00
Garfield69	dacaa45958	add teamos a private tracker for software. resolves #5572	2019-07-19 17:50:34 +12:00
Garfield69	32412b39eb	amigosshare: replace spaces with % for search. resolves #5682 also update categories. add grabs column.	2019-07-19 10:46:55 +12:00
Garfield69	9d9c2b513a	add crazyspirits a French Private site. resolves #5479	2019-07-18 19:57:10 +12:00
Garfield69	188082e2e2	add asgaard a Nordic Private site. resolves #5562	2019-07-17 20:25:51 +12:00
Garfield69	6c635afd77	unit3d sites: correct Global Freeleech DVF	2019-07-17 11:15:01 +12:00
Garfield69	2c55f564bb	add tellytorrent a private Indian site. resolves #5635	2019-07-17 10:21:42 +12:00
Yllelder Bamir	105ee61807	mejortorrent: Change to UTF-8 (#5660 )	2019-07-15 12:54:47 +12:00
Sytanek	3d51ca7336	torrenting: correct freeleech DVF (#5663 )	2019-07-15 12:53:33 +12:00
Garfield69	7b6fe429c9	xwtorrents: aff cats 74 & 75. resolves #5651	2019-07-13 06:26:26 +12:00
Garfield69	d5d99d42df	oxtorrent: site changed the category selector.	2019-07-11 15:15:58 +12:00
Garfield69	a668551ce5	torrent9clone: new domain ww5.	2019-07-11 14:53:34 +12:00
Garfield69	85bedbabe4	tapochek: site is forcing http only	2019-07-11 14:50:35 +12:00
Garfield69	29ae57a2a2	torrentkitty: new domain torrentkittyso.cc	2019-07-11 14:43:46 +12:00
Garfield69	864ec0d7bd	mactorrents: new domain .io	2019-07-11 14:39:12 +12:00
Garfield69	68d38e7a24	rockethd: site forcing http only.	2019-07-11 14:21:51 +12:00
Garfield69	87926ea027	mejortorrent: is forcing http. resolves #5632	2019-07-10 10:29:24 +12:00
Garfield69	e1758093bf	Revert "mejortorrent: switch to https (#5583 )" This reverts commit `c5116e9d06`.	2019-07-10 10:18:27 +12:00
Garfield69	2916e8f1d4	pwtorrents: added seedbox download link. resolves #5629	2019-07-10 08:41:30 +12:00
tkimball83	6f87aaba86	Fixes location of centos/redhat jackett role (#5622 )	2019-07-10 08:37:52 +12:00
Garfield69	3d210e10a3	vizuk: https cert expired. resolves #5614	2019-07-09 08:44:28 +12:00
Garfield69	f0dfe5546f	soundpark: new domain .world. resolves #5613	2019-07-08 10:56:54 +12:00
Garfield69	6557f5b696	soundpark: new domain .world. resolves #5613	2019-07-08 10:53:19 +12:00
Garfield69	1cbba5630c	kickasstorrent: cleanup redundant code. no impact.	2019-07-07 11:19:36 +12:00
Garfield69	d2bc96bbea	kickasstorrent: drop login, its a public site! resolves #5594	2019-07-07 10:56:17 +12:00
Garfield69	9aefa04ea5	beyondhd: handle missing category. resolves #5603	2019-07-07 10:05:08 +12:00
Garfield69	7b23f17a68	abnormal, norbits, nordicbits: mask password on config. resolves #5607	2019-07-07 09:48:30 +12:00
Garfield69	2c53cac853	scenefz and wihd; cleanup after they were convereted to yaml in 2018	2019-07-07 09:32:30 +12:00
Garfield69	5a5b48513f	1337x: add optional download .torrent links for BTcache.me or Torrage.info	2019-07-06 19:08:53 +12:00
Yuri Moens	cb59120c02	Nyaa.si: Add more filter categories to config (#5600 )	2019-07-06 07:19:55 +12:00
Yllelder Bamir	c5116e9d06	mejortorrent: switch to https (#5583 ) The web now uses https instead http. Without this, the indexer doesn't work.	2019-07-02 07:55:03 +12:00
Garfield69	79d5989d0a	shareisland: new results layout. resolves #5575	2019-07-01 08:32:16 +12:00
Kyrylo Mikos	3f8d4d968d	Add Toloka.to Semi-Private Tracker. resolves #4970 (#5576 )	2019-07-01 08:31:23 +12:00
Yllelder Bamir	eeb0e9b982	MejorTorrent: handle 4K and 3D. resolves #3384 (#5568 ) This indexer was not able to distinguish whether a film is 3D or 4K, which made it totally unusable. After a lot of fighting with Visual Studio to do tests compiling Jackett, I got the indexer to differentiate 3D and 4K movies. Example screenshot: https://imgur.com/cVp2Klc	2019-06-30 16:32:54 +12:00
Garfield69	33c6f753a1	tigers-ds: drop duplicate filters statement	2019-06-29 17:22:25 +12:00
Garfield69	13ded4e5a5	add seedfile a Romanian Private site. resolves #5551	2019-06-29 17:21:53 +12:00
Garfield69	0f385c7393	cpasbienclone: handle size from keyword searches. resolves #5567	2019-06-29 13:11:06 +12:00
Garfield69	2925eb7434	oxtorrent: remove delete from last year	2019-06-29 12:30:02 +12:00
Garfield69	5c62c29cea	mejortorrent: new domain .org	2019-06-28 19:17:23 +12:00
Garfield69	552912f8c2	add twilight torrents a private site. resolves #1438	2019-06-27 16:31:21 +12:00
Garfield69	a65c649cf3	remove TBPlus, gone. resolves #5552	2019-06-27 13:47:48 +12:00
Garfield69	d53f325afb	add music-master a Romanian Private Music site. resolves #5547	2019-06-27 13:38:40 +12:00
Garfield69	1119c0d379	torrentlt: add ca bypass resolves #5546	2019-06-27 10:43:03 +12:00
Garfield69	8ae402d71b	1337x, et.ag, isuhunt2, karcrs, kathow: drop star from magnets. #5372	2019-06-27 10:07:55 +12:00
Garfield69	055a70eb3e	torrentlt: new domain	2019-06-27 09:28:06 +12:00
xfouloux	4df1a0d64d	cpasbienclone: download via magnet (#5545 ) download via magnets now	2019-06-27 09:26:08 +12:00
Garfield69	70491dfe57	torrentscsv: dont use magnet link as details link. resolves #5539 details or comments link are not available in the results, and returning a magnet instead of a details link is contra to user expectations. so we just point to the web site instead. also added a download link to conform to torznab specs.	2019-06-24 11:01:57 +12:00
Garfield69	2df53768ae	bitmetv: drop insertion of /after sitelink as it already has one.	2019-06-24 10:15:24 +12:00
MsKrypt1	f38f7a9227	anidub: add RUS to title and retry to requests (#5535 ) * Changed http requests to have a retry for AniDUB * Append RUS language tag to releases from AniDUB tracker	2019-06-24 08:08:22 +12:00
Garfield69	5f15651e19	add libranet a Hungarian Private music / ebook site. resolves #5528	2019-06-23 16:44:37 +12:00
Garfield69	23a796378f	tigers-dl: add info to config for list mode. #5527	2019-06-23 08:44:15 +12:00
Garfield69	a1acf2af60	add hon3yhd.net a public Indian site. resolves #5525	2019-06-22 16:56:19 +12:00
Garfield69	5fef1cc0f9	readme: add macos upgrade from mono note.	2019-06-22 12:21:46 +12:00
Garfield69	4f7fbe4763	add ebooks-shares a private ebook/audiobook site. resolves #5515	2019-06-21 20:06:41 +12:00
Ricardo Constantino	dc9022edd1	Animebytes: add Live Action Movies categorization (#5519 )	2019-06-21 07:45:22 +12:00
Garfield69	734bdd21dd	hon3yhd: bypass login issue by using cookie login for now. #5455	2019-06-20 17:05:14 +12:00
Garfield69	79f8657c9f	mactorrents: new domain. resolves #5512	2019-06-20 11:41:06 +12:00
Garfield69	41142dc88f	add mkvcage. resolves #5146	2019-06-19 10:21:39 +12:00
Garfield69	eeb791dbb6	Merge branch 'master' of https://github.com/Jackett/Jackett	2019-06-18 14:06:29 +12:00
Garfield69	cf8011f2b8	add nbtorrents as Indian private site. resolves #5337	2019-06-18 14:06:17 +12:00
xfouloux	f1b7d591bd	sharewood: new category selector (#5503 ) match on category changed	2019-06-18 13:47:54 +12:00
Garfield69	d4e776e23a	transmitthenet (nebulance): handle both date settings, #5496	2019-06-18 10:05:49 +12:00
MsKrypt1	1a548d1c8c	Add AniDUB a Russian Anime site. resolves #5399 (#5490 )	2019-06-15 11:26:07 +12:00
julakali	756161f1e7	TorrentSyndikat: Do not filter query, remove wildcard operator. (#5489 ) TS removes too short terms automatically. Wildcard causes problems with not indexed terms such as "how" (as in "how to sell drugs online fast").	2019-06-15 07:35:06 +12:00
xfouloux	919bf4d99a	yggtorrent: optional beta search engine (#5487 ) 1. Removed sonarrv3hack and add betasearchengine instead Search URL is https://...yggurl..../new_search/..... instead of https://...yggurl..../engine/...... when checkbox selected new_search is less restrictive, and should work better for sonarr V3 and animes too 2. Improved the AnimeEnhancedSearch Returning a Exxx when title contains 1 or more digits (up to 4) and surrounded by a space, dash or dot only, it could break movies search, still have to see if it would be better to just match with \d{3,4} only ``` title_anime: text: "{{ .Result.title_phase3 }}" filters: # Sonarr need E in front of 3 digit number or else it thinks it is episode # S01E10 for number 110 for example ==> enhancedAnime - name: re_replace args: ["(.)(\\.\| \|\\-)(\\d{1,4})(\\.\| \|\\-)(.)", "$1 E$3 $5"] title: text: "{{if .Config.enhancedAnime }}{{ .Result.title_anime }}{{else}}{{ .Result.title_phase3 }}{{end}}" ```	2019-06-15 07:33:59 +12:00
snamds	6eb7a3df45	NewPct: New domain (#5485 )	2019-06-14 10:41:34 +12:00
sunn0	5a822fe5ab	MoreThanTV: switch 4K with 2160p (#5484 ) MTV lists 2160p torrents like " ... / 4K", which tools like Sonarr falsely parse as 480p. This should fix it.	2019-06-14 09:21:03 +12:00
Víctor de la Rosa	dffefa1044	hachede: switch to cookie login. (#5476 ) resolves #5474	2019-06-13 07:13:30 +12:00
Garfield69	1cc62c0f7c	add torrentquest a public magnet tracker. resolves #5468	2019-06-12 17:51:35 +12:00
Garfield69	46edeabcfa	magnetdl: fix leechers and files selectors	2019-06-12 17:49:32 +12:00
Garfield69	e89d1f4616	add oxtorrent a public French site. resolves #5465	2019-06-12 16:33:34 +12:00
Garfield69	65aec0058d	add hamsterstudio a semi-private Russian TV site. resolves #5402	2019-06-12 12:18:23 +12:00
Garfield69	11e6e26c12	magnetdl: fix test. resolves #5470 for empty searches, the site has dropped the invalid-cat page, so we search for movies instead	2019-06-12 08:33:02 +12:00
Garfield69	2b59863409	add itorrent a Public Hungarian site. resolves #5459	2019-06-11 18:13:17 +12:00
Garfield69	34f518841e	torrent9clone: new domain ww1.	2019-06-11 16:42:43 +12:00
Garfield69	771fb73062	add movcr an Indian Public site. resolves #5443	2019-06-11 15:41:05 +12:00
Garfield69	ba6a4647a0	nebulance: change date selector. #5456	2019-06-10 14:21:07 +12:00
Garfield69	7aadf02167	mactorrents: selector changes. resolves #5453	2019-06-10 13:06:39 +12:00
Garfield69	e9536bff76	add rptorrents a private tracker. resolves #5368	2019-06-09 21:23:39 +12:00
Jorman	012fd043f6	btdb: fetch up to 5 pages (#5445 )	2019-06-09 21:21:59 +12:00
Garfield69	d81a8f0217	add yourbittorent a public indexer. resolves #5417	2019-06-09 16:58:38 +12:00
Jorman	db97f9eed3	bigtower: Fixed error on searching phase (#5440 )	2019-06-09 13:59:33 +12:00
Jorman	94f0e1a732	btdb: fix date parser (#5442 )	2019-06-09 13:58:55 +12:00
Garfield69	7b076a001c	rockbox: amend row selector. #5393	2019-06-09 13:48:45 +12:00
Garfield69	5fd7210791	Elitetracker: change date format. resolves #5436 also add a few more categories	2019-06-09 13:22:13 +12:00
Garfield69	dcf3956afd	remove cinefilhd	2019-06-08 12:31:08 +12:00
Garfield69	73b8495197	pleasuredone: handle different ranks results. #5357	2019-06-08 12:07:41 +12:00
Garfield69	2f86b439e4	yts: new domain. resolves #5422	2019-06-08 07:27:21 +12:00
dvdbot	d010053f36	correct the aggregate example (#5412 ) Without the `/api` on the end it works but with it doesn't so maybe a typo?	2019-06-07 07:27:34 +12:00
Garfield69	edbb0159e7	torrentgalaxy: update. resolves #5394 drop .torrent support change row selector	2019-06-06 12:42:32 +12:00
Garfield69	2c770607e6	sportscult: strip uprightbars from title #5378	2019-06-02 06:09:17 +12:00
Garfield69	6191ec0ef4	sportscult: strip %7C from download link for #5378	2019-06-01 20:00:15 +12:00
Garfield69	771e2ea2be	sportscult: update download, add new categories. resolves #5378	2019-06-01 07:12:19 +12:00
Garfield69	a16a0ff73c	Revert "magnetdl has closed." This reverts commit `deb016fabf`.	2019-05-30 08:02:31 +12:00
Garfield69	470550a3c8	limetorrents: add sort by date. resolves #5365	2019-05-29 16:27:09 +12:00
Garfield69	2195c6bb87	torrent9clone: new domain wwv.	2019-05-29 11:55:20 +12:00
djoole	f36a3232d8	yggtorrent: fix search keywords (#5364 ) Doing again what was done in #4597 (and undoing what was broken in #4791) Ex : Search for _la""grande""aventure""lego""2_ and you will find 3 results. Search for _la grande aventure lego 2_ and you'll find nothing at all.	2019-05-29 11:41:45 +12:00
Garfield69	f7fcc614f7	morethantv: try to provide default quality #5334	2019-05-26 19:28:52 +12:00
Garfield69	c15d6468d2	Revert "morethantv: attempt to handle missing quality. #5334 " This reverts commit `ecec867de8`.	2019-05-26 16:18:50 +12:00
Garfield69	ecec867de8	morethantv: attempt to handle missing quality. #5334	2019-05-26 11:50:51 +12:00
Garfield69	461834879e	zamundanet: update categories	2019-05-26 08:49:27 +12:00
Garfield69	d0507319c5	zelkaorg: update categories	2019-05-26 08:49:11 +12:00
R91g	0921388f9e	hdspain: updates (#5330 ) - Fixed details url, now when click on a torrent name will open the torrent url correctly - Added comments (link to topic in forum) - Added minimum ratio and minimum seed time - Added "Megapack / Audio Editado" labels as to the title torrent and description.	2019-05-25 11:53:09 +12:00
Garfield69	543ea776c4	freedomtorrent: handler login errors and poster on/off	2019-05-24 22:12:15 +12:00
Garfield69	bb595337bd	dxdhd: handle login errors and poster on/off	2019-05-24 22:06:04 +12:00
Garfield69	a3f7575e8e	r4e: handle login errors and posters on/off	2019-05-24 22:03:04 +12:00
Garfield69	2c423b3b88	channelx: handle login errors	2019-05-24 21:54:58 +12:00
Garfield69	1253b15061	blutopia: handle posters on/off and login errors	2019-05-24 21:53:02 +12:00
Garfield69	d6f36349c9	channelx: handle posters on/off	2019-05-24 21:49:31 +12:00
Garfield69	46553c3054	hush: update for unit3d 1.9.2	2019-05-24 21:44:01 +12:00
Garfield69	e843f6ce31	add RocketHD a German Private site. resolves #5317	2019-05-24 20:58:53 +12:00
Garfield69	5e4286e382	elitetorrent-biz: new domain .one	2019-05-24 13:51:47 +12:00
Garfield69	2e110e986b	newpct: new domain	2019-05-24 07:32:34 +12:00
Garfield69	3039e2fbe5	siambit: enable downloads. #5243 resolves #5296	2019-05-23 10:40:15 +12:00
Garfield69	9e83be6ae1	Merge branch 'master' of https://github.com/Jackett/Jackett	2019-05-23 07:12:36 +12:00
Garfield69	5f68c25b6e	sportscult: fix date. resolves #5314	2019-05-23 07:12:06 +12:00
Anthony Guillemette	50019e05b7	yggtorrent: replace SUBFRENCH with English (#5309 )	2019-05-22 19:03:20 +12:00
Garfield69	679c74eebd	siambit: fix results for non-vip users. WIP. download not working. #5296	2019-05-22 11:40:55 +12:00
Garfield69	3ac9d26a91	add uniongang a Russian Private site. resolves #5288	2019-05-22 10:02:22 +12:00
Garfield69	45fa6e3971	cardigannindexer: these int values need to be string if used in yml #5293	2019-05-20 11:22:06 +12:00
Garfield69	deb016fabf	magnetdl has closed.	2019-05-20 08:43:48 +12:00
Garfield69	ad281585f2	theshinning: add kids category also handle banners if present and adjustments for discounts	2019-05-19 20:08:52 +12:00
Garfield69	3206d3350d	sharingue: no domain? removed.	2019-05-19 19:25:18 +12:00
Garfield69	c4744f84e2	hd4free: add sports category and corrections to discounts	2019-05-19 19:17:12 +12:00
Garfield69	bc25de158d	beyond-hd: corrections to discounts	2019-05-19 19:05:16 +12:00
Garfield69	ed4e1b801b	xktorrent: add sport and xxx categories	2019-05-19 18:30:30 +12:00
Garfield69	3c81af1a62	freetorrent: update to unit3d 1.9.2	2019-05-19 08:32:17 +12:00
Garfield69	4737093f81	torrentseeds: new search engine. resolves #5292	2019-05-18 11:01:32 +12:00
Garfield69	7a77245e25	yggtorrent: improve login error recognition. resolves #5283	2019-05-18 08:16:40 +12:00
Garfield69	138185929f	cztorrent: add form login and let cardigannindexer decide to show cookie login when recaptcha detected.	2019-05-17 15:23:23 +12:00
Garfield69	a82c166b23	awsomehd: add login form and let cardigannindexer decide to show cookie login when recaptcha detected.	2019-05-17 14:33:25 +12:00
Garfield69	b421253ee5	proaudiotorrent: add login form and let cardigannindexer decide to show cookie login when recaptcha detected.	2019-05-17 14:25:24 +12:00
Garfield69	77832602bd	desireleasers: add login form and let cardigannindexer decide to show cookie login when recaptcha detected.	2019-05-17 14:24:41 +12:00
Garfield69	87a36e3621	cardigannindexer: correclty identify when recaptcha is in use some sites drop the script but leave the g-recaptcha div behind causing false positives on hascaptcha flag.	2019-05-17 14:23:18 +12:00
Garfield69	c33f0594bd	divteam: switch to cookie login. resolves #5282 #5281	2019-05-17 08:40:27 +12:00
flightlevel	a4ee8fee8d	Pull .NET Core 2.2.5 on Appveyor #5179	2019-05-16 19:12:45 +10:00
Garfield69	a12f573e80	generationfree: add multi replacement option. #5279	2019-05-16 20:12:18 +12:00
Garfield69	ea14a5a194	mejortorrent: new domain	2019-05-16 12:55:23 +12:00
Garfield69	b9f9c10baf	asiancinema: now using download_check.	2019-05-16 12:25:29 +12:00
Garfield69	e049376381	add generation-free a Private French site. resolves #5279	2019-05-16 11:13:06 +12:00
Garfield69	e89312b52f	cartoonchaos: add note that only default style is supported. resolves #5274	2019-05-16 07:43:02 +12:00