extratorrent-st: ignore comment link. resolves #16186

Update rudub
uztracker: new cat
2025-12-15 11:45:04 +01:00 · 2025-09-14 16:57:01 +12:00 · 2025-09-14 01:29:04 +00:00 · 2025-09-14 05:54:26 +12:00 · 2025-09-13 01:28:37 +00:00 · 2025-09-12 23:58:26 +01:00
462 changed files with 9318 additions and 12520 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -21,10 +21,17 @@ body:
  id: contributing-guidelines
  attributes:
    label: Have you read our Contributing Guidelines?
-    description: Please read our <a href="https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md">Contributing Guidelines</a> before submitting your issue to ensure a prompt response to your bug.
+    description: Please read our <a href="https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md#troubleshooting">Contributing Guidelines (Troubleshooting and Reporting a Bug sections)</a> before submitting your issue to ensure a prompt response to your bug.
    options:
      - label: I have read the Contributing Guidelines
        required: true
+- type: input
+  attributes:
+    label: Have you ACTUALLY checked all these?
+    description: Please do not waste our time and yours; these checks are there for a reason, it is not just so you can tick boxes for fun. If you type <b>YES</b> and it is clear you did not or have put in no effort, your issue will be closed and locked without comment. If you type <b>NO</b> but still open this issue, you will be permanently blocked for timewasting.
+    placeholder: YES or NO
+  validations:
+    required: true
 - type: textarea
  id: environment
  attributes:
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,7 +57,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/definitions-update.yml
+++ b/.github/workflows/definitions-update.yml
@@ -0,0 +1,68 @@
+name: Update definitions
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 1 * * *'
+  pull_request:
+    paths:
+      - '.github/workflows/definitions-update.ya?ml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  update-rudub:
+    name: Update rudub
+    if: github.repository == 'Jackett/Jackett'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Generate Token
+        uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: "${{ secrets.BOT_APP_ID }}"
+          private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
+
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Environment Variables
+        run: |
+          echo "CURRENT_RUDUB_DOMAIN=$(date +'%b%d' | tr '[:upper:]' '[:lower:]').rudub.bet" >> $GITHUB_ENV
+          echo "PREVIOUS_RUDUB_DOMAIN=$(date --date='yesterday' +'%b%d' | tr '[:upper:]' '[:lower:]').rudub.bet" >> $GITHUB_ENV
+
+      - name: Update rudub definition
+        uses: mikefarah/yq@master
+        with:
+          cmd: yq -i '.legacylinks += "https://" + strenv(PREVIOUS_RUDUB_DOMAIN) + "/" | .legacylinks += "http://" + strenv(CURRENT_RUDUB_DOMAIN) + "/" | .links = ["https://" + strenv(CURRENT_RUDUB_DOMAIN) + "/"] | .legacylinks |= unique | .legacylinks = .legacylinks.[-30:]' src/Jackett.Common/Definitions/rudub.yml
+
+      - name: Show changes
+        run: git diff --color
+
+      - name: Commit Changes
+        if: github.event_name != 'pull_request'
+        run: |
+          git config user.name '${{ steps.app-token.outputs.app-slug }}[bot]'
+          git config user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com'
+
+          git add src/Jackett.Common/Definitions/rudub.yml
+
+          if git status | grep -q modified
+          then
+            git commit -m "Update rudub"
+            git push
+          else
+            echo "No changes since last run"
+          fi
--- a/.github/workflows/issuebot.yml
+++ b/.github/workflows/issuebot.yml
@@ -20,11 +20,11 @@ jobs:
    steps:
      # This workflow will run a script that is stored in the repository. This step checks out the repository contents so that the workflow can access the script.
      - name: Check out repo content
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      # This step sets up Node.js. The script that this workflow will run uses Node.js.
      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
        with:
          node-version: '18.x'

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,8 +71,8 @@ Your issue should have the following information.
 - **What happens** when you take the steps and **what you expected to happen**
 - **Error messages** and/or screenshots of the issue.
 - The **last working version** if it's applicable. Tracker issues normally don't need this information.
- An attached copy of your **enhanced logs**. Don't forget to remove usernames/passwords/API-keys from the logs.
-    We'll be working on making sure these are automatically censored in the future.
+- An attached copy of your **enhanced logs**. Don't forget to check and remove usernames/passwords/API-keys etc. from the logs.
+    We've attempted to automatically censor these, but it pays to double check we've not missed anything.
 - Any other **relevant details** you can think of. The more information we have, the quicker we can solve the problem.

 ## Adding a New Tracker
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ The software implements the [Torznab](https://torznab.github.io/spec-1.3-draft/i
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)

 #### Supported Systems
-The currently supported version of Jackett is 0.22.+, which is compatible with the following OS:
+The currently supported version of Jackett is 0.23.+, which is compatible with the following OS:
 * Windows 10 Version 1607+ or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#windows)
 * Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux)
 * macOS 13.0+ (Ventura) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos)
@@ -34,7 +34,6 @@ Prior versions of Jackett are no longer supported.
 * 1337x
 * 52BT
 * ACG.RIP
- * Anidex
 * AniLibria
 * Anime Time
 * Anime Tosho
@@ -42,22 +41,21 @@ Prior versions of Jackett are no longer supported.
 * AniSource
 * ApacheTorrent
 * AudioBook Bay (ABB)
- * Badass Torrents
 * Bangumi Moe
 * BigFANGroup
 * BitRu
- * BitSearch
+ * BitSearch (Solid Torrents)
 * BluDV
 * BlueRoms
 * BT.etree
 * BTdirectory (BT目录)
- * BTMET
- * BTSOW
+ * btstate
 * Byrutor
+ * Catorrent
 * Cinecalidad
- * cpasbien
 * cpasbienClone
 * CrackingPatching
+ * DaMagNet
 * DivxTotal
 * dmhy
 * DonTorrent
@@ -68,48 +66,48 @@ Prior versions of Jackett are no longer supported.
 * EXT Torrents
 * ExtraTorrent.st
 * EZTV
+ * FileMood
 * FilmesHdTorrent
+ * Free JAV Torrent
+ * Frozen Layer
 * GamesTorrents
- * GloDLS
 * GTorrent.pro
 * Idope
 * ilCorSaRoNeRo
 * Internet Archive (archive.org)
 * Isohunt2
 * iTorrent
- * JAV-Torrent
 * kickasstorrents.to
 * kickasstorrents.ws
 * Knaben
- * LAPUMiA
- * LePorno.info
- * Libronube
 * LimeTorrents
 * LinuxTracker
 * Mac Torrents Download
 * Magnet Cat
+ * MagnetDownload
 * MegaPeer
 * MejorTorrent
 * Mikan
 * MixTapeTorrent
 * MoviesDVDR
 * MyPornClub
- * Newstudio
+ * NewStudio
 * Nipponsei
 * NoNaMe Club (NNM-Club)
 * NorTorrent
 * Nyaa.si
- * NyaaPantsu
 * OneJAV
 * OxTorrent
 * OxTorrent-vip
 * OpenSharing
 * PC-torrent
+ * Pirate's Paradise
 * plugintorrent
 * PornoTorrent
 * PornRips
+ * PornXLab
 * Postman
- * ProPorn
+ * Qbite (Hubite)
 * Rapidzona
 * RedeTorrent
 * RinTorNeT
@@ -118,44 +116,40 @@ Prior versions of Jackett are no longer supported.
 * Sexy-Pics
 * Shana Project
 * ShowRSS
- * Solid Torrents
+ * SkidrowRepack
 * sosulki
 * SubsPlease
 * sukebei.Nyaa.si
 * The Pirate Bay (TPB)
 * TheRARBG
 * Tokyo Tosho
- * Torlock
 * Torrent Downloads
 * Torrent Oyun indir
 * Torrent[CORE]
 * torrent.by
 * torrent-pirat
 * Torrent9
- * TorrentFunk
 * TorrentDosFilmes
 * TorrentDownload
- * TorrentGalaxy
+ * TorrentGalaxyClone
 * TorrentKitty
 * TorrentProject2
 * TorrentQQ (토렌트큐큐)
 * Torrents.csv
 * TorrentSir (토렌트썰)
+ * Torrentsome (토렌트썸)
 * torrentssg (토렌트쓱)
- * TorrentView (토렌트뷰)
- * Torrentz2nz
+ * Torrenttip (토렌트팁)
 * TrahT
- * truPornolabs
 * U3C3
- * UnionDHT
+ * Uindex
+ * UzTracker
 * VSTHouse
 * VST Torrentz
 * VSTorrent
 * Wolfmax4K
- * xxxAdultTorrent
 * XXXClub
 * xxxtor
- * YourBittorrent
 * YTS.ag
 * zetorrents
 * ZkTorrent
@@ -171,24 +165,22 @@ Prior versions of Jackett are no longer supported.
 * BitMagnet (Local DHT) [[site](https://github.com/bitmagnet-io/bitmagnet)]
 * BookTracker
 * BootyTape
- * Catorrent
 * comicat
 * Deildu
 * Devil-Torrents
 * DreamingTree
 * DXP (Deaf Experts)
 * Electro-Torrent
- * EniaHD
 * Erai-Raws
 * Ex-torrenty
 * ExKinoRay
- * ExtremlymTorrents
+ * EZTV (login)
+ * Fenyarnyek-Tracker
 * File-Tracker
 * Gay-Torrents.net
- * Genesis-Movement
- * HD-CzTorrent
+ * HD-CzTorrent [PAY2DL]
 * HDGalaKtik
- * HellTorrents
+ * HellTorrents [PAY2DL]
 * HunTorrent
 * Il CorSaRo Blu
 * ilDraGoNeRo
@@ -206,10 +198,12 @@ Prior versions of Jackett are no longer supported.
 * MVGroup Forum
 * MVGroup Main
 * NetHD (VietTorrent)
- * Newstudio (login)
+ * NewStudio (login)
 * NoNaMe Club (NNM-Club) (login)
 * Polskie-Torrenty
 * PornoLab
+ * Postman (login)
+ * ProPorno
 * PussyTorrents
 * Rainbow Tracker
 * RGFootball
@@ -226,44 +220,45 @@ Prior versions of Jackett are no longer supported.
 * themixingbowl (TMB)
 * Toloka
 * TorrentMasters
- * Torrents-Local
 * TribalMixes
 * Union Fansub
 * UniOtaku
- * ViDEOTEKA
- * ZOMB
+ * ViDEOTEKA (VT)
 * Ztracker
 </details>

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

 * 0day.kiev
+ * 13City
 * 1ptbar
 * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
 * 3D Torrents (3DT)
 * 4thD (4th Dimension) [![(invite needed)][inviteneeded]](#)
 * 52PT
 * 720pier
- * Abnormal
+ * Abnormal (ABN)
 * ABtorrents (ABT + RNS)
 * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
 * Aftershock
- * AGSVPT (Artic Global Seed Vault)
+ * AFUN
+ * AGSVPT (Arctic Global Seed Vault)
 * Aidoru!Online
 * Aither
 * AlphaRatio (AR)
- * AmigosShareClub
+ * AmigosShareClub (ASC)
 * AnimeBytes (AB)
 * AnimeLovers
 * AnimeTorrents (AnT)
 * AnimeTorrents.ro (Anime Torrents Romania)
- * AnimeWorld
- * Anthelion
+ * AnimeWorld (AW)
+ * Anthelion (ANT)
 * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
+ * ArabicSource
 * ArabP2P
 * ArabTorrents [![(invite needed)][inviteneeded]](#)
 * AsianCinema
- * AsianDVDClub
+ * AsianDVDClub (ADC)
 * Audiences
 * AudioNews (AN)
 * Aussierul.es [![(invite needed)][inviteneeded]](#)
@@ -275,14 +270,16 @@ Prior versions of Jackett are no longer supported.
 * Best-Core
 * BeyondHD (BHD)
 * Bibliotik [![(invite needed)][inviteneeded]](#)
+ * BigCore
 * Bit-Bázis
 * BIT-HDTV
 * Bitded
+ * bitGAMER
 * Bithorlo (BHO)
- * BitHUmen [![(invite needed)][inviteneeded]](#)
+ * BitHUmen
 * Bitpalace
 * BitPorn
- * Bitspyder
+ * BitSexy
 * BitTorrentFiles
 * BiTTuRK
 * BJ-Share (BJ) [![(invite needed)][inviteneeded]](#)
@@ -313,50 +310,50 @@ Prior versions of Jackett are no longer supported.
 * CinemaMovieS_ZT
 * Cinematik
 * CinemaZ (EuTorrents)
- * Coastal-Crew
- * ConCen [![(invite needed)][inviteneeded]](#)
+ * ClearJAV
+ * Coastal-Music-Crew (C-M-C)
+ * ConCen (Conspiracy Central) [![(invite needed)][inviteneeded]](#)
 * Concertos
 * CrabPT (蟹黄堡)
 * CrazySpirits
 * CrnaBerza
+ * cspt (财神)
 * cyanbug (大青虫)
- * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
 * DANISH BYTES
- * Dark-Shadow
+ * Darkpeers
 * Das Unerwartete (D-U)
 * DataScene (DS)
 * DesiTorrents [![(invite needed)][inviteneeded]](#)
 * Diablo Torrent
 * DICMusic [![(invite needed)][inviteneeded]](#)
- * DigitalCore
+ * DigitalCore (DC)
 * DimeADozen (EzTorrent)
 * DiscFan [![(invite needed)][inviteneeded]](#)
- * DivTeam
 * DocsPedia
 * Drugari
 * Ebooks-Shares [![(invite needed)][inviteneeded]](#)
 * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
 * eMuwarez
- * Enthralled
 * eShareNet
 * eStone (BigTorrent)
 * Exitorrent.org [![(invite needed)][inviteneeded]](#)
 * ExoticaZ (YourExotic)
+ * Explosiv-World (E-W)
 * ExtremeBits
 * F1Carreras
+ * F1GP
 * FANO.IN [![(invite needed)][inviteneeded]](#)
 * Fappaizuri
 * FearNoPeer
 * Femdomcult
 * FileList (FL)
 * FinElite (FE) [![(invite needed)][inviteneeded]](#)
- * FinVip
+ * Flood (FLD)
 * Flux-Zone
 * Free Farm (自由农场)
- * FSM
 * FunFile (FF)
 * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
- * FutureTorrent
+ * FutureTorrent [PAY2DL]
 * Fuzer (FZ)
 * Gay-Torrents.org
 * GAYtorrent.ru
@@ -364,13 +361,13 @@ Prior versions of Jackett are no longer supported.
 * Generation-Free [![(invite needed)][inviteneeded]](#)
 * GGPT
 * GigaTorrents
- * GimmePeers (formerly ILT)
+ * GimmePeers (formerly ILT) [PAY2DL]
 * GiroTorrent
 * GreatPosterWall (GPW)
 * HaiDan
 * Hǎitáng (海棠PT)
- * HappyFappy
- * Hawke-uno
+ * HappyFappy (HF)
+ * Hawke-uno (HUNO)
 * HD Dolby [![(invite needed)][inviteneeded]](#)
 * HD Zero
 * HD-Club [![(invite needed)][inviteneeded]](#)
@@ -381,78 +378,74 @@ Prior versions of Jackett are no longer supported.
 * HD-Torrents (HDT)
 * HD-UNiT3D
 * HDArea (HDA)
- * HDAtmos
+ * HDBao
 * HDBits [![(invite needed)][inviteneeded]](#)
 * HDCiTY (HDC) [![(invite needed)][inviteneeded]](#)
 * HDClone
 * HDFans
- * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
+ * HDHome [![(invite needed)][inviteneeded]](#)
 * HDKylin (麒麟)
 * HDRoute [![(invite needed)][inviteneeded]](#)
 * HDSky [![(invite needed)][inviteneeded]](#)
- * HDT-LaFenice
 * HDtime
 * HDTorrents.it [PAY2DL]
 * HDTurk
 * HDU
- * HDVIDEO
- * Hebits
+ * Hebits (HB)
 * HellasHut
 * HHanClub
 * HHD
 * HomePornTorrents (HPT)
 * House of Devil
+ * HQMusic
 * HUDBT (蝴蝶) [![(invite needed)][inviteneeded]](#)
- * iAnon
- * ICC2022 (冰淇淋) [![(invite needed)][inviteneeded]](#)
 * ilolicon PT
 * ImmortalSeed (iS)
 * Immortuos
 * Indietorrents [![(invite needed)][inviteneeded]](#)
- * INFINITY [![(invite needed)][inviteneeded]](#)
+ * INFINITY [PAY2DL] [![(invite needed)][inviteneeded]](#)
 * Infire
 * Insane Tracker
 * IPTorrents (IPT)
- * IrishTV
 * ItaTorrents
 * JME-REUNIT3D
- * JoyHD [![(invite needed)][inviteneeded]](#)
+ * JoyHD (JHD) [![(invite needed)][inviteneeded]](#)
 * JPopsuki
- * JPTV
 * KamePT [![(invite needed)][inviteneeded]](#)
 * Karagarga [![(invite needed)][inviteneeded]](#)
- * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * Keep Friends (FRDS-PT) [![(invite needed)][inviteneeded]](#)
 * Kelu [![(invite needed)][inviteneeded]](#)
 * Korsar [![(invite needed)][inviteneeded]](#)
 * KrazyZone
 * Kufei (库非)
 * Kufirc
 * Last Digital Underground (LDU)
- * LastFiles
- * LaidBackManor
+ * LastFiles (LF)
 * Lat-Team
 * Le Saloon [![(invite needed)][inviteneeded]](#)
- * Le-Cinephile
- * LearnBits
 * LearnFlakes
+ * Leech24
 * LemonHD [![(invite needed)][inviteneeded]](#)
 * Lesbians4u
+ * LetSeed
 * Libble
 * LibraNet (LN)
 * LinkoManija
 * Locadora
 * LosslessClub [![(invite needed)][inviteneeded]](#)
 * LST
+ * LuckPT [![(invite needed)][inviteneeded]](#)
 * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
 * MaDs Revolution
 * Majomparádé (TurkDepo)
 * Making Off
- * Mansão dos Animes (MDAN)
 * Malayabits
+ * Mansão dos Animes (MDAN)
+ * Matrix
 * MegamixTracker
 * MeseVilág (Fairytale World)
 * MetalGuru [![(invite needed)][inviteneeded]](#)
- * Milkie
+ * Milkie (ME)
 * MMA-Torrents [![(invite needed)][inviteneeded]](#)
 * MNV (Max-New-Vision)
 * MOJBLiNK
@@ -461,23 +454,20 @@ Prior versions of Jackett are no longer supported.
 * MouseBits
 * MyAnonamouse (MAM)
 * MySpleen [![(invite needed)][inviteneeded]](#)
- * NCore [![(invite needed)][inviteneeded]](#)
+ * NCore
 * Nebulance (NBL) (TransmiTheNet)
 * NewHeaven (TorrentHeavenResurrection) [![(invite needed)][inviteneeded]](#)
 * NicePT
- * Nirvana
 * NorBits
 * NordicQuality
- * Ntelogo
 * Nusanta(RA.RE)
 * OKPT
- * Old Greek Tracker
- * Old Toons World
+ * Old Greek Tracker (OGT)
+ * Old Toons World (OTW)
 * OpenCD [![(invite needed)][inviteneeded]](#)
 * Orpheus
 * OnlyEncodes+
 * OshenPT
- * Ostwiki
 * OurBits (HDPter)
 * P2PBG
 * Panda
@@ -485,6 +475,7 @@ Prior versions of Jackett are no longer supported.
 * PassThePopcorn (PTP) [![(invite needed)][inviteneeded]](#)
 * Peeratiko
 * Peers.FM
+ * Phoenix Project
 * PigNetwork (猪猪网)
 * PixelCove (Ultimate Gamer)
 * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
@@ -494,7 +485,6 @@ Prior versions of Jackett are no longer supported.
 * Portugas
 * Pretome
 * PrivateHD (PHD)
- * PrivateSilverScreen (PSS)
 * ProAudioTorrents (PAT)
 * PT GTK
 * PT分享站 (itzmx)
@@ -505,6 +495,7 @@ Prior versions of Jackett are no longer supported.
 * PTFiles (PTF)
 * PThome [![(invite needed)][inviteneeded]](#)
 * PTSBAO (烧包) [![(invite needed)][inviteneeded]](#)
+ * PTSKIT
 * PTtime
 * PTVicomo
 * Punk's Horror Tracker
@@ -515,30 +506,31 @@ Prior versions of Jackett are no longer supported.
 * R3V WTF! [![(invite needed)][inviteneeded]](#)
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
- * Rain
- * RareShare2
- * Red Leaves (红叶) [![(invite needed)][inviteneeded]](#)
+ * RailgunPT
+ * Rain (雨)
+ * Rastastugan
 * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
 * Redacted (PassTheHeadphones)
- * ReelFlix
+ * ReelFlix (HD4Free,LegacyHD)
 * RetroFlix
 * RevolutionTT [![(invite needed)][inviteneeded]](#)
 * RocketHD
 * Romanian Metal Torrents (RMT)
- * RoTorrent
 * Rousi
 * SAMARITANO
- * SATClubbing
 * SceneHD [![(invite needed)][inviteneeded]](#)
- * SceneRush
+ * SceneRush [![(invite needed)][inviteneeded]](#)
 * SceneTime
 * Secret Cinema
- * SeedFile
+ * SeedFile (SF)
 * seedpool
+ * SewerPT (下水道) [![(invite needed)][inviteneeded]](#)
+ * SexTorrent
 * SFP (Share Friends Projekt)
 * Shareisland
 * Shazbat
 * SiamBIT
+ * SkipTheCommercials
 * SnowPT (SSPT)
 * SoulVoice (聆音Club) [![(invite needed)][inviteneeded]](#)
 * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
@@ -546,7 +538,7 @@ Prior versions of Jackett are no longer supported.
 * Speedmaster HD [![(invite needed)][inviteneeded]](#)
 * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
 * SportsCult
- * SpringSunday [![(invite needed)][inviteneeded]](#)
+ * SpringSunday (SSD) [![(invite needed)][inviteneeded]](#)
 * SugoiMusic
 * Superbits (SBS)
 * Swarmazon
@@ -557,30 +549,29 @@ Prior versions of Jackett are no longer supported.
 * TeamOS
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * The Crazy Ones
+ * The Empire (TE)
 * The Falling Angels (TFA)
 * The Geeks
- * The Kitchen
+ * The Kitchen (TK)
 * The New Retro
- * The Occult
- * The Old School
+ * The Occult (TO)
+ * The Old School (TOS)
 * The Paradiese
- * The Place [![(invite needed)][inviteneeded]](#)
- * The Show
- * The Vault
+ * The Place (TP)
+ * The Show (TSBZ)
+ * The Vault (TVBZ)
 * The-New-Fun
- * TheEmpire (TE)
 * TheLeachZone (TLZ)
 * ThePiratedShip
 * TJUPT (北洋园PT)
 * TLFBits [![(invite needed)][inviteneeded]](#)
- * TmGHuB [![(invite needed)][inviteneeded]](#)
+ * TmGHuB (TH) [![(invite needed)][inviteneeded]](#)
 * Toca Share
 * Tormac
 * Tornado
 * Torrent Heaven (Dutch)
 * Torrent Network (TN)
 * Torrent Trader [![(invite needed)][inviteneeded]](#)
- * Torrent-Explosiv
 * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
 * TOrrent-tuRK (TORK)
 * Torrent.LT
@@ -588,20 +579,18 @@ Prior versions of Jackett are no longer supported.
 * TorrentBytes (TBy) [![(invite needed)][inviteneeded]](#)
 * TorrentCCF (TCCF)
 * TorrentDay (TD)
- * TorrentDD
+ * TorrentDD (TodayBit)
 * Torrenteros (TTR)
 * TorrentHR
 * Torrenting (TT)
- * Torrentland
 * TorrentLeech (TL)
 * TorrentLeech.pl [![(invite needed)][inviteneeded]](#)
- * TorrentSeeds (TS)
 * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
 * TrackerMK
 * TranceTraffic
 * Trellas (Magico) [![(invite needed)][inviteneeded]](#)
 * TreZzoR
- * TurkSeed
+ * TurkSeed (Aturk)
 * TurkTorrent (TT)
 * TV Chaos UK (TVCUK)
 * TVstore
@@ -609,9 +598,8 @@ Prior versions of Jackett are no longer supported.
 * UBits
 * UHDBits
 * UltraHD
- * UnionGang
 * UnlimitZ
- * upload.cx
+ * upload.cx (ULCX)
 * Upscale Vault
 * UTOPIA
 * Vault network
@@ -620,19 +608,18 @@ Prior versions of Jackett are no longer supported.
 * WinterSakura [![(invite needed)][inviteneeded]](#)
 * World-In-HD [![(invite needed)][inviteneeded]](#)
 * World-of-Tomorrow [![(invite needed)][inviteneeded]](#)
- * Wukong (悟空问道)
 * x-ite.me (XM)
- * Xider-Torrent
 * XSpeeds (XS)
 * Xthor [![(invite needed)][inviteneeded]](#)
 * xTorrenty [![(invite needed)][inviteneeded]](#)
- * XtremeBytes
+ * XtremeBytes (TorrentSurf)
 * XWT-Classics
 * XWTorrents (XWT)
 * YggTorrent (YGG)
 * YOiNKED
 * YUSCENE
 * Zamunda.net
+ * Zappateers
 * Zelka.org
 * ZmPT (织梦)
 * ZonaQ [![(invite needed)][inviteneeded]](#)
@@ -662,6 +649,8 @@ t=book:
   params  : q, title, author, publisher, year, genre
 ```

+Note that most indexers will only support a subset of these search modes and parameters, use the t=caps to get a list of the actual modes and parms supported by an indexer.
+
 Examples:

 ```
@@ -711,7 +700,7 @@ 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.
-Using the "all" indexer has no advantages (besides reduced management overhead), the only disadvantages:
+Using the "all" indexer has no advantages (besides reduced management overhead), and there are many disadvantages:
 * you lose control over indexer specific settings (categories, search modes, etc.)
 * mixing search modes (IMDB, query, etc.) might cause low-quality results
 * indexer specific categories (>= 100000) can't be used.
@@ -774,7 +763,7 @@ If you want to run it with a user without a /home directory you need to add `Env


 ## Installation on Linux (ARMv6 or below)
- 1. Install [Mono 5.8](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release is recommended)
+ 1. Install [Mono 5.10](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release is recommended)
       * Follow the instructions on the mono website and install the `mono-devel` and the `ca-certificates-mono` packages.
       * On Red Hat/CentOS/openSUSE/Fedora the `mono-locale-extras` package is also required.
 2. Install  libcurl:
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,7 +2,7 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
  majorVersion: 0
-  minorVersion: 22
+  minorVersion: 23
  patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
@@ -108,7 +108,7 @@ stages:
            Mono:
              buildDescription: Mono
              imageName: ubuntu-22.04
-              framework: net462
+              framework: net471
              runtime: linux-x64
              archiveType: tar
              artifactName: Jackett.Binaries.Mono.tar.gz
@@ -280,7 +280,6 @@ stages:
                $newVersion.Value = '4.0.0.0'
                $xml.Save($file)
                Remove-Item '$(Build.BinariesDirectory)/Jackett/System.Net.Http.dll'
-                Remove-Item '$(Build.BinariesDirectory)/Jackett/System.Runtime.InteropServices.RuntimeInformation.dll'

          - task: Bash@3
            displayName: Set Folder and File Permissions (Mono, Linux and macOS)
@@ -438,7 +437,7 @@ stages:
            Mono:
              buildDescription: Mono
              imageName: ubuntu-22.04
-              framework: net462
+              framework: net471
              runtime: linux-x64
        pool:
          vmImage: $(imageName)
@@ -535,7 +534,7 @@ stages:
              buildDescription: Mono
              imageName: ubuntu-22.04
              artifactName: Jackett.Binaries.Mono.tar.gz
-              framework: net462
+              framework: net471
              runtime: linux-x64
        pool:
          vmImage: $(imageName)
--- a/src/Jackett.Common/Content/favicon.ico
+++ b/src/Jackett.Common/Content/favicon.ico
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -323,7 +323,7 @@
                <li><a target="_blank" href="{{this}}" class="alternativesitelink">{{this}}</a></li>
                {{/each}}
            </ul>
-            Click on an URL to copy it to the Site Link field.
+            Click on a URL to load it into the Site Link field.
        </div>
    </script>
    <script id="setup-item-inputtags" type="text/x-handlebars-template">
--- a/src/Jackett.Common/Content/jacket_medium.png
+++ b/src/Jackett.Common/Content/jacket_medium.png
--- a/src/Jackett.Common/Definitions/0magnet.yml
+++ b/src/Jackett.Common/Definitions/0magnet.yml
@@ -6,12 +6,12 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
-  - https://0magnet.co/
  - https://13mag.net/
  - https://16mag.net/
 legacylinks:
  - https://0magnet.com/
  - https://9mag.net/
+  - https://0magnet.co/

 caps:
  categories:
@@ -42,7 +42,7 @@ search:
  paths:
    - path: search
  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}.{{ end }}"

  rows:
    selector: table > tbody > tr:has(td)
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -12,14 +12,7 @@ links:
  - https://1337x.st/
  - https://x1337x.ws/
  - https://x1337x.eu/
-  - https://x1337x.se/
  - https://x1337x.cc/
-  - https://1337x.unblockninja.com/
-  - https://1337x.ninjaproxy1.com/
-  - https://1337x.proxyninja.org/
-  - https://1337x.proxyninja.net/
-  - https://1337x.torrentbay.st/
-  - https://1337x.torrentsbay.org/
 legacylinks:
  - https://1337x.is/
  - https://1337x.gd/
@@ -27,6 +20,13 @@ legacylinks:
  - https://1337x.abcproxy.org/
  - https://1337x.so/
  - https://1337x.unblockit.download/
+  - https://1337x.unblockninja.com/ # keyword search not working
+  - https://1337x.ninjaproxy1.com/ # keyword search not working
+  - https://1337x.proxyninja.org/ # keyword search not working
+  - https://1337x.proxyninja.net/ # keyword search not working
+  - https://1337x.torrentbay.st/ # keyword search not working
+  - https://1337x.torrentsbay.org/ # keyword search not working
+  - https://x1337x.se/

 caps:
  categorymappings:
@@ -120,6 +120,13 @@ caps:
  allowrawsearch: true

 settings:
+  - name: uploader
+    type: text
+    label: Filter by Uploader
+  - name: info_uploader
+    type: info
+    label: About filtering by Uploader
+    default: "You can filter by Uploader by entering a Case Sensitive username, or leave empty to get all results.<br>Note: this is the username of the Uploader and not the Groupname that often show up at the end of 1337x titles, eg -GalaxyRG."
  - name: info_flaresolverr
    type: info_flaresolverr
  - name: downloadlink
@@ -177,7 +184,7 @@ search:
      args: ["\\bS(20\\d{2})\\b", "$1"]

  rows:
-    selector: tr:has(a[href^="/torrent/"])
+    selector: "tr:has(a[href^=\"/torrent/\"]){{ if .Config.uploader }}:has(td[class^=\"coll-5\"]:contains({{ .Config.uploader }})){{ else }}{{ end }}"

  fields:
    title_default:
@@ -273,6 +280,10 @@ search:
      selector: td[class^="coll-2"]
    leechers:
      selector: td[class^="coll-3"]
+    _username:
+      selector: td[class^="coll-5"]
+    description:
+      text: "Uploader: {{ .Result._username }}"
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/hdvideo.yml
+++ b/src/Jackett.Common/Definitions/hdvideo.yml
@@ -1,32 +1,31 @@
 ---
-id: hdvideo
-name: HDVIDEO
-description: "HDVIDEO is a CHINESE Private torrent tracker for MOVIES / TV / GENERAL"
+id: 13city
+name: 13City
+description: "13City is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
-requestDelay: 2
 links:
-  - https://hdvideo.one/
+  - https://13city.org/

 caps:
-  # dont forget to update the path categories in the search block
  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影", default: true}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧", default: true}
-    - {id: 403, cat: TV, desc: "TV Shows/综艺", default: true}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片", default: true}
-    - {id: 405, cat: TV/Anime, desc: "Anime/动漫", default: true}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos/演唱会", default: true}
-    - {id: 407, cat: TV/Sport, desc: "Sports/体育", default: true}
-    - {id: 408, cat: Audio, desc: "HQ Audio/音乐", default: true}
-    - {id: 409, cat: PC, desc: "3D模型", default: false}
+    - {id: 401, cat: Movies, desc: "电影/Movies"}
+    - {id: 402, cat: TV, desc: "电视剧/TVSeries"}
+    - {id: 403, cat: TV, desc: "综艺/TV Shows"}
+    - {id: 405, cat: TV/Anime, desc: "动漫/Animations"}
+    - {id: 406, cat: Audio/Video, desc: "演唱会、MV/Music Videos"}
+    - {id: 408, cat: Audio, desc: "音乐/Music"}
+    - {id: 409, cat: Books/EBook, desc: "电子书/E-book"}
+    - {id: 409, cat: Audio/Audiobook, desc: "有声读物/A-book"}
+    - {id: 413, cat: TV/Documentary, desc: "纪录片/Documentary"}

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

 settings:
  - name: cookie
@@ -61,10 +60,10 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Accounts inactive (i.e. not logged in for a long time) are automatically deleted."
+    default: "Account retention rules:<ol><li>If there is no valid traffic within 7 days of registration (participation in the calculation of sharing rate), the account will be blocked</li><li>After the level is reduced to \"Peasant\", if the sharing rate is not improved within 7 days, the account will be blocked</li><li>Long-term non-login:<ul>- UnParked account: 60 consecutive days of non-login → banned</ul><ul>- Parked account: 180 consecutive days of non-login → banned</ul><ul>- Nexus Master and above levels are not subject to long-term non-login ban restrictions</ul></li></ol>"

 login:
-  # switched from form method to cookie method when it was restored the second time #15071 reason was not recorded
+  # using cookie method because site does a JS call to API/Challenge via JQuery to load response parm required for takelogin.php
  method: cookie
  inputs:
    cookie: "{{ .Config.cookie }}"
@@ -75,9 +74,6 @@ login:
 search:
  paths:
    - path: torrents.php
-      categories: [401, 402, 403, 404, 405, 406, 407, 408]
-    - path: special.php
-      categories: [409]
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
@@ -94,7 +90,7 @@ search:
    notnewword: 1

  rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])

  fields:
    category:
@@ -116,6 +112,9 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
    imdbid:
      # site currently only has a badge and rating, the id is not present. just in case a future update.
      selector: a[href*="imdb.com/title/tt"]
@@ -147,12 +146,20 @@ search:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td.rowfollow:nth-child(5)
+      optional: true
+      default: 512MB
    seeders:
      selector: td.rowfollow:nth-child(6)
+      optional: true
+      default: 0
    leechers:
      selector: td.rowfollow:nth-child(7)
+      optional: true
+      default: 0
    grabs:
      selector: td.rowfollow:nth-child(8)
+      optional: true
+      default: 0
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -167,15 +174,12 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
-    description_verified:
-      case:
-        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
-        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
-        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
+    minimumratio:
+      text: 2.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
    description:
-      selector: td:nth-child(2)
+      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-      filters:
-        - name: prepend
-          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.15 2024-12-23
+# NexusPHP v1.9.6 2025-06-25
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -18,9 +18,7 @@ caps:
    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
    - {id: 407, cat: TV/Sport, desc: "Sports"}
    - {id: 408, cat: Audio, desc: "HQ Audio"}
-    - {id: 410, cat: PC, desc: "Software"}
-    - {id: 411, cat: Books, desc: "Documents"}
-    - {id: 412, cat: PC/Games, desc: "Games"}
+    - {id: 409, cat: Other, desc: "Misc"}

  modes:
    search: [q]
@@ -30,12 +28,11 @@ caps:
    book-search: [q]

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -68,23 +65,10 @@ settings:
    default: "Cherish your account. Inactive accounts will be deleted based on the following provisions:<ol><li>Nexus Master or later will not be deleted account.</li><li>Veteran User or higher will not be deleted if temporarily locked (at User Settings).</li><li>Temporarily locked accounts will be deleted if not logged in within 90 days.</li><li>Accounts that are not temporarily locked will be deleted if they do not log in within 60 days.</li><li>Accounts with no storage for uploads and downloads will be deleted if they do not log in within 30 days or have registered within 14 days.</li></ol>"

 login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[alt="CAPTCHA"]
-    input: imagestring
+  # using cookie method because site does a JS call to API/Challenge via JQuery to load response parm required for takelogin.php
+  method: cookie
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("Đăng nhập thất bại!")) # Login failed!
-    - selector: td.embedded:has(h2:contains("Thất bại")) # Failure (captcha)
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
    selector: a[href="logout.php"]
@@ -101,7 +85,7 @@ search:
    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
    # 0 title, 1 descr, 3 uploader, 4 imdburl
    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0 AND, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -112,23 +96,23 @@ search:

  fields:
    category:
-      selector: a[href^="?cat="]
+      selector: a[href*="?cat="]
      attribute: href
      filters:
        - name: querystring
          args: cat
    title_default:
-      selector: a[href^="details.php?id="]
+      selector: a[href*="details.php?id="]
    title:
-      selector: a[title][href^="details.php?id="]
+      selector: a[title][href*="details.php?id="]
      attribute: title
      optional: true
      default: "{{ .Result.title_default }}"
    details:
-      selector: a[href^="details.php?id="]
+      selector: a[href*="details.php?id="]
      attribute: href
    download:
-      selector: a[href^="download.php?id="]
+      selector: a[href*="download.php?id="]
      attribute: href
    poster:
      selector: img[data-src]
@@ -138,7 +122,7 @@ search:
      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td.rowfollow:nth-child(5) > span[title]
+      selector: td.rowfollow:nth-child(4) > span[title]
      attribute: title
      optional: true
      filters:
@@ -148,7 +132,7 @@ search:
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td.rowfollow:nth-child(5):not(:has(span))
+      selector: td.rowfollow:nth-child(4):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -158,13 +142,13 @@ search:
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
-      selector: td.rowfollow:nth-child(6)
+      selector: td.rowfollow:nth-child(5)
    seeders:
-      selector: td.rowfollow:nth-child(7)
+      selector: td.rowfollow:nth-child(6)
    leechers:
-      selector: td.rowfollow:nth-child(8)
+      selector: td.rowfollow:nth-child(7)
    grabs:
-      selector: td.rowfollow:nth-child(9)
+      selector: td.rowfollow:nth-child(8)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -180,9 +164,9 @@ search:
        img.pro_2up: 2
        "*": 1
    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
    description:
-      selector: td:nth-child(3)
+      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP 3ChangTrai v3.0 2020-04-30
+# NexusPHP 3ChangTrai v2.0 2025-02-18
--- a/src/Jackett.Common/Definitions/52bt.yml
+++ b/src/Jackett.Common/Definitions/52bt.yml
@@ -1,20 +1,31 @@
 ---
 id: 52bt
 name: 52BT
-description: "52BT is a CHINESE Public tracker for TV / MOVIES / MUSIC / GENERAL"
+description: "52BT is a CHINESE Public tracker for MOVIES / TV / MUSIC / GENERAL"
 language: zh-CN
 type: public
 encoding: UTF-8
 requestDelay: 2
 links:
-  # Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://521.52btbt.cyou/
-  - https://www.529053.xyz/
-  - https://www.529055.xyz/
+  # Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://52btbt.icu/
+  - https://www.529065.xyz/
+  - https://www.529067.xyz/
 legacylinks:
-  - https://529050.xyz/
-  - https://529048.xyz/
  - https://529049.xyz/
  - https://www.529052.xyz/
+  - https://www.529053.xyz/
+  - https://www.529055.xyz/
+  - https://www.529057.xyz/
+  - https://www.529056.xyz/
+  - https://www.529058.xyz/
+  - https://www.52bt059.buzz/
+  - https://www.529060.xyz/
+  - https://www.529061.xyz/
+  - https://www.529059.xyz/
+  - https://www.529062.xyz/
+  - https://www.529063.xyz/
+  - https://www.529064.xyz/
+  - https://www.529066.xyz/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -1,7 +1,7 @@
 ---
 id: Bittorrentfiles
 name: Bittorrentfiles
-description: "Bittorrentfiles is a Private GERMAN tracker"
+description: "Bittorrentfiles is a Private GERMAN Torrent Tracker for MOVIES / TV / GENERAL"
 language: de-DE
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/abnormal.yml
+++ b/src/Jackett.Common/Definitions/abnormal.yml
@@ -1,7 +1,7 @@
 ---
 id: abnormal
 name: Abnormal
-description: "General French Private Tracker"
+description: "ABNormal (ABN) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: fr-FR
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/abtorrents.yml
+++ b/src/Jackett.Common/Definitions/abtorrents.yml
@@ -8,6 +8,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://abtorrents.xyz/
+legacylinks:
  - https://abtorrents.me/

 caps:
@@ -15,13 +17,12 @@ caps:
    - {id: 10, cat: Audio/Audiobook, desc: "Action/Adventure"}
    - {id: 80, cat: Audio/Audiobook, desc: "Adult/Erotica"}
    - {id: 20, cat: Audio/Audiobook, desc: "Biography/Memoirs"}
-    - {id: 30, cat: Audio/Audiobook, desc: "Business "}
+    - {id: 30, cat: Audio/Audiobook, desc: "Business"}
    - {id: 40, cat: Audio/Audiobook, desc: "Childrens"}
-    - {id: 70, cat: Audio/Audiobook, desc: "Computers "}
-    - {id: 260, cat: Audio/Audiobook, desc: "Crime/Thriller/Mystery"}
+    - {id: 70, cat: Audio/Audiobook, desc: "Computers"}
+    - {id: 260, cat: Audio/Audiobook, desc: "Crime/Thriller"}
    - {id: 90, cat: Audio/Audiobook, desc: "Fantasy-General"}
    - {id: 100, cat: Audio/Audiobook, desc: "Fantasy-Youth"}
-    - {id: 110, cat: Audio/Audiobook, desc: "Files"}
    - {id: 130, cat: Audio/Audiobook, desc: "General Fiction"}
    - {id: 140, cat: Audio/Audiobook, desc: "Historical Fiction"}
    - {id: 150, cat: Audio/Audiobook, desc: "History"}
@@ -29,27 +30,34 @@ caps:
    - {id: 50, cat: Audio/Audiobook, desc: "Humor (Comedy)"}
    - {id: 170, cat: Audio/Audiobook, desc: "Literature"}
    - {id: 175, cat: Audio/Audiobook, desc: "LitRPG"}
-    - {id: 180, cat: Audio/Audiobook, desc: "Mystery "}
+    - {id: 180, cat: Audio/Audiobook, desc: "Mystery"}
    - {id: 190, cat: Audio/Audiobook, desc: "Non-Fiction"}
    - {id: 215, cat: Audio/Audiobook, desc: "Paranormal Romance"}
    - {id: 200, cat: Audio/Audiobook, desc: "Radio Drama"}
+    - {id: 205, cat: Audio/Audiobook, desc: "Reference/Educational"}
+    - {id: 207, cat: Audio/Audiobook, desc: "Religion and Spirituality"}
    - {id: 210, cat: Audio/Audiobook, desc: "Romance"}
    - {id: 240, cat: Audio/Audiobook, desc: "Sci-Fi Apocalypse"}
    - {id: 220, cat: Audio/Audiobook, desc: "Science"}
-    - {id: 230, cat: Audio/Audiobook, desc: "Science Fiction "}
+    - {id: 230, cat: Audio/Audiobook, desc: "Science Fiction"}
    - {id: 250, cat: Audio/Audiobook, desc: "Self Improvement"}
+    - {id: 265, cat: Audio/Audiobook, desc: "Sports/Fitness"}
    - {id: 270, cat: Audio/Audiobook, desc: "Suspense"}
    - {id: 280, cat: Audio/Audiobook, desc: "Talk Radio"}
-    - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy"}
+    - {id: 285, cat: Audio/Audiobook, desc: "Travel"}
+    - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy/Paranormal"}
    - {id: 300, cat: Audio/Audiobook, desc: "Western"}
+    - {id: 310, cat: Audio/Audiobook, desc: "Young Adult"}
    - {id: 400, cat: Books/EBook, desc: "[E] Action/Adventure"}
-    - {id: 410, cat: Books/EBook, desc: "[E] Adult / Erotica"}
+    - {id: 410, cat: Books/EBook, desc: "[E] Adult/Erotica"}
    - {id: 420, cat: Books/EBook, desc: "[E] Arts & Crafts (Hobbies)"}
    - {id: 430, cat: Books/EBook, desc: "[E] Biography/Memoirs"}
+    - {id: 435, cat: Books/EBook, desc: "[E] Business"}
    - {id: 450, cat: Books/EBook, desc: "[E] Computer Learning"}
    - {id: 460, cat: Books/EBook, desc: "[E] Cookery"}
-    - {id: 470, cat: Books/EBook, desc: "[E] Crime/Thriller/Mystery"}
+    - {id: 470, cat: Books/EBook, desc: "[E] Crime/Thriller"}
    - {id: 480, cat: Books/EBook, desc: "[E] Fantasy"}
+    - {id: 490, cat: Books/EBook, desc: "[E] Fantasy-Youth"}
    - {id: 500, cat: Books/EBook, desc: "[E] General Fiction"}
    - {id: 510, cat: Books/EBook, desc: "[E] Historical Fiction"}
    - {id: 520, cat: Books/EBook, desc: "[E] History/Documentary"}
@@ -57,7 +65,7 @@ caps:
    - {id: 540, cat: Books/EBook, desc: "[E] Humor (Comedy)"}
    - {id: 560, cat: Books/EBook, desc: "[E] Literary Fiction"}
    - {id: 565, cat: Books/EBook, desc: "[E] LitRPG"}
-    - {id: 570, cat: Books/EBook, desc: "[E] Magazines - all"}
+    - {id: 570, cat: Books/EBook, desc: "[E] Mystery"}
    - {id: 580, cat: Books/EBook, desc: "[E] Non-Fiction"}
    - {id: 590, cat: Books/EBook, desc: "[E] Paranormal Romance"}
    - {id: 600, cat: Books/EBook, desc: "[E] Reference/Educational"}
@@ -68,8 +76,8 @@ caps:
    - {id: 645, cat: Books/EBook, desc: "[E] Science"}
    - {id: 650, cat: Books/EBook, desc: "[E] Self-Help"}
    - {id: 660, cat: Books/EBook, desc: "[E] Sports/Fitness"}
+    - {id: 665, cat: Books/EBook, desc: "[E] Suspense"}
    - {id: 670, cat: Books/EBook, desc: "[E] Travel"}
-    - {id: 680, cat: Books/EBook, desc: "[E] Unsorted"}
    - {id: 690, cat: Books/EBook, desc: "[E] Urban Fantasy/Paranormal"}
    - {id: 700, cat: Books/EBook, desc: "[E] Western"}
    - {id: 710, cat: Books/EBook, desc: "[E] Young Adult"}
@@ -113,26 +121,23 @@ search:
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
-    # title, descr
+    # title, descr, series, additional_info, author, author, uploader
    searchin: title
-    # 0 active, 1 incldead, 2 onlydead
+    # 0 active, 1 incldead, 2 onlydead, 3 My Unsatisfied Torrents, 4 My Watch List, 5 My Uploads
    incldead: 1
-    # 1 onlyfree, null all
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # 0 All Torrents, 1 Only Free Torrents
+    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"

  rows:
    selector: table.table-striped > tbody > tr:has(a[href^="download.php?torrent="])

  fields: # some users (rank specific?) have an extra column (td:nth-child(4)) with bookmark features
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    categorydesc:
+      selector: div[data-tid] > img
+      attribute: alt
    title:
      selector: a[href^="details.php?id="]
-      remove: span
+      remove: span.has-text-red
    details:
      selector: a[href^="details.php?id="]
      attribute: href
@@ -163,9 +168,13 @@ search:
    grabs:
      selector: a[href^="snatches.php?id="]
    seeders:
-      selector: td:nth-last-child(3) div:nth-last-child(2)
+      selector: a[title="Seeders"]
+      optional: true
+      default: 0
    leechers:
-      selector: td:nth-last-child(3) div:last-child
+      selector: a[title="Leechers"]
+      optional: true
+      default: 0
    downloadvolumefactor:
      case:
        tr.freeleech_color: 0
--- a/src/Jackett.Common/Definitions/acgrip.yml
+++ b/src/Jackett.Common/Definitions/acgrip.yml
@@ -29,10 +29,10 @@ search:
    selector: tbody tr

  fields:
-    title:
-      selector: td.title > span.title a
    category:
      text: 1
+    title:
+      selector: td.title > span.title a
    details:
      selector: td.title > span.title a
      attribute: href
@@ -42,16 +42,13 @@ search:
    size:
      selector: td.size
    seeders:
-      selector: td.peers div.seed
+      text: 1
    leechers:
-      selector: td.peers div.leech
-    grabs:
-      selector: td.peers div.done
+      text: 1
    date:
+      # unix
      selector: td.date time
      attribute: datetime
-      filters:
-        - name: fuzzytime
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/acrossthetasman.yml
+++ b/src/Jackett.Common/Definitions/acrossthetasman.yml
@@ -1,7 +1,7 @@
 ---
 id: acrossthetasman
 name: Across The Tasman
-description: "ATT is a torrent site for Rugby and other sports played in Australia"
+description: "ATT is a Private torrent site for Rugby and other sports played in Australia"
 language: en-AU
 type: private
 encoding: UTF-8
@@ -51,7 +51,7 @@ login:
    - selector: div.restore:contains("invalid username or password")
  test:
    path: torrents.php
-    selector: a[href*="logout.php"]
+    selector: a[href*="login.php?do=logout"]

 search:
  paths:
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -101,7 +101,7 @@ login:
        selector: td.text
  test:
    path: /
-    selector: a[href="/logout.php"]
+    selector: a[href*="/logout.php"]

 search:
  paths:
@@ -120,6 +120,12 @@ search:
      - name: andmatch

  fields:
+    category:
+      selector: a[href*="/browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
    title:
      selector: a.index
      attribute: href
@@ -127,17 +133,11 @@ search:
        - name: querystring
          args: name
        - name: urldecode
-    category:
-      selector: td a[href^="/browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
    details:
-      selector: a.index
+      selector: a[href*="/details.php?id="]
      attribute: href
    download:
-      selector: a[href^="download.php?id="]
+      selector: a.index
      attribute: href
      filters:
        - name: urldecode
@@ -147,6 +147,8 @@ search:
      filters:
        - name: regexp
          args: src=([^\s]+)
+        - name: replace
+          args: ["\"", ""]
    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
--- a/src/Jackett.Common/Definitions/afun.yml
+++ b/src/Jackett.Common/Definitions/afun.yml
@@ -0,0 +1,180 @@
+---
+id: afun
+name: AFUN
+description: "AFUN is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://www.ptlover.cc/
+
+caps:
+  categorymappings:
+    - {id: 407, cat: TV/Sport, desc: "Sports/赛事"}
+    - {id: 414, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/HQ音频"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 407, cat: TV/Sport, desc: "TV Sport/体育"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 403, cat: TV, desc: "TV Talk Shows/脱口秀"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 405, cat: TV/Anime, desc: "Anime/动画"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Cherish your user account. Inactive accounts will be deleted based on the following rules:<ol><li>Veteran User or above will never be deleted.</li><li>Elite User or above will never be deleted if parked (at User CP).</li><li>Parked accounts will be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts will be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 will be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+
+login:
+  # using cookie method because site regularly disables login page for certain events during the year
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    # searching in description causes HTTP 500 so we will not support doubanid searching
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0: include dead, 1: alive, 2: dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0: title, 1: description, 3: uploader, 4: imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0: AND, 2: exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # Support in NexusPHP so bots don't pollute trending searches:
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# NexusPHP v1.9.0 2025-02-06
--- a/src/Jackett.Common/Definitions/agsvpt.yml
+++ b/src/Jackett.Common/Definitions/agsvpt.yml
@@ -8,6 +8,8 @@ encoding: UTF-8
 requestDelay: 2
 links:
  - https://www.agsvpt.com/
+  - https://pt.agsvpt.cn/
+legacylinks:
  - https://abroad.agsvpt.com/

 caps:
--- a/src/Jackett.Common/Definitions/aidoruonline.yml
+++ b/src/Jackett.Common/Definitions/aidoruonline.yml
@@ -1,7 +1,7 @@
 ---
 id: aidoruonline
 name: Aidoru!Online
-description: "Aidoru!Online is a Private Torrent Tracker for Female Japanese Idol related files"
+description: "Aidoru!Online is a JAPANESE Private Torrent Tracker for Female Japanese Idol related files"
 language: en-US
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -5,6 +5,7 @@ description: "Aither is a Private Torrent Tracker for HD MOVIES / TV"
 language: en-US
 type: private
 encoding: UTF-8
+# status https://status.aither.cc/
 links:
  - https://aither.cc/

@@ -13,13 +14,11 @@ caps:
    - {id: 1, cat: Movies, desc: "Movie"}
    - {id: 9, cat: TV/Sport, desc: "Sport"}
    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}

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

 settings:
@@ -70,9 +69,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -139,8 +138,13 @@ search:
          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -152,7 +156,7 @@ search:
      selector: created_at
      filters:
        - name: append
-          args: " +00:00" # UTC
+          args: " +00:00" # GMT
        - name: dateparse
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
@@ -188,4 +192,4 @@ search:
    minimumseedtime:
      # 5 days (as seconds = 5 x 24 x 60 x 60)
      text: 432000
-# json UNIT3D 8.3.5
+# json UNIT3D 9.1.5
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -1,7 +1,7 @@
 ---
 id: amigosshare
 name: Amigos Share Club
-description: "Amigos Share Club is a Brazilian Private site for TV / MOVIES / GENERAL"
+description: "Amigos Share Club (ASC) is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: pt-BR
 type: private
 encoding: UTF-8
@@ -152,7 +152,7 @@ search:
  keywordsfilters:
    # drop the year from searches since site titles do not include year
    - name: re_replace
-      args: ["(19|20[0-9]{2})", ""]
+      args: ["(\\b((19|20)\\d{2})\\b)", ""]

  rows:
    selector: "div#fancy-list-group ul.list-group li.list-group-item{{ if .Config.freeleech }}:has(span.badge-success:contains(\"FREE\")){{ else }}{{ end }}"
--- a/src/Jackett.Common/Definitions/anilibria.yml
+++ b/src/Jackett.Common/Definitions/anilibria.yml
@@ -1,300 +0,0 @@
---
-id: anilibria
-name: AniLibria
-description: "AniLibria is a Public torrent tracker for anime, voiced on russian by AniLibria team"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - https://www.anilibria.tv/
-
-caps:
-  categories:
-    Anime: TV/Anime
-    Movies: Movies/Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: sonarr_compatibility
-    type: checkbox
-    label: Improve Sonarr compatibility by trying to better parse Season information in release titles.
-    default: false
-  - name: addrussiantotitle
-    type: checkbox
-    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
-    default: false
-
-search:
-  paths:
-    # https://github.com/anilibria/docs/blob/master/api_v3.md
-    - path: "https://api.anilibria.tv/v3/title/{{ if .Keywords }}search{{ else }}updates{{ end }}"
-      response:
-        type: json
-
-  inputs:
-    search: "{{ .Keywords }}"
-    filter: "names,posters.small.url,code,torrents.list,season.year,description"
-    limit: 100
-
-  keywordsfilters:
-    # strip season and/or ep
-    - name: re_replace
-      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
-
-  rows:
-    selector: list
-    attribute: torrents.list
-    multiple: true
-
-  fields:
-    _episodes:
-      selector: episodes.string
-      optional: true
-    category:
-      text: "{{ if eq .Result._episodes \"Фильм\" }}Movies{{ else }}Anime{{ end }}"
-    title_ru:
-      selector: ..names.ru
-    title_en:
-      selector: ..names.en
-    title_en_parsed:
-      selector: ..names.en
-      filters:
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*1\\b", "Part One"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*2\\b", "Part Two"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*3\\b", "Part Three"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*4\\b", "Part Four"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*5\\b", "Part Five"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*6\\b", "Part Six"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*7\\b", "Part Seven"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*8\\b", "Part Eight"]
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*9\\b", "Part Nine"]
-        - name: re_replace
-          args: ["(?i)\\bseason\\s*(\\d+)\\b", ""]
-        - name: re_replace
-          args: ["(?i)\\b(\\d+)(st|nd|rd|th)\\s*season[\\s\\.]*", ""]
-        - name: re_replace
-          args: ["(?i)\\b(\\d+)\\s*season\\b[\\s\\.]*", ""]
-        - name: re_replace
-          args: ["(?i)\\bseason\\s*([IVXLCDM]+)\\b", ""]
-        - name: re_replace
-          args: ["\\bI$", ""]
-        - name: re_replace
-          args: ["\\bII$", ""]
-        - name: re_replace
-          args: ["\\bIII$", ""]
-        - name: re_replace
-          args: ["\\bIV$", ""]
-        - name: re_replace
-          args: ["\\bV$", ""]
-        - name: re_replace
-          args: ["\\bVI$", ""]
-        - name: re_replace
-          args: ["\\bVII$", ""]
-        - name: re_replace
-          args: ["\\bVIII$", ""]
-        - name: re_replace
-          args: ["\\bIX$", ""]
-        - name: re_replace
-          args: ["\\bX$", ""]
-        - name: re_replace
-          args: ["(?i)\\b(\\d+)(?:st|nd|rd|th)?\\b", ""]
-        - name: trim
-    title_alternative:
-      selector: ..names.alternative
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
-        - name: re_replace
-          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
-        - name: re_replace
-          args: ["^OVA$", ""]
-    _season_number_en:
-      selector: ..names.en
-      filters:
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*\\d+\\s*$", ""]
-        - name: re_replace
-          args: ["(?i)(^.*\\bseason\\s*(\\d+)\\b\\s*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)(^.*\\b(\\d+)(st|nd|rd|th)\\s*season\\b.*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)(^.*\\b(\\d+)\\s*season\\b.*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)(^.*\\bseason\\s*([IVXLCDM]+)\\b\\s*$)", "$1"]
-        - name: re_replace
-          args: ["(^.*X$)", "S10"]
-        - name: re_replace
-          args: ["(^.*IX$)", "S9"]
-        - name: re_replace
-          args: ["(^.*VIII$)", "S8"]
-        - name: re_replace
-          args: ["(^.*VII$)", "S7"]
-        - name: re_replace
-          args: ["(^.*VI$)", "S6"]
-        - name: re_replace
-          args: ["(^.*V$)", "S5"]
-        - name: re_replace
-          args: ["(^.*IV$)", "S4"]
-        - name: re_replace
-          args: ["(^.*III$)", "S3"]
-        - name: re_replace
-          args: ["(^.*II$)", "S2"]
-        - name: re_replace
-          args: ["(^.*I$)", "S1"]
-        - name: re_replace
-          args: ["(?i)(^.*\\b(\\d+)(?:st|nd|rd|th)?\\b\\s*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)^(?!S\\d+).*", ""]
-    _season_number_alternative:
-      selector: ..names.alternative
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["(?i)\\bPart\\s*\\d+\\s*$", ""]
-        - name: re_replace
-          args: ["(?i)(^.*\\bseason\\s*(\\d+)\\b\\s*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)(^.*\\b(\\d+)(st|nd|rd|th)\\s*season\\b\\s*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)(^.*\\b(\\d+)\\s*season\\b\\s*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)(^.*\\bseason\\s*([IVXLCDM]+)\\b\\s*$)", "$1"]
-        - name: re_replace
-          args: ["(^.*X$)", "S10"]
-        - name: re_replace
-          args: ["(^.*IX$)", "S9"]
-        - name: re_replace
-          args: ["(^.*VIII$)", "S8"]
-        - name: re_replace
-          args: ["(^.*VII$)", "S7"]
-        - name: re_replace
-          args: ["(^.*VI$)", "S6"]
-        - name: re_replace
-          args: ["(^.*V$)", "S5"]
-        - name: re_replace
-          args: ["(^.*IV$)", "S4"]
-        - name: re_replace
-          args: ["(^.*III$)", "S3"]
-        - name: re_replace
-          args: ["(^.*II$)", "S2"]
-        - name: re_replace
-          args: ["(^.*I$)", "S1"]
-        - name: re_replace
-          args: ["(?i)(^.*\\b(\\d+)(?:st|nd|rd|th)?\\b\\s*$)", "S$2"]
-        - name: re_replace
-          args: ["(?i)^(?!S\\d+).*", ""]
-    _season_number:
-      text: "{{ .Result._season_number_en }}"
-      filters:
-        - name: append
-          args: "{{ .Result._season_number_alternative }}"
-        - name: re_replace
-          args: ["^S1S1$", "S1"]
-        - name: re_replace
-          args: ["^S1(.+)$", "$1"]
-        - name: re_replace
-          args: ["^(S\\d+).*$", "$1"]
-        - name: re_replace
-          args: ["^$", "S1"]
-    year:
-      selector: ..season.year
-    _quality:
-      selector: quality.string
-    _quality_type:
-      selector: quality.type
-    _quality_resolution:
-      selector: quality.resolution
-    _quality_encoder:
-      selector: quality.encoder
-      filters:
-        - name: re_replace
-          args: ["(?i)^h", "x"]
-    title_parsed:
-      text: "{{ if .Config.stripcyrillic }}{{ else }}{{ .Result.title_ru }} / {{ end }}{{ .Result.title_en_parsed }} {{ .Result._season_number}}E{{ .Result._episodes }} [{{ .Result._quality_type }} {{ .Result._quality_resolution }} {{ .Result._quality_encoder }}]"
-      filters:
-        - name: re_replace
-          args: ["\\bS\\d+EФильм\\b", "({{ .Result.year }}) MOVIE"]
-        - name: re_replace
-          args: ["\\bS\\d+EOVA\\b", "({{ .Result.year }}) OVA"]
-        - name: re_replace
-          args: ["\\bS\\d+EONA\\b", "({{ .Result.year }}) ONA"]
-        - name: re_replace
-          args: ["\\bS\\d+EMovie\\b", "({{ .Result.year }}) MOVIE"]
-        - name: re_replace
-          args: ["\\bS\\d+EП/м фильм\\b", "({{ .Result.year }}) MOVIE"]
-        - name: re_replace
-          args: ["\\bS\\d+EРекап\\b", "({{ .Result.year }}) RECAP"]
-        - name: re_replace
-          args: ["\\bS\\d+ETV-Special\\b", "({{ .Result.year }}) SPECIAL"]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} - RUS{{ else }}{{ end }}"
-    title_original:
-      text: "{{ if .Config.stripcyrillic }}{{ else }}{{ .Result.title_ru }} / {{ end }}{{ .Result.title_en }}{{ if .Result.title_alternative }} / AKA {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}]{{ if .Result._episodes }} - E{{ .Result._episodes }}{{ else }}{{ end }}"
-      filters:
-        - name: re_replace
-          args: [" - \\bEФильм\\b", " - MOVIE"]
-        - name: re_replace
-          args: [" - \\bEMovie\\b", " - MOVIE"]
-        - name: re_replace
-          args: [" - \\bEП/м фильм\\b", " - MOVIE"]
-        - name: re_replace
-          args: [" - \\bEOVA\\b", " - OVA"]
-        - name: re_replace
-          args: [" - \\bEONA\\b", " - ONA"]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} - RUS{{ else }}{{ end }}"
-    title:
-      text: "{{ if .Config.sonarr_compatibility }}{{ .Result.title_parsed }}{{ else }}{{ .Result.title_original }}{{ end }}"
-    _code:
-      selector: ..code
-    details:
-      text: "{{ .Config.sitelink }}release/{{ .Result._code }}.html"
-    download_url:
-      selector: url
-    download:
-      text: "{{ .Config.sitelink }}{{ .Result.download_url }}"
-    magnet:
-      selector: magnet
-    poster:
-      selector: ..posters.small.url
-      filters:
-        - name: prepend
-          args: "https://static.anilibria.tv"
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: downloads
-    date:
-      # unix
-      selector: uploaded_timestamp
-    size:
-      selector: total_size
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    description:
-      selector: ..description
-# json api v3
--- a/src/Jackett.Common/Definitions/animelovers-api.yml
+++ b/src/Jackett.Common/Definitions/animelovers-api.yml
@@ -75,9 +75,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -144,8 +144,13 @@ search:
          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -193,4 +198,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.3.4
+# json UNIT3D 9.1.5
--- a/src/Jackett.Common/Definitions/animeworld-api.yml
+++ b/src/Jackett.Common/Definitions/animeworld-api.yml
@@ -1,7 +1,7 @@
 ---
 id: animeworld-api
 name: AnimeWorld (API)
-description: "AnimeWorld (AW) is a GERMAN Private site for ANIME / MANGA / HENTAI"
+description: "AnimeWorld (AW) is a GERMAN Private Torrent Tracker for ANIME / MANGA / HENTAI"
 language: de-DE
 type: private
 encoding: UTF-8
@@ -81,9 +81,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -148,8 +148,13 @@ search:
          args: ["(?i)(Science Fiction)", "Science_Fiction"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
--- a/src/Jackett.Common/Definitions/anthelion-api.yml
+++ b/src/Jackett.Common/Definitions/anthelion-api.yml
@@ -4,7 +4,7 @@ replaces:
  - tehconnectionme
  - anthelion
 name: Anthelion (API)
-description: "Anthelion is a Private MOVIES tracker"
+description: "Anthelion (ANT) is a Private Torrent Tracker for MOVIES"
 language: en-US
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/arabafenice.yml
+++ b/src/Jackett.Common/Definitions/arabafenice.yml
@@ -1,7 +1,7 @@
 ---
 id: arabafenice
 name: ArabaFenice
-description: "Araba Fenice (Phoenix) is an ITALIAN Private site for TV / MOVIES / GENERAL"
+description: "Araba Fenice (Phoenix) is an ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: it-IT
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -51,7 +51,6 @@ caps:
    - {id: 89, cat: TV, desc: "مسلسلات عربية كامله (Full Arabic Series)"}
    - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
    - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
-    - {id: 117, cat: TV, desc: "رمضان 2025 (Ramadan 2025)"}
    - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
    # المرئيات الاجنبية Foreign Movies
    - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
@@ -111,12 +110,13 @@ login:

 search:
  paths:
-    # https://www.arabp2p.com/index.php?page=torrents&search=&category=0&active=0&internel=0
+    # https://www.arabp2p.net/index.php?page=torrents&search=&category=0&active=0&internel=0&order=3&by=2
    - path: index.php
  inputs:
    page: torrents
    search: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
+    # does not support multi categories, default to All
+    category: 0
    # 0 all 1 activeonly 2 deadonly
    active: 0
    # 0 all 1 internal 2 external
@@ -126,13 +126,13 @@ search:
    # does not support imdbid search or provide imdb link in results

  rows:
-    selector: table.torrent tr.torrent
+    selector: table#torrents_list_p > tbody > tr:has(a[href^="download.php?id="])
    filters:
      - name: andmatch

  fields:
    category:
-      selector: a[href^="index.php?page=torrents&category="]
+      selector: a[href^="index.php?page=torrents&category="]:last-child
      attribute: href
      filters:
        - name: querystring
@@ -143,7 +143,7 @@ search:
      selector: a[href^="index.php?page=torrent-details"]
      attribute: href
    download:
-      selector: a[href^="download.php"]
+      selector: a[href^="download.php?id="]
      attribute: href
      optional: true
    magnet:
@@ -151,18 +151,18 @@ search:
      attribute: href
      optional: true
    date:
-      selector: td:nth-child(4) span
+      selector: span.upload-date > span
      attribute: title
      # auto adjusted by site account profile
      filters:
        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss"
-    seeders:
-      selector: td:nth-child(5)
-    leechers:
-      selector: td:nth-child(6)
+          args: "MM-yy-dd HH:mm:ss tt"
    size:
-      selector: td:nth-child(7)
+      selector: span.size
+    seeders:
+      selector: span[title="Seeders"]
+    leechers:
+      selector: span[title="Leechers"]
    downloadvolumefactor:
      case:
        span.free: 0
--- a/src/Jackett.Common/Definitions/asiancinema.yml
+++ b/src/Jackett.Common/Definitions/asiancinema.yml
@@ -1,7 +1,7 @@
 ---
 id: asiancinema
 name: AsianCinema
-description: "Tracker Movies/TV/Music"
+description: "AsianCinema is a Private Tracker for ASIAN MOVIES / TV / MUSIC"
 language: en-US
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/asiandvdclub.yml
+++ b/src/Jackett.Common/Definitions/asiandvdclub.yml
@@ -1,7 +1,7 @@
 ---
 id: asiandvdclub
 name: AsianDVDClub
-description: "AsianDVDClub (ADC) is a Private Torrent Tracker for Asian DVD and BluRay"
+description: "AsianDVDClub (ADC) is a Private Torrent Tracker for ASIAN DVD and BluRay"
 language: en-US
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/aussierules.yml
+++ b/src/Jackett.Common/Definitions/aussierules.yml
@@ -1,7 +1,7 @@
 ---
 id: aussierules
 name: Aussierul.es
-description: "Aussierul.es is a torrent site for Aussie Rules Football played in Australia"
+description: "AussieRul.es is a Private Torrent Tracker for AUSTRALIAN RULES FOOTBALL"
 language: en-AU
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/azusa.yml
+++ b/src/Jackett.Common/Definitions/azusa.yml
@@ -1,7 +1,7 @@
 ---
 id: azusa
 name: Azusa (梓喵)
-description: "Azusa (梓喵) is a CHINESE Private Torrent Tracker focusing on Comics"
+description: "Azusa (梓喵) is a CHINESE Private Torrent Tracker focusing on COMICS"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -64,20 +64,23 @@ login:
 search:
  paths:
    - path: torrents.php
+  allowEmptyInputs: true
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
    # 0 incldead, 1 active, 2 dead
    incldead: 0
    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    inclbookmarked: 0
+    approval_status: ""
+    trackerStatus: ""
+    search: "{{ .Keywords }}"
    # 0 title, 1 descr, 3 uploader, 4 imdburl
    search_area: 0
    # 0 AND, 1 OR, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
-    notnewword: 1

  rows:
    selector: table.torrents > tbody > tr:has(table.torrentname)
--- a/src/Jackett.Common/Definitions/backups.yml
+++ b/src/Jackett.Common/Definitions/backups.yml
@@ -10,6 +10,7 @@ links:

 caps:
  categorymappings:
+    - {id: 100, cat: Console, desc: "Anbernic"}
    - {id: 15, cat: PC/Mobile-Android, desc: "Android"}
    - {id: 35, cat: TV/Anime, desc: "Anime"}
    - {id: 51, cat: PC/Mac, desc: "Apple"}
@@ -17,10 +18,9 @@ caps:
    - {id: 64, cat: Audio/Audiobook, desc: "Audiobooks"}
    - {id: 71, cat: Console, desc: "Batocera"}
    - {id: 4, cat: Movies/BluRay, desc: "Blu-Ray"}
-    - {id: 86, cat: Console, desc: "Chinese Systems"}
-    - {id: 22, cat: Console, desc: "CoinOps"}
    - {id: 42, cat: Console, desc: "CoinOPS Official"}
    - {id: 65, cat: Console, desc: "CoinOps Unofficial"}
+    - {id: 22, cat: Console, desc: "CoinOps"}
    - {id: 63, cat: Books/Comics, desc: "Comics"}
    - {id: 60, cat: Console, desc: "Core"}
    - {id: 72, cat: Console, desc: "CORE Community"}
@@ -30,7 +30,7 @@ caps:
    - {id: 5, cat: Books, desc: "EBooks"}
    - {id: 80, cat: PC, desc: "Emulation Media"}
    - {id: 61, cat: PC, desc: "emuxtras"}
-    - {id: 69, cat: TV, desc: "Entertainment"}
+    - {id: 89, cat: PC, desc: "Ghostware"}
    - {id: 84, cat: TV, desc: "GOG DRM FREE"}
    - {id: 77, cat: PC, desc: "Hyperspin"}
    - {id: 34, cat: TV, desc: "Kids"}
@@ -38,7 +38,9 @@ caps:
    - {id: 85, cat: PC, desc: "MAME Rom Sets"}
    - {id: 33, cat: TV/Sport, desc: "MMA/Boxing"}
    - {id: 32, cat: Movies, desc: "Movie Pack"}
-    - {id: 6, cat: Movies, desc: "Movies/XVID"}
+    - {id: 106, cat: Movies/UHD, desc: "Movie Pack 4K"}
+    - {id: 6, cat: Movies, desc: "Movies"}
+    - {id: 105, cat: Movies/UHD, desc: "Movies 4K"}
    - {id: 82, cat: PC, desc: "MS-DOS"}
    - {id: 7, cat: Audio, desc: "Music"}
    - {id: 31, cat: Console, desc: "Nintendo"}
@@ -47,7 +49,7 @@ caps:
    - {id: 50, cat: Console, desc: "PlayBox"}
    - {id: 87, cat: Console, desc: "Playnite"}
    - {id: 30, cat: Console, desc: "Playstation"}
-    - {id: 62, cat: PC, desc: "RaspberryPi"}
+    - {id: 62, cat: PC, desc: "Raspberry Pi"}
    - {id: 83, cat: PC, desc: "Retro eXo"}
    - {id: 56, cat: PC, desc: "Retro Minis"}
    - {id: 81, cat: PC, desc: "Retro Scene Releases"}
@@ -59,12 +61,12 @@ caps:
    - {id: 68, cat: PC, desc: "Schmoomer's"}
    - {id: 57, cat: Console, desc: "Sega"}
    - {id: 74, cat: PC, desc: "Sleyk/SGC"}
-    - {id: 40, cat: TV, desc: "Soaps"}
    - {id: 29, cat: TV/Sport, desc: "Sport"}
-    - {id: 9, cat: TV, desc: "TV-Boxsets"}
-    - {id: 11, cat: TV, desc: "TV/x264"}
-    - {id: 10, cat: TV, desc: "TV/Xvid"}
-    - {id: 75, cat: Audio, desc: "Video Game Music"}
+    - {id: 90, cat: PC, desc: "TeknoParrot"}
+    - {id: 9, cat: TV, desc: "TV Packs"}
+    - {id: 11, cat: TV, desc: "TV Shows"}
+    - {id: 97, cat: TV/Other, desc: "Video Courses"}
+    - {id: 75, cat: TV, desc: "Video Game Music"}
    - {id: 73, cat: Console, desc: "Wolfanoz"}
    - {id: 14, cat: TV/Sport, desc: "WWE"}
    - {id: 26, cat: Console, desc: "Xbox"}
--- a/src/Jackett.Common/Definitions/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -1,106 +0,0 @@
---
-id: badasstorrents
-name: Badass Torrents
-description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL"
-language: en-US
-type: public
-encoding: UTF-8
-requestDelay: 5
-links:
-  - https://badasstorrents.com/
-legacylinks:
-  - https://badasstorrents.mrunblock.bond/
-  - https://badasstorrents.nocensor.cloud/
-
-caps:
-  categories:
-    Anime: TV/Anime
-    Apps: PC
-    Books: Books
-    Games: PC/Games
-    Movies: Movies
-    Music: Audio
-    Other: Other
-    TV: TV
-    XXX: XXX
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q, album, artist]
-    book-search: [q]
-
-settings:
-  - name: info_flaresolverr
-    type: info_flaresolverr
-  - name: downloadlink
-    type: select
-    label: Download link
-    default: "magnet:?xt="
-    options:
-      "/d/": ".torrent"
-      "magnet:?xt=": "magnet"
-  - name: downloadlink2
-    type: select
-    label: Download link (fallback)
-    default: "/d/"
-    options:
-      "/d/": ".torrent"
-      "magnet:?xt=": "magnet"
-  - name: info_download
-    type: info
-    label: About the Download links
-    default: You can optionally set as a fallback an automatic alternate link, so if the .torrent download link fails your download will still be successful.
-
-download:
-  selectors:
-    - selector: a[href*="{{ .Config.downloadlink }}"]
-      attribute: href
-    - selector: a[href*="{{ .Config.downloadlink2 }}"]
-      attribute: href
-
-search:
-  paths:
-    # search has 10 torrents per page, latest has 100 torrents per page.
-    - path: "{{ if .Keywords }}s/{{ .Keywords }}{{ else }}latest.html{{ end }}"
-    - path: "{{ if .Keywords }}s/{{ .Keywords }}&page=10{{ else }}{{ end }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "-"]
-    - name: tolower
-
-  rows:
-    selector: table.table-hover > tbody > tr
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="/c/"]
-    title:
-      selector: a[href*="/v/"]
-    details:
-      selector: a[href*="/v/"]
-      attribute: href
-    download:
-      selector: a[href*="/v/"]
-      attribute: href
-    date:
-      selector: td:nth-child(3)
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: td:nth-child(4)
-    seeders:
-      selector: td:nth-child(5)
-    leechers:
-      selector: td:nth-child(6)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/bestcore.yml
+++ b/src/Jackett.Common/Definitions/bestcore.yml
@@ -1,7 +1,7 @@
 ---
 id: bestcore
 name: Best-Core
-description: "Best-Core is a HUNGARIAN Private Tracker for MOVIES / TV"
+description: "Best-Core is a HUNGARIAN Private Tracker for MOVIES / TV / GENERAL"
 language: hu-HU
 type: private
 encoding: ISO-8859-2
--- a/src/Jackett.Common/Definitions/bibliotik.yml
+++ b/src/Jackett.Common/Definitions/bibliotik.yml
@@ -1,7 +1,7 @@
 ---
 id: bibliotik
 name: Bibliotik
-description: "Bibliotik is a private site for eBooks and audiobooks"
+description: "Bibliotik is a Private Torrent Tracker for EBOOKS and AUDIOBOOKS"
 language: en-US
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/bigcore.yml
+++ b/src/Jackett.Common/Definitions/bigcore.yml
@@ -0,0 +1,147 @@
+---
+id: bigcore
+name: BigCore
+description: "BigCore is a HUNGARIAN Private Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://bigcore.eu/
+
+caps:
+  categorymappings:
+    - {id: 48, cat: Movies/SD, desc: "CAM/Hun"}
+    - {id: 49, cat: Movies/SD, desc: "CAM/Eng"}
+    - {id: 50, cat: Movies/SD, desc: "SD/Hun"}
+    - {id: 51, cat: Movies/SD, desc: "SD/Eng"}
+    - {id: 52, cat: Movies/DVD, desc: "DVD/Hun"}
+    - {id: 53, cat: Movies/DVD, desc: "DVD/Eng"}
+    - {id: 54, cat: Movies/HD, desc: "HD/Hun"}
+    - {id: 55, cat: Movies/HD, desc: "HD/Eng"}
+    - {id: 56, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 57, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 58, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 59, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 60, cat: PC/Games, desc: "Játék/RIP"}
+    - {id: 61, cat: PC/0day, desc: "Program/RIP"}
+    - {id: 62, cat: Audio, desc: "Zene/Hun"}
+    - {id: 63, cat: Audio, desc: "Zene/Eng"}
+    - {id: 64, cat: Books, desc: "Könyv"}
+    - {id: 65, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 66, cat: XXX/x264, desc: "XXX/Video"}
+    - {id: 67, cat: XXX/ImageSet, desc: "XXX/Kép"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: title
+      4: created
+      7: seeders
+      5: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek száma egy oldalon</b> setting to <b>100</b> on your account profile. The default is <i>30</i>.
+
+login:
+  # using cookie method because login page has embedded Google reCAPTCHA
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.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 myupload, 4 waiting for seed
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: tr[id^="torrent_row_"], tr[id^="hidden_torrent_row_"]
+    after: 1
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a.tooltip[href$="details"]
+      attribute: title
+    details:
+      selector: a.tooltip[href$="details"]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="kepek/"]
+      attribute: href
+    files:
+      selector: a.viewFileList
+    date:
+      selector: td:nth-child(7) a[title]
+      attribute: title
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(9)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    description:
+      case:
+        i.fa-check: "Verified"
+        i.fa-question: "Unverified"
+    downloadvolumefactor:
+      case:
+        span:contains("0x"): 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        span:contains("2x"): 2
+        span:contains("3x"): 3
+        span:contains("4x"): 4
+        span:contains("5x"): 5
+        "*": 1
+    minimumseedtime:
+      # 1 days (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+# engine n/a
--- a/src/Jackett.Common/Definitions/bitgamer.yml
+++ b/src/Jackett.Common/Definitions/bitgamer.yml
@@ -0,0 +1,160 @@
+---
+id: bitgamer
+name: bitGAMER
+description: "bitGAMER is a Private Torrent Tracker for GAMES"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://bitgamer.ch/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX/Other, desc: "Adult Games"}
+    - {id: 3, cat: PC/0day, desc: "Burning/Ripping Tools"}
+    - {id: 4, cat: Books/Other, desc: "Guides/Game Documents"}
+    - {id: 13, cat: Movies/Other, desc: "Movies/TV/Video"}
+    - {id: 48, cat: Audio/Other, desc: "Music/OST"}
+    - {id: 52, cat: Console/Other, desc: "Amiga"}
+    - {id: 18, cat: PC/Mobile-iOS, desc: "Apple - iPhone/iPod/iPad"}
+    - {id: 54, cat: Console/Other, desc: "Arcade"}
+    - {id: 19, cat: Console/Other, desc: "Atari"}
+    - {id: 51, cat: Console/Other, desc: "Commodore 64"}
+    - {id: 22, cat: PC/Mobile-Android, desc: "Google - Android"}
+    - {id: 61, cat: Console/Other, desc: "Hyperspin"}
+    - {id: 24, cat: Console/XBox, desc: "Microsoft - Xbox"}
+    - {id: 25, cat: Console/XBox 360, desc: "Microsoft - Xbox 360"}
+    - {id: 49, cat: Console/XBox 360, desc: "Microsoft - Xbox 360 JTAG"}
+    - {id: 57, cat: Console/XBox One, desc: "Microsoft - Xbox One"}
+    - {id: 27, cat: Console/Other, desc: "Neo Geo"}
+    - {id: 55, cat: Console/3DS, desc: "Nintendo - 3DS"}
+    - {id: 28, cat: Console/NDS, desc: "Nintendo - DS"}
+    - {id: 29, cat: Console/Other, desc: "Nintendo - Game Boy Advance"}
+    - {id: 30, cat: Console/Other, desc: "Nintendo - Gameboy"}
+    - {id: 31, cat: Console/Other, desc: "Nintendo - Gamecube "}
+    - {id: 33, cat: Console/Other, desc: "Nintendo - N64 "}
+    - {id: 35, cat: Console/Other, desc: "Nintendo - NES"}
+    - {id: 50, cat: Console/Other, desc: "Nintendo - SNES"}
+    - {id: 63, cat: Console/Other, desc: "Nintendo - Switch"}
+    - {id: 37, cat: Console/Wii, desc: "Nintendo - Wii"}
+    - {id: 59, cat: Console/WiiU, desc: "Nintendo - Wii U"}
+    - {id: 53, cat: PC/Games, desc: "PC - DOS"}
+    - {id: 64, cat: PC/Games, desc: "PC - Linux"}
+    - {id: 39, cat: PC/Mac, desc: "PC - Mac OS X"}
+    - {id: 40, cat: PC/Games, desc: "PC - Windows"}
+    - {id: 41, cat: Console/Other, desc: "Sega"}
+    - {id: 42, cat: Console/Other, desc: "Sega - Dreamcast"}
+    - {id: 43, cat: Console/Other, desc: "Sega - Megadrive"}
+    - {id: 44, cat: Console/Other, desc: "Sony - Playstation"}
+    - {id: 45, cat: Console/Other, desc: "Sony - Playstation 2"}
+    - {id: 46, cat: Console/PS3, desc: "Sony - Playstation 3"}
+    - {id: 56, cat: Console/PS4, desc: "Sony - Playstation 4"}
+    - {id: 47, cat: Console/PSP, desc: "Sony - Playstation Portable "}
+    - {id: 58, cat: Console/PS Vita, desc: "Sony - Playstation Vita"}
+
+  modes:
+    search: [q]
+    book-search: [q]
+  allowrawsearch: true
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td:has(:contains("Login failed"))
+  test:
+    path: my.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    search: "{{ .Keywords }}"
+    # multi-cat search appears to be broken on site
+    category: 0
+    # 0: name, 1: descr, 2: both
+    blah: 0
+    # 0: include dead, 1: alive, 2: dead, 3: freeleech
+    incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: .outer > form > table > tbody > tr:has(a[href^="download.php"])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php"][title]
+      attribute: title
+    details:
+      selector: a[href^="details.php"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    date:
+      # several old torrents with `0000-00-00 00:00:00` dates
+      selector: td:nth-child(5):not(:contains("000-00-0000:00:00"))
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+      optional: true
+      default: now
+    size:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    grabs:
+      selector: td:nth-child(7)
+    downloadvolumefactor:
+      case:
+        img[src*="/freeleech.png"]: 0
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -145,7 +145,7 @@ search:
        - name: dateparse
          args: "yyyy-MM-dd HH:mm:ss zzz"
    size:
-      selector: td.fixed-width-size > span
+      selector: td.fixed-width-size > a
    grabs:
      selector: td.fixed-width-completed
    seeders:
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@@ -1,7 +1,7 @@
 ---
 id: bithumen
 name: BitHUmen
-description: "BitHUmen is a Hungarian Private site for TV / MOVIES / GENERAL"
+description: "BitHUmen is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: hu-HU
 type: private
 encoding: ISO-8859-2
@@ -48,44 +48,61 @@ caps:
    music-search: [q]
    book-search: [q]

+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: DESC
+    options:
+      DESC: desc
+      ASC: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "If you do not visit the site for 1 year, you will be banned for inactivity. The permanent deletion of your account after the ban is 2 years."
+
 login:
-  path: takelogin.php
-  method: post
+  method: cookie
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("bejelentkezés"))
+    cookie: "{{ .Config.cookie }}"
  test:
-    path: browse.php
-    selector: a[href*="logout.php"]
+    path: index.php
+    selector: a[href^="/logout.php?"]

 search:
  paths:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    incldead: 1
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    onlytitle: "{{ if .Query.IMDBID }}{{ else }}yes{{ end }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"

  rows:
    selector: table#torrenttable > tbody > tr:has(a[href^="details.php?id="])
-    filters:
-      - name: andmatch

  fields:
-# download button can be disbled in the profile, use details link instead
-#      download:
-#        selector: a[href^="download.php/"]
-#        attribute: href
-    download:
-      selector: a[href^="details.php?id="]
+    category:
+      selector: a[href^="?cat="]
      attribute: href
      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php/"]
-        - name: append
-          args: "/invalid.torrent"
+        - name: querystring
+          args: cat
    title_default:
      selector: a[href^="details.php?id="]
    title:
@@ -96,21 +113,30 @@ search:
    details:
      selector: a[href^="details.php?id="]
      attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
+    # download button can be disabled in the profile, use details link instead
+    download:
+      selector: a[href^="details.php?id="]
      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php/"]
+        - name: append
+          args: "/invalid.torrent"
    poster:
      selector: a[onmouseover^="bithumen.UI.images.coverShow"]
      attribute: onmouseover
      filters:
        - name: regexp
          args: "\"(.*?)\""
-    category:
-      selector: a[href^="?cat="]
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    size:
+      selector: td:nth-child(6) > u
+    files:
+      selector: td:nth-child(3)
+    grabs:
+      selector: td:nth-child(7)
    seeders:
      selector: td:nth-child(8)
    leechers:
@@ -118,21 +144,19 @@ search:
      filters:
        - name: regexp
          args: /\s*([\d,]+)
-    grabs:
-      selector: td:nth-child(7)
-    files:
-      selector: td:nth-child(3)
-    size:
-      selector: td:nth-child(6) > u
+    genre:
+      selector: span:has(a[href^="browse.php?genre="])
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
      selector: td:nth-child(5) > nobr > font:contains(" × ")
      optional: true
      default: 1
-      filters:
-        - name: replace
-          args: ["×", ""]
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td:nth-child(2) > div
    date_year:
      selector: td:nth-child(5):contains('.')
      optional: true
@@ -155,6 +179,4 @@ search:
          args: ["tegnap", "yesterday"]
    date:
      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
-    description:
-      selector: td:nth-child(2) > div
 # engine tbd
--- a/src/Jackett.Common/Definitions/bitmagnet.yml
+++ b/src/Jackett.Common/Definitions/bitmagnet.yml
@@ -49,8 +49,8 @@ search:
    t: "{{ .Query.Type }}"
    q: "{{ .Keywords }}"
    cat: "{{ join .Categories \",\" }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tmdbId: "{{ .Query.TMDBID }}"
+    imdbid: "{{ .Query.IMDBIDShort }}"
+    tmdbid: "{{ .Query.TMDBID }}"
    season: "{{ .Query.Season }}"
    ep: "{{ .Query.Ep }}"
    limit: 100
--- a/src/Jackett.Common/Definitions/bitpalace.yml
+++ b/src/Jackett.Common/Definitions/bitpalace.yml
@@ -1,7 +1,7 @@
 ---
 id: bitpalace
 name: Bitpalace
-description: "Bitpalace is a Hungarian Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "Bitpalace is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: hu-HU
 type: private
 encoding: UTF-8
@@ -35,10 +35,10 @@ caps:
    - {id: 3, cat: Movies/SD, desc: "XVID HUN"}
    - {id: 12, cat: XXX/DVD, desc: "XXX DVD-R"}
    - {id: 6, cat: XXX/x264, desc: "XXX HD"}
-    - {id: 10, cat: XXX/ImageSet, desc: "XXX/Képek"}
+    - {id: 10, cat: XXX/ImageSet, desc: "XXX KÉPEK"}
    - {id: 11, cat: XXX/XviD, desc: "XXX XVID"}
    - {id: 19, cat: Audio/Video, desc: "ZENE Klipp"}
-    - {id: 26, cat: Audio/MP3, desc: "ZENE MP3"}
+    - {id: 20, cat: Audio/MP3, desc: "ZENE MP3"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/bitporn.yml
+++ b/src/Jackett.Common/Definitions/bitporn.yml
@@ -1,7 +1,7 @@
 ---
 id: bitporn
-name: BitPorn
-description: "BitPorn is a HUNGARIAN Private Torrent Tracker for 3X"
+name: BitPorn (API)
+description: "BitPorn (Malacka) is a HUNGARIAN Private Torrent Tracker for 3X"
 language: hu-HU
 type: private
 encoding: UTF-8
@@ -10,67 +10,68 @@ links:

 caps:
  categorymappings:
-    - {id: 418, cat: XXX, desc: "Amateur"}
-    - {id: 410, cat: XXX, desc: "Anal"}
-    - {id: 414, cat: XXX, desc: "Animal"}
-    - {id: 415, cat: XXX, desc: "Asian"}
-    - {id: 416, cat: XXX, desc: "BBW"}
-    - {id: 417, cat: XXX, desc: "BDSM"}
-    - {id: 419, cat: XXX, desc: "Big Ass"}
-    - {id: 420, cat: XXX, desc: "Big Tits"}
-    - {id: 421, cat: XXX, desc: "Black"}
-    - {id: 447, cat: XXX, desc: "Cartoon"}
-    - {id: 448, cat: XXX, desc: "Casting"}
-    - {id: 422, cat: XXX, desc: "Classic"}
-    - {id: 434, cat: XXX, desc: "Collection"}
-    - {id: 423, cat: XXX, desc: "Creampie"}
-    - {id: 424, cat: XXX, desc: "Cumshot"}
-    - {id: 451, cat: XXX, desc: "Deepthroat"}
-    - {id: 455, cat: XXX, desc: "Extreme"}
-    - {id: 460, cat: XXX, desc: "Fansite"}
-    - {id: 454, cat: XXX, desc: "Family"}
-    - {id: 425, cat: XXX, desc: "Feature"}
-    - {id: 426, cat: XXX, desc: "Fetish"}
-    - {id: 457, cat: XXX, desc: "Fisting"}
-    - {id: 453, cat: XXX, desc: "Gangbang"}
-    - {id: 459, cat: XXX, desc: "Game"}
-    - {id: 427, cat: XXX, desc: "Gay / Bi"}
-    - {id: 412, cat: XXX, desc: "Hair"}
-    - {id: 411, cat: XXX, desc: "Hardcore"}
-    - {id: 456, cat: XXX, desc: "HiddenCam"}
-    - {id: 428, cat: XXX, desc: "Homemade"}
-    - {id: 429, cat: XXX, desc: "Interracial"}
-    - {id: 430, cat: XXX, desc: "Lesbian"}
-    - {id: 431, cat: XXX, desc: "Magyar"}
-    - {id: 432, cat: XXX, desc: "Masturbation"}
-    - {id: 433, cat: XXX, desc: "Mature"}
-    - {id: 435, cat: XXX, desc: "Milf"}
-    - {id: 436, cat: XXX, desc: "Old and Young"}
-    - {id: 437, cat: XXX, desc: "Parody"}
-    - {id: 449, cat: XXX, desc: "Pictures"}
-    - {id: 438, cat: XXX, desc: "Pissing"}
-    - {id: 439, cat: XXX, desc: "POV"}
-    - {id: 440, cat: XXX, desc: "Pregnant"}
-    - {id: 452, cat: XXX, desc: "Public"}
-    - {id: 441, cat: XXX, desc: "Shemale"}
-    - {id: 442, cat: XXX, desc: "Softcore"}
-    - {id: 443, cat: XXX, desc: "Squirt"}
-    - {id: 444, cat: XXX, desc: "Straight"}
-    - {id: 445, cat: XXX, desc: "Teen"}
-    - {id: 450, cat: XXX, desc: "Threesome"}
-    - {id: 446, cat: XXX, desc: "VR"}
-    - {id: 458, cat: XXX, desc: "Uncategorized"}
+    - {id: 4, cat: XXX, desc: Amateur"}
+    - {id: 5, cat: XXX, desc: Anal"}
+    - {id: 6, cat: XXX, desc: Asian"}
+    - {id: 7, cat: XXX, desc: BBW"}
+    - {id: 8, cat: XXX, desc: BDSM"}
+    - {id: 9, cat: XXX, desc: Big Ass"}
+    - {id: 10, cat: XXX, desc: Big Tits"}
+    - {id: 11, cat: XXX, desc: Black"}
+    - {id: 12, cat: XXX, desc: Cartoon"}
+    - {id: 13, cat: XXX, desc: Casting"}
+    - {id: 14, cat: XXX, desc: Classic"}
+    - {id: 15, cat: XXX, desc: Collection"}
+    - {id: 16, cat: XXX, desc: Creampie"}
+    - {id: 17, cat: XXX, desc: Cumshot"}
+    - {id: 18, cat: XXX, desc: Deepthroat"}
+    - {id: 19, cat: XXX, desc: Extreme"}
+    - {id: 20, cat: XXX, desc: Fansite"}
+    - {id: 21, cat: XXX, desc: Family"}
+    - {id: 22, cat: XXX, desc: Feature"}
+    - {id: 23, cat: XXX, desc: Fetish"}
+    - {id: 24, cat: XXX, desc: Fisting"}
+    - {id: 25, cat: XXX, desc: Gangbang"}
+    - {id: 26, cat: XXX, desc: Game"}
+    - {id: 27, cat: XXX, desc: Gay / Bi"}
+    - {id: 28, cat: XXX, desc: Hair"}
+    - {id: 29, cat: XXX, desc: Hardcore"}
+    - {id: 30, cat: XXX, desc: HiddenCam"}
+    - {id: 31, cat: XXX, desc: Homemade"}
+    - {id: 32, cat: XXX, desc: Interracial"}
+    - {id: 33, cat: XXX, desc: Lesbian"}
+    - {id: 34, cat: XXX, desc: Magyar"}
+    - {id: 35, cat: XXX, desc: Masturbation"}
+    - {id: 36, cat: XXX, desc: Mature"}
+    - {id: 37, cat: XXX, desc: Milf"}
+    - {id: 53, cat: XXX, desc: Movie"}
+    - {id: 38, cat: XXX, desc: Old and Young"}
+    - {id: 39, cat: XXX, desc: Parody"}
+    - {id: 40, cat: XXX, desc: Pictures"}
+    - {id: 41, cat: XXX, desc: Pissing"}
+    - {id: 42, cat: XXX, desc: POV"}
+    - {id: 43, cat: XXX, desc: Pregnant"}
+    - {id: 44, cat: XXX, desc: Public"}
+    - {id: 45, cat: XXX, desc: Shemale"}
+    - {id: 46, cat: XXX, desc: Softcore"}
+    - {id: 47, cat: XXX, desc: Squirt"}
+    - {id: 48, cat: XXX, desc: Straight"}
+    - {id: 49, cat: XXX, desc: Teen"}
+    - {id: 50, cat: XXX, desc: Threesome"}
+    - {id: 51, cat: XXX, desc: VR"}
+    - {id: 52, cat: XXX, desc: Uncategorized"}

  modes:
    search: [q]

 settings:
-  - name: username
+  - name: apikey
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://bitporn.eu/\" target=\"_blank\">BitPorn</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -78,12 +79,12 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: 4
+    default: created_at
    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
  - name: type
    type: select
    label: Order requested from site
@@ -91,121 +92,105 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: info_activity
    type: info
    label: Account Inactivity
    default: "You must log in to the site at least once a month; otherwise, your account will be suspended."

 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    secret: ""
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
+  path: /api/torrents
+  method: get
  error:
-    - selector: td.embedded:has(h2:contains("Bejelentkezés sikertelen!"))
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+    - selector: :root:contains("Account is Banned")

 search:
  paths:
-    - path: torrents.php
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: 0
-    # 0 AND, 2 exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    notnewword: 1
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]

  rows:
-    selector: table.contenttable > tbody > tr:has(a[href^="details.php?id="])
+    selector: data
+    attribute: attributes

  fields:
    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_default:
-      selector: a[href^="details.php?id="]
+      selector: category_id
    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
+      selector: name
    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+      selector: details_link
    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img[data-src]
-      attribute: data-src
-    date_elapsed:
-      # time type: time elapsed (default)
-      selector: td.rowfollow:nth-child(4) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_added:
-      # time added
-      selector: td.rowfollow:nth-child(4):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
-    size:
-      selector: td.rowfollow:nth-child(5)
+      selector: download_link
+    infohash:
+      selector: info_hash
+    files:
+      selector: num_file
    seeders:
-      selector: td.rowfollow:nth-child(6)
+      selector: seeders
    leechers:
-      selector: td.rowfollow:nth-child(7)
+      selector: leechers
    grabs:
-      selector: td.rowfollow:nth-child(8)
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
+      # api returns False, True
+      selector: double_upload
      case:
-        img.pro_free: 0
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
+        False: 1 # normal
+        True: 2 # double
    uploadvolumefactor:
-      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
    minimumratio:
      text: 1.0
    minimumseedtime:
      # 48 hours (as seconds = 2 x 24 x 60 x 60)
      text: 172800
-    description:
-      selector: td.rowfollow:nth-child(2)
-      remove: a, b, font, img, span
-# NexusPHP v2.3 (custom)
+# json UNIT3D 9.1.5 (custom)
--- a/src/Jackett.Common/Definitions/bitsearch.yml
+++ b/src/Jackett.Common/Definitions/bitsearch.yml
@@ -1,47 +1,67 @@
 ---
 id: bitsearch
+replaces:
+  - solidtorrents
 name: BitSearch
-description: "BitSearch is a Public torrent meta-search engine"
+description: "BitSearch (Solid Torrents) is a Public torrent meta-search engine"
 language: en-US
 type: public
 encoding: UTF-8
-requestDelay: 2
 links:
  - https://bitsearch.to/
+  - https://solidtorrents.to/
 legacylinks:
  - https://bitsearch.nocensor.cloud/
  - https://bitsearch.mrunblock.bond/
+  - https://solidtorrents.net/
+  - https://solidtorrents.nocensor.cloud/
+  - https://solidtorrents.eu/

 caps:
  categories:
-    AudioBook: Audio/Audiobook
-    eBook: Books/EBook
-    "Ebook/Course": Books/EBook
-    Games: PC/Games
-    "Games/PC": PC/Games
+    Anime: TV/Anime
+    Anime/Dub/Dual Audio: TV/Anime
+    Anime/Raw: TV/Anime
+    Anime/Subbed: TV/Anime
+    Books: Books
+    Books/Academic: Books/EBook
+    Books/Comics: Books/Comics
+    Books/Fiction: Books/EBook
+    Books/Magazines: Books/Mags
+    Books/Non-fiction: Books/EBook
+    Ebook/Course: Books/EBook
+    Games: Console
+    Games/Console: Console
+    Games/Mobile: PC/Mobile-Other
+    Games/PC: PC/Games
+    Games/RIP: PC/Games
    Movies: Movies
+    Movies/Dub/Dual Audio: Movies
    Music: Audio
-    "Music/Album": Audio
-    "Music/mp3": Audio/MP3
-    "Music/Lossless": Audio/Lossless
-    "Music/Video": Audio/Video
+    Music/Album: Audio
+    Music/Discography: Audio
+    Music/FLAC: Audio/Lossless
+    Music/Lossless: Audio/Lossless
+    Music/MP3: Audio/MP3
+    Music/Single: Audio
    Other: Other
-    "Other/Android": PC/Mobile-Android
-    "Other/Archive": Other
-    "Other/Audio": Audio
-    "Other/Database": PC
-    "Other/DiskImage": PC/ISO
-    "Other/Document": Books/Comics
-    "Other/Image": Other/Misc
-    "Other/Program": PC/0day
-    "Other/Sourcecode": PC
-    "Other/Source Code": PC
-    "Other/Video": Other
+    Other/Android: PC/Mobile-Android
+    Other/Archive: Other
+    Other/Audio: Audio
+    Other/Database: PC
+    Other/DiskImage: PC/ISO
+    Other/Document: Books/Comics
+    Other/Image: Other/Misc
+    Other/Program: PC
+    Other/Source Code: PC
+    Other/Video: TV
    Softwares: PC/0day
-    "Softwares/Windows": PC/0day
+    Softwares/Android: PC/Mobile-Android
+    Softwares/Linux: PC
+    Softwares/MacOS: PC/Mac
+    Softwares/Windows: PC/0day
+    Softwares/iOS: PC/Mobile-iOS
    TV: TV
-    Unknown: Other
-    XXX: XXX

  modes:
    search: [q]
@@ -51,139 +71,73 @@ caps:
    book-search: [q]

 settings:
-  - name: prefer_magnet_links
-    type: checkbox
-    label: Prefer Magnet Links
-    default: false
  - name: sort
    type: select
-    label: Sort requested from site
-    default: date
+    label: Sort requested from site.
+    default: created
    options:
-      date: created
+      created: created
      seeders: seeders
      size: size
  - name: type
    type: select
-    label: Order requested from site
+    label: Order requested from site.
    default: desc
    options:
      desc: desc
      asc: asc
-  - name: info_category_8000
-    type: info
-    label: About BitSearch Categories
-    default: BitSearch does not properly return categories in its search results for some releases.</br>To add to your Apps' Torznab indexer, you will need to include the 8000(Other) category.
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt"]
+      attribute: href

 search:
  paths:
-     # https://bitsearch.to/search?q=&sort=date&order=desc
-    - path: search
-  inputs:
-    q: "{{ .Keywords }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    limit: 100
-    page: 1
+     # https://bitsearch.to/search?q=spongebob&sortBy=created&order=desc&page=1
+    - path: "{{ if .Keywords }}search?q={{ .Keywords }}&sortBy={{ .Config.sort }}&order={{ .Config.type }}&page=1{{ else }}latest{{ end }}"

  keywordsfilters:
    - name: re_replace
      args: ["\\.", " "]

  rows:
-    selector: div.search-result:has(a.dl-torrent), li.search-result:has(a.dl-torrent)
+    selector: div.space-y-4 > div.bg-white > div.items-start

  fields:
    category:
-      selector: a.category
+      # latest, search
+      selector: div.space-y-2 > span:nth-child(1), span.space-x-1:nth-child(1)
    title:
-      selector: h5 a
+      selector: h3 > a
    details:
-      selector: h5 a
+      selector: h3 > a
      attribute: href
-    download_optional:
-      selector: a.dl-torrent
-      attribute: href
-      optional: true
    download:
-      text: "{{ if .Config.prefer_magnet_links }}{{ else }}{{ .Result.download_optional }}{{ end }}"
-      optional: true
-    magnet:
-      selector: a[href^="magnet:?xt"]
+      selector: h3 > a
      attribute: href
-    infohash:
-      selector: a[href^="magnet:?xt"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    grabs_dot:
-      selector: div.stats div:has(img[alt="Download"]):contains(".")
-      optional: true
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: ["K", "00"]
-        - name: replace
-          args: ["M", "00000"]
-    grabs_nodot:
-      selector: div.stats div:has(img[alt="Download"]):not(:contains("."))
-      optional: true
-      filters:
-        - name: replace
-          args: ["K", "000"]
-        - name: replace
-          args: ["M", "000000"]
-    grabs:
-      text: "{{ if or .Result.grabs_dot .Result.grabs_nodot }}{{ or .Result.grabs_dot .Result.grabs_nodot }}{{ else }}0{{ end }}"
    size:
-      selector: div.stats div:has(img[alt="Size"])
-    seeders_dot:
-      selector: div.stats div:has(img[alt="Seeder"]):contains(".")
+      selector: div.space-y-2 > span:nth-child(2), span.space-x-1:nth-child(2)
+    date_year:
+      selector: div.space-y-2 > span:nth-child(3):contains("/"), span.space-x-1:nth-child(3):contains("/")
      optional: true
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: ["K", "00"]
-        - name: replace
-          args: ["M", "00000"]
-    seeders_nodot:
-      selector: div.stats div:has(img[alt="Seeder"]):not(:contains("."))
-      optional: true
-      filters:
-        - name: replace
-          args: ["K", "000"]
-        - name: replace
-          args: ["M", "000000"]
-    seeders:
-      text: "{{ if or .Result.seeders_dot .Result.seeders_nodot }}{{ or .Result.seeders_dot .Result.seeders_nodot }}{{ else }}0{{ end }}"
-    leechers_dot:
-      selector: div.stats div:has(img[alt="Leecher"]):contains(".")
-      optional: true
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: ["K", "00"]
-        - name: replace
-          args: ["M", "00000"]
-    leechers_nodot:
-      selector: div.stats div:has(img[alt="Leecher"]):not(:contains("."))
-      optional: true
-      filters:
-        - name: replace
-          args: ["K", "000"]
-        - name: replace
-          args: ["M", "000000"]
-    leechers:
-      text: "{{ if or .Result.leechers_dot .Result.leechers_nodot }}{{ or .Result.leechers_dot .Result.leechers_nodot }}{{ else }}0{{ end }}"
-    date:
-      selector: div.stats div:has(img[alt="Date"])
      filters:
        - name: dateparse
-          args: "MMM d, yyyy"
+          args: "M/d/yyyy"
+    date_ago:
+      selector: div.space-y-2 > span:nth-child(3):contains("ago"), span.space-x-1:nth-child(3):contains("ago")
+      optional: true
+      filters:
+        - name: timeago
+    date:
+      text: "{{ if or .Result.date_year .Result.date_ago }}{{ or .Result.date_year .Result.date_ago }}{{ else }}now{{ end }}"
+    seeders:
+      selector: div.space-x-3 > span:nth-child(1), span:contains("seeders")
+    leechers:
+      selector: div.space-x-3 > span:nth-child(2), span:contains("leechers")
+    grabs:
+      selector: span:contains("downloads")
+      optional: true
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/bitsexy-api.yml
+++ b/src/Jackett.Common/Definitions/bitsexy-api.yml
@@ -1,26 +1,25 @@
 ---
-id: nirvana
-name: Nirvana (API)
-description: "Nirvana is a Private RUSSIAN Tracker for MOVIES / TV"
-language: ru-RU
+id: bitsexy-api
+name: BitSexy (API)
+description: "BitSexy is a Private Torrent Tracker for 3X"
+language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://nirvana.li/
+  - https://bitsexy.cc/

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Фильмы"}
-    - {id: 2, cat: TV, desc: "Сериалы"}
-    - {id: 6, cat: Movies/Other, desc: "Аниме-фильмы"}
-    - {id: 7, cat: TV/Anime, desc: "Аниме-сериалы"}
-    - {id: 6, cat: Movies/Other, desc: "35mm"}
-    - {id: 4, cat: Other, desc: "No"}
+    - {id: 1, cat: XXX/x264, desc: "Movies"}
+    - {id: 2, cat: XXX/Pack, desc: "Pack"}
+    - {id: 3, cat: XXX/ImageSet, desc: "Images"}
+    - {id: 4, cat: Console, desc: "Games"}
+    - {id: 5, cat: Books, desc: "Books"}

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

 settings:
  - name: apikey
@@ -29,7 +28,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://nirvana.li/\" target=\"_blank\">Nirvana</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://bitsexy.cc/\" target=\"_blank\">BitSexy</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -57,7 +56,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Inactive users are regularly deleted. To keep an account, you must visit the site at least once a season."
+    default: "<ul><li>You must log in once every 60 days or seed at least 1 torrent to not get disabled</li><li>Once disabled, you have another 60 days to log back in and have your account re-activated. You may need to contact Helpdesk to do so</li><li>Disabled account will be deleted after 180 days of inactivity</li><ul>"

 login:
  path: /api/torrents
@@ -70,9 +69,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -83,11 +82,6 @@ search:
  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
-    seasonNumber: "{{ .Query.Season }}"
-    episodeNumber: "{{ .Query.Ep }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tmdbId: "{{ .Query.TMDBID }}"
-    tvdbId: "{{ .Query.TVDBID }}"
    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
@@ -117,8 +111,6 @@ search:
      selector: details_link
    download:
      selector: download_link
-    infohash:
-      selector: info_hash
    poster:
      selector: meta.poster
      filters:
@@ -132,8 +124,16 @@ search:
      selector: tvdb_id
    genre:
      selector: meta.genres
+      filters:
+        - name: replace
+          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -175,10 +175,7 @@ search:
        True: 2 # double
    uploadvolumefactor:
      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
    minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 8.3.3
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 9.1.6 (custom)
--- a/src/Jackett.Common/Definitions/bitspyder.yml
+++ b/src/Jackett.Common/Definitions/bitspyder.yml
@@ -1,182 +0,0 @@
---
-id: bitspyder
-name: Bitspyder
-description: "Bitspyder is a Private site for Educational BOOKS / AUDIO"
-language: en-US
-type: private
-encoding: iso-8859-1
-links:
-  - https://bitspyder.net/
-legacylinks:
-  - http://bitspyder.net/
-
-caps:
-  categorymappings:
-    - {id: 61, cat: Books, desc: "3D"}
-    - {id: 69, cat: Books, desc: "Anim|GFX"}
-    - {id: 56, cat: Books, desc: "Art"}
-    - {id: 40, cat: Audio/Audiobook, desc: "Audio Books"}
-    - {id: 55, cat: Books, desc: "Business"}
-    - {id: 46, cat: Books, desc: "Career"}
-    - {id: 2, cat: Books, desc: "CBTs"}
-    - {id: 39, cat: Books, desc: "Cert QA"}
-    - {id: 63, cat: Books, desc: "College"}
-    - {id: 53, cat: Books, desc: "Cooking"}
-    - {id: 35, cat: Books, desc: "Developer"}
-    - {id: 42, cat: Books, desc: "Documentary"}
-    - {id: 37, cat: Books/EBook, desc: "e-Books"}
-    - {id: 65, cat: Books, desc: "Engineering"}
-    - {id: 45, cat: Books, desc: "Ethical hacking"}
-    - {id: 54, cat: Books, desc: "Health-Fitness"}
-    - {id: 64, cat: Books, desc: "Kids"}
-    - {id: 47, cat: Books, desc: "Languages"}
-    - {id: 49, cat: Books, desc: "Linux CBTs"}
-    - {id: 43, cat: Books, desc: "Lynda.com"}
-    - {id: 57, cat: Books/Mags, desc: "Magazines"}
-    - {id: 60, cat: Books, desc: "Medical"}
-    - {id: 44, cat: Books, desc: "Misc Learning"}
-    - {id: 51, cat: Books, desc: "Music Learning"}
-    - {id: 41, cat: Books, desc: "Others"}
-    - {id: 58, cat: Books, desc: "Packt"}
-    - {id: 52, cat: Books, desc: "Photography"}
-    - {id: 71, cat: Books, desc: "Pluralsight"}
-    - {id: 68, cat: Books, desc: "Self Growth"}
-    - {id: 72, cat: Books, desc: "Templates"}
-    - {id: 38, cat: Books, desc: "Udemy"}
-    - {id: 59, cat: Books, desc: "WEB | SocialMedia"}
-
-  modes:
-    search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 8
-    options:
-      8: created
-      6: seeders
-      4: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: form
-  form: form
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.msg_info > font > b
-  test:
-    path: index.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
-    incldead: 1
-    # 0 title, 1 default
-    scope: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\s+", " "] # More than 1 space to 1 space
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-    - name: trim
-
-  rows:
-    selector: table > tbody > tr[class]
-
-  fields:
-    # there are two styles, we support both
-    title:
-      selector: a[href^="details.php?id="]
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php/"]
-        - name: replace
-          args: ["&hit=1", "/dummy.torrent"]
-    size:
-      selector: td.rowcol:nth-child(6):has(br), font:contains("Size:") + font
-    files:
-      selector: a[href*="&filelist=1"]
-    grabs:
-      selector: td.rowcol:nth-child(7):has(br), td.clear:nth-child(4)
-    seeders:
-      selector: td.rowcol:nth-last-child(3)
-    leechers:
-      selector: td.rowcol:nth-last-child(2)
-    date_added:
-      optional: true
-      selector: font[color="5F5F5F"]
-      filters:
-        - name: split
-          args: [" (", 0]
-        - name: replace
-          args: ["\xA0", " "]
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_upload:
-      optional: true
-      selector: a[title^="Upploaded at"]
-      attribute: title
-      filters:
-        - name: replace
-          args: ["Upploaded at - ", ""]
-        - name: replace
-          args: ["\xA0", " "]
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_upload .Result.date_added }}{{ or .Result.date_upload .Result.date_added }}{{ else }}now{{ end }}"
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-    description:
-      selector: font[color="#990000"]
-    minimumratio:
-      text: 1.0
-# custom v4
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -1,7 +1,7 @@
 ---
 id: bitturk
 name: BiTTuRK
-description: "BiTTuRK is a Turkish Private Torrent Tracker for HD MOVIES / TV / GENERAL. This Indexer is for English only."
+description: "BiTTuRK is a TURKISH Private Torrent Tracker for HD MOVIES / TV / GENERAL. This Indexer is for English only."
 language: en-US
 type: private
 encoding: UTF-8
@@ -13,67 +13,23 @@ legacylinks:

 caps:
  categorymappings:
-    - {id: 56, cat: Movies, desc: "BTRG"}
-    - {id: 57, cat: Movies, desc: "Yerli Dizi"}
-    - {id: 62, cat: Movies, desc: "Yab@ncı Dizi"}
-    - {id: 63, cat: Movies, desc: "Türkçe Film"}
-    - {id: 64, cat: Movies, desc: "Türk Filmi"}
-    - {id: 66, cat: Movies/HD, desc: "x265"}
-    - {id: 67, cat: XXX, desc: "XxX"}
-    - {id: 68, cat: Movies, desc: "Dual (TR-~)"}
-    - {id: 71, cat: Movies, desc: "NFLIX"}
-    - {id: 78, cat: TV, desc: "EXXEN"}
-    - {id: 79, cat: TV, desc: "BLUTV"}
-    - {id: 90, cat: TV, desc: "Disney+"}
-    - {id: 91, cat: TV, desc: "Prime Video"}
-    - {id: 93, cat: TV, desc: "Gain"}
-    - {id: 94, cat: TV, desc: "ATVP"}
-    - {id: 95, cat: Movies, desc: "HMAX"}
-    - {id: 98, cat: Movies, desc: "PUHUTV"}
-    - {id: 58, cat: Movies, desc: "Film"}
-    - {id: 72, cat: Movies, desc: "Belgesel"}
-    - {id: 60, cat: Movies/3D, desc: "3D"}
-    - {id: 76, cat: Movies/UHD, desc: "4K UHD"}
-    - {id: 80, cat: TV/Sport, desc: "Formula-1"}
-    - {id: 45, cat: Other, desc: "Eğitim/Prog"}
    - {id: 1, cat: Movies, desc: "Filmler"}
-    - {id: 14, cat: Movies/3D, desc: "3D Film"}
-    - {id: 77, cat: Movies/UHD, desc: "4K UHD"}
-    - {id: 16, cat: Movies, desc: "Animasyon"}
-    - {id: 17, cat: TV/Anime, desc: "Anime"}
-    - {id: 31, cat: Movies, desc: "Belgesel"}
-    - {id: 32, cat: Movies/BluRay, desc: "Bluray"}
-    - {id: 33, cat: Movies/HD, desc: "BRRiP"}
-    - {id: 34, cat: Movies, desc: "Çizgi Film"}
-    - {id: 35, cat: Movies, desc: "D-Z0N3"}
-    - {id: 36, cat: Movies/DVD, desc: "DVD"}
-    - {id: 37, cat: Movies, desc: "MP4"}
    - {id: 38, cat: Movies, desc: "Türk Filmi"}
-    - {id: 39, cat: Movies, desc: "Türkçe BoX"}
    - {id: 40, cat: Movies, desc: "Türkçe Film"}
-    - {id: 41, cat: Movies, desc: "ViP"}
-    - {id: 42, cat: Movies/SD, desc: "XviD"}
-    - {id: 43, cat: Movies/SD, desc: "XviD BoX"}
-    - {id: 55, cat: Movies/WEB-DL, desc: "WEB-DL"}
-    - {id: 7, cat: Audio, desc: "Müzik"}
-    - {id: 20, cat: Audio, desc: "Türkçe MüziK"}
-    - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
-    - {id: 21, cat: Audio/Video, desc: "Video Klipler"}
-    - {id: 2, cat: Console, desc: "Oyun"}
-    - {id: 74, cat: PC/Games, desc: "Oyun PC"}
-    - {id: 84, cat: Console/PS3, desc: "Oyun Playstation"}
-    - {id: 82, cat: Console/PSP, desc: " Oyun PSP"}
-    - {id: 83, cat: Console/Other, desc: "Oyun Gameboy"}
-    - {id: 87, cat: Console/XBox, desc: "Oyun XBOX"}
-    - {id: 88, cat: Console/Other, desc: "Oyun NEO-GEO"}
-    - {id: 89, cat: Console/Wii, desc: "Oyun Nintendo Wii"}
-    - {id: 6, cat: PC/0day, desc: "Program"}
-    - {id: 47, cat: Other, desc: "Resimler"}
+    - {id: 113, cat: Movies, desc: "Yabancı Dil"}
+    - {id: 77, cat: Movies/UHD, desc: "4K UHD / 3D"}
+    - {id: 16, cat: Movies, desc: "Animasyon"}
+    - {id: 31, cat: Movies, desc: "Belgesel"}
+    - {id: 112, cat: XXX, desc: "XxX"}
    - {id: 48, cat: TV, desc: "Televizyon"}
    - {id: 49, cat: TV/HD, desc: "Tv HD"}
    - {id: 50, cat: TV, desc: "Yab@ncı Dizi"}
    - {id: 51, cat: TV, desc: "Yerli Dizi"}
-    - {id: 44, cat: Books, desc: "E-BooK"}
+    - {id: 7, cat: Audio, desc: "Müzik"}
+    - {id: 20, cat: Audio, desc: "Türkçe MüziK"}
+    - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
+    - {id: 2, cat: Console, desc: "Oyun / Program"}
+    - {id: 44, cat: Books, desc: "E-BooK / Eğitim"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/blueroms.yml
+++ b/src/Jackett.Common/Definitions/blueroms.yml
@@ -10,23 +10,26 @@ links:

 caps:
  categorymappings:
-    - {id: "/3ds", cat: Console/3DS, desc: "3DS"}
    - {id: "/arcade", cat: Console/Other, desc: "Arcade"}
    - {id: "/dreamcast", cat: Console/Other, desc: "Dreamcast"}
-    - {id: "/nds", cat: Console/Other, desc: "DS"}
    - {id: "/gba", cat: Console/Other, desc: "Game Boy Advance"}
-    - {id: "/gamecube", cat: Console/Other, desc: "GameCube"}
    - {id: "/genesis", cat: Console/Other, desc: "Mega Drive - Genesis"}
    - {id: "/neogeo", cat: Console/Other, desc: "Neo Geo"}
+    - {id: "/3ds", cat: Console/3DS, desc: "Nintendo 3DS"}
    - {id: "/n64", cat: Console/NDS, desc: "Nintendo 64"}
+    - {id: "/nds", cat: Console/NDS, desc: "Nintendo DS"}
+    - {id: "/gamecube", cat: Console/Other, desc: "Nintendo GameCube"}
    - {id: "/switch", cat: Console/NDS, desc: "Nintendo Switch"}
+    - {id: "/wii", cat: Console/Wii, desc: "Nintendo Wii"}
+    - {id: "/wiiu", cat: Console/WiiU, desc: "Nintendo Wii U"}
    - {id: "/ps1", cat: Console/PS3, desc: "PlayStation"}
    - {id: "/ps2", cat: Console/PS3, desc: "PlayStation 2"}
    - {id: "/ps3", cat: Console/PS3, desc: "PlayStation 3"}
-    - {id: "psp", cat: Console/PSP, desc: "PlayStation Portable"}
+    - {id: "/ps4", cat: Console/PS4, desc: "PlayStation 4"}
+    - {id: "/psp", cat: Console/PSP, desc: "PlayStation Portable"}
+    - {id: "/psvita", cat: Console/PS Vita, desc: "PlayStation Vita"}
    - {id: "/saturn", cat: Console/Other, desc: "Saturn"}
    - {id: "/snes", cat: Console/NDS, desc: "Super Nintendo"}
-    - {id: "/wii", cat: Console/Wii, desc: "Wii"}
    - {id: "/xbox", cat: Console/XBox, desc: "Xbox"}

  modes:
@@ -76,31 +79,30 @@ search:
    category:
      selector: p.card-text a
      attribute: href
-    _platform:
+    title_platform:
      selector: p.card-text a
    title:
      selector: h4.card-title a
      filters:
        - name: append
-          args: " - {{ .Result._platform }}"
+          args: " - {{ .Result.title_platform }}"
    details:
      selector: h4.card-title a
      attribute: href
    download:
      selector: div.card-footer a
      attribute: href
+    poster:
+      selector: img
+      attribute: src
    size:
      selector: p.card-text
      filters:
        - name: regexp
-          args: (\d+\.?\d+[T|G|K]iB)
+          args: ([\d\.]+[T|G|M|K]iB)
    date:
-      selector: p.card-text
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2})
-        - name: dateparse
-          args: "yyyy-MM-dd"
+      # release date is for game, not torrent
+      text: now
    seeders:
      text: 1
    leechers:
@@ -109,4 +111,9 @@ search:
      text: 0
    uploadvolumefactor:
      text: 1
+    description:
+      selector: p.card-text
+      filters:
+        - name: regexp
+          args: "(Score: .+)"
 # engine n/a
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -73,9 +73,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -120,8 +120,6 @@ search:
      selector: details_link
    download:
      selector: download_link
-    infohash:
-      selector: info_hash
    poster:
      selector: meta.poster
      filters:
@@ -142,8 +140,13 @@ search:
          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -191,4 +194,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 8.3.6
+# json UNIT3D 9.1.6
--- a/src/Jackett.Common/Definitions/bootytape.yml
+++ b/src/Jackett.Common/Definitions/bootytape.yml
@@ -1,7 +1,7 @@
 ---
 id: bootytape
 name: BootyTape
-description: "BootyTape is a Semi-Private site for 3X"
+description: "BootyTape is a Semi-Private Torrent Tracker for 3X"
 language: en-US
 type: semi-private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/btdirectory.yml
+++ b/src/Jackett.Common/Definitions/btdirectory.yml
@@ -7,13 +7,17 @@ type: public
 encoding: UTF-8
 # current domain at https://cursor.vip/btmulu then follow links to the final search-movie link
 links:
-  - https://www.btmulu.one/
+  - https://btmulu.live/
  - https://www.btmulu.cyou/
+  - https://www.btmulu.quest/
+  - https://www.btmulu.cfd/
+  - https://www.btmulu.help/
 legacylinks:
-  - https://btmulu.work/
  - https://www.btmulu.asia/
  - https://www.btmulu.digital/
  - https://www.btmulu.pw/
+  - https://www.btmulu.one/
+  - https://btmulu.work/

 caps:
  categorymappings:
@@ -39,7 +43,7 @@ search:
    name: "{{ re_replace .Keywords \"[\\s]+\" \"+\" }}"

  rows:
-    selector: article.item
+    selector: article.item:has(a[href^="/hash/"])
    filters:
      - name: andmatch

--- a/src/Jackett.Common/Definitions/btmet.yml
+++ b/src/Jackett.Common/Definitions/btmet.yml
@@ -1,104 +0,0 @@
---
-id: btmet
-name: BTMET
-description: "BTMET is a Public magnet indexer"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://btmet.com/
-
-caps:
-  categories:
-    Audio: Audio
-    Compressed: Other
-    Document: Books
-    Image: Other
-    Installation: PC
-    Other: Other
-    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
-    Video: Movies
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 0
-    options:
-      0: relevance
-      1: created
-      2: size
-  - name: info_flaresolverr
-    type: info_flaresolverr
-
-search:
-  paths:
-    # https://btmet.com/search.php?q=2022&c=&l=&o=1
-    - path: search.php
-  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    o: "{{ if .Keywords }}{{ .Config.sort }}{{ else }}1{{ end }}"
-
-  rows:
-    selector: div.search-item:has(a[href^="magnet"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: div.item-bar > span[class="cpill blue-pill"]
-    category|append:
-      # add tv to video
-      optional: true
-      selector: div.item-bar > span[class="cpill blue-pill"]
-      filters:
-        - name: replace
-          args: ["Video", "TV"]
-    title:
-      selector: a.smashTitle > script:contains("decodeURIComponent")
-      filters:
-        - name: urldecode
-        - name: replace
-          args: ['document.write(decodeURIComponent("', ""]
-        - name: replace
-          args: ['"));', ""]
-        - name: replace
-          args: ["<b style='color:#ea644a'>", ""]
-        - name: replace
-          args: ["</b>", ""]
-        - name: htmldecode
-    details:
-      selector: a.smashTitle
-      attribute: href
-    infohash:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([a-f|0-9]{40})
-    date:
-      # unix
-      selector: div.item-bar > span:nth-child(2) > b
-      attribute: t
-      filters:
-        - name: regexp
-          args: (\d{10})
-    size:
-      selector: div.item-bar > span:nth-child(3) > b
-    files:
-      selector: div.item-bar > span:nth-child(4) > b
-    seeders:
-      selector: div.item-bar > span:nth-child(5) > b
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -1,7 +1,7 @@
 ---
 id: btschool
 name: BTSCHOOL
-description: "BTSCHOOL is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "BTSCHOOL is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -1,88 +0,0 @@
---
-id: btsow
-name: BTSOW
-description: "BTSOW is a Public torrent indexer"
-language: en-US
-type: public
-encoding: UTF-8
-# use https://tellme.pw/btsow to find the new domain
-links:
-  - https://btsow.motorcycles/
-legacylinks:
-  - https://btsow.bar/
-  - https://btsow.click/
-  - https://btsow.cfd/
-  - https://btsow.sbs/
-  - https://btsow.quest/
-  - https://btsow.autos/
-  - https://btsow.beauty/
-  - https://btsow.mom/
-  - https://btsow.boats/
-  - https://btsow.hair/
-  - https://btsow.bond/
-  - https://btsow.skin/
-  - https://btsow.makeup/
-  - https://btsow.homes/
-  - https://btsow.yachts/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_category_8000
-    type: info_category_8000
-
-download:
-  selectors:
-    - selector: a#magnetOpen
-      attribute: href
-
-search:
-  paths:
-    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-
-  headers:
-    # site blocks Jackett's User-Agents, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
-    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
-
-  rows:
-    selector: div.row:has(a[href*="/detail/hash/"])
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: a[href*="/detail/hash/"]
-      attribute: title
-    details:
-      selector: a[href*="/detail/hash/"]
-      attribute: href
-    download:
-      selector: a[href*="/detail/hash/"]
-      attribute: href
-    date:
-      selector: div.date
-      filters:
-        - name: append
-          args: " -00:00" # GMT
-        - name: dateparse
-          args: "yyyy-MM-dd zzz"
-    size:
-      selector: div.size
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/btstate.yml
+++ b/src/Jackett.Common/Definitions/btstate.yml
@@ -0,0 +1,72 @@
+---
+id: btstate
+replaces:
+  - btsate
+name: btstate
+description: "btstate is a Public BitTorrent DHT search engine."
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://btstate.com/
+
+caps:
+  categories:
+    Other: Other
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_category_8000
+    type: info_category_8000
+
+search:
+  paths:
+    # https://btstate.com/api/searchByKeyword/2025?take=100&skip=0&page=1&pageSize=100
+    - path: "api/searchByKeyword/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+      response:
+        type: json
+
+  inputs:
+    take: 100
+    skip: 0
+    page: 1
+    pageSize: 100
+
+  rows:
+    selector: items
+    attribute: _source
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: Other
+    title:
+      selector: name
+    details:
+      text: "{{ .Config.sitelink }}"
+    infohash:
+      selector: infohash
+    date:
+      # unix
+      selector: createTime
+      filters:
+        - name: regexp
+          args: ^(\d{10})
+    size:
+      selector: size
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# json api
--- a/src/Jackett.Common/Definitions/bwtorrents.yml
+++ b/src/Jackett.Common/Definitions/bwtorrents.yml
@@ -1,21 +1,21 @@
 ---
 id: bwtorrents
 name: BwTorrents
-description: "BwTorrents is a Private Torrent Tracker for BollyWood MOVIES / TV / GENERAL"
+description: "BwTorrents is an INDIAN Private Torrent Tracker for MOVIES / TV"
 language: en-US
 type: private
 encoding: UTF-8
 links:
  - https://bwtorrents.tv/
-  - https://www.bwtorrents.life/
  - https://www.bwtorrents.pro/
  - https://bwtorrents.cc/
+  - https://bwtorrents.live/
 legacylinks:
  - https://bwtorrents.fun/
  - https://bwtorrents.xyz/
  - https://bwtorrents.us/
-  - https://bwtorrents.live/
  - https://bwtorrents.co/
+  - https://www.bwtorrents.life/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/capybarabr.yml
+++ b/src/Jackett.Common/Definitions/capybarabr.yml
@@ -77,9 +77,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -146,8 +146,13 @@ search:
          args: ["(?i)(Cinema TV)", "Cinema_TV"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
--- a/src/Jackett.Common/Definitions/catorrent.yml
+++ b/src/Jackett.Common/Definitions/catorrent.yml
@@ -1,11 +1,13 @@
 ---
 id: catorrent
 name: Catorrent
-description: "Catorrent is a RUSSIAN Semi-Private Torrent Tracker for GAMES"
+description: "Catorrent is a RUSSIAN Public Torrent Tracker for GAMES"
 language: ru-RU
-type: semi-private
+type: public
 encoding: UTF-8
 links:
+  - https://catorrent.net/
+legacylinks:
  - https://catorrent.org/

 caps:
@@ -33,28 +35,7 @@ caps:
  modes:
    search: [q]

-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-
-login:
-  path: index.php
-  method: form
-  form: form[action=""]
-  inputs:
-    login_name: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    login_not_save: ""
-    login: submit
-  error:
-    - selector: div.berrors
-  test:
-    path: /
-    selector: a[href$="/index.php?action=logout"]
+settings: []

 download:
  selectors:
@@ -78,6 +59,8 @@ search:
  fields:
    category:
      selector: div.icon_default
+      optional: true
+      default: PS1
    title:
      selector: div.short_game_title
    details:
@@ -105,4 +88,4 @@ search:
      text: 0
    uploadvolumefactor:
      text: 1
-# engine n/a
+# DataLife v25
--- a/src/Jackett.Common/Definitions/cdfile.yml
+++ b/src/Jackett.Common/Definitions/cdfile.yml
@@ -148,7 +148,7 @@ search:
      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(4) > span[title]
      attribute: title
      optional: true
      filters:
@@ -158,7 +158,7 @@ search:
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(4):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -168,13 +168,13 @@ search:
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-child(5)
    seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow.rowfollow:nth-child(6)
    leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(7)
    grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(8)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -193,6 +193,6 @@ search:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
    description:
-      selector: td:nth-child(2)
+      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.9.6 2025-06-25
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -6,8 +6,8 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://chdbits.co/
  - https://ptchdbits.co/
+  - https://chdbits.co/

 caps:
  categorymappings:
@@ -66,6 +66,8 @@ login:
  path: login.php
  method: form
  form: form[action="takelogin.php"]
+  headers:
+    user-agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"]
  captcha:
    type: image
    selector: img[alt="CAPTCHA"]
@@ -80,9 +82,12 @@ login:
  error:
    - selector: td.embedded:has(h2:contains("失败"))
    - selector: td.embedded:has(h2:contains("failed"))
+    - selector: td.embedded:has(h2:contains("错误"))
+    - selector: td.embedded:has(h2:contains("error"))
+    - selector: font[color="red"]
  test:
    path: torrents.php
-    selector: a[href*="logout.php"]
+    selector: a[href*="logout"]

 download:
  selectors:
--- a/src/Jackett.Common/Definitions/chilebt-api.yml
+++ b/src/Jackett.Common/Definitions/chilebt-api.yml
@@ -73,9 +73,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -142,8 +142,13 @@ search:
          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
--- a/src/Jackett.Common/Definitions/cinemageddon.yml
+++ b/src/Jackett.Common/Definitions/cinemageddon.yml
@@ -1,7 +1,7 @@
 ---
 id: cinemageddon
 name: Cinemageddon
-description: "B-movie tracker"
+description: "Cinemageddon is a Private Torrent Tracker for B-movies"
 language: en-US
 type: private
 encoding: UTF-8
@@ -38,6 +38,14 @@ caps:
    search: [q]
    movie-search: [q, imdbid]

+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+
 login:
  path: takelogin.php
  method: post
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -1,7 +1,7 @@
 ---
 id: cinematik
 name: Cinematik (API)
-description: "A tracker for full BD and DVD discs of non-mainstream movies, niche cinema and arthouse."
+description: "Cinematik is a Private tracker for full BD and DVD discs of non-mainstream movies, niche cinema and arthouse."
 language: en-US
 type: private
 encoding: UTF-8
@@ -72,9 +72,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -119,8 +119,6 @@ search:
      selector: details_link
    download:
      selector: download_link
-    infohash:
-      selector: info_hash
    poster:
      selector: meta.poster
      filters:
@@ -141,8 +139,13 @@ search:
          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -190,4 +193,4 @@ search:
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# json UNIT3D 8.3.6
+# json UNIT3D 9.1.6
--- a/src/Jackett.Common/Definitions/clearjav-api.yml
+++ b/src/Jackett.Common/Definitions/clearjav-api.yml
@@ -1,29 +1,19 @@
 ---
-id: jptv-api
-name: JPTV (API)
-description: "JPTV is a JAPANESE Private Torrent Tracker for JAPANESE TV / MOVIES / GENERAL"
-language: ja-JP
+id: clearjav-api
+name: ClearJAV (API)
+description: "ClearJAV is a Private Torrent Tracker for Japanese Adult Video (JAV) content from official JAV studios only."
+language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://jptv.club/
+  - https://clearjav.com/

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV Shows"}
-    - {id: 6, cat: TV, desc: "TS Firehose"}
-    - {id: 7, cat: Movies/Other, desc: "Anime Movies"}
-    - {id: 9, cat: TV/Anime, desc: "Anime Series"}
-    - {id: 8, cat: Audio, desc: "Audio"}
-    - {id: 10, cat: Books, desc: "Book"}
+    - {id: 1, cat: XXX, desc: "JAV"}

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

 settings:
  - name: apikey
@@ -32,7 +22,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://jptv.club/\" target=\"_blank\">JPTV</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://clearjav.com/\" target=\"_blank\">ClearJAV</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -56,7 +46,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Your membership requires that you stay active at JPTVclub. In order to not be disabled, you are required to login to the site at least once every 90 days. If your account gets disabled, you will recive an email informing you about it, along with instructions on how to get enabled again."
+    default: "You must download or upload data within 30 days of joining, or your account may be pruned for lurking."

 login:
  path: /api/torrents
@@ -69,9 +59,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -79,15 +69,13 @@ search:
    Authorization: ["Bearer {{ .Config.apikey }}"]

  inputs:
-    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
    name: "{{ .Keywords }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    # there are no categories on the site so using XXX as a default

  keywordsfilters:
    - name: re_replace
@@ -98,20 +86,16 @@ search:
    attribute: attributes

  fields:
-    categorydesc:
-      selector: category
+    category:
+      text: 1
    title:
      selector: name
    details:
      selector: details_link
    download:
      selector: download_link
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
+    infohash:
+      selector: info_hash
    files:
      selector: num_file
    seeders:
@@ -130,22 +114,35 @@ search:
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
-      # api returns 0=false, 1=true
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
+      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
-        0: 1 # not free
-        1: 0 # freeleech
-    uploadvolumefactor:
-      # api returns 0=false, 1=true
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
+      # api returns False, True
      selector: double_upload
      case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 5.2.0
+# json UNIT3D 9.1.5 (custom)
--- a/src/Jackett.Common/Definitions/coastalcrew.yml
+++ b/src/Jackett.Common/Definitions/coastalcrew.yml
@@ -1,7 +1,7 @@
 ---
 id: coastalcrew
-name: Coastal-Crew
-description: "Coastal-Crew is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+name: Coastal-Music-Crew
+description: "Coastal-Music-Crew (C-M-C) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: de-DE
 type: private
 encoding: UTF-8
@@ -10,47 +10,90 @@ links:

 caps:
  categorymappings:
-    - {id: 30, cat: TV/Anime, desc: "Filme - Animie"}
-    - {id: 28, cat: Movies/BluRay, desc: "Filme - Bluray"}
-    - {id: 31, cat: Movies/Other, desc: "Filme - Bollywood"}
-    - {id: 77, cat: TV/Documentary, desc: "Filme - DokusHD"}
-    - {id: 32, cat: Movies/DVD, desc: "Filme - DVD"}
-    - {id: 33, cat: Movies/HD, desc: "Filme - HD"}
-    - {id: 34, cat: Movies, desc: "Filme - Klassiker"}
-    - {id: 35, cat: Movies, desc: "Filme - Pack"}
-    - {id: 36, cat: Movies/SD, desc: "Filme - SD"}
-    - {id: 37, cat: Movies/UHD, desc: "Filme - UHD"}
-    - {id: 38, cat: Movies/HD, desc: "Filme - x264"}
-    - {id: 39, cat: Audio, desc: "Musik - Alben"}
-    - {id: 72, cat: Audio, desc: "Musik - Charts"}
-    - {id: 40, cat: Audio, desc: "Musik - Diskografie"}
-    - {id: 75, cat: Audio/Lossless, desc: "Musik - Flac"}
-    - {id: 41, cat: Audio/Audiobook, desc: "Musik - Hoerbuch"}
-    - {id: 74, cat: Audio/Other, desc: "Musik - Kids"}
-    - {id: 42, cat: Audio, desc: "Musik - Mixe"}
-    - {id: 66, cat: Audio, desc: "Musik - Pack"}
-    - {id: 70, cat: Audio, desc: "Musik - Sampler Deu."}
-    - {id: 71, cat: Audio, desc: "Musik - Sampler Int."}
-    - {id: 76, cat: Audio/Other, desc: "Musik - Soundtrack"}
-    - {id: 44, cat: Audio/Video, desc: "Musik - Video"}
-    - {id: 45, cat: PC, desc: "Programme - Linux"}
-    - {id: 48, cat: PC/Mac, desc: "Programme - Mac"}
-    - {id: 49, cat: PC/0day, desc: "Programme - Windows"}
-    - {id: 65, cat: TV, desc: "Serien - Allgemein"}
-    - {id: 50, cat: TV/Documentary, desc: "Serien - Dokus"}
-    - {id: 51, cat: TV, desc: "Serien - Klassiker"}
-    - {id: 52, cat: TV, desc: "Serien - Pack"}
-    - {id: 53, cat: TV/Sport, desc: "Serien - Sport"}
-    - {id: 62, cat: Books/EBook, desc: "EBook"}
-    - {id: 63, cat: Movies, desc: "Fuer Unsere Kleinsten"}
-    - {id: 64, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
-    - {id: 60, cat: Other, desc: "Sonstiges"}
-    - {id: 69, cat: Books/Mags, desc: "Zeitung"}
-    - {id: 54, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
-    - {id: 55, cat: Console, desc: "Spiele - Konsolen"}
-    - {id: 57, cat: PC/Games, desc: "Spiele - Mac / Linux / PC"}
-    - {id: 58, cat: Console/Other, desc: "Spiele - Wimmel"}
-    - {id: 59, cat: XXX, desc: "XXX"}
+    - {id: 122, cat: Movies, desc: "Movie Klassiker"}
+    - {id: 124, cat: Movies, desc: "Movie Kids"}
+    - {id: 127, cat: Movies, desc: "Movie Pack"}
+    - {id: 138, cat: Movies/BluRay, desc: "Movie BluRay"}
+    - {id: 140, cat: Movies/3D, desc: "Movie 3D"}
+    - {id: 114, cat: Movies/DVD, desc: "Movie DVD-R"}
+    - {id: 28, cat: Movies/SD, desc: "Movie SD"}
+    - {id: 32, cat: Movies/HD, desc: "Movie HD"}
+    - {id: 26, cat: Movies/UHD, desc: "Movie 4K"}
+
+    - {id: 133, cat: TV/Anime, desc: "Serien Anime"}
+    - {id: 57, cat: TV/HD, desc: "Serien HD"}
+    - {id: 59, cat: TV, desc: "Serien Pack"}
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
+    - {id: 56, cat: TV/SD, desc: "Serien DVD-R"}
+    - {id: 123, cat: TV, desc: "Serien Klassiker"}
+    - {id: 126, cat: TV, desc: "Serien Kids"}
+    - {id: 132, cat: TV/UHD, desc: "Serien UHD"}
+
+    - {id: 92, cat: TV/Documentary, desc: "Doku Avi"}
+    - {id: 94, cat: TV/Documentary, desc: "Doku Audio"}
+    - {id: 135, cat: TV/Documentary, desc: "Doku UHD"}
+    - {id: 13, cat: TV/Documentary, desc: "Doku DVD-R"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 136, cat: TV/Documentary, desc: "Doku Pack"}
+
+    - {id: 9, cat: PC, desc: "App Linux"}
+    - {id: 10, cat: PC/Mac, desc: "App Mac"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "App Other"}
+    - {id: 12, cat: PC/0day, desc: "App Win"}
+    - {id: 139, cat: PC/Mobile-Android, desc: "App Android Apps"}
+
+    - {id: 16, cat: Console, desc: "Game Misc"}
+    - {id: 17, cat: PC/Games, desc: "Game PC"}
+    - {id: 18, cat: Console/PS3, desc: "Game PS2"}
+    - {id: 19, cat: Console/PS3, desc: "Game PS3"}
+    - {id: 20, cat: Console/PSP, desc: "Game PSP"}
+    - {id: 21, cat: Console/PS4, desc: "Game PSX"}
+    - {id: 22, cat: Console/Wii, desc: "Game Wii"}
+    - {id: 23, cat: Console/XBox, desc: "Game XBOX"}
+    - {id: 24, cat: Console/XBox 360, desc: "Game XBOX360"}
+
+    - {id: 137, cat: Audio, desc: "Music OST"}
+    - {id: 54, cat: Audio, desc: "Music Single"}
+    - {id: 48, cat: Audio, desc: "Music Album"}
+    - {id: 49, cat: Audio, desc: "Music Charts"}
+    - {id: 52, cat: Audio, desc: "Music Pack"}
+    - {id: 53, cat: Audio, desc: "Music Sampler"}
+    - {id: 120, cat: Audio, desc: "Music Xmas"}
+    - {id: 121, cat: Audio/Lossless, desc: "Music Flac"}
+    - {id: 55, cat: Audio/Video, desc: "Music Video SD"}
+    - {id: 109, cat: Audio/Video, desc: "Music Video HD"}
+    - {id: 110, cat: Audio/Video, desc: "Music DVD-R"}
+    - {id: 128, cat: Audio, desc: "Music EP"}
+    - {id: 125, cat: Audio, desc: "Music Kids"}
+
+    - {id: 61, cat: TV/Sport, desc: "Sport HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport SD"}
+    - {id: 116, cat: TV/Sport, desc: "Sport DVD-R"}
+    - {id: 117, cat: TV/Sport, desc: "Sport DVD-R"}
+
+    - {id: 134, cat: Other, desc: "Sonstiges Pack"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges A-Book"}
+    - {id: 96, cat: Books/EBook, desc: "Sonstiges E-Book"}
+    - {id: 69, cat: Other, desc: "Sonstiges Tutorial"}
+    - {id: 71, cat: Other/Misc, desc: "Sonstiges Other"}
+
+    - {id: 131, cat: TV/UHD, desc: "Internt'l Serie UHD"}
+    - {id: 103, cat: Movies/SD, desc: "Internt'l Movie SD"}
+    - {id: 98, cat: Movies/HD, desc: "Internt'l Movie HD"}
+    - {id: 102, cat: TV/SD, desc: "Internt'l Serie SD"}
+    - {id: 99, cat: TV/HD, desc: "Internt'l Serie HD"}
+    - {id: 115, cat: Movies/DVD, desc: "Internt'l DVD-R"}
+    - {id: 107, cat: Audio/Audiobook, desc: "Internt'l A-Book"}
+    - {id: 106, cat: Books/EBook, desc: "Internt'l E-Book"}
+    - {id: 105, cat: TV/Documentary, desc: "Internt'l Doku"}
+    - {id: 104, cat: Other, desc: "Internt'l Misc"}
+
+    - {id: 73, cat: XXX/x264, desc: "XXX HD"}
+    - {id: 74, cat: XXX/Other, desc: "XXX Other"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
+    - {id: 76, cat: XXX/SD, desc: "XXX SD"}
+    - {id: 113, cat: XXX/DVD, desc: "XXX DVD-R"}

  modes:
    search: [q]
@@ -66,14 +109,6 @@ settings:
  - name: password
    type: password
    label: Password
-  - name: onlyupload
-    type: checkbox
-    label: Filter OnlyUpload only
-    default: false
-  - name: info_free
-    type: info
-    label: About Freeleech and OnlyUpload at Coastal Crew
-    default: "<ul><li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li></ul>"
  - name: sort
    type: select
    label: Sort requested from site
@@ -93,85 +128,102 @@ settings:
  - name: info_tpp
    type: info
    label: Results Per Page
-    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
+    default: For best results, change the <b>Anzahl der Torrents beim Durchsuchen</b> <i>Torrents per page:</i> setting to <b>60</b> on your account profile. The default is <i>15</i>.
  - name: info_activity
    type: info
    label: Account Inactivity
    default: "If you do not log in, your account will be automatically deleted after 28 days."

 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
  error:
-    - selector: .tablea:contains("Fehler")
+    - selector: div#login_error
  test:
    path: index.php
    selector: a[href="logout.php"]

 search:
-  # https://coastal-crew.bounceme.net/browse.php?showsearch=1&c62=1&c33=1&search=&incldead=1&orderby=added&sort=desc
-  path: browse.php
+  paths:
+    - path: selection.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    showsearch: 1
    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 dead
-    incldead: 1
+    # 0 name, 1 descr, 2 both (options 1 and 2 are disabled)
+    blah: 0
    orderby: "{{ .Config.sort }}"
    sort: "{{ .Config.type }}"
-    # site does not support imdbid search from the browse.php page or return imdb links in results

  rows:
-    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"]:not(:has(a[href=\"index.php\"])) > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
+    selector: div.selection_wrap

  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    category_p1:
+      selector: div.kat_cat_pic_name
+    category_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
    title:
-      selector: a[href^="details.php"]
+      selector: a.selection_a
+      filters:
+        - name: re_replace
+          args: ["^\\[[\\w ]*\\]\\s?", ""]
    details:
-      selector: a[href^="details.php"]
+      selector: a.selection_a
      attribute: href
    download:
-      selector: a[href^="download.php"]
+      selector: a[href^="download_ssl.php?torrent="]
      attribute: href
    poster:
-      selector: img[id="img-1"]
+      selector: div[id^="details"] img
      attribute: src
    size:
-      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
-    files:
-      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
-    seeders:
-      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
-    leechers:
-      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+      selector: div.selection_unter_ad
    grabs:
-      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
-    date:
-      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(5)
+      selector: div.selection_unter_ae
+    date_day:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
        - name: append
          args: " +01:00" # CET
+    date_year:
+      # 30.02.2018 um 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
        - name: replace
-          args: ["\xA0", " "]
+          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
          args: "dd.MM.yyyy HH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    seeders:
+      selector: div.selection_unter_aa
+    leechers:
+      selector: div.selection_unter_aaa
    downloadvolumefactor:
-      case:
-        img[src="pic/oupic.gif"]: 0 # only upload is counted
-        "*": 1
+      text: 1
    uploadvolumefactor:
-      case:
-        img[src="pic/freeleech.gif"]: 0 # nothing is counted
-        "*": 1
-    minimumratio:
-      text: 0.7
-# engine n/a
+      text: 1
+# global MR is 1.0 but torrents must be seeded for 3 days regardless of ratio
+#    minimumratio:
+#      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# 3xT
--- a/src/Jackett.Common/Definitions/concertos.yml
+++ b/src/Jackett.Common/Definitions/concertos.yml
@@ -1,7 +1,7 @@
 ---
 id: concertos
 name: Concertos
-description: "Concertos - Private site for Live Concerts with Strict Quality Control"
+description: "Concertos is a Private Torrent Tracker for Live Concerts with Strict Quality Control"
 language: en-US
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -1,151 +0,0 @@
---
-id: cpasbien
-name: cpasbien
-description: "cpasbien is a FRENCH Public site for TV / MOVIES / GENERAL"
-language: fr-FR
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://feminalpes.fr/
-legacylinks:
-  - https://www.cpasbiens.cz/
-  - https://www.cpasbiens.bz/
-  - https://www.cpasbien.vg/
-  - https://www.cpasbien.lol/
-  - https://www.gktorrent.biz/
-  - https://vww.cpasbien-fr.fr/
-  - https://wvw.cpasbien-fr.fr/
-  - https://wwwv.cpasbien-fr.fr/
-  - https://www2.cpasbien-fr.fr/
-  - https://www.cpasbien-fr.nz/
-  - https://vwwvwvwvvw.cpasbien-fr.nz/
-  - https://cpasbiens3.fr/
-  - https://labastidevivante.fr/
-  - https://cpasbiens911.fr/
-  - https://jardattraction.fr/
-  - https://cpasbien-vf.fr/
-  - https://cpasbien-vf.pics/
-  - https://cpasbien-vf.li/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_flaresolverr
-    type: info_flaresolverr
-  - name: info_category_8000
-    type: info_category_8000
-  - name: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTi FRENCH: MULTi FRENCH
-      ENGLISH: ENGLISH
-      MULTi ENGLISH: MULTi ENGLISH
-      VOSTFR: VOSTFR
-      MULTi VOSTFR: MULTi VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR and SUBFRENCH with ENGLISH
-    default: false
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}index.php?do=search&subaction=search{{ else }}{{ end }}"
-      method: post
-  # postData is mandatory FlareSolverr/FlareSolverr#789
-  allowEmptyInputs: true
-  inputs:
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
-  # does not support imdbid search and does not return imdb link in results.
-
-  keywordsfilters:
-    # if searching for season packs with S01 to saison 1 #9712
-    - name: re_replace
-      args: ["(?i)\\b(?:S0?)(\\d{1,3})\\b", "saison $1"]
-
-  headers:
-    # site blocks Linux UAs, so slightly alter the Windows UA here (e.g. Safari/537.36 > Safari/537.35)
-    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
-
-  rows:
-    selector: div#gauche > table > tbody > tr:has(a), div#dle-content > a.cover2
-
-  fields:
-    category:
-      text: Other
-    title_phase1_title:
-      selector: a
-    title_phase1_url:
-      selector: a
-      attribute: href
-      filters:
-        - name: regexp
-          args: torrents\d+\/(.+?)\/
-        - name: replace
-          args: ["-", " "]
-    title_phase1:
-      text: "{{ if .Result.title_phase1_title }}{{ .Result.title_phase1_title }}{{ else }}{{ .Result.title_phase1_url }}{{ end }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"]
-    title_vostfr:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
-    title_phase2:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a
-      attribute: href
-    download:
-      selector: a
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    size:
-      selector: div.poid
-      optional: true
-      default: "512 MB"
-    date:
-      text: now
-    seeders:
-      selector: div.up
-      optional: true
-      default: 0
-    leechers:
-      selector: div.down
-      optional: true
-      default: 0
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/cpasbienclone.yml
+++ b/src/Jackett.Common/Definitions/cpasbienclone.yml
@@ -1,7 +1,7 @@
 ---
 id: cpasbienclone
 name: cpasbien clone
-description: "cpasbien clone is a FRENCH Public site for TV / MOVIES / GENERAL"
+description: "cpasbien clone is a FRENCH Public site for MOVIES / TV / GENERAL"
 language: fr-FR
 type: public
 encoding: UTF-8
@@ -93,7 +93,7 @@ search:
      selector: a
      filters:
        - name: re_replace
-          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"]
+          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b((19|20)\\d{2})\\b)$", "$3 $1$2"]
    title_vostfr:
      text: "{{ .Result.title_phase1 }}"
      filters:
--- a/src/Jackett.Common/Definitions/crabpt.yml
+++ b/src/Jackett.Common/Definitions/crabpt.yml
@@ -10,6 +10,7 @@ links:
  - https://crabpt.vip/

 caps:
+  # dont forget to update the path categories in the search block
  categorymappings:
    - {id: 401, cat: Movies, desc: "电影 / Movies", default: true}
    - {id: 402, cat: TV, desc: "电视剧 / TVSeries", default: true}
@@ -17,7 +18,7 @@ caps:
    - {id: 408, cat: Audio, desc: "音乐 / Music", default: true}
    - {id: 405, cat: TV/Anime, desc: "动漫 / Anime", default: true}
    - {id: 406, cat: Audio/Video, desc: "MV", default: true}
-    - {id: 403, cat: Movies, desc: "综艺 / TV Shows", default: true}
+    - {id: 403, cat: TV, desc: "综艺 / TV Shows", default: true}
    - {id: 407, cat: TV/Sport, desc: "体育竞技 / Sports", default: true}
    - {id: 404, cat: TV/Documentary, desc: "纪录片 / Documentary", default: true}
    - {id: 409, cat: Other, desc: "其他 / Other", default: true}
@@ -178,12 +179,20 @@ search:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td.rowfollow:nth-child(5)
+      optional: true
+      default: 512MB
    seeders:
      selector: td.rowfollow:nth-child(6)
+      optional: true
+      default: 0
    leechers:
      selector: td.rowfollow:nth-child(7)
+      optional: true
+      default: 0
    grabs:
      selector: td.rowfollow:nth-child(8)
+      optional: true
+      default: 0
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -206,4 +215,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.13 2024-09-21
+# NexusPHP v1.9.6 2025-06-25
--- a/src/Jackett.Common/Definitions/cspt.yml
+++ b/src/Jackett.Common/Definitions/cspt.yml
@@ -0,0 +1,177 @@
+---
+id: cspt
+name: Caishen (财神)
+description: "Caishen (财神) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://cspt.top/
+
+caps:
+  categorymappings:
+    - {id: 408, cat: Audio, desc: "HQ音乐 / HQ Audio"}
+    - {id: 409, cat: Other, desc: "其他 / Misc"}
+    - {id: 407, cat: TV/Sport, desc: "体育 / Sports"}
+    - {id: 406, cat: Audio/Video, desc: "MV / Music Videos"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片 / Documentary"}
+    - {id: 403, cat: TV, desc: "综艺 / TV Shows"}
+    - {id: 402, cat: TV, desc: "电视剧 / TVSeries"}
+    - {id: 401, cat: Movies, desc: "电影 / Movies"}
+    - {id: 405, cat: TV/Anime, desc: "动漫 / Anime"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li> Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users with no traffic (i.e. upload/download data is 0) will be deleted if they have not logged in for more than 100 consecutive days.</li></ol>"
+
+login:
+  # using cookie method because site regularly disables login page for certain events during the year
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: div.torrents > div > div.torrent-table-sub-info
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: div.torrent-info-text-added > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: div.torrent-info-text-added:not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: div.torrent-info-text-size
+    seeders:
+      selector: div.torrent-info-text-seeders
+    leechers:
+      selector: div.torrent-info-text-leechers
+    grabs:
+      selector: div.torrent-info-text-finished
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    description_verified:
+      case:
+        span[title="通过"]: "Verified:"
+        span[title="未审"]: "Unverified:"
+        span[title="拒绝"]: "Banned:"
+    description:
+      selector: div.text-start
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
+# NexusPHP v1.8.15 2024-12-23
--- a/src/Jackett.Common/Definitions/cyanbug.yml
+++ b/src/Jackett.Common/Definitions/cyanbug.yml
@@ -169,6 +169,8 @@ search:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
      selector: td.rowfollow:nth-child(5)
+      optional: true
+      default: 512MB
    seeders:
      selector: td.rowfollow:nth-child(6)
      optional: true
--- a/src/Jackett.Common/Definitions/damagnet.yml
+++ b/src/Jackett.Common/Definitions/damagnet.yml
@@ -0,0 +1,82 @@
+---
+id: damagnet
+name: DaMagNet
+description: "DaMagNet is a Public DHT Crawler"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://damag.net/
+
+caps:
+  categorymappings:
+    - {id: Other, cat: Other, desc: Other}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_category_8000
+    type: info_category_8000
+
+download:
+  infohash:
+    hash:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: input[name="q"]
+      attribute: value
+      filters:
+        - name: validfilename
+
+search:
+  paths:
+    # https://damag.net/?q=2025&wanted=100
+    - path: /
+  inputs:
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    # 20, 50, 100
+    wanted: 100
+
+  headers:
+    Referer: ["{{ .Config.sitelink }}"]
+
+  rows:
+    selector: table.table-striped > tbody > tr:has(a)
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: Other
+    title:
+      selector: a
+    details:
+      selector: a
+      attribute: href
+    download:
+      selector: a
+      attribute: href
+    date:
+      text: now
+    files:
+      selector: span.label
+    size:
+      selector: span[id^="size"]
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/danishbytes-api.yml
+++ b/src/Jackett.Common/Definitions/danishbytes-api.yml
@@ -1,7 +1,7 @@
 ---
 id: danishbytes-api
 name: DanishBytes (API)
-description: "DanishBytes is a Private Danish Tracker"
+description: "DanishBytes is a Private Danish Torrent Tracker for MOVIES / TV / GENERAL"
 language: da-DK
 type: private
 encoding: UTF-8
@@ -19,9 +19,10 @@ caps:
    - {id: 2, cat: TV, desc: "TV"}
    - {id: 5, cat: PC/0day, desc: "Apps"}
    - {id: 4, cat: PC/Games, desc: "Games"}
-    - {id: 3, cat: Audio, desc: "Sound"}
+    - {id: 3, cat: Audio, desc: "Music"}
    - {id: 8, cat: Books, desc: "Books"}
    - {id: 17, cat: Audio/Audiobook, desc: "AudioBooks"}
+    - {id: 19, cat: Audio, desc: "Podcasts"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -1,157 +0,0 @@
---
-id: dark-shadow
-name: Dark-Shadow
-description: "Dark-Shadow (D-S) is a GERMAN Private Torrent Tracker for TV / MOVIES / GENERAL"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://dark-shadow.me/
-legacylinks:
-  - https://dark-shadow.ml/
-  - https://projekt.dark-shadow.me/
-
-caps:
-  categorymappings:
-    - {id: 32, cat: Movies/HD, desc: "Filme > HD"}
-    - {id: 28, cat: Movies/SD, desc: "Filme > SD"}
-    - {id: 114, cat: Movies/UHD, desc: "Filme > UHD"}
-    - {id: 140, cat: Movies/BluRay, desc: "Filme > BluRay"}
-    - {id: 138, cat: Movies, desc: "Filme > Pack's"}
-    - {id: 57, cat: TV/HD, desc: "Serien > HD"}
-    - {id: 60, cat: TV/SD, desc: "Serien > SD"}
-    - {id: 139, cat: TV/UHD, desc: "Serien > UHD"}
-    - {id: 59, cat: TV, desc: "Serien > Pack's"}
-    - {id: 110, cat: Audio/MP3, desc: "Audio > MP3"}
-    - {id: 48, cat: Audio/Lossless, desc: "Audio > Flac"}
-    - {id: 52, cat: Audio, desc: "Audio > Pack"}
-    - {id: 63, cat: Audio/Audiobook, desc: "Audio > Hörbuch"}
-    - {id: 120, cat: Audio/Video, desc: "Audio > Videos"}
-    - {id: 12, cat: PC/0day, desc: "Apps > Windows"}
-    - {id: 125, cat: PC/Mac, desc: "Apps > Mac-OSX"}
-    - {id: 11, cat: PC/Mobile-Other, desc: "Apps > Mobil"}
-    - {id: 141, cat: PC/ISO, desc: "Apps > Other"}
-    - {id: 14, cat: TV/Documentary, desc: "Doku > HD"}
-    - {id: 15, cat: TV/Documentary, desc: "Doku > SD"}
-    - {id: 123, cat: TV/Documentary, desc: "Doku > Pack's"}
-    - {id: 17, cat: PC/Games, desc: "Spiel > PC"}
-    - {id: 24, cat: Console, desc: "Spiel > Konsole"}
-    - {id: 126, cat: Console/Other, desc: "Spiel > Mobil"}
-    - {id: 121, cat: Console, desc: "Spiel > Wimmelbild"}
-    - {id: 61, cat: TV/Sport, desc: "Sport > HD"}
-    - {id: 62, cat: TV/Sport, desc: "Sport > SD"}
-    - {id: 144, cat: TV/Sport, desc: "Sport > Wrestling"}
-    - {id: 96, cat: Books/Mags, desc: "ePaper > Zeitungen"}
-    - {id: 136, cat: Books/EBook, desc: "ePaper > E-Book"}
-    - {id: 137, cat: Books/Comics, desc: "ePaper > Comics"}
-    - {id: 143, cat: XXX/x264, desc: "XXX > HD / SD"}
-    - {id: 75, cat: XXX/Pack, desc: "XXX > Pack's"}
-    - {id: 142, cat: XXX/ImageSet, desc: "XXX > Pic's"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_password
-    type: info
-    label: About Password Expiry
-    default: "D-S has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://dark-shadow.me/login.php\" target=\"_blank\">Dark-Shadow</a>,  and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: onlyupload
-    type: checkbox
-    label: Search OnlyUpload
-    default: false
-  - name: info_free
-    type: info
-    label: About OnlyUpload at D-S
-    default: "OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech)."
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks."
-
-login:
-  path: login.php
-  method: form
-  form: form
-  inputs:
-    login_identifier: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    loggiin: Login
-  error:
-    - selector: div.error-message
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://dark-shadow.me//selection.php?ajax=true&search=&page=1&visible=no&free=no&c32=1&c28=1
-    - path: selection.php
-      response:
-        type: json
-
-  inputs:
-    ajax: true
-    search: "{{ .Keywords }}"
-    page: 1
-    # all=active+inactive, yes=active, no=inactive (the default is all, which ajax simply drops the parm)
-    # visible: all
-    # all=all+onlyup, yes=onlyup, no=without onlyup (the default is all, which ajax simply drops the parm)
-    free: "{{ if .Config.onlyupload }}yes{{ else }}{{ end }}"
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-
-  rows:
-    selector: $
-
-  fields:
-    categorydesc:
-      selector: category
-      filters:
-        - name: htmldecode
-    title:
-      selector: name
-    _id:
-      selector: id
-    details:
-      text: "details.php?id={{ .Result._id }}"
-    download:
-      selector: download_link
-    poster:
-      selector: cover
-    size:
-      selector: size
-    date:
-      # 25.12.2024 16:02
-      selector: added
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "dd.MM.yyyy HH:mm zzz"
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    _onlyup:
-      selector: free_button:contains(Only Upload)
-      optional: true
-    downloadvolumefactor:
-      text: "{{ if .Result._onlyup }}0{{ else }}1{{ end }}"
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1.5 days (as seconds = 1.5 x 24 x 60 x 60)
-      text: 129600
-# THX JSON
--- a/src/Jackett.Common/Definitions/darkpeers.yml
+++ b/src/Jackett.Common/Definitions/darkpeers.yml
@@ -1,25 +1,22 @@
 ---
-id: ntelogo
-name: Ntelogo (API)
-description: "Ntelogo is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: el-GR
+id: darkpeers-api
+name: Darkpeers (API)
+description: "Darkpeers is a NORDIC Private Torrent Tracker for MOVIES / TV"
+language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://ntelogo.org/
+  - https://darkpeers.org/

 caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 6, cat: PC/0day, desc: "Windows"}
+    - {id: 7, cat: Audio/Audiobook, desc: "Audiobooks"}
    - {id: 4, cat: Console, desc: "Games"}
+    - {id: 3, cat: Audio, desc: "Music"}
    - {id: 5, cat: PC, desc: "Software"}
-    - {id: 7, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 8, cat: XXX, desc: "Adult Only"}
-    - {id: 9, cat: Books/EBook, desc: "Book"}
-    - {id: 10, cat: Audio/Audiobook, desc: "AudioBook"}
+    - {id: 6, cat: XXX, desc: "XXX"}

  modes:
    search: [q]
@@ -35,7 +32,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://ntelogo.org/\" target=\"_blank\">Ntelogo</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://darkpeers.org/\" target=\"_blank\">Darkpeers</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -60,6 +57,10 @@ settings:
    options:
      desc: desc
      asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "If you do not log in for (number) days, your account will be closed/deleted."

 login:
  path: /api/torrents
@@ -72,9 +73,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -119,8 +120,6 @@ search:
      selector: details_link
    download:
      selector: download_link
-    infohash:
-      selector: info_hash
    poster:
      selector: meta.poster
      filters:
@@ -141,8 +140,13 @@ search:
          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -184,7 +188,10 @@ search:
        True: 2 # double
    uploadvolumefactor:
      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
+# global MR is 0.4 but torrents must be seeded for 3 days or 1:1
+    minimumratio:
+      text: 1.0
    minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 8.3.6
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 9.1.6
--- a/src/Jackett.Common/Definitions/dasunerwartete.yml
+++ b/src/Jackett.Common/Definitions/dasunerwartete.yml
@@ -10,17 +10,20 @@ links:

 caps:
  categorymappings:
+    - {id: 145, cat: Movies, desc: "Filme > DRG"}
    - {id: 28, cat: Movies/SD, desc: "Filme > SD"}
    - {id: 32, cat: Movies/HD, desc: "Filme > HD"}
    - {id: 114, cat: Movies/UHD, desc: "Filme > UHD"}
    - {id: 140, cat: Movies/BluRay, desc: "Filme > BluRay"}
    - {id: 143, cat: TV/Anime, desc: "Filme > Anime"}
    - {id: 138, cat: Movies, desc: "Filme > Packs"}
+    - {id: 148, cat: Movies, desc: "Filme > Packs UHD"}
    - {id: 60, cat: TV/SD, desc: "Serien > SD"}
    - {id: 57, cat: TV/HD, desc: "Serien > HD"}
    - {id: 139, cat: TV/UHD, desc: "Serien > UHD"}
    - {id: 144, cat: TV/Anime, desc: "Serien > Anime"}
    - {id: 59, cat: TV, desc: "Serien > Packs"}
+    - {id: 147, cat: TV, desc: "Serien > Packs UHD"}
    - {id: 110, cat: Audio/MP3, desc: "Audio > MP3"}
    - {id: 48, cat: Audio/Lossless, desc: "Audio > Flac"}
    - {id: 52, cat: Audio, desc: "Audio > Pack"}
@@ -96,6 +99,7 @@ login:
    password: "{{ .Config.password }}"
    loggiin: Login
  error:
+    - selector: div#login_error
    - selector: div.error-message
  test:
    path: index.php
--- a/src/Jackett.Common/Definitions/datascene-api.yml
+++ b/src/Jackett.Common/Definitions/datascene-api.yml
@@ -63,6 +63,10 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -95,9 +99,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -129,8 +133,15 @@ search:
  fields:
    category:
      selector: category_id
-    title:
+    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -151,8 +162,6 @@ search:
    genre:
      selector: meta.genres
      filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
        - name: re_replace
          args: ["(?i)(All Sex)", "All_Sex"]
        - name: re_replace
@@ -161,10 +170,13 @@ search:
          args: ["(?i)(TV Movie)", "TV_Movie"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -176,12 +188,17 @@ search:
      selector: created_at
      filters:
        - name: append
-          args: " +00:00" # GMT
+          args: " +02:00" # EET
        - name: dateparse
          args: "MM/dd/yyyy HH:mm:ss zzz"
    size:
      selector: size
-    downloadvolumefactor:
+    _featured:
+      selector: featured
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
+    downloadvolumefactor_freeleech:
      # api returns 0%, 25%, 50%, 75%, 100%
      selector: freeleech
      case:
@@ -191,16 +208,20 @@ search:
        75%: 0.25
        100%: 0 # freeleech
        "*": 0 # catch errors
-    uploadvolumefactor:
+    downloadvolumefactor:
+      text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}"
+    uploadvolumefactor_double_upload:
      # api returns False, True
      selector: double_upload
      case:
        False: 1 # normal
        True: 2 # double
+    uploadvolumefactor:
+      text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}"
 # global MR is 0.4 but torrents must be seeded for 2 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
      # 2 days (as seconds = 2 x 24 x 60 x 60)
      text: 172800
-# json UNIT3D 7.2.0
+# json UNIT3D 9.1.1
--- a/src/Jackett.Common/Definitions/deildu.yml
+++ b/src/Jackett.Common/Definitions/deildu.yml
@@ -1,7 +1,7 @@
 ---
 id: deildu
 name: Deildu
-description: "Deildu is an Icelandic Semi-Private site for TV / MOVIES / GENERAL"
+description: "Deildu is an ICELANDIC Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: is-IS
 type: semi-private
 encoding: iso-8859-1
--- a/src/Jackett.Common/Definitions/desitorrents-api.yml
+++ b/src/Jackett.Common/Definitions/desitorrents-api.yml
@@ -1,7 +1,7 @@
 ---
 id: desitorrents-api
 name: DesiTorrents (API)
-description: "Desitorrents is a Private Torrent Tracker for BOLLYWOOD / TOLLYWOOD / MUSIC"
+description: "DesiTorrents is an INDIAN Private Torrent Tracker for MOVIES / TV"
 language: en-US
 type: private
 encoding: UTF-8
@@ -67,8 +67,8 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
    - path: "/api/v1/torrents/filter"
      response:
        type: json
--- a/src/Jackett.Common/Definitions/diablotorrent.yml
+++ b/src/Jackett.Common/Definitions/diablotorrent.yml
@@ -1,7 +1,7 @@
 ---
 id: diablotorrent
 name: Diablo Torrent
-description: "Diablo Torrent is a Hungarian Private site for TV / MOVIES / GENERAL"
+description: "Diablo Torrent is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: hu-HU
 type: private
 encoding: UTF-8
--- a/src/Jackett.Common/Definitions/digitalcore-api.yml
+++ b/src/Jackett.Common/Definitions/digitalcore-api.yml
@@ -1,7 +1,9 @@
 ---
-id: digitalcore
-name: DigitalCore
-description: "DigitalCore is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+id: digitalcore-api
+replaces:
+  - digitalcore
+name: DigitalCore (API)
+description: "DigitalCore (DC) is a Private Torrent Tracker for 0DAY / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
@@ -62,11 +64,13 @@ caps:
    book-search: [q]

 settings:
-  - name: cookie
+  - name: apikey
    type: text
-    label: Cookie
-  - name: info_cookie
-    type: info_cookie
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Generate a new API Key by accessing your <a href=\"https://digitalcore.club/\" target=\"_blank\">DigitalCore</a> account <i>Settings</i> page and clicking on the <b>Security</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -101,10 +105,8 @@ settings:
    default: "If your account is inactive (you do not sign in) for more than 60 days, your account is disabled. Park your account if you are going away for more than 60 days."

 login:
-  # using cookie method because login page is dynamically generated using JS
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
+  method: get
+  path: /api/v1/torrents

 search:
  paths:
@@ -113,6 +115,9 @@ search:
        type: json
        noResultsMessage: ""

+  headers:
+    X-API-KEY: ["{{ .Config.apikey }}"]
+
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
    dead: true
--- a/src/Jackett.Common/Definitions/discfan.yml
+++ b/src/Jackett.Common/Definitions/discfan.yml
@@ -184,4 +184,4 @@ search:
          args: "cat={{ .Result.category_title }} - "
    minimumratio:
      text: 0.9
-# NexusPHP v1.8.13 2024-09-21
+# NexusPHP v1.9.7 2025-06-29
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -1,194 +0,0 @@
---
-id: divteam
-name: DivTeam
-description: "DivTeam is a SPANISH Private Torrent Tracker for MOVIES / GENERAL"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://divteam.com/
-
-caps:
-  categorymappings:
-    - {id: 60, cat: Movies/HD, desc: "MicroHD 720p"}
-    - {id: 77, cat: Movies/HD, desc: "MicroHD 1080p"}
-    - {id: 78, cat: Movies/UHD, desc: "MicroHD 4K"}
-    - {id: 64, cat: TV/HD, desc: "Pack Series"}
-    - {id: 65, cat: TV/HD, desc: "Pack Series VOSE"}
-    - {id: 80, cat: Movies/HD, desc: "BDRip X265 1080p"}
-    - {id: 81, cat: Movies/UHD, desc: "UHDRip x265 4K"}
-    - {id: 82, cat: Movies/WEB-DL, desc: "Pelis Web-DL 1080"}
-    - {id: 83, cat: Movies/WEB-DL, desc: "Pelis Web-DL 720"}
-    - {id: 84, cat: Movies/UHD, desc: "UHD Remux x265"}
-    - {id: 91, cat: Movies/HD, desc: "BDRip x264"}
-    - {id: 89, cat: Movies/HD, desc: "BDRemux"}
-    - {id: 88, cat: Movies/BluRay, desc: "Full HD"}
-    - {id: 90, cat: Movies/BluRay, desc: "UHD Full"}
-    - {id: 92, cat: Movies/UHD, desc: "Web-DL UHD"}
-    - {id: 23, cat: TV/Sport, desc: "Deportes"}
-    - {id: 20, cat: TV/HD, desc: "Series"}
-    - {id: 31, cat: TV/HD, desc: "Series VOSE"}
-    - {id: 69, cat: Movies, desc: "Ciclo Cine Clasico"}
-    - {id: 70, cat: Movies, desc: "Ciclo Clint Eastwood"}
-    - {id: 71, cat: Movies, desc: "Ciclo Studio Ghibli"}
-    - {id: 72, cat: Movies, desc: "Ciclo George A. Romero"}
-    - {id: 73, cat: Movies, desc: "Saga Fast And Furious"}
-    - {id: 74, cat: Movies, desc: "Saga Crepúsculo"}
-    - {id: 75, cat: Movies, desc: "Saga The Purge"}
-    - {id: 79, cat: Movies, desc: "Saga Star Wars"}
-    - {id: 76, cat: Movies, desc: "x-men saga"}
-    - {id: 85, cat: Movies, desc: "Sean Connery"}
-    - {id: 6, cat: Books/EBook, desc: "EBooks"}
-    - {id: 58, cat: Books/Mags, desc: "Kiosko"}
-    - {id: 24, cat: TV/Documentary, desc: "Documentales"}
-    - {id: 32, cat: TV/Documentary, desc: "Documentales VOSE"}
-    - {id: 49, cat: Books/Technical, desc: "eLearning"}
-    - {id: 68, cat: Books/Technical, desc: "eLearning Multimedia"}
-    - {id: 87, cat: Audio/Audiobook, desc: "Audiolibros"}
-    - {id: 0, cat: Other, desc: "Otros"} # results can have a category of 0, but searching by category 0 returns all results
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info_cookie
-    type: info_cookie
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info_results
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "In principle, the STAFF reserves the right to delete any user who has not accessed the tracker in 90 days or has not downloaded/uploaded any contribution in the last 180 days, if you are going to be away for a while, park the account from your panel."
-
-login:
-  # using cookie method because login page has embedded Google reCAPTCHA
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://divteam.com/index.php?page=torrents&search=daredevil&category=20;23;31;65;64;60;63;69;70;71;72;73;74;75;76;77;78;80;81;82;83;84&active=1
-    - path: index.php
-  inputs:
-    page: torrents
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 title, 1 title&desc, 2 descr, 3 uploaders, 5 gold, 6 silver, 9 2x, 10 3x, 11 4x, 12 5x
-    # note the options are exclusive, so searching for gold means the search keywords are ignored
-    options: 0
-    # 0 all, 1 activeonly, 2 deadonly
-    active: 0
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-    # does not support imdbid search and does not supply imdb link in results.
-
-  rows:
-    selector: "table.table.table-bordered > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"gold.gif\"]){{ else }}{{ end }}, table.table.table-bordered > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"freeleech.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    title_vose:
-      selector: a[href^="index.php?page=torrent-details"][onmouseover]:contains("VOSE")
-      optional: true
-      filters:
-        - name: append
-          args: " English"
-    title_notvose:
-      selector: a[href^="index.php?page=torrent-details"][onmouseover]:not(:contains("VOSE"))
-      optional: true
-      filters:
-        - name: append
-          args: " MULTi/SPANiSH" # DivTeam doesn't bring languages. Usually Original + Spanish.
-        - name: re_replace
-          args: ["\\.+", "."] # More than 1 dot -> .
-        - name: re_replace
-          args: ["^\\.", ""] # Delete first dot
-        - name: replace
-          args: ["UHDRip", "Bluray-2160p"] # Fix for Radarr
-        - name: replace
-          args: ["2160p BDRip", "Bluray-2160p"] # Fix for Radarr
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details"]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    details:
-      selector: a[href^="index.php?page=torrent-details"]
-      attribute: href
-    size:
-      selector: td:nth-child(4)
-    date:
-      selector: td:nth-child(6)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy"
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src="images/freeleech.gif"]: 0
-        img[src="images/gold.png"]: 0
-        img[src="images/silver.png"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="images/2x.png"]: 2
-        img[src="images/3x.png"]: 3
-        img[src="images/4x.png"]: 4
-        img[src="images/5x.png"]: 5
-        "*": 1
-    minimumratio:
-      text: 0.7
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# xbtit customised
--- a/src/Jackett.Common/Definitions/docspedia.yml
+++ b/src/Jackett.Common/Definitions/docspedia.yml
@@ -1,7 +1,7 @@
 ---
 id: docspedia
 name: DocsPedia
-description: "DocsPedia is a Private Torrent Tracker for E-learning"
+description: "DocsPedia is a Private Torrent Tracker for E-LEARNING"
 language: en-US
 type: private
 encoding: UTF-8
@@ -26,6 +26,7 @@ caps:
    - {id: 79, cat: TV, desc: "Educational"}
    - {id: 93, cat: Books/EBook, desc: "Fantasy"}
    - {id: 71, cat: Other, desc: "Fonts"}
+    - {id: 94, cat: Books/EBook, desc: "Gaming"}
    - {id: 82, cat: Books/EBook, desc: "History"}
    - {id: 87, cat: Books/EBook, desc: "Horror"}
    - {id: 72, cat: Books, desc: "IT Books"}
--- a/src/Jackett.Common/Definitions/dxp.yml
+++ b/src/Jackett.Common/Definitions/dxp.yml
@@ -72,6 +72,8 @@ settings:
    options:
      desc: desc
      asc: asc
+  - name: info_flaresolverr
+    type: info_flaresolverr

 login:
  path: takelogin.php
--- a/src/Jackett.Common/Definitions/ebooks-shares.yml
+++ b/src/Jackett.Common/Definitions/ebooks-shares.yml
@@ -5,259 +5,108 @@ description: "Ebooks-Shares is a Private Torrent Tracker for EBOOKS / AUDIOBOOKS
 language: en-US
 type: private
 encoding: UTF-8
+testlinktorrent: false
 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: 314, cat: Audio/Audiobook, desc: "Audio: Dystopian/Post Apocalyptic Bks"}
-    - {id: 47, cat: Books/EBook, desc: "Children's: Adventure"}
-    - {id: 48, cat: Books/EBook, desc: "Children's: Novels"}
-    - {id: 49, cat: Books/EBook, desc: "Children's: Collections"}
-    - {id: 50, cat: Books/EBook, desc: "Children's: Educational"}
-    - {id: 51, cat: Books/EBook, desc: "Children's: Games"}
-    - {id: 52, cat: Books/EBook, desc: "Children's: General"}
-    - {id: 283, cat: Books/EBook, desc: "Children's: Sci-Fi/Fantasy"}
-    - {id: 284, cat: Books/EBook, desc: "Children's: Mystery"}
-    - {id: 286, cat: Books/EBook, desc: "Children's: Early Years / Picture"}
-    - {id: 295, cat: Books/EBook, desc: "Children's: Nonfiction"}
-    - {id: 296, cat: Books/EBook, desc: "Children's: Leveled / Decodable Readers"}
-    - {id: 288, cat: Books/EBook, desc: "Collections: Same Author"}
-    - {id: 289, cat: Books/EBook, desc: "Collections: Same Series"}
-    - {id: 291, cat: Books/EBook, desc: "Collections: Fiction"}
-    - {id: 292, cat: Books/EBook, desc: "Collections: Non Fiction"}
-    - {id: 220, cat: Books/Comics, desc: "Comics: Archie"}
-    - {id: 222, cat: Books/Comics, desc: "Comics: Books & Mags - Comics"}
-    - {id: 225, cat: Books/Comics, desc: "Comics: ComicStrip Collection"}
-    - {id: 228, cat: Books/Comics, desc: "Comics: DC"}
-    - {id: 244, cat: Books/Comics, desc: "Comics: Manga"}
-    - {id: 245, cat: Books/Comics, desc: "Comics: Marvel"}
-    - {id: 258, cat: Books/Comics, desc: "Comics: Other Pub - Humor/Satire"}
-    - {id: 262, cat: Books/Comics, desc: "Comics: Other Pub - Educational"}
-    - {id: 264, cat: Books/Comics, desc: "Comics: Independent Publishers"}
-    - {id: 265, cat: Books/Comics, desc: "Comics: General/Misc"}
-    - {id: 281, cat: Books/Technical, desc: "Computer: Tutorials"}
-    - {id: 38, cat: Books/Technical, desc: "Computer: Applications"}
-    - {id: 55, cat: Books/Technical, desc: "Computer: Gaming "}
-    - {id: 56, cat: Books/Technical, desc: "Computer: General"}
-    - {id: 57, cat: Books/Technical, desc: "Computer: Graphics"}
-    - {id: 58, cat: Books/Technical, desc: "Computer: Internet-WWW"}
-    - {id: 59, cat: Books/Technical, desc: "Computer: Networking"}
-    - {id: 60, cat: Books/Technical, desc: "Computer: OS/Mac"}
-    - {id: 61, cat: Books/Technical, desc: "Computer: OS/Other"}
-    - {id: 62, cat: Books/Technical, desc: "Computer: OS/Windows"}
-    - {id: 63, cat: Books/Technical, desc: "Computer: Programming "}
-    - {id: 66, cat: Books/EBook, desc: "Doc/Vid/Tut: Computer"}
-    - {id: 67, cat: Books/EBook, desc: "Doc/Vid/Tut: Crafts"}
-    - {id: 68, cat: Books/EBook, desc: "Doc/Vid/Tut: Educational"}
-    - {id: 69, cat: Books/EBook, desc: "Doc/Vid/Tut: General"}
-    - {id: 70, cat: Books/EBook, desc: "Doc/Vid/Tut: History"}
-    - {id: 71, cat: Books/EBook, desc: "Doc/Vid/Tut: Medical/Health"}
-    - {id: 72, cat: Books/EBook, desc: "Doc/Vid/Tut: Military"}
-    - {id: 73, cat: Books/EBook, desc: "Doc/Vid/Tut: Modelling"}
-    - {id: 74, cat: Books/EBook, desc: "Doc/Vid/Tut: Sciences"}
-    - {id: 75, cat: Books/EBook, desc: "Doc/Vid/Tut: Transportation"}
-    - {id: 76, cat: Books/EBook, desc: "Doc/Vid/Tut: Woodworking"}
-    - {id: 287, cat: Books/EBook, desc: "Doc/Vid/Tut: Martial Arts/Boxing/Wrestling"}
-    - {id: 121, cat: Books/EBook, desc: "Educational: Arts"}
-    - {id: 122, cat: Books/EBook, desc: "Educational: Astronomy/Cosmology"}
-    - {id: 123, cat: Books/EBook, desc: "Educational: Biology & Genetics"}
-    - {id: 124, cat: Books/EBook, desc: "Educational: Chemistry"}
-    - {id: 125, cat: Books/EBook, desc: "Educational: Culture/Languages"}
-    - {id: 126, cat: Books/EBook, desc: "Educational: Earth Sciences"}
-    - {id: 127, cat: Books/EBook, desc: "Educational:  Educational"}
-    - {id: 128, cat: Books/EBook, desc: "Educational: Engineering & Technology "}
-    - {id: 129, cat: Books/EBook, desc: "Educational: Environmental Studies"}
-    - {id: 130, cat: Books/EBook, desc: "Educational: General Science Titles"}
-    - {id: 131, cat: Books/EBook, desc: "Educational: Literature / Writing"}
-    - {id: 132, cat: Books/EBook, desc: "Educational: Mathematics and Statistics"}
-    - {id: 133, cat: Books/EBook, desc: "Educational: Medical Texts"}
-    - {id: 134, cat: Books/EBook, desc: "Educational: Military History"}
-    - {id: 135, cat: Books/EBook, desc: "Educational: Non-Military History"}
-    - {id: 136, cat: Books/EBook, desc: "Educational: Paleontology"}
-    - {id: 137, cat: Books/EBook, desc: "Educational: Physics"}
-    - {id: 138, cat: Books/EBook, desc: "Educational: Psychology"}
-    - {id: 139, cat: Books/EBook, desc: "Educational: Student Reference"}
-    - {id: 297, cat: Books/EBook, desc: "Educational: Life Sciences/Evolution/Human "}
-    - {id: 77, cat: Books/EBook, desc: "Fiction: Adventure"}
-    - {id: 78, cat: Books/EBook, desc: "Fiction: Classics"}
-    - {id: 79, cat: Books/EBook, desc: "Fiction: Collections"}
-    - {id: 80, cat: Books/EBook, desc: "Fiction: Comedy/Humorous  "}
-    - {id: 81, cat: Books/EBook, desc: "Fiction: Crime/Mystery/Thriller"}
-    - {id: 302, cat: Books/EBook, desc: "Fiction: Cozy Mysteries"}
-    - {id: 82, cat: Books/EBook, desc: "Fiction: General Fiction"}
-    - {id: 83, cat: Books/EBook, desc: "Fiction: Horror"}
-    - {id: 84, cat: Books/EBook, desc: "Fiction: Military & Historic"}
-    - {id: 86, cat: Books/EBook, desc: "Fiction: Romance"}
-    - {id: 87, cat: Books/EBook, desc: "Fiction: Sci-Fi/Fantasy"}
-    - {id: 88, cat: Books/EBook, desc: "Fiction: Westerns"}
-    - {id: 270, cat: Books/EBook, desc: "Fiction: Historical "}
-    - {id: 312, cat: Books/EBook, desc: "Fiction: Various Authors"}
-    - {id: 303, cat: Books/EBook, desc: "Fiction: Poetry"}
-    - {id: 313, cat: Books/EBook, desc: "Fiction: Dystopian"}
-    - {id: 140, cat: Books/EBook, desc: "Hobby/Pastime: Art"}
-    - {id: 141, cat: Books/EBook, desc: "Hobby/Pastime: Boating"}
-    - {id: 142, cat: Books/EBook, desc: "Hobby/Pastime: Crafts/Knitting/Sewing"}
-    - {id: 143, cat: Books/EBook, desc: "Hobby/Pastime: Food & Drink"}
-    - {id: 144, cat: Books/EBook, desc: "Hobby/Pastime: Games/RPG/Gaming"}
-    - {id: 145, cat: Books/EBook, desc: "Hobby/Pastime: General Pastimes"}
-    - {id: 146, cat: Books/EBook, desc: "Hobby/Pastime: Graphic Arts and Design"}
-    - {id: 147, cat: Books/EBook, desc: "Hobby/Pastime: Health/Lifestyle"}
-    - {id: 148, cat: Books/EBook, desc: "Hobby/Pastime: Home/Gardening"}
-    - {id: 149, cat: Books/EBook, desc: "Hobby/Pastime: Metalworking"}
-    - {id: 150, cat: Books/EBook, desc: "Hobby/Pastime: Modelling"}
-    - {id: 151, cat: Books/EBook, desc: "Hobby/Pastime: Pets/Vet Science"}
-    - {id: 152, cat: Books/EBook, desc: "Hobby/Pastime: Photography"}
-    - {id: 153, cat: Books/EBook, desc: "Hobby/Pastime: Quiz and Crossword Books"}
-    - {id: 154, cat: Books/EBook, desc: "Hobby/Pastime: Sports"}
-    - {id: 155, cat: Books/EBook, desc: "Hobby/Pastime: Travel"}
-    - {id: 156, cat: Books/EBook, desc: "Hobby/Pastime: Woodworking"}
-    - {id: 157, cat: Books/EBook, desc: "Language Learn: Arabic"}
-    - {id: 158, cat: Books/EBook, desc: "Language Learn: Chinese"}
-    - {id: 159, cat: Books/EBook, desc: "Language Learn: English"}
-    - {id: 160, cat: Books/EBook, desc: "Language Learn: French"}
-    - {id: 161, cat: Books/EBook, desc: "Language Learn: German"}
-    - {id: 162, cat: Books/EBook, desc: "Language Learn: Italian"}
-    - {id: 163, cat: Books/EBook, desc: "Language Learn: Japanese"}
-    - {id: 164, cat: Books/EBook, desc: "Language Learn: Latin"}
-    - {id: 165, cat: Books/EBook, desc: "Language Learn: Nordic Lang"}
-    - {id: 166, cat: Books/EBook, desc: "Language Learn: Oriental Lang"}
-    - {id: 167, cat: Books/EBook, desc: "Language Learn: Russian"}
-    - {id: 168, cat: Books/EBook, desc: "Language Learn: Spanish"}
-    - {id: 169, cat: Books/EBook, desc: "Language Learn: Other Lang"}
-    - {id: 310, cat: Books/Mags, desc: "Magazines: Woodworking"}
-    - {id: 311, cat: Books/Mags, desc: "Magazines: Sewing, Knitting and Quilting"}
-    - {id: 170, cat: Books/Mags, desc: "Magazines : Computer"}
-    - {id: 171, cat: Books/Mags, desc: "Magazines: Current Events"}
-    - {id: 172, cat: Books/Mags, desc: "Magazines: Business/Finance "}
-    - {id: 173, cat: Books/Mags, desc: "Magazines: Electronics"}
-    - {id: 174, cat: Books/Mags, desc: "Magazines: General/Misc"}
-    - {id: 175, cat: Books/Mags, desc: "Magazines: Military"}
-    - {id: 176, cat: Books/Mags, desc: "Magazines: Photography"}
-    - {id: 177, cat: Books/Mags, desc: "Magazines: Sciences "}
-    - {id: 178, cat: Books/Mags, desc: "Magazines: Sports"}
-    - {id: 179, cat: Books/Mags, desc: "Magazines: Technology"}
-    - {id: 180, cat: Books/Mags, desc: "Magazines: Transportation"}
-    - {id: 181, cat: Books/EBook, desc: "Military: Aircraft"}
-    - {id: 182, cat: Books/EBook, desc: "Military: Armour"}
-    - {id: 183, cat: Books/EBook, desc: "Military: General Military"}
-    - {id: 184, cat: Books/EBook, desc: "Military: Miscellaneous"}
-    - {id: 185, cat: Books/EBook, desc: "Military: Naval"}
-    - {id: 186, cat: Books/Foreign, desc: "Non English Bks: Dutch"}
-    - {id: 187, cat: Books/Foreign, desc: "Non English Bks: French"}
-    - {id: 188, cat: Books/Foreign, desc: "Non English Bks: German"}
-    - {id: 189, cat: Books/Foreign, desc: "Non English Bks: Greek"}
-    - {id: 190, cat: Books/Foreign, desc: "Non English Bks: Hungarian"}
-    - {id: 191, cat: Books/Foreign, desc: "Non English Bks: Italian"}
-    - {id: 192, cat: Books/Foreign, desc: "Non English Bks: Japanese"}
-    - {id: 194, cat: Books/Foreign, desc: "Non English Bks: Other"}
-    - {id: 193, cat: Books/Foreign, desc: "Non English Bks: Polish"}
-    - {id: 195, cat: Books/Foreign, desc: "Non English Bks: Romanian"}
-    - {id: 196, cat: Books/Foreign, desc: "Non English Bks: Russian"}
-    - {id: 197, cat: Books/Foreign, desc: "Non English Bks: Scandinavian"}
-    - {id: 198, cat: Books/Foreign, desc: "Non English Bks: Serbian"}
-    - {id: 199, cat: Books/Foreign, desc: "Non English Bks: Spanish"}
-    - {id: 89, cat: Books/EBook, desc: "Non Fict/Ref: Agricultural"}
-    - {id: 90, cat: Books/EBook, desc: "Non Fict/Ref: Alt. Therapies"}
-    - {id: 95, cat: Books/EBook, desc: "Non Fict/Ref: Architecture"}
-    - {id: 91, cat: Books/EBook, desc: "Non Fict/Ref: Auto & Repair"}
-    - {id: 92, cat: Books/EBook, desc: "Non Fict/Ref: Aviation"}
-    - {id: 94, cat: Books/EBook, desc: "Non Fict/Ref: Biographies and Memoirs"}
-    - {id: 96, cat: Books/EBook, desc: "Non Fict/Ref: Business/Finance"}
-    - {id: 97, cat: Books/EBook, desc: "Non Fict/Ref: Comedy/Humorous"}
-    - {id: 98, cat: Books/EBook, desc: "Non Fict/Ref: Crime"}
-    - {id: 99, cat: Books/EBook, desc: "Non Fict/Ref: Criminology"}
-    - {id: 100, cat: Books/EBook, desc: "Non Fict/Ref: Economics & Math"}
-    - {id: 102, cat: Books/EBook, desc: "Non Fict/Ref: Electronics"}
-    - {id: 103, cat: Books/EBook, desc: "Non Fict/Ref: Enc/Dict/Atlas,s"}
-    - {id: 104, cat: Books/EBook, desc: "Non Fict/Ref: Entertainment"}
-    - {id: 105, cat: Books/EBook, desc: "Non Fict/Ref: General Ref"}
-    - {id: 106, cat: Books/EBook, desc: "Non Fict/Ref: Geo & Archaeology"}
-    - {id: 107, cat: Books/EBook, desc: "Non Fict/Ref: Journ/Current Affairs "}
-    - {id: 108, cat: Books/EBook, desc: "Non Fict/Ref: Legal"}
-    - {id: 109, cat: Books/EBook, desc: "Non Fict/Ref: Medical/Health"}
-    - {id: 110, cat: Books/EBook, desc: "Non Fict/Ref: Motorcycle"}
-    - {id: 111, cat: Books/EBook, desc: "Non Fict/Ref:  Music"}
-    - {id: 112, cat: Books/EBook, desc: "Non Fict/Ref: Parenting/Family"}
-    - {id: 113, cat: Books/EBook, desc: "Non Fict/Ref: Philosophy & Belief"}
-    - {id: 114, cat: Books/EBook, desc: "Non Fict/Ref: Literature / Writing"}
-    - {id: 115, cat: Books/EBook, desc: "Non Fict/Ref: Political Science"}
-    - {id: 116, cat: Books/EBook, desc: "Non Fict/Ref: Project Management"}
-    - {id: 117, cat: Books/EBook, desc: "Non Fict/Ref: Self-Improvement"}
-    - {id: 118, cat: Books/EBook, desc: "Non Fict/Ref: Sht Music-Tablatures"}
-    - {id: 119, cat: Books/EBook, desc: "Non Fict/Ref: Sociology/Politics"}
-    - {id: 120, cat: Books/EBook, desc: "Non Fict/Ref: Transportation"}
-    - {id: 266, cat: Books/EBook, desc: "Non Fict/Ref: Technology Books"}
-    - {id: 267, cat: Books/EBook, desc: "Non Fict/Ref: History Books"}
-    - {id: 271, cat: Books/EBook, desc: "Non Fict/Ref: Collections"}
-    - {id: 272, cat: Books/EBook, desc: "Non Fict/Ref: DIY (Do It Yourself)"}
-    - {id: 273, cat: Books/EBook, desc: "Non Fict/Ref: Archaeology"}
-    - {id: 278, cat: Books/EBook, desc: "Non Fict/Ref: Conspiracy Theory/UFO/Alien Bk"}
-    - {id: 279, cat: Books/EBook, desc: "Non Fict/Ref: Psychology"}
-    - {id: 280, cat: Books/EBook, desc: "Non Fict/Ref: Education"}
-    - {id: 282, cat: Books/EBook, desc: "Non Fict/Ref: Martial Arts/Boxing/Wrestling"}
-    - {id: 293, cat: Books/EBook, desc: "Non Fict/Ref: Zoology & Veterinary Science"}
-    - {id: 294, cat: Books/EBook, desc: "Non Fict/Ref: True Stories"}
-    - {id: 300, cat: Books/EBook, desc: "Non Fict/Ref: Maritime Books (Building,navig"}
-    - {id: 200, cat: Books/EBook, desc: "Teens: Collections"}
-    - {id: 201, cat: Books/EBook, desc: "Teens: Educational"}
-    - {id: 202, cat: Books/EBook, desc: "Teens: Fiction"}
-    - {id: 203, cat: Books/EBook, desc: "Teens: Non Fiction"}
-    - {id: 285, cat: Books/EBook, desc: "Teens: Sci-Fi/Fantasy"}
-    - {id: 305, cat: Books/Other, desc: "VIP: Science Fiction"}
-    - {id: 307, cat: Books/Other, desc: "VIP: Thriller"}
-    - {id: 306, cat: Books/Other, desc: "VIP: Mystery"}
-    - {id: 308, cat: Books/Other, desc: "VIP: Crime"}
-    - {id: 309, cat: Books/Other, desc: "VIP: Fantasy"}
-    - {id: 204, cat: Books/Other, desc: "VIP: Collections"}
-    - {id: 205, cat: Books/Other, desc: "VIP: Audiobooks"}
-    - {id: 206, cat: Books/Other, desc: "VIP: Comics"}
-    - {id: 207, cat: Books/Other, desc: "VIP: Computers"}
-    - {id: 208, cat: Books/Other, desc: "VIP: Documentaries"}
-    - {id: 209, cat: Books/Other, desc: "VIP: Educational"}
-    - {id: 210, cat: Books/Other, desc: "VIP: Fiction"}
-    - {id: 211, cat: Books/Other, desc: "VIP: Hobby/Craft"}
-    - {id: 212, cat: Books/Other, desc: "VIP: Literature"}
-    - {id: 213, cat: Books/Other, desc: "VIP: Medical"}
-    - {id: 214, cat: Books/Other, desc: "VIP: Military"}
-    - {id: 215, cat: Books/Other, desc: "VIP: Music"}
-    - {id: 216, cat: Books/Other, desc: "VIP: Non Fiction"}
-    - {id: 217, cat: Books/Other, desc: "VIP: Original Content"}
-    - {id: 218, cat: Books/Other, desc: "VIP: RPG"}
+    # Audio
+    - {id: 293, cat: Audio/Audiobook, desc: "Audio: Fiction"}
+    - {id: 294, cat: Audio/Audiobook, desc: "Audio:Sci-Fi/Fantasy"}
+    - {id: 295, cat: Audio/Audiobook, desc: "Audio:Crime/Thriller"}
+    - {id: 296, cat: Audio/Audiobook, desc: "Audio:Horror"}
+    - {id: 297, cat: Audio/Audiobook, desc: "Audio:General"}
+    - {id: 302, cat: Audio/Audiobook, desc: "Audio: (TTC,TMS,TGC)"}
+    - {id: 303, cat: Audio/Audiobook, desc: "Audio:Autobiography "}
+    - {id: 308, cat: Audio/Audiobook, desc: "Audio:Collections"}
+    - {id: 309, cat: Audio/Audiobook, desc: "Audio:History"}
+    - {id: 310, cat: Audio/Audiobook, desc: "Audio:Children/YA"}
+    - {id: 311, cat: Audio/Audiobook, desc: "Audio:Romance"}
+    - {id: 317, cat: Audio/Audiobook, desc: "Audio:Urbn Fant/para"}
+    - {id: 319, cat: Audio/Audiobook, desc: "Audio:V.I.P"}
+    - {id: 320, cat: Audio/Audiobook, desc: "Audio:Science/engine"}
+    - {id: 321, cat: Audio/Audiobook, desc: "Audio:History/War"}
+    - {id: 322, cat: Audio/Audiobook, desc: "Audio:non fiction"}
+    - {id: 323, cat: Audio/Audiobook, desc: "Audio:Educational"}
+    - {id: 324, cat: Audio/Audiobook, desc: "Audio:Tutorials"}
+    - {id: 325, cat: Audio/Audiobook, desc: "Audio:True Crime"}
+    - {id: 326, cat: Audio/Audiobook, desc: "Audio:Tech/Computers"}
+    # Collections
+    - {id: 305, cat: Books/EBook, desc: "Same Author"}
+    - {id: 345, cat: Books/Mags, desc: "Collection: Magazines"}
+    - {id: 307, cat: Books/EBook, desc: "Collection: Military"}
+    - {id: 342, cat: Books/EBook, desc: "Collection: Multiple Authors"}
+    - {id: 343, cat: Books/EBook, desc: "Collection: Fantasy"}
+    - {id: 359, cat: Books/EBook, desc: "Collection: Same Series"}
+    # Fiction
+    - {id: 281, cat: Books/EBook, desc: "Horror"}
+    - {id: 282, cat: Books/EBook, desc: "Sci-Fi/Fantasy"}
+    - {id: 275, cat: Books/EBook, desc: "General Fiction"}
+    - {id: 280, cat: Books/EBook, desc: "Crime/Thriller/Myste"}
+    - {id: 312, cat: Books/EBook, desc: "Romance"}
+    - {id: 313, cat: Books/EBook, desc: "Comedy/Humour"}
+    - {id: 314, cat: Books/EBook, desc: "Historical Fiction"}
+    - {id: 315, cat: Books/EBook, desc: "Cozy/Mystery "}
+    - {id: 318, cat: Books/EBook, desc: "Urbn Fantasy/Para"}
+    - {id: 340, cat: Books/EBook, desc: "Lit/RPG"}
+    - {id: 341, cat: Books/EBook, desc: "Collections"}
+    - {id: 352, cat: Books/EBook, desc: "Westerns"}
+    # Children & Y/A
+    - {id: 299, cat: Books/EBook, desc: "Young Adult"}
+    - {id: 298, cat: Books/EBook, desc: "Children's"}
+    # Education/Textbooks
+    - {id: 278, cat: Books/EBook, desc: "Tutorials"}
+    - {id: 300, cat: Books/EBook, desc: "Textbooks"}
+    - {id: 301, cat: Books/EBook, desc: "Educational"}
+    - {id: 328, cat: Books/EBook, desc: "Engineering/Mech"}
+    - {id: 339, cat: Books/EBook, desc: "Science/Physics"}
+    - {id: 346, cat: Books/EBook, desc: "Chemistry"}
+    - {id: 347, cat: Books/EBook, desc: "Medical"}
+    - {id: 348, cat: Books/EBook, desc: "Mathematics"}
+    # Tech/Computers
+    - {id: 331, cat: Books/EBook, desc: "Electronics"}
+    - {id: 336, cat: Books/EBook, desc: "Video Games"}
+    - {id: 337, cat: Books/EBook, desc: "Computers"}
+    - {id: 350, cat: Books/EBook, desc: "Programming"}
+    - {id: 354, cat: Books/EBook, desc: "Apps"}
+    # Hobbies/pastimes
+    - {id: 271, cat: Books/EBook, desc: "Food And Drink"}
+    - {id: 272, cat: Books/EBook, desc: "General Hobbies"}
+    - {id: 327, cat: Books/EBook, desc: "Gardening"}
+    - {id: 329, cat: Books/EBook, desc: "Motorcars/Repairs"}
+    - {id: 330, cat: Books/EBook, desc: "D.I.Y"}
+    - {id: 332, cat: Books/EBook, desc: "Trivia/Quiz"}
+    # Non Fict/Ref
+    - {id: 285, cat: Books/EBook, desc: "General Non-fiction"}
+    - {id: 289, cat: Books/EBook, desc: "Autobiography/Memoir"}
+    - {id: 274, cat: Books/EBook, desc: "Business"}
+    - {id: 316, cat: Books/EBook, desc: "True Crime"}
+    - {id: 335, cat: Books/EBook, desc: "Entertainment"}
+    - {id: 338, cat: Books/EBook, desc: "Encyclopedia/Ref"}
+    - {id: 349, cat: Books/EBook, desc: "Self Help"}
+    - {id: 351, cat: Books/EBook, desc: "Religion"}
+    - {id: 358, cat: Books/EBook, desc: "History"}
+    # Military
+    - {id: 287, cat: Books/EBook, desc: "WW1"}
+    - {id: 288, cat: Books/EBook, desc: "WW2"}
+    - {id: 12, cat: Books/EBook, desc: "Army,Navy,Airforce"}
+    - {id: 286, cat: Books/EBook, desc: "General Military "}
+    # Zoology
+    - {id: 334, cat: Books/EBook, desc: "Veterinary/Pets"}
+    - {id: 361, cat: Books/EBook, desc: "Nature And Wildlife"}
+    # Art & Crafts
+    - {id: 344, cat: Books/EBook, desc: "Model Making"}
+    - {id: 357, cat: Books/EBook, desc: "Art"}
+    # Comics
+    - {id: 290, cat: Books/Comics, desc: "General Comics"}
+    - {id: 291, cat: Books/Comics, desc: "Marvel"}
+    - {id: 292, cat: Books/Comics, desc: "D/C"}
+    # Magazines
+    - {id: 306, cat: Books/Mags, desc: "Music"}
+    - {id: 10, cat: Books/Mags, desc: "Language Learn"}
+    - {id: 13, cat: Books/Mags, desc: "Non English Bks"}
+    - {id: 16, cat: Books/Mags, desc: "VIP"}

  modes:
    search: [q]
@@ -270,10 +119,6 @@ settings:
  - name: password
    type: password
    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
  - name: vip
    type: checkbox
    label: Include VIP results
@@ -281,35 +126,39 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: id
+    default: 3
    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
+      3: created
+      5: seeders
+      4: size
+      2: title
  - name: type
    type: select
    label: Order requested from site
-    default: desc
+    default: 2
    options:
-      desc: desc
-      asc: asc
-  - name: info_results
+      2: desc
+      1: asc
+  - name: info
    type: info
-    label: Search results
-    default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "All members are required to log into their account at least every 89 days or you will be deleted without warning."

 login:
-  path: account-login.php
+  path: index.php?page=login
  method: post
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
  error:
-    - selector: div.panel:contains("Access Denied")
+    - selector: tr td span[style="color:#FF0000;"]
  test:
    path: index.php
-    selector: a[href^="account-logout.php"]
+    selector: a[href="logout.php"]

 download:
  selectors:
@@ -318,54 +167,70 @@ download:

 search:
  paths:
-    - path: torrents-search.php
+    # https://ebooks-shares.org/index.php?page=torrents&search=&category=0&active=0
+    - path: index.php
  inputs:
-    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
-    # 0 only active 1 incl dead 2 only dead
-    incldead: 1
-    # 0 all 1 not freeleech 2 only freeleech
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
+    page: torrents
+    search: "{{ .Keywords }}"
+    # does not support multi category selection so defaulting to all
+    category: 0
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"

  rows:
-    selector: "tr.t-row{{ if .Config.vip }}{{ else }}:not(:has(a[href^=\"torrents.php?cat=\"]):contains(\"VIP\")){{ end }}"
+    selector: "table.lista:not(table[cellspacing]) > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ if .Config.vip }}{{ else }}:not(:has(a[href$=\"&category=16\"])):not(:has(a[href$=\"&category=319\"])){{ end }}"

  fields:
    category:
-      selector: a[href^="torrents.php?cat="]
+      selector: a[href^="index.php?page=torrents&category="]
      attribute: href
      filters:
        - name: querystring
-          args: cat
+          args: category
+    _is_vip:
+      selector: a[href$="&category=16"], a[href$="&category=319"]
+      attribute: href
+      optional: true
    title:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: title
+      selector: a[href^="index.php?page=torrent-details&id="]
+      filters:
+        - name: append
+          args: "{{ if .Result._is_vip }} VIP{{ else }}{{ end }}"
    details:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="index.php?page=torrent-details&id="]
      attribute: href
    download:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="index.php?page=downloadcheck"]
      attribute: href
-    size:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    description:
-      selector: td:nth-child(4)
+    poster:
+      selector: a[href^="index.php?page=torrent-details&id="]
+      attribute: onmouseover
      filters:
-        - name: prepend
-          args: "uploader: "
+        - name: regexp
+          args: "src=(.*?) "
+        - name: replace
+          args: ["torrentimg/nocover.jpg", ""]
+    size:
+      selector: td:nth-last-child(4)
    date:
-      text: now
+      selector: td:nth-last-child(8)
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: dd/MM/yyyy
+    seeders:
+      selector: td:nth-last-child(7)
+    leechers:
+      selector: td:nth-last-child(6)
+    grabs:
+      selector: td:nth-last-child(5)
    downloadvolumefactor:
-      case:
-        img[src="images/free.gif"]: 0
-        "*": 1
+      text: 1
    uploadvolumefactor:
      text: 1
-# engine tbd
+    minimumseedtime:
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+#  xbtitFM v4.1.31
--- a/src/Jackett.Common/Definitions/empornium.yml
+++ b/src/Jackett.Common/Definitions/empornium.yml
@@ -66,6 +66,10 @@ caps:
    search: [q]

 settings:
+  - name: info_2fa
+    type: info
+    label: "About 2FA"
+    default: "If you want to enable 2FA then use the Empornium2FA indexer instead."
  - name: username
    type: text
    label: Username
--- a/src/Jackett.Common/Definitions/emuwarez.yml
+++ b/src/Jackett.Common/Definitions/emuwarez.yml
@@ -12,17 +12,18 @@ caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Películas"}
    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 4, cat: TV/Documentary, desc: "Documentales"}
+    - {id: 5, cat: Audio, desc: "Musica"}
+    - {id: 6, cat: Console, desc: "Juegos"}
+    - {id: 7, cat: PC, desc: "Software"}

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

 settings:
-  - name: ip_filtering
-    type: info
-    label: "IP Filtering"
-    default: "eMuwarez blocks Non-Spanish IP addresses. A <b>FlareSolverr</b> error means your IP was not accepted."
  - name: apikey
    type: text
    label: APIKey
@@ -66,9 +67,9 @@ login:

 search:
  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    # https://hdinnovations.github.io/UNIT3D/torrent_api.html
+    # https://github.com/HDInnovations/UNIT3D/blob/master/app/Http/Controllers/API/TorrentController.php#L657
+    - path: api/torrents/filter
      response:
        type: json

@@ -135,8 +136,13 @@ search:
          args: ["(?i)(Película de TV)", "Película_de_TV"]
        - name: replace
          args: [" & ", "_&_"]
+    _internal:
+      selector: internal
+      case:
+        False: "{{ .False }}"
+        True: "{{ .True }}"
    description:
-      text: "{{ .Result.genre }}"
+      text: "{{ if .Result._internal }}Internal{{ else }}{{ end }}{{ if and .Result._internal .Result.genre }} | {{ else }}{{ end }}{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -183,4 +189,4 @@ search:
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# json UNIT3D 8.2.0
+# json UNIT3D 9.0.8
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/src/Jackett.Common/Definitions/eniahd.yml
@@ -1,262 +0,0 @@
---
-id: eniahd
-name: EniaHD
-description: "EniaHD is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
-language: ru-RU
-type: semi-private
-encoding: UTF-8
-links:
-  - https://eniatv.com/
-legacylinks:
-  - https://eniahd.com/
-
-caps:
-  categorymappings:
-    # Cinema
-    - {id: 13, cat: Movies/HD, desc: "Зарубежное кино HD"}
-    - {id: 11, cat: Movies, desc: "Зарубежное кино"}
-    - {id: 12, cat: Movies, desc: "Наше кино"}
-    - {id: 66, cat: Movies, desc: "Зарубежное кино | VIP"}
-    - {id: 67, cat: Movies, desc: "Зарубежное кино HD | VIP"}
-    - {id: 68, cat: Movies, desc: "Фабельманы / The Fabelmans"}
-    # TV
-    - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
-    - {id: 65, cat: TV/HD, desc: "Майя МС / Майянцы / Mayans M.C."}
-    - {id: 52, cat: TV/HD, desc: "Блудный сын / Prodigal Son"}
-    - {id: 49, cat: TV/HD, desc: "Пенниуорт / Pennyworth"}
-    - {id: 62, cat: TV/HD, desc: "Черный список / The Blacklist"}
-    - {id: 64, cat: TV/HD, desc: "Игра престолов / Game of Thrones"}
-    - {id: 59, cat: TV/HD, desc: "Американская история ужасов / American Horror Story"}
-    - {id: 60, cat: TV/HD, desc: "Хороший доктор / The Good Doctor"}
-    - {id: 54, cat: TV/HD, desc: "Рэй Донован / Ray Donovan"}
-    - {id: 55, cat: TV/HD, desc: "Сверхъестественное / Supernatural"}
-    - {id: 56, cat: TV/HD, desc: "Сквозь снег / Snowpiercer"}
-    - {id: 57, cat: TV/HD, desc: "Теория большого взрыва / The Big Bang Theory"}
-    - {id: 58, cat: TV/HD, desc: "Миллиарды / Billions"}
-    - {id: 53, cat: TV/HD, desc: "Родина / Homeland"}
-    - {id: 51, cat: TV/HD, desc: "Новобранец / The Rookie"}
-    - {id: 50, cat: TV/HD, desc: "Это мы / This Is Us"}
-    - {id: 48, cat: TV/HD, desc: "Бэтвумен / Batwoman"}
-    - {id: 32, cat: TV/HD, desc: "Кости / Bones"}
-    - {id: 31, cat: TV/HD, desc: "Американские боги / American Gods"}
-    - {id: 30, cat: TV/HD, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
-    - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
-    - {id: 22, cat: TV, desc: "Зарубежные сериалы HEVC"}
-    - {id: 3, cat: TV, desc: "Зарубежные сериалы"}
-    - {id: 14, cat: TV, desc: "Русские сериалы"}
-    - {id: 10, cat: TV, desc: "Звуковые дорожки"}
-    # Cartoons
-    - {id: 24, cat: TV, desc: "Мультфильмы"}
-    - {id: 25, cat: TV, desc: "Мультсериалы"}
-    # Documentary
-    - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
-    - {id: 21, cat: TV/Documentary, desc: "Документальные"}
-    - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
-    # Private Forums
-    - {id: 47, cat: TV/HD, desc: "Рассказ служанки / The Handmaid's Tale"}
-    # Miscellaneous
-    - {id: 8, cat: Other, desc: "Разное (раздачи)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: addrussiantotitle
-    type: checkbox
-    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
-    default: false
-  - name: freeleech_50
-    type: checkbox
-    label: Search freeleech and 50% freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-login:
-  path: login.php
-  method: form
-  form: form[action="login.php"]
-  inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    autologin: 1
-  error:
-    - selector: table.error
-  test:
-    path: index.php
-    selector: a[href="./login.php?logout=1"]
-
-search:
-  paths:
-    - path: tracker.php
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    prev_allw: 0
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    prev_tor_type: 0
-    o: "{{ .Config.sort }}"
-    s: "{{ .Config.type }}"
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    # title search
-    nm: "{{ .Keywords }}"
-    # search by partial word
-    allw: 0
-    tor_type: "{{ if .Config.freeleech_50 }}1{{ else }}{{ end }}"
-
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    # strip season and/or ep
-    - name: re_replace
-      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
-
-  fields:
-    title:
-      selector: a.tLink
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
-        - name: re_replace
-          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
-    details:
-      selector: a.tLink
-      attribute: href
-    download:
-      selector: a[href^="./dl.php?id="]
-      attribute: href
-    magnet:
-      optional: true
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    category:
-      selector: a.gen
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    size:
-      selector: td:nth-child(6) > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(9)
-    date:
-      # unix
-      selector: td:last-child > u
-    downloadvolumefactor:
-      case:
-        img[src$="/tor_gold.gif"]: 0
-        img[src$="/tor_silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 100 hours (as seconds = 100 x 60 x 60)
-      text: 360000
-    description:
-      selector: a.tLink
-# TorrentPier
--- a/src/Jackett.Common/Definitions/enthralled.yml
+++ b/src/Jackett.Common/Definitions/enthralled.yml
@@ -1,140 +0,0 @@
---
-id: enthralled
-name: Enthralled
-description: "Enthralled is a Private Torrent Tracker for FETISH 3X"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.enthralled.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: XXX, desc: "FemDom"}
-    - {id: 2, cat: XXX, desc: "LezDom"}
-    - {id: 4, cat: XXX, desc: "POV"}
-    - {id: 5, cat: XXX, desc: "Scat"}
-    - {id: 3, cat: XXX, desc: "TransDom"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login
-  method: form
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    cinfo: "2550|1350|24|-60"
-    keeploggedin: 1
-  error:
-    - selector: div.error
-  test:
-    path: index.php
-    selector: "#nav_userinfo"
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    title: "{{ .Keywords }}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    action: advanced
-    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table#torrent_table > tbody > tr[class^="torrent shaded_row"]:has(a[href*="action=download"])
-
-  fields:
-    category:
-      selector: a[href*="filter_cat"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "(\\d+)]=1"
-    title:
-      selector: a[href^="/torrents.php?id="]
-    details:
-      selector: a[href^="/torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/torrents.php?action=download&id="]
-      attribute: href
-    description_tags:
-      selector: div.tags
-    description:
-      case:
-        span.icon_okay: "Verified: {{ .Result.description_tags }}"
-        "*": "Unverified: {{ .Result.description_tags }}"
-    poster:
-      selector: td:nth-child(2) > script
-      filters:
-        - name: regexp
-          args: "src=\\\\\"(.*?)\\\\\""
-        - name: re_replace
-          args: ["\\\\(.)", "$1"]
-        - name: replace
-          args: ["/static/common/noartwork/noimage.png", ""]
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(5) > span
-      attribute: title
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "MMM dd yyyy, HH:mm"
-    size:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      case:
-        span.icon[title*="Freeleech"]: 0
-        "img[alt=\"Freeleech\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        span.icon[title*="DoubleSeed"]: 2
-        "img[alt=\"DoubleSeed\"]": 2
-        "*": 1
-    minimumratio:
-      text: 0.5
-# Luminance
--- a/src/Jackett.Common/Definitions/enthralled2fa.yml
+++ b/src/Jackett.Common/Definitions/enthralled2fa.yml
@@ -1,134 +0,0 @@
---
-id: enthralled2fa
-name: Enthralled2FA
-description: "Enthralled is a Private Torrent Tracker for FETISH 3X.  Cookie Login for 2FA use."
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.enthralled.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: XXX, desc: "FemDom"}
-    - {id: 2, cat: XXX, desc: "LezDom"}
-    - {id: 4, cat: XXX, desc: "POV"}
-    - {id: 5, cat: XXX, desc: "Scat"}
-    - {id: 3, cat: XXX, desc: "TransDom"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info_cookie
-    type: info_cookie
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  # using cookie method because login page can present second page for 2FA when enabled
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-    selector: "#nav_userinfo"
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    title: "{{ .Keywords }}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    action: advanced
-    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table#torrent_table > tbody > tr[class^="torrent shaded_row"]:has(a[href*="action=download"])
-
-  fields:
-    category:
-      selector: a[href*="filter_cat"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "(\\d+)]=1"
-    title:
-      selector: a[href^="/torrents.php?id="]
-    details:
-      selector: a[href^="/torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/torrents.php?action=download&id="]
-      attribute: href
-    description_tags:
-      selector: div.tags
-    description:
-      case:
-        span.icon_okay: "Verified: {{ .Result.description_tags }}"
-        "*": "Unverified: {{ .Result.description_tags }}"
-    poster:
-      selector: td:nth-child(2) > script
-      filters:
-        - name: regexp
-          args: "src=\\\\\"(.*?)\\\\\""
-        - name: re_replace
-          args: ["\\\\(.)", "$1"]
-        - name: replace
-          args: ["/static/common/noartwork/noimage.png", ""]
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(5) > span
-      attribute: title
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "MMM dd yyyy, HH:mm"
-    size:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      case:
-        span.icon[title*="Freeleech"]: 0
-        "img[alt=\"Freeleech\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        span.icon[title*="DoubleSeed"]: 2
-        "img[alt=\"DoubleSeed\"]": 2
-        "*": 1
-    minimumratio:
-      text: 0.5
-# Luminance
--- a/src/Jackett.Common/Definitions/ex-torrenty.yml
+++ b/src/Jackett.Common/Definitions/ex-torrenty.yml
@@ -9,6 +9,8 @@ links:
  - https://ex-torrenty.org/

 caps:
+  # find the category numbers from the szukaj.php page
+  # and dont forget to update the search fields category case block
  categorymappings:
    - {id: 774, cat: Movies, desc: "Filmy Polskie"}
    - {id: 642, cat: Movies, desc: "Filmy/Bajki"}
@@ -19,14 +21,15 @@ caps:
    - {id: 17, cat: Movies/HD, desc: "Filmy HD"}
    - {id: 265, cat: Movies/HD, desc: "Filmy x265 HEVC"}
    - {id: 12, cat: Movies/3D, desc: "Filmy 3D"}
-    - {id: 530, cat: Movies/SD, desc: "Filmy TS/CAM"}
    - {id: 826, cat: Movies/HD, desc: "REMUX / Complete"}
+    - {id: 530, cat: Movies/SD, desc: "Filmy TS/CAM"}
    - {id: 9, cat: PC, desc: "Programy"}
    - {id: 7, cat: Console, desc: "Konsole"}
    - {id: 6, cat: PC/Games, desc: "Gry"}
    - {id: 5, cat: Audio, desc: "Muzyka"}
    - {id: 305, cat: Audio/Video, desc: "Teledyski"}
-    - {id: 22, cat: TV, desc: "TV"}
+    - {id: 829, cat: TV, desc: "Seriale Polskie"}
+    - {id: 922, cat: TV/Foreign, desc: "Seriale Zagraniczne"}
    - {id: 228, cat: XXX, desc: "Erotyka"}
    - {id: 25, cat: Books/EBook, desc: "Książki"}
    - {id: 739, cat: Audio/Audiobook, desc: "AudioBooki"}
@@ -112,7 +115,8 @@ search:
        ":contains(\"Gry\")": 6
        ":contains(\"Muzyka\")": 5
        ":contains(\"Teledyski\")": 305
-        ":contains(\"TV\")": 22
+        ":contains(\"Seriale Polskie\")": 829
+        ":contains(\"Seriale Zagraniczne\")": 922
        ":contains(\"Erotyka\")": 228
        ":contains(\"Książki\")": 25
        ":contains(\"AudioBooki\")": 739
--- a/src/Jackett.Common/Definitions/torrent-explosiv.yml
+++ b/src/Jackett.Common/Definitions/torrent-explosiv.yml
@@ -1,69 +1,63 @@
 ---
-id: torrent-explosiv
-name: Torrent-Explosiv
-description: "Torrent-Explosiv (T-E) is a German Private Torrent Tracker for TV / MOVIES / GENERAL"
+id: explosiv-world
+replaces:
+  - torrent-explosiv
+name: Explosiv-World
+description: "Explosiv-World (E-W) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: de-DE
 type: private
 encoding: UTF-8
 links:
-  - https://torrent-explosiv.me/
+  - https://explosiv-world.biz/
 legacylinks:
  - https://torrent-explosiv.eu/
  - https://torrent-explosiv.hopto.org/
+  - https://torrent-explosiv.me/

 caps:
  categorymappings:
    - {id: 114, cat: Movies/UHD, desc: "Filme > UHD"}
    - {id: 32, cat: Movies/HD, desc: "Filme > HD"}
    - {id: 28, cat: Movies/SD, desc: "Filme > SD"}
-    - {id: 148, cat: Movies/DVD, desc: "Filme > DVD/HD2DVD"}
-    - {id: 151, cat: Movies/Other, desc: "Filme > Anime"}
-    - {id: 138, cat: Movies/UHD, desc: "Filme > Pack UHD"}
-    - {id: 140, cat: Movies/HD, desc: "Filme > Pack HD"}
-    - {id: 147, cat: Movies/SD, desc: "Filme > Pack SD"}
+    - {id: 145, cat: Movies/UHD, desc: "Filme > Pack UHD"}
+    - {id: 138, cat: Movies/HD, desc: "Filme > Pack HD"}
+    - {id: 140, cat: Movies/SD, desc: "Filme > Pack SD"}
+    - {id: 143, cat: Movies/Other, desc: "Filme > Anime"}
    - {id: 139, cat: TV/UHD, desc: "Serien > UHD"}
    - {id: 57, cat: TV/HD, desc: "Serien > HD"}
    - {id: 60, cat: TV/SD, desc: "Serien > SD"}
-    - {id: 152, cat: TV/Anime, desc: "Serien > Anime"}
-    - {id: 59, cat: TV/UHD, desc: "Serien > Pack UHD"}
-    - {id: 149, cat: TV/HD, desc: "Serien > Pack HD"}
-    - {id: 150, cat: TV/SD, desc: "Serien > Pack SD"}
+    - {id: 144, cat: TV/Anime, desc: "Serien > Anime"}
+    - {id: 146, cat: TV/UHD, desc: "Serien > Pack UHD/HD"}
+    - {id: 59, cat: TV/SD, desc: "Serien > Pack SD"}
    - {id: 110, cat: Audio, desc: "Audio > Alben"}
-    - {id: 48, cat: Audio, desc: "Audio > Sampler/OST"}
-    - {id: 155, cat: Audio, desc: "Audio > Mixe"}
-    - {id: 63, cat: Audio, desc: "Audio > Charts/Singles"}
-    - {id: 153, cat: Audio/Lossless, desc: "Audio > FLAC"}
+    - {id: 148, cat: Audio, desc: "Audio > Mixe"}
+    - {id: 149, cat: Audio, desc: "Audio > Sampler/OST"}
+    - {id: 150, cat: Audio, desc: "Audio > Charts/Singles"}
+    - {id: 48, cat: Audio/Lossless, desc: "Audio > Flac"}
    - {id: 52, cat: Audio/MP3, desc: "Audio > Pack mp3"}
-    - {id: 154, cat: Audio/Lossless, desc: "Audio > Pack FLAC"}
+    - {id: 147, cat: Audio/Lossless, desc: "Audio > Pack Flac"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Audio > Hörbuch"}
    - {id: 120, cat: Audio/Video, desc: "Audio > Videos"}
-    - {id: 162, cat: Audio/Audiobook, desc: "Audio > ABooks"}
-    - {id: 12, cat: PC/0day, desc: "Software > Windows"}
-    - {id: 125, cat: PC/Mac, desc: "Software > Mac-OSX"}
-    - {id: 11, cat: PC/Mobile-Other, desc: "Software > Mobil"}
-    - {id: 141, cat: PC/Mobile-Other, desc: "Software > Other"}
-    - {id: 17, cat: PC/Games, desc: "Spiele > PC"}
-    - {id: 24, cat: Console, desc: "Spiele > Konsolen"}
+    - {id: 17, cat: PC/Games, desc: "Spiele > Windows"}
+    - {id: 24, cat: Console, desc: "Spiele > Konsole"}
    - {id: 126, cat: Console/Other, desc: "Spiele > Mobil"}
    - {id: 121, cat: Console, desc: "Spiele > andere"}
-    - {id: 159, cat: TV/Sport, desc: "Sport > UHD"}
-    - {id: 61, cat: TV/Sport, desc: "Sport > HD"}
+    - {id: 12, cat: PC/0day, desc: "Software > Windows"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Software > Mobil"}
+    - {id: 141, cat: PC/Mobile-Other, desc: "Software > andere"}
+    - {id: 61, cat: TV/Sport, desc: "Sport > UHD/HD"}
    - {id: 62, cat: TV/Sport, desc: "Sport > SD"}
-    - {id: 156, cat: TV/Documentary, desc: "Doku > UHD"}
-    - {id: 14, cat: TV/Documentary, desc: "Doku > HD"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku > UHD/HD"}
    - {id: 15, cat: TV/Documentary, desc: "Doku > SD"}
-    - {id: 123, cat: TV/Documentary, desc: "Doku > Pack UHD"}
-    - {id: 157, cat: TV/Documentary, desc: "Doku > Pack HD"}
-    - {id: 158, cat: TV/Documentary, desc: "Doku > Pack SD"}
-    - {id: 160, cat: XXX/UHD, desc: "XXX > UHD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku > Pack UHD/HD"}
+    - {id: 151, cat: TV/Documentary, desc: "Doku > Pack SD"}
+    - {id: 96, cat: Books/Other, desc: "ePaper > Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "ePaper > E-Book"}
+    - {id: 137, cat: Books/Mags, desc: "ePaper > Magazine"}
    - {id: 73, cat: XXX/x264, desc: "XXX > HD"}
    - {id: 76, cat: XXX/SD, desc: "XXX > SD"}
    - {id: 75, cat: XXX/Pack, desc: "XXX > Pack"}
-    - {id: 142, cat: XXX/ImageSet, desc: "XXX > Pic´s"}
-    - {id: 161, cat: XXX/Other, desc: "XXX > ePaper"}
-    - {id: 163, cat: Books/Mags, desc: "ePaper > Magazine"}
-    - {id: 96, cat: Books/Other, desc: "ePaper > Zeitungen"}
-    - {id: 136, cat: Books/EBook, desc: "ePaper > E-Book"}
-    - {id: 137, cat: Books/Comics, desc: "ePaper > Comics"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX > andere"}

  modes:
    search: [q]
@@ -76,7 +70,7 @@ settings:
  - name: info_password
    type: info
    label: About Password Expiry
-    default: "T-E has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://torrent-explosiv.me/login.php\" target=\"_blank\">Torrent-Explosiv</a>, and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
+    default: "E-W has an <b>8 week Password Expiry</b> regime. So if the Indexer has stopped working then the first thing you should do is check if your password has expired by login in at <a href=\"https://explosiv-world.biz/login.php\" target=\"_blank\">Explosiv-World</a>, and if necessary use the <b>Passwort anfordern</b> (<i>Request password</i>) button to renew it."
  - name: username
    type: text
    label: Username
@@ -89,7 +83,7 @@ settings:
    default: false
  - name: info_free
    type: info
-    label: About OnlyUpload at T-E
+    label: About OnlyUpload at E-W
    default: "OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech)."

 login:
@@ -97,17 +91,18 @@ login:
  method: form
  form: form
  inputs:
-    username: "{{ .Config.username }}"
+    login_identifier: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
+    loggiin: Einloggen
  error:
-    - selector: div#login_error
+    - selector: div.alert
  test:
    path: index.php
    selector: a[href="logout.php"]

 search:
  paths:
-    # https://torrent-explosiv.me/torrents_search.php?ajax=true&search=&page=1&visible=no&free=no&c114=1&c32=1
+    # https://explosiv-world.biz/torrents_search.php?ajax=true&search=&page=1
    - path: torrents_search.php
      response:
        type: json
--- a/src/Jackett.Common/Definitions/extratorrent-st.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-st.yml
@@ -94,7 +94,7 @@ search:
          args: ["in ", ""]
        - name: trim
    title:
-      selector: a[href^="/torrent/"]
+      selector: a[href^="/torrent/"]:not([href$="comments"])
    details:
      selector: a[href^="/torrent/"]
      attribute: href
--- a/src/Jackett.Common/Definitions/extremlymtorrents.yml
+++ b/src/Jackett.Common/Definitions/extremlymtorrents.yml
@@ -1,189 +0,0 @@
---
-id: extremlymtorrents
-name: ExtremlymTorrents
-description: "ExtremlymTorrents (XTR) is a Semi-Private tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: semi-private
-encoding: UTF-8
-links:
-  - https://extremlymtorrents.ws/
-caps:
-  categorymappings:
-    - {id: 15, cat: Movies/HD, desc: "1080p HD"}
-    - {id: 52, cat: Other/Misc, desc: "2021 xROBOT Extern"}
-    - {id: 40, cat: Movies/UHD, desc: "4K UHD 2160p"}
-    - {id: 48, cat: Audio/Video, desc: "4K | 2160p | Music Video"}
-    - {id: 22, cat: Movies/HD, desc: "720p HD"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Android Apk"}
-    - {id: 28, cat: TV/Anime, desc: "Anime | Japanese"}
-    - {id: 3, cat: PC, desc: "Applications"}
-    - {id: 16, cat: Movies/3D, desc: "BluRay 3D"}
-    - {id: 12, cat: Movies/BluRay, desc: "BluRay HDR"}
-    - {id: 44, cat: Movies, desc: "Bollywood"}
-    - {id: 35, cat: Movies, desc: "BRRip | BDRip | HDRip"}
-    - {id: 36, cat: Movies, desc: "CAMRip | REC"}
-    - {id: 8, cat: Books/EBook, desc: "Comics | EBook"}
-    - {id: 31, cat: TV/Documentary, desc: "DOC's"}
-    - {id: 27, cat: Movies/DVD, desc: "DVD | PAL | NTSC"}
-    - {id: 5, cat: Movies/DVD, desc: "DVDRip"}
-    - {id: 1, cat: PC/Games, desc: "Games PC"}
-    - {id: 32, cat: PC/Mobile-Other, desc: "GPS Navigation"}
-    - {id: 13, cat: TV/HD, desc: "HDTV"}
-    - {id: 43, cat: XXX, desc: "Hentai | Manga"}
-    - {id: 20, cat: PC/Mobile-iOS, desc: "Iphone iOS"}
-    - {id: 9, cat: TV, desc: "Kidz | Cartoons"}
-    - {id: 23, cat: PC, desc: "Linux"}
-    - {id: 7, cat: PC/Mac, desc: "Mac"}
-    - {id: 6, cat: Audio, desc: "Music Mp3 | FLAC"}
-    - {id: 21, cat: Movies, desc: "Pack"}
-    - {id: 30, cat: TV/SD, desc: "PDTV | SDTV"}
-    - {id: 11, cat: XXX, desc: "Porn -[+18]- xXx"}
-    - {id: 47, cat: XXX/UHD, desc: "Porn UHD 4K -[+18]- xXx"}
-    - {id: 18, cat: Console/PS3, desc: "PS3 | Playstation 3"}
-    - {id: 46, cat: Console/PS4, desc: "PS4 | PlayStation 4"}
-    - {id: 17, cat: Console/PSP, desc: "PSP | Playstation"}
-    - {id: 39, cat: TV/Sport, desc: "Sport TV"}
-    - {id: 38, cat: Movies, desc: "TS: TeleSync | HD-TS"}
-    - {id: 10, cat: TV, desc: "TV Episode | Season Complete"}
-    - {id: 49, cat: TV/UHD, desc: "TV UHD | 2160p | Episodes"}
-    - {id: 41, cat: TV/WEB-DL, desc: "TVRip"}
-    - {id: 24, cat: Audio/Video, desc: "VideoClip"}
-    - {id: 45, cat: Audio, desc: "Vinyl Rip"}
-    - {id: 14, cat: Other, desc: "Wallpapers"}
-    - {id: 25, cat: Movies/WEB-DL, desc: "WEBRip | WEB-DL"}
-    - {id: 26, cat: Console/Wii, desc: "Wii Games"}
-    - {id: 29, cat: PC/0day, desc: "Windows PC"}
-    - {id: 42, cat: Other/Misc, desc: "X EXTERN ONLY MAGNET"}
-    - {id: 2, cat: Console/XBox 360, desc: "XBOX 360"}
-    - {id: 50, cat: XXX/ImageSet, desc: "xXx iMAGESET (+18)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: span.titlebar:contains("Access Denied")
-      message:
-        selector: td.text
-  test:
-    path: index.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 all 1 English 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-
-  rows:
-    selector: table.xtrz > tbody > tr[class^="ttable_col"]
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    _language:
-      selector: td:nth-last-child(5)
-    _vip:
-      selector: img[src="/images/vip-icon.png"]
-      attribute: alt
-      optional: true
-    title:
-      selector: a[href^="file.php?id="] b
-      filters:
-        - name: append
-          args: " {{ .Result._language }}{{ if .Result._vip }} VIP ONLY{{ else }}{{ end }}"
-    details:
-      selector: a[href^="file.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="file.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-        - name: replace
-          args: ["/pic/uploadimage.jpg", ""]
-    date:
-      selector: td:nth-last-child(1)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd.MM.yyyyHH:mm:ss"
-    leechers:
-      selector: td:nth-last-child(2)
-    seeders:
-      selector: td:nth-last-child(3)
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        img[src="/images/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    genre:
-      # Drama, Romance | N/A | 2022 | 112 min | N/A
-      # Drama:Family:Romance
-      selector: td:nth-child(2)
-      remove: a
-      filters:
-        - name: split
-          args: ["|", 0]
-        - name: re_replace
-          args: ["\\bn\\\\a\\b", ""]
-    description:
-      text: "{{ .Result.genre }}{{ if .Result._vip }}</br>VIP ONLY{{ else }}{{ end }}"
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# engine n/a
--- a/src/Jackett.Common/Definitions/exttorrents.yml
+++ b/src/Jackett.Common/Definitions/exttorrents.yml
@@ -75,8 +75,8 @@ caps:

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

@@ -103,19 +103,21 @@ search:
  paths:
    # https://ext.to/browse/?sort=age&order=desc&age=4&with_adult=1
    # https://ext.to/browse/?sort=age&order=desc&q=wipeout&with_adult=1
+    # https://ext.to/browse/?imdb_id=tt2693776
    - path: browse/
    - path: browse/
      inputs:
        page: 2
      followredirect: true
  inputs:
-    q: "{{ .Keywords }}"
+    q: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    sort: "{{ .Config.sort }}"
    order: "{{ .Config.type }}"
    # 0=last 24 hours, 1=last 3 days, 2=last week, 3=last 2 weeks, 4=last month
-    age: "{{ if .Keywords }}{{ else }}0{{ end }}"
+    age: "{{ if or .Keywords .Query.IMDBID }}{{ else }}0{{ end }}"
    # familysafe 0=enabled, 1=disabled
-    with_adult: 1
+    with_adult: "{{ if .Query.IMDBID }}{{ else }}1{{ end }}"
+    imdb_id: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}"

  rows:
    selector: table.table-striped > tbody > tr
--- a/Show More
+++ b/Show More