world-of-tomorrow: expired CA

digitalcore: hawke-uno: Fix searching by season/episode in combo with imdbid (#13809 )
hebits: switch to json. resolves #13808
2025-09-09 21:24:42 +02:00 · 2022-12-26 15:21:33 +13:00 · 2022-12-26 12:36:40 +13:00 · 2022-12-26 07:02:55 +13:00 · 2022-12-25 06:30:20 +00:00 · 2022-12-25 16:32:03 +13:00
30 changed files with 404 additions and 510 deletions
--- a/README.md
+++ b/README.md
@@ -271,7 +271,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BeyondHD (BHD)
 * Bibliotik
 * Bit-Bázis
- * Bit-City Reloaded
 * BIT-HDTV
 * Bitded
 * Bithorlo (BHO)
@@ -411,7 +410,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * leech24
 * LegacyHD (HD4Free)
 * LemonHD
- * Libble [![(invite needed)][inviteneeded]](#)
+ * Libble
 * LibraNet (LN)
 * LinkoManija [![(invite needed)][inviteneeded]](#)
 * Locadora
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -917,8 +917,7 @@ function doErrorNotify(indexerId, errorMessage, errorEvent) {
    var githubTemplate = "?template=bug_report.yml&"
    if (errorMessage.includes("FlareSolverr")) {
      githubRepo = "FlareSolverr/FlareSolverr";
-      githubText = "FlareSolverr";
-      githubTemplate = "?"
+      githubText = "FlareSolverr"
    }
    var githubUrl = "https://github.com/" + githubRepo + "/issues/new" + githubTemplate + "title=[" + indexerId + "] (" + errorEvent + ")";
    var indexEnd = 2000 - githubUrl.length; // keep url <= 2k #5104
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -756,6 +756,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20221003"></script>
+    <script type="text/javascript" src="../custom.js?changed=20221221"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -125,9 +125,15 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
+    poster:
+      selector: img.lazyload
+      attribute: data-src
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(5) > span[title]
      attribute: title
      optional: true
      filters:
@@ -137,7 +143,7 @@ search:
          args: "2006-01-02 15:04:05 -07:00"
    date_added:
      # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(5):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -147,13 +153,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(6)
    seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(7)
    leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(8)
    grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(9)
    downloadvolumefactor:
      case:
        img.pro_free: 0
--- a/src/Jackett.Common/Definitions/animeclipse.yml
+++ b/src/Jackett.Common/Definitions/animeclipse.yml
@@ -2,7 +2,7 @@
 id: animeclipse
 name: AnimeClipse
 description: "AnimeClipse is a Public site for Hellenic Fansubs Anime."
-language: en-US
+language: el-GR
 type: public
 encoding: UTF-8
 links:
--- a/src/Jackett.Common/Definitions/anthelion-api.yml
+++ b/src/Jackett.Common/Definitions/anthelion-api.yml
@@ -84,6 +84,9 @@ search:
      selector: container
    _media:
      selector: media
+      filters:
+        - name: replace
+          args: ["WEB", "WEB-DL"]
    _resolution:
      selector: resolution
    _audioFormat:
@@ -100,13 +103,18 @@ search:
    _language:
      selector: language
      optional: true
+    _releaseGroup:
+      selector: releaseGroup
+      optional: true
+      filters:
+        - name: trim
    title:
      selector: title
      filters:
        - name: replace
          args: ["&#39;", "'"]
        - name: append
-          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
+          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}{{ if and (.Result._releaseGroup) (ne .Result._releaseGroup \"NULL\") }} -{{ .Result._releaseGroup }}{{ else }}{{ end }}"
    details:
      selector: guid
    download:
--- a/src/Jackett.Common/Definitions/bitcityreloaded.yml
+++ b/src/Jackett.Common/Definitions/bitcityreloaded.yml
@@ -1,161 +0,0 @@
---
-id: bitcityreloaded
-name: Bit-City Reloaded
-description: "Bit-City Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
-type: private
-encoding: ISO-8859-1
-links:
-  - https://bc-reloaded.net/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Anderes"}
-    - {id: 34, cat: PC, desc: "Appz/Linux"}
-    - {id: 35, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 36, cat: PC, desc: "Appz/Other"}
-    - {id: 20, cat: PC/0day, desc: "Appz/Win"}
-    - {id: 4, cat: Books/EBook, desc: "EBooks"}
-    - {id: 10, cat: PC/Games, desc: "Games/PC"}
-    - {id: 15, cat: PC/Mobile-Android, desc: "Handy & PDA"}
-    - {id: 16, cat: Audio/Audiobook, desc: "Hörspiel/Hörbuch"}
-    - {id: 30, cat: Movies/Foreign, desc: "International"}
-    - {id: 43, cat: Movies/3D, desc: "Movie/3D"}
-    - {id: 6, cat: Movies/HD, desc: "Movie/HD 1080p"}
-    - {id: 7, cat: Movies/HD, desc: "Movie/HD 720p"}
-    - {id: 17, cat: Movies/Other, desc: "Movie/MegaPack"}
-    - {id: 9, cat: Movies/SD, desc: "Movie/SD"}
-    - {id: 26, cat: XXX, desc: "Movie/XXX"}
-    - {id: 41, cat: XXX/Other, desc: "Movie/XXX/Other"}
-    - {id: 42, cat: XXX/Pack, desc: "Movie/XXX/Pack"}
-    - {id: 45, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 33, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 19, cat: Audio/Video, desc: "Musik Videos"}
-    - {id: 18, cat: Audio, desc: "Musik/MP3/Flac"}
-    - {id: 13, cat: Console/WiiU, desc: "Nintendo"}
-    - {id: 12, cat: Console/PS4, desc: "Playstation"}
-    - {id: 22, cat: TV/HD, desc: "Serie/HD"}
-    - {id: 38, cat: TV, desc: "Serie/Pack"}
-    - {id: 23, cat: TV/SD, desc: "Serie/SD"}
-    - {id: 25, cat: TV/Sport, desc: "Sport"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeds: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Anzahl der Torrents beim Durchsuchen</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login/index.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div#login_error
-  test:
-    path: /
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://bc-reloaded.net/uebersicht.php?c7=1&c17=1&showsearch=1&search=2021+720p&blah=0&incldead=1&orderby=added&sort=desc
-    - path: uebersicht.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    showsearch: 1
-    search: "{{ .Keywords }}"
-    # 0 name, 1 descr, 2 both, 3 noDVDRip
-    blah: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-    # site does not support imdbid searching or display imdb links in results.
-
-  rows:
-    selector: "table.tableinborder[cellpadding=0] > tbody > tr{{ if .Config.freeleech }}:has(img[src$=\"torrent_ou.gif\"]){{ else }}{{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="uebersicht.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php"]
-      attribute: href
-    date:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(5)
-      filters:
-        - name: re_replace
-          args: ["\u00a0", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
-    size:
-      selector: table tbody tr:nth-of-type(2) > td > b
-    files:
-      selector: td:has(a[href*="&filelist=1"])> b:nth-child(2)
-    grabs:
-      selector: td:has(a[href*="&tosnatchers=1"])> b:nth-child(1)
-    seeders:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(1) font
-    leechers:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(2) font
-    downloadvolumefactor:
-      case:
-        img[src$="torrent_ou.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="torrent_2u.gif"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.7
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine n/a
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://blutopia.cc/
+legacylinks:
  - https://blutopia.xyz/

 caps:
@@ -27,7 +29,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://blutopia.xyz/\" target =_blank>Blutopia</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://blutopia.cc/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/broadcity.yml
+++ b/src/Jackett.Common/Definitions/broadcity.yml
@@ -25,7 +25,6 @@ caps:
    - {id: 5, cat: Movies/WEB-DL, desc: "HD - WEB-DL"}
    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
    - {id: 40, cat: Movies/HD, desc: "PTer"}
-    - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
    - {id: 9, cat: Movies/SD, desc: "SD"}
    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
    - {id: 10, cat: Movies/DVD, desc: "SD - DVD"}
@@ -60,12 +59,19 @@ login:
    path: index.php
    selector: a[href*="/logout.php?logouthash="]

+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href*="download.php?id="]
+      attribute: href
+
 search:
  paths:
    - path: browse.php
-  keywordsfilters:
-    - name: re_replace # E01 to BL01
-      args: ["(?i)\\bE(\\d+)\\b", "E$1"]
  inputs:
    # does not support multi categories so defaulting to ALL
    do: search
@@ -86,14 +92,11 @@ search:
          args: category
    title:
      selector: div[id^="port-target-"] a
-      filters:
-        - name: re_replace # BL01 to E01
-          args: ["(?i)\\bBL(\\d+)\\b", " E$1 "]
    details:
      selector: div[id^="port-target-"] a
      attribute: href
    download:
-      selector: a[href*="download.php?id="]
+      selector: div[id^="port-target-"] a
      attribute: href
    poster:
      selector: div[id^="port-content-"] img
--- a/src/Jackett.Common/Definitions/desitorrents-api.yml
+++ b/src/Jackett.Common/Definitions/desitorrents-api.yml
@@ -73,7 +73,7 @@ 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
    api_token: "{{ .Config.apikey }}"
    name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
@@ -98,6 +98,8 @@ search:
      selector: details_link
    download:
      selector: download_link
+    infohash:
+      selector: info_hash
    poster:
      selector: meta.poster
      filters:
@@ -154,9 +156,10 @@ search:
      case:
        0: 1 # normal
        1: 2 # double
-    minimumratio:
-      text: 1.0
+# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 6.4.1 (custom)
+# json UNIT3D 6.5.0 (custom)
--- a/src/Jackett.Common/Definitions/digitalcore.yml
+++ b/src/Jackett.Common/Definitions/digitalcore.yml
@@ -110,7 +110,7 @@ search:
    limit: 100
    order: "{{ .Config.type }}"
    page: search
-    searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }} {{ else }}{{ end }}{{ .Keywords }}"
    section: all
    sort: "{{ .Config.sort }}"
    stereoscopic: false
--- a/src/Jackett.Common/Definitions/hawke-uno.yml
+++ b/src/Jackett.Common/Definitions/hawke-uno.yml
@@ -61,10 +61,24 @@ search:
  paths:
    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
      response:
        type: json

+  inputs:
+    # 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
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
  rows:
    selector: data
    attribute: attributes
--- a/src/Jackett.Common/Definitions/hebits.yml
+++ b/src/Jackett.Common/Definitions/hebits.yml
@@ -61,11 +61,15 @@ login:
  inputs:
    cookie: "{{ .Config.cookie }}"
  test:
-    path: torrents.php
+    path: /
+    selector: a[href*="/logout.php?auth="]

 search:
  paths:
-    - path: torrents.php
+    - path: ajax.php
+      response:
+        type: json
+
  inputs:
    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    order_by: "{{ .Config.sort }}"
@@ -74,29 +78,21 @@ search:
    imdblt: 10
    # 1 freeleech, 2 neutral, 3 50%, 4 2x, 5 3x, 9 75%, 11 only perks, 0 normal
    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    action: advanced
-    searchsubmit: 1
+    action: browse
    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"

  rows:
-    selector: .torrent
+    selector: response.results
+    attribute: torrents
+    multiple: true

  fields:
+    _id:
+      selector: torrentId
    category:
-      selector: .tooltip
-      case:
-        "div[class*=\"movies\"]": 1
-        "div[class*=\"tv\"]": 2
-        "div[class*=\"theater\"]": 3
-        "div[class*=\"software\"]": 4
-        "div[class*=\"games\"]": 5
-        "div[class*=\"music\"]": 6
-        "div[class*=\"books\"]": 7
-        "div[class*=\"packs\"]": 8
-        "div[class*=\"porno\"]": 9
-        "div[class*=\"other\"]": 10
+      selector: ..categoryID
    title_notenglish:
-      selector: .torrent_info:not(:contains("a")):not(:contains("e")):not(:contains("i")):not(:contains("o")):not(:contains("u")):not(:contains("y"))
+      selector: release:not(:contains("a")):not(:contains("e")):not(:contains("i")):not(:contains("o")):not(:contains("u")):not(:contains("y"))
      optional: true
      filters:
        # space out the book language at the end of the title
@@ -106,7 +102,7 @@ search:
        - name: re_replace
          args: ["(עברית)$", " - עברית"] # Hebrew
    title_english:
-      selector: .torrent_info
+      selector: release
      optional: true
      filters:
        - name: append
@@ -116,54 +112,59 @@ search:
    title:
      text: "{{ if .Result.title_notenglish }}{{ .Result.title_notenglish }}{{ else }}{{ .Result.title_english }}{{ end }}"
    details:
-      selector: a[href*="torrentid"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet"]
-      attribute: href
-      optional: true
+      text: "{{ .Config.sitelink }}torrents.php?torrentid={{ .Result._id }}"
    download:
-      selector: a[href^="torrents.php?action=download"]
-      attribute: href
+      text: "{{ .Config.sitelink }}torrents.php?action=download&id={{ .Result._id }}"
    poster:
-      selector: a[data-cover^="/images/"]
-      attribute: data-cover
+      selector: ..cover
+    imdbid:
+      selector: ..catalogue
    files:
-      selector: td:nth-child(4)
+      selector: fileCount
    date:
-      selector: td:nth-child(5) span
-      attribute: title
+      selector: time
      filters:
        - name: append
          args: " +02:00" # IST
        - name: dateparse
-          args: "02/01/2006, 15:04 -07:00"
+          args: "2006-01-02 15:04:05 -07:00"
    size:
-      selector: td:nth-child(6)
+      selector: size
    grabs:
-      selector: td:nth-child(7)
+      selector: snatches
    seeders:
-      selector: td:nth-child(8)
+      selector: seeders
    leechers:
-      selector: td:nth-child(9)
+      selector: leechers
+    description:
+      selector: ..tags
+    _half:
+      selector: isHalfFreeleech
+    _free:
+      selector: isFreeleech
+    _x2:
+      selector: isUploadX2
+    _x3:
+      selector: isUploadX3
+    _quarter:
+      selector: isQuarterLeech
+    _neutral:
+      selector: isNeutralLeech
+    _personal:
+      selector: isPersonalFreeleech
+    downloadvolumefactor_special:
+      optional: true
+      text: "{{ if eq .Result._half \"True\" }}0.5{{ else }}{{ end }}{{ if eq .Result._quarter \"True\" }}0.25{{ else }}{{ end }}{{ if eq .Result._neutral \"True\" }}0{{ else }}{{ end }}{{ if eq .Result._free \"True\" }}0{{ else }}{{ end }}{{ if eq .Result._personal \"True\" }}0{{ else }}{{ end }}"
    downloadvolumefactor:
-      case:
-        "strong.tl_notice[title*=\"חצי פריליץ'\"]": 0.5 # 50%
-        "strong.tl_notice[title*=\"75% פריליץ'!\"]": 0.25 # 75%
-        "strong.tl_notice[title*=\"נטרלי\"]": 0 # neutral
-        "strong.tl_notice[title*=\"פריליץ'\"]": 0 # freeleech
-        "*": 1
+      text: "{{ if .Result.downloadvolumefactor_special }}{{ .Result.downloadvolumefactor_special }}{{ else }}1{{ end }}"
+    uploadvolumefactor_special:
+      optional: true
+      text: "{{ if eq .Result._x3 \"True\" }}3{{ else }}{{ end }}{{ if eq .Result._x2 \"True\" }}2{{ else }}{{ end }}{{ if eq .Result._neutral \"True\" }}0{{ else }}{{ end }}"
    uploadvolumefactor:
-      case:
-        "strong.tl_notice[title*=\"העלאה משולשת\"]": 3 # 3x
-        "strong.tl_notice[title*=\"העלאה כפולה\"]": 2 # 2x
-        "strong.tl_notice[title*=\"נטרלי\"]": 0 # neutral
-        "*": 1
+      text: "{{ if .Result.uploadvolumefactor_special }}{{ .Result.uploadvolumefactor_special }}{{ else }}1{{ end }}"
    minimumratio:
      text: 1.0
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-    description:
-      selector: div.tags
-# Gazelle
+# JSON Gazelle
--- a/src/Jackett.Common/Definitions/reelflix-api.yml
+++ b/src/Jackett.Common/Definitions/reelflix-api.yml
@@ -72,7 +72,7 @@ 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
    api_token: "{{ .Config.apikey }}"
    name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
@@ -100,7 +100,7 @@ search:
    infohash:
      selector: info_hash
    poster:
-      selector: poster
+      selector: meta.poster
      filters:
        - name: replace
          args: ["https://via.placeholder.com/90x135", ""]
@@ -110,6 +110,17 @@ search:
      selector: tmdb_id
    tvdbid:
      selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
    files:
      selector: num_file
    seeders:
@@ -146,4 +157,4 @@ search:
        1: 2 # double
    minimumratio:
      text: 1.0
-# json UNIT3D 6.1.0
+# json UNIT3D 6.5.0
--- a/src/Jackett.Common/Definitions/rgfootball.yml
+++ b/src/Jackett.Common/Definitions/rgfootball.yml
@@ -11,53 +11,103 @@ links:
 caps:
  categorymappings:
    # VIP-Архив / VIP-Archive
-    - {id: 224, cat: TV/Sport, desc: "VIP January 2021"}
-    - {id: 225, cat: TV/Sport, desc: "VIP February 2021"}
-    - {id: 402, cat: TV/Sport, desc: "VIP March 2021"}
-    - {id: 403, cat: TV/Sport, desc: "VIP April 2021"}
-    - {id: 408, cat: TV/Sport, desc: "VIP May 2021"}
-    - {id: 409, cat: TV/Sport, desc: "VIP June 2021"}
-    - {id: 436, cat: TV/Sport, desc: "VIP July 2021"}
-    - {id: 438, cat: TV/Sport, desc: "VIP August 2021"}
-    - {id: 448, cat: TV/Sport, desc: "VIP September 2021"}
-    - {id: 449, cat: TV/Sport, desc: "VIP October 2021"}
-    - {id: 450, cat: TV/Sport, desc: "VIP November 2021"}
-    - {id: 451, cat: TV/Sport, desc: "VIP December 2021"}
-    - {id: 235, cat: TV/Sport, desc: "VIP January 2020"}
-    - {id: 247, cat: TV/Sport, desc: "VIP February 2020"}
-    - {id: 250, cat: TV/Sport, desc: "VIP March 2020"}
-    - {id: 252, cat: TV/Sport, desc: "VIP April 2020"}
-    - {id: 273, cat: TV/Sport, desc: "VIP May 2020"}
-    - {id: 275, cat: TV/Sport, desc: "VIP June 2020"}
-    - {id: 375, cat: TV/Sport, desc: "VIP July 2020"}
-    - {id: 378, cat: TV/Sport, desc: "VIP August 2020"}
-    - {id: 382, cat: TV/Sport, desc: "VIP September 2020"}
-    - {id: 384, cat: TV/Sport, desc: "VIP October 2020"}
-    - {id: 385, cat: TV/Sport, desc: "VIP November 2020"}
-    - {id: 386, cat: TV/Sport, desc: "VIP December 2020"}
+    - {id: 235, cat: TV/Sport, desc: " |- VIP January 2022"}
+    - {id: 247, cat: TV/Sport, desc: " |- VIP February 2022"}
+    - {id: 250, cat: TV/Sport, desc: " |- VIP March 2022"}
+    - {id: 252, cat: TV/Sport, desc: " |- VIP April 2022"}
+    - {id: 273, cat: TV/Sport, desc: " |- VIP May 2022"}
+    - {id: 275, cat: TV/Sport, desc: " |- VIP June 2022"}
+    - {id: 375, cat: TV/Sport, desc: " |- VIP July 2022"}
+    - {id: 378, cat: TV/Sport, desc: " |- VIP August 2022"}
+    - {id: 382, cat: TV/Sport, desc: " |- VIP September 2022"}
+    - {id: 384, cat: TV/Sport, desc: " |- VIP October 2022"}
+    - {id: 385, cat: TV/Sport, desc: " |- VIP November 2022"}
+    - {id: 386, cat: TV/Sport, desc: " |- VIP December 2022"}
+    - {id: 224, cat: TV/Sport, desc: " |- VIP January 2021"}
+    - {id: 225, cat: TV/Sport, desc: " |- VIP February 2021"}
+    - {id: 402, cat: TV/Sport, desc: " |- VIP March 2021"}
+    - {id: 403, cat: TV/Sport, desc: " |- VIP April 2021"}
+    - {id: 408, cat: TV/Sport, desc: " |- VIP May 2021"}
+    - {id: 409, cat: TV/Sport, desc: " |- VIP June 2021"}
+    - {id: 436, cat: TV/Sport, desc: " |- VIP July 2021"}
+    - {id: 438, cat: TV/Sport, desc: " |- VIP August 2021"}
+    - {id: 448, cat: TV/Sport, desc: " |- VIP September 2021"}
+    - {id: 449, cat: TV/Sport, desc: " |- VIP October 2021"}
+    - {id: 450, cat: TV/Sport, desc: " |- VIP November 2021"}
+    - {id: 451, cat: TV/Sport, desc: " |- VIP December 2021"}
+    # Олимпийские игры / Olympic Games
+    - {id: 465, cat: TV/Sport, desc: "Зимние Олимпийские игры 2022 /..."}
+    - {id: 473, cat: TV/Sport, desc: " |- Церемонии"}
+    - {id: 483, cat: TV/Sport, desc: " |- Биатлон"}
+    - {id: 485, cat: TV/Sport, desc: " |- Фигурное катание"}
+    - {id: 467, cat: TV/Sport, desc: " |- Лыжный спорт"}
+    - {id: 474, cat: TV/Sport, desc: " |- Хоккей"}
+    - {id: 475, cat: TV/Sport, desc: " |- Конькобежный спорт/Шорт-трек"}
+    - {id: 484, cat: TV/Sport, desc: " |- Бобслей/Санный спорт/Скелетон"}
+    - {id: 481, cat: TV/Sport, desc: " |- Сноуборд/Фристайл/Кёрлинг"}
+    - {id: 482, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
+    - {id: 476, cat: TV/Sport, desc: " |- Архив - Олимпиады прошлых лет"}
+    - {id: 464, cat: TV/Sport, desc: "Летние Олимпийские игры / Summer..."}
+    - {id: 486, cat: TV/Sport, desc: " |- Церемонии"}
+    - {id: 487, cat: TV/Sport, desc: " |- Футбол"}
+    - {id: 489, cat: TV/Sport, desc: " |- Баскетбол"}
+    - {id: 491, cat: TV/Sport, desc: " |- Волейбол"}
+    - {id: 500, cat: TV/Sport, desc: " |- Гандбол"}
+    - {id: 488, cat: TV/Sport, desc: " |- Теннис"}
+    - {id: 490, cat: TV/Sport, desc: " |- Бокс"}
+    - {id: 331, cat: TV/Sport, desc: " |- Лёгкая атлетика"}
+    - {id: 330, cat: TV/Sport, desc: " |- Тяжёлая атлетика"}
+    - {id: 329, cat: TV/Sport, desc: " |- Водные виды спорта и гребля"}
+    - {id: 323, cat: TV/Sport, desc: " |- Велоспорт"}
+    - {id: 324, cat: TV/Sport, desc: " |- Гимнастика"}
+    - {id: 327, cat: TV/Sport, desc: " |- Борьба и единоборства"}
+    - {id: 292, cat: TV/Sport, desc: " |- Другие виды спорта"}
+    - {id: 304, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
    # Футбол / Football
-    - {id: 163, cat: TV/Sport, desc: "EURO 2020 / Чемпионат Европы 2020"}
-    - {id: 528, cat: TV/Sport, desc: " |- VIP-Extra 4K EURO 2020"}
-    - {id: 521, cat: TV/Sport, desc: " |- VIP-Extra SAT FEED EURO 2020"}
-    - {id: 216, cat: TV/Sport, desc: " |- VIP UEFA EURO 2020"}
-    - {id: 497, cat: TV/Sport, desc: " |- VIP-Light UEFA EURO 2020"}
-    - {id: 395, cat: TV/Sport, desc: " |- UEFA EURO 2020"}
-    - {id: 447, cat: TV/Sport, desc: " |- UEFA EURO 2020 qualifying"}
-    - {id: 426, cat: TV/Sport, desc: " |- VIP-Extra UEFA EURO 2020 qualifying"}
    - {id: 580, cat: TV/Sport, desc: "FIFA WC 2022 / Чемпионат мира 2022"}
-    - {id: 234, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2022"}
+    - {id: 515, cat: TV/Sport, desc: " |- VIP-Extra FIFA SATFEEDS WC 2022"}
+    - {id: 234, cat: TV/Sport, desc: " |- VIP-Extra FIFA 4K WC 2022"}
    - {id: 583, cat: TV/Sport, desc: " |- VIP FIFA WC 2022"}
    - {id: 525, cat: TV/Sport, desc: " |- VIP-Light FIFA WC 2022"}
    - {id: 581, cat: TV/Sport, desc: " |- FIFA WC 2022"}
    - {id: 582, cat: TV/Sport, desc: " |- FIFA WC 2022. Qualifiers"}
+    - {id: 163, cat: TV/Sport, desc: "EURO 2020 / Чемпионат Европы 2020"}
+    - {id: 528, cat: TV/Sport, desc: " |- VIP-Extra 4K EURO 2020"}
+    - {id: 521, cat: TV/Sport, desc: " |- VIP-Extra SAT FEED EURO 2020"}
+    - {id: 216, cat: TV/Sport, desc: " |- VIP-Archive UEFA EURO 2020"}
+    - {id: 497, cat: TV/Sport, desc: " |- VIP-Light UEFA EURO 2020"}
+    - {id: 395, cat: TV/Sport, desc: " |- UEFA EURO 2020"}
+    - {id: 447, cat: TV/Sport, desc: " |- UEFA EURO 2020 qualifying"}
+    - {id: 426, cat: TV/Sport, desc: " |- VIP-Extra UEFA EURO 2020 qualifying"}
    - {id: 432, cat: TV/Sport, desc: "FIFA WC 2018 / Чемпионат мира 2018"}
    - {id: 535, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2018 4K"}
    - {id: 559, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2018 Sat Feed"}
-    - {id: 574, cat: TV/Sport, desc: " |- VIP FIFA WC 2018"}
+    - {id: 574, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC 2018"}
    - {id: 185, cat: TV/Sport, desc: " |- FIFA WC 2018"}
    - {id: 136, cat: TV/Sport, desc: " |- FIFA WC 2018. Qualifiers"}
    - {id: 217, cat: TV/Sport, desc: " |- FIFA WC 2018. Reviews"}
    - {id: 458, cat: TV/Sport, desc: " |- VIP-Extra Archive FIFA WC 2018 Qualifiers"}
+    - {id: 452, cat: TV/Sport, desc: "2022-23 UEFA Champions League"}
+    - {id: 558, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
+    - {id: 346, cat: TV/Sport, desc: " |- VIP-Extra UCL 2022-23"}
+    - {id: 415, cat: TV/Sport, desc: " |- VIP UCL 2022-23"}
+    - {id: 569, cat: TV/Sport, desc: " |- VIP-Light UCL 2022-23"}
+    - {id: 158, cat: TV/Sport, desc: " |- Qualifying Rounds"}
+    - {id: 159, cat: TV/Sport, desc: " |- Group stage"}
+    - {id: 232, cat: TV/Sport, desc: " |- Play-off"}
+    - {id: 160, cat: TV/Sport, desc: "2022-23 UEFA Europa League"}
+    - {id: 347, cat: TV/Sport, desc: " |- VIP-Extra UEL 2022-23"}
+    - {id: 570, cat: TV/Sport, desc: " |- VIP-Light UEL 2022-23"}
+    - {id: 161, cat: TV/Sport, desc: " |- Qualifying Rounds"}
+    - {id: 162, cat: TV/Sport, desc: " |- Group stage"}
+    - {id: 231, cat: TV/Sport, desc: " |- Play-off"}
+    - {id: 48, cat: TV/Sport, desc: "2022–23 UEFA Europa Conference League"}
+    - {id: 419, cat: TV/Sport, desc: " |- VIP-Extra UEFA ECL"}
+    - {id: 442, cat: TV/Sport, desc: " |- VIP 2022-23 UEFA Europa Conference League"}
+    - {id: 517, cat: TV/Sport, desc: " |- VIP-Light 2022-23 UEFA Europa Conference League"}
+    - {id: 405, cat: TV/Sport, desc: " |- Qualifying Rounds"}
+    - {id: 536, cat: TV/Sport, desc: " |- Group stage"}
+    - {id: 249, cat: TV/Sport, desc: " |- Play-off"}
    - {id: 578, cat: TV/Sport, desc: "2021-22 UEFA Champions League"}
    - {id: 13, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
    - {id: 511, cat: TV/Sport, desc: " |- VIP-Extra UCL 2021-22"}
@@ -74,104 +124,86 @@ caps:
    - {id: 343, cat: TV/Sport, desc: " |- Group stage"}
    - {id: 341, cat: TV/Sport, desc: " |- Qualifying Rounds"}
    - {id: 315, cat: TV/Sport, desc: "2021–22 UEFA Europa Conference League"}
-    - {id: 419, cat: TV/Sport, desc: " |- VIP-Extra UEFA ECL"}
-    - {id: 442, cat: TV/Sport, desc: " |- VIP 2021–22 UEFA Europa Conference League"}
-    - {id: 517, cat: TV/Sport, desc: " |- VIP-Light 2021–22 UEFA Europa Conference League"}
    - {id: 132, cat: TV/Sport, desc: " |- 2021–22 UEFA Europa Conference League"}
    - {id: 114, cat: TV/Sport, desc: " |- Qualifying Rounds"}
    - {id: 165, cat: TV/Sport, desc: " |- Group stage"}
    - {id: 164, cat: TV/Sport, desc: " |- Play-off"}
-    - {id: 452, cat: TV/Sport, desc: "2020-21 UEFA Champions League"}
-    - {id: 558, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
-    - {id: 346, cat: TV/Sport, desc: " |- VIP-Extra UCL 2020-21"}
-    - {id: 415, cat: TV/Sport, desc: " |- VIP UCL 2020-21"}
-    - {id: 569, cat: TV/Sport, desc: " |- VIP-Light UCL 2020-21"}
-    - {id: 158, cat: TV/Sport, desc: " |- Qualifying Rounds"}
-    - {id: 159, cat: TV/Sport, desc: " |- Group stage"}
-    - {id: 232, cat: TV/Sport, desc: " |- Play-off"}
-    - {id: 160, cat: TV/Sport, desc: "2020-21 UEFA Europa League"}
-    - {id: 347, cat: TV/Sport, desc: " |- VIP-Extra UEL 2020-21"}
-    - {id: 570, cat: TV/Sport, desc: " |- VIP-Light UEL 2020-21"}
-    - {id: 161, cat: TV/Sport, desc: " |- Qualifying Rounds"}
-    - {id: 162, cat: TV/Sport, desc: " |- Group stage"}
-    - {id: 231, cat: TV/Sport, desc: " |- Play-off"}
    - {id: 3, cat: TV/Sport, desc: "Англия/England"}
    - {id: 407, cat: TV/Sport, desc: " |- VIP-Extra 4k England"}
    - {id: 561, cat: TV/Sport, desc: " |- VIP-Extra EPL Classic"}
    - {id: 223, cat: TV/Sport, desc: " |- VIP England"}
    - {id: 553, cat: TV/Sport, desc: " |- VIP-Light England"}
+    - {id: 54, cat: TV/Sport, desc: " |- Premier League 2022-23"}
+    - {id: 412, cat: TV/Sport, desc: " |- National Cups 2022-23"}
+    - {id: 418, cat: TV/Sport, desc: " |- Championship+ 2022-23"}
    - {id: 538, cat: TV/Sport, desc: " |- Premier League 2021-22"}
-    - {id: 412, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 418, cat: TV/Sport, desc: " |- Championship+ 2021-22"}
-    - {id: 54, cat: TV/Sport, desc: " |- Premier League 2020-21"}
    - {id: 351, cat: TV/Sport, desc: " |- Championship+"}
-    - {id: 53, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 53, cat: TV/Sport, desc: " |- National Cups up to 2023"}
    - {id: 55, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 2, cat: TV/Sport, desc: "Россия/СССР - Russia/USSR"}
    - {id: 562, cat: TV/Sport, desc: " |- VIP-Light Russia"}
+    - {id: 57, cat: TV/Sport, desc: " |- RPL 2022-23"}
+    - {id: 496, cat: TV/Sport, desc: " |- FNL 2022-23"}
+    - {id: 423, cat: TV/Sport, desc: " |- National Cups 2022-23"}
    - {id: 251, cat: TV/Sport, desc: " |- RPL 2021-22"}
-    - {id: 423, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 496, cat: TV/Sport, desc: " |- FNL 2021-22"}
-    - {id: 57, cat: TV/Sport, desc: " |- RPL 2020-21"}
-    - {id: 56, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 56, cat: TV/Sport, desc: " |- National Cups up to 2022"}
    - {id: 46, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 8, cat: TV/Sport, desc: "Украина/Ukraine"}
    - {id: 563, cat: TV/Sport, desc: " |- VIP-Light Ukraine"}
+    - {id: 72, cat: TV/Sport, desc: " |- UPL 2022-23"}
+    - {id: 152, cat: TV/Sport, desc: " |- National Cups 2022-23"}
    - {id: 410, cat: TV/Sport, desc: " |- UPL 2021-22"}
-    - {id: 152, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 72, cat: TV/Sport, desc: " |- UPL 2020-21"}
-    - {id: 71, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 71, cat: TV/Sport, desc: " |- National Cups up to 2023"}
    - {id: 348, cat: TV/Sport, desc: " |- Lower leagues"}
    - {id: 70, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 4, cat: TV/Sport, desc: "Испания/Spain"}
    - {id: 516, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed"}
-    - {id: 189, cat: TV/Sport, desc: " |- VIP-Extra Barca 2020-21"}
    - {id: 173, cat: TV/Sport, desc: " |- VIP-Extra Spain Classic"}
    - {id: 506, cat: TV/Sport, desc: " |- VIP-Extra El Clasico"}
    - {id: 208, cat: TV/Sport, desc: " |- VIP Spain"}
    - {id: 564, cat: TV/Sport, desc: " |- VIP-Light Spain"}
+    - {id: 58, cat: TV/Sport, desc: " |- Primera Division 2022-23"}
+    - {id: 424, cat: TV/Sport, desc: " |- National Cups 2022-23"}
    - {id: 194, cat: TV/Sport, desc: " |- Primera Division 2021-22"}
-    - {id: 424, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 58, cat: TV/Sport, desc: " |- Primera Division 2020-21"}
+    - {id: 59, cat: TV/Sport, desc: " |- National Cups up to 2023"}
    - {id: 353, cat: TV/Sport, desc: " |- Segunda, Segunda B"}
-    - {id: 59, cat: TV/Sport, desc: " |- National Cups up to 2021"}
    - {id: 60, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 6, cat: TV/Sport, desc: "Германия/Germany"}
    - {id: 555, cat: TV/Sport, desc: " |- VIP-Extra 4k+ Germany"}
    - {id: 210, cat: TV/Sport, desc: " |- VIP Germany"}
    - {id: 565, cat: TV/Sport, desc: " |- VIP-Light Germany"}
+    - {id: 66, cat: TV/Sport, desc: " |- Bundesliga 2022-23"}
+    - {id: 352, cat: TV/Sport, desc: " |- National Cups 2022-23"}
    - {id: 175, cat: TV/Sport, desc: " |- Bundesliga 2021-22"}
-    - {id: 352, cat: TV/Sport, desc: " |- National Cups 2021-22"}
-    - {id: 66, cat: TV/Sport, desc: " |- Bundesliga 2020-21"}
    - {id: 355, cat: TV/Sport, desc: " |- 2. Bundesliga"}
-    - {id: 65, cat: TV/Sport, desc: " |- National Cups up to 2021"}
+    - {id: 65, cat: TV/Sport, desc: " |- National Cups up to 2022"}
    - {id: 427, cat: TV/Sport, desc: " |- Lower leagues"}
    - {id: 64, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 5, cat: TV/Sport, desc: "Италия/Italy"}
    - {id: 529, cat: TV/Sport, desc: " |- VIP-Extra Italy"}
    - {id: 209, cat: TV/Sport, desc: " |- VIP Italy"}
    - {id: 566, cat: TV/Sport, desc: " |- VIP-Light Italy"}
-    - {id: 63, cat: TV/Sport, desc: " |- Serie A 2020/21"}
-    - {id: 196, cat: TV/Sport, desc: " |- National Cups 2020/21"}
+    - {id: 63, cat: TV/Sport, desc: " |- Serie A 2022-23"}
+    - {id: 196, cat: TV/Sport, desc: " |- National Cups 2022-23"}
+    - {id: 174, cat: TV/Sport, desc: " |- Serie A 2021-22"}
    - {id: 354, cat: TV/Sport, desc: " |- Serie B, Lega Pro, Serie D"}
-    - {id: 174, cat: TV/Sport, desc: " |- Serie A 2019/20"}
-    - {id: 62, cat: TV/Sport, desc: " |- National Cups up to 2020"}
+    - {id: 62, cat: TV/Sport, desc: " |- National Cups up to 2023"}
    - {id: 540, cat: TV/Sport, desc: " |- 1996-97 Juventus Classic"}
    - {id: 61, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 7, cat: TV/Sport, desc: "Франция/France"}
    - {id: 184, cat: TV/Sport, desc: " |- VIP-Extra 4k + Sat Feed"}
-    - {id: 515, cat: TV/Sport, desc: " |- VIP-Extra Ligue 2"}
    - {id: 211, cat: TV/Sport, desc: " |- VIP France"}
    - {id: 567, cat: TV/Sport, desc: " |- VIP-Light France"}
-    - {id: 69, cat: TV/Sport, desc: " |- Ligue 1 2020/21"}
-    - {id: 133, cat: TV/Sport, desc: " |- National Cups 2020/21"}
+    - {id: 69, cat: TV/Sport, desc: " |- Ligue 1 2022-23"}
+    - {id: 133, cat: TV/Sport, desc: " |- National Cups 2022-23"}
+    - {id: 176, cat: TV/Sport, desc: " |- Ligue 1 2021-22"}
    - {id: 428, cat: TV/Sport, desc: " |- Ligue 2"}
-    - {id: 176, cat: TV/Sport, desc: " |- Ligue 1 2019/20"}
-    - {id: 68, cat: TV/Sport, desc: " |- National Cups up to 2020"}
+    - {id: 68, cat: TV/Sport, desc: " |- National Cups up to 2023"}
    - {id: 67, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 188, cat: TV/Sport, desc: "Нидерланды/Netherlands"}
-    - {id: 568, cat: TV/Sport, desc: " |- VIP-Light Netherlands"}
-    - {id: 356, cat: TV/Sport, desc: " |- Season 2020/21"}
+    - {id: 189, cat: TV/Sport, desc: " |- VIP-Extra Eredividie"}
+    - {id: 568, cat: TV/Sport, desc: " |- VIP Netherlands"}
+    - {id: 356, cat: TV/Sport, desc: " |- Season 2022-23"}
    - {id: 190, cat: TV/Sport, desc: " |- National Cups"}
    - {id: 191, cat: TV/Sport, desc: " |- Previous years matches"}
    - {id: 9, cat: TV/Sport, desc: "Другие национальные чемпионаты..."}
@@ -205,18 +237,6 @@ caps:
    - {id: 78, cat: TV/Sport, desc: " |- UEFA Cup"}
    - {id: 79, cat: TV/Sport, desc: " |- Cup Winners Cup"}
    - {id: 80, cat: TV/Sport, desc: " |- Other Compeitions"}
-    - {id: 405, cat: TV/Sport, desc: " |- VIP-Extra UCL 2018-19"}
-    - {id: 536, cat: TV/Sport, desc: " |- VIP-Extra UEL 2018-19"}
-    - {id: 249, cat: TV/Sport, desc: " |- VIP-Extra UCL 2017-18"}
-    - {id: 527, cat: TV/Sport, desc: " |- VIP-Extra UEL 2017-18"}
-    - {id: 202, cat: TV/Sport, desc: " |- VIP-Extra UCL 2016-17"}
-    - {id: 431, cat: TV/Sport, desc: " |- VIP-Extra UEL 2016-17"}
-    - {id: 440, cat: TV/Sport, desc: " |- VIP-Extra UСL 2015-16"}
-    - {id: 381, cat: TV/Sport, desc: " |- VIP-Extra UEL 2015-16"}
-    - {id: 557, cat: TV/Sport, desc: " |- VIP-Extra UCL 2014-15"}
-    - {id: 556, cat: TV/Sport, desc: " |- VIP-Extra UEL 2014-15"}
-    - {id: 514, cat: TV/Sport, desc: " |- VIP-Extra UСL 2013-14"}
-    - {id: 513, cat: TV/Sport, desc: " |- VIP-Extra UEL 2013-14"}
    - {id: 328, cat: TV/Sport, desc: "Лига наций УЕФА / UEFA Nations League"}
    - {id: 530, cat: TV/Sport, desc: " |- VIP-Extra UEFA Nations League"}
    - {id: 201, cat: TV/Sport, desc: " |- VIP UEFA Nations League"}
@@ -228,6 +248,7 @@ caps:
    - {id: 117, cat: TV/Sport, desc: " |- Play-off"}
    - {id: 15, cat: TV/Sport, desc: "Чемпионаты Мира/FIFA World Cups"}
    - {id: 461, cat: TV/Sport, desc: " |- VIP-Extra FIFA WC Classic"}
+    - {id: 509, cat: TV/Sport, desc: " |- VIP-Extra 2019 FIFA U-17 World Cup"}
    - {id: 510, cat: TV/Sport, desc: " |- VIP 2019 FIFA U-17 World Cup"}
    - {id: 443, cat: TV/Sport, desc: " |- VIP-Extra 2019 FIFA U-20 World Cup"}
    - {id: 411, cat: TV/Sport, desc: " |- 2019 FIFA U-20 World Cup"}
@@ -259,29 +280,29 @@ caps:
    - {id: 550, cat: TV/Sport, desc: " |- VIP-Extra AFC Competitions"}
    - {id: 399, cat: TV/Sport, desc: " |- VIP-Extra CAF Competitions"}
    - {id: 524, cat: TV/Sport, desc: " |- VIP-Extra CONCACAF Competitions"}
-    - {id: 463, cat: TV/Sport, desc: " |- 2021 Copa Libertadores"}
-    - {id: 433, cat: TV/Sport, desc: " |- 2021 Copa Sudamericana"}
+    - {id: 463, cat: TV/Sport, desc: " |- 2022 Copa Libertadores"}
+    - {id: 433, cat: TV/Sport, desc: " |- 2022 Copa Sudamericana"}
    - {id: 457, cat: TV/Sport, desc: " |- FIFA Club World Cups"}
    - {id: 472, cat: TV/Sport, desc: " |- CONCACAF Champions League"}
    - {id: 241, cat: TV/Sport, desc: " |- Copa Libertadores"}
    - {id: 367, cat: TV/Sport, desc: " |- Copa Sudamericana"}
    - {id: 390, cat: TV/Sport, desc: " |- AFC Club Competitions"}
    - {id: 10, cat: TV/Sport, desc: "Международные турниры/National Team..."}
-    - {id: 534, cat: TV/Sport, desc: " |- VIP-Extra 2021 CONCACAF Gold Cup"}
-    - {id: 230, cat: TV/Sport, desc: " |- VIP-Extra Copa America 2021"}
-    - {id: 575, cat: TV/Sport, desc: " |- VIP-Light Copa America 2021"}
-    - {id: 422, cat: TV/Sport, desc: " |- 2021 Copa America"}
+    - {id: 462, cat: TV/Sport, desc: " |- VIP-Extra 2022 Africa Cup of Nations"}
+    - {id: 575, cat: TV/Sport, desc: " |- VIP 2022 Africa Cup of Nations"}
    - {id: 466, cat: TV/Sport, desc: " |- VIP-Extra International"}
    - {id: 213, cat: TV/Sport, desc: " |- VIP International"}
-    - {id: 532, cat: TV/Sport, desc: " |- 2020 CONMEBOL Pre-Olympic"}
-    - {id: 507, cat: TV/Sport, desc: " |- 2019 AFC Asian Cup"}
+    - {id: 532, cat: TV/Sport, desc: " |- 2022 Africa Cup of Nations"}
+    - {id: 230, cat: TV/Sport, desc: " |- VIP-Extra Copa America 2021"}
+    - {id: 422, cat: TV/Sport, desc: " |- 2021 Copa America"}
    - {id: 155, cat: TV/Sport, desc: " |- Copa America"}
-    - {id: 435, cat: TV/Sport, desc: " |- CONCACAF Gold Cups"}
+    - {id: 435, cat: TV/Sport, desc: " |- CONCACAF Competitions"}
    - {id: 406, cat: TV/Sport, desc: " |- FIFA Confederations Cups"}
    - {id: 239, cat: TV/Sport, desc: " |- Africa Cup of Nations"}
+    - {id: 507, cat: TV/Sport, desc: " |- AFC Asian Cups"}
    - {id: 393, cat: TV/Sport, desc: " |- Sudamericano U-20"}
+    - {id: 534, cat: TV/Sport, desc: " |- VIP-Extra 2021 CONCACAF Gold Cup"}
    - {id: 560, cat: TV/Sport, desc: " |- VIP-Extra 2019 Sudamericano U-20 + U-17"}
-    - {id: 462, cat: TV/Sport, desc: " |- VIP-Extra 2020 Africa Cup of Nations"}
    - {id: 233, cat: TV/Sport, desc: " |- VIP-Extra 2020 AFC U-23"}
    - {id: 16, cat: TV/Sport, desc: "Товарищеские турниры и матчи/Frie..."}
    - {id: 387, cat: TV/Sport, desc: " |- VIP-Extra Friendlies"}
@@ -297,6 +318,104 @@ caps:
    - {id: 199, cat: TV/Sport, desc: " |- Видео для мобильных устройств"}
    - {id: 86, cat: TV/Sport, desc: " |- Футбольная графика"}
    - {id: 43, cat: TV/Sport, desc: "Аудиопередачи /Футбольное..."}
+    # Спорт / Sport
+    - {id: 23, cat: TV/Sport, desc: "Авто/мотоспорт"}
+    - {id: 131, cat: TV/Sport, desc: " |- Formula 1. Season 2022"}
+    - {id: 492, cat: TV/Sport, desc: " |- Formula 1. Season 2021"}
+    - {id: 400, cat: TV/Sport, desc: " |- Formula 1. Seasons until 2022"}
+    - {id: 21, cat: TV/Sport, desc: "Хоккей"}
+    - {id: 420, cat: TV/Sport, desc: " |- ЧМ 2022 /  IIHF WС 2022"}
+    - {id: 501, cat: TV/Sport, desc: " |- ЧМ 2022 U-20 / IIHF WС 2022 U-20"}
+    - {id: 207, cat: TV/Sport, desc: " |- КХЛ 2022/23"}
+    - {id: 391, cat: TV/Sport, desc: " |- NHL 2022/23"}
+    - {id: 444, cat: TV/Sport, desc: " |- КХЛ 2021/22"}
+    - {id: 445, cat: TV/Sport, desc: " |- NHL 2021/22"}
+    - {id: 151, cat: TV/Sport, desc: " |- NHL до 2021"}
+    - {id: 47, cat: TV/Sport, desc: " |- КХЛ до 2021"}
+    - {id: 460, cat: TV/Sport, desc: " |- World Championships until 2022"}
+    - {id: 206, cat: TV/Sport, desc: " |- European club championships"}
+    - {id: 222, cat: TV/Sport, desc: " |- Euro Hockey Tour"}
+    - {id: 49, cat: TV/Sport, desc: " |- International tournaments"}
+    - {id: 468, cat: TV/Sport, desc: " |- СССР - Канада"}
+    - {id: 20, cat: TV/Sport, desc: "Баскетбол"}
+    - {id: 50, cat: TV/Sport, desc: " |- NBA 2022/23"}
+    - {id: 453, cat: TV/Sport, desc: " |- NCAA"}
+    - {id: 204, cat: TV/Sport, desc: " |- WNBA"}
+    - {id: 150, cat: TV/Sport, desc: " |- NBA до 2022"}
+    - {id: 51, cat: TV/Sport, desc: " |- European club basketball"}
+    - {id: 197, cat: TV/Sport, desc: " |- World Championships. Men"}
+    - {id: 379, cat: TV/Sport, desc: " |- World Championships. Women"}
+    - {id: 446, cat: TV/Sport, desc: " |- European Championships"}
+    - {id: 171, cat: TV/Sport, desc: " |- International tournaments"}
+    - {id: 203, cat: TV/Sport, desc: " |- Women&#039;s basketball"}
+    - {id: 22, cat: TV/Sport, desc: "Теннис"}
+    - {id: 227, cat: TV/Sport, desc: " |- Australian Open 2022"}
+    - {id: 248, cat: TV/Sport, desc: " |- Roland Garros 2022"}
+    - {id: 388, cat: TV/Sport, desc: " |- Wimbledon 2022"}
+    - {id: 459, cat: TV/Sport, desc: " |- US Open 2022"}
+    - {id: 505, cat: TV/Sport, desc: " |- ATP 1000 WT Masters 2022"}
+    - {id: 502, cat: TV/Sport, desc: " |- ATP 250/500 World Tour 2022"}
+    - {id: 504, cat: TV/Sport, desc: " |- WTA Tour 2022"}
+    - {id: 503, cat: TV/Sport, desc: " |- Team Season 2022"}
+    - {id: 128, cat: TV/Sport, desc: " |- Grand Slam Tournaments up to 2022"}
+    - {id: 127, cat: TV/Sport, desc: " |- ATP WT Masters 1000 up to 2022"}
+    - {id: 125, cat: TV/Sport, desc: " |- ATP World Tour up to 2022"}
+    - {id: 126, cat: TV/Sport, desc: " |- WTA Tour up to 2022"}
+    - {id: 130, cat: TV/Sport, desc: " |- Team Season up to 2022"}
+    - {id: 129, cat: TV/Sport, desc: " |- Matches of previous years"}
+    - {id: 274, cat: TV/Sport, desc: " |- VIP-Extra Tennis"}
+    - {id: 44, cat: TV/Sport, desc: "Биатлон"}
+    - {id: 498, cat: TV/Sport, desc: " |- Season 2023"}
+    - {id: 455, cat: TV/Sport, desc: " |- Seasons until 2022"}
+    - {id: 82, cat: TV/Sport, desc: "Гандбол"}
+    - {id: 548, cat: TV/Sport, desc: " |- VIP-Extra Handball"}
+    - {id: 205, cat: TV/Sport, desc: " |- VIP Handball"}
+    - {id: 469, cat: TV/Sport, desc: " |- WC&#039;s and EURO&#039;s. Men"}
+    - {id: 547, cat: TV/Sport, desc: " |- WC&#039;s and EURO&#039;s. Women"}
+    - {id: 397, cat: TV/Sport, desc: " |- European club handball"}
+    - {id: 398, cat: TV/Sport, desc: " |- International tournaments"}
+    - {id: 38, cat: TV/Sport, desc: "Волейбол"}
+    - {id: 261, cat: TV/Sport, desc: " |- Лига наций"}
+    - {id: 262, cat: TV/Sport, desc: " |- Клубный волейбол"}
+    - {id: 170, cat: TV/Sport, desc: " |- Международные турниры"}
+    - {id: 169, cat: TV/Sport, desc: " |- Пляжный волейбол"}
+    - {id: 25, cat: TV/Sport, desc: "Боевые единоборства"}
+    - {id: 98, cat: TV/Sport, desc: " |- Бокс"}
+    - {id: 101, cat: TV/Sport, desc: " |- Рестлинг"}
+    - {id: 100, cat: TV/Sport, desc: " |- Mixed Martial Arts"}
+    - {id: 99, cat: TV/Sport, desc: " |- Ultimate Fighting Championship"}
+    - {id: 97, cat: TV/Sport, desc: " |- Боевые искусства"}
+    - {id: 137, cat: TV/Sport, desc: "Легкая атлетика"}
+    - {id: 139, cat: TV/Sport, desc: "Тяжелая атлетика"}
+    - {id: 122, cat: TV/Sport, desc: "Бильярд"}
+    - {id: 123, cat: TV/Sport, desc: " |- Снукер"}
+    - {id: 106, cat: TV/Sport, desc: "Покер"}
+    - {id: 140, cat: TV/Sport, desc: "Велоспорт"}
+    - {id: 141, cat: TV/Sport, desc: "Гимнастика"}
+    - {id: 24, cat: TV/Sport, desc: "Зимние виды спорта"}
+    - {id: 142, cat: TV/Sport, desc: " |- Фигурное катание"}
+    - {id: 105, cat: TV/Sport, desc: " |- Лыжи"}
+    - {id: 104, cat: TV/Sport, desc: " |- Горные лыжи"}
+    - {id: 149, cat: TV/Sport, desc: " |- Фристайл и сноуборд"}
+    - {id: 103, cat: TV/Sport, desc: " |- Прыжки с трамплина"}
+    - {id: 148, cat: TV/Sport, desc: " |- Кёрлинг"}
+    - {id: 96, cat: TV/Sport, desc: " |- Всемирные зимние Универсиады"}
+    - {id: 192, cat: TV/Sport, desc: "Летние виды спорта"}
+    - {id: 143, cat: TV/Sport, desc: " |- Бадминтон"}
+    - {id: 144, cat: TV/Sport, desc: " |- Настольный теннис"}
+    - {id: 147, cat: TV/Sport, desc: " |- Гольф"}
+    - {id: 439, cat: TV/Sport, desc: " |- Всемирные летние Универсиады"}
+    - {id: 138, cat: TV/Sport, desc: "Водные виды спорта"}
+    - {id: 121, cat: TV/Sport, desc: "Бейсбол"}
+    - {id: 145, cat: TV/Sport, desc: "Американский футбол"}
+    - {id: 541, cat: TV/Sport, desc: " |- VIP-Extra American football"}
+    - {id: 26, cat: TV/Sport, desc: "Другие виды спорта"}
+    - {id: 146, cat: TV/Sport, desc: " |- Регби"}
+    - {id: 95, cat: TV/Sport, desc: "Информационно-аналитические..."}
+    - {id: 180, cat: TV/Sport, desc: "Разное о спорте"}
+    - {id: 182, cat: TV/Sport, desc: " |- Спортивная литература"}
+    - {id: 181, cat: TV/Sport, desc: " |- Спортивное видео"}
+    - {id: 183, cat: TV/Sport, desc: " |- Обучающее видео"}
    # Летняя Олимпиада 2020 / Summer Olympic Games 2020
    - {id: 276, cat: TV/Sport, desc: "Football / Soccer"}
    - {id: 277, cat: TV/Sport, desc: " |- VIP-Extra Football"}
@@ -334,10 +453,10 @@ caps:
    - {id: 279, cat: TV/Sport, desc: " |- Water polo"}
    - {id: 284, cat: TV/Sport, desc: " |- Canoeing - Rowing - Sailing - Surfing"}
    - {id: 303, cat: TV/Sport, desc: "Boxing / Wrestling / Judo / Karate / Taekwondo"}
-    - {id: 518, cat: TV/Sport, desc: " |- VIP-Extra"}
+    - {id: 518" value="518, cat: TV/Sport, desc: " |- VIP-Extra"}
    - {id: 310, cat: TV/Sport, desc: "Gymnastics"}
-    - {id: 312, cat: TV/Sport, desc: " |- Artistic - Художественная"}
-    - {id: 311, cat: TV/Sport, desc: " |- Rhythmic - Спортивная"}
+    - {id: 312, cat: TV/Sport, desc: " |- Artistic - Спортивная"}
+    - {id: 311, cat: TV/Sport, desc: " |- Rhythmic - Художественная"}
    - {id: 313, cat: TV/Sport, desc: " |- Trampoline - Прыжки на батуте"}
    - {id: 294, cat: TV/Sport, desc: "Cycling"}
    - {id: 519, cat: TV/Sport, desc: " |- VIP-Extra Cycling"}
@@ -356,137 +475,19 @@ caps:
    - {id: 319, cat: TV/Sport, desc: " |- Modern pentathlon - Triathlon"}
    - {id: 336, cat: TV/Sport, desc: " |- Golf - Skateboarding - Sport climbing"}
    - {id: 349, cat: TV/Sport, desc: "Обзорные передачи / Reviews"}
-    # Спорт / Sport
-    - {id: 23, cat: TV/Sport, desc: "Авто/мотоспорт"}
-    - {id: 492, cat: TV/Sport, desc: " |- Formula 1. Season 2021"}
-    - {id: 131, cat: TV/Sport, desc: " |- Formula 1. Season 2020"}
-    - {id: 400, cat: TV/Sport, desc: " |- Formula 1. Seasons until 2020"}
-    - {id: 21, cat: TV/Sport, desc: "Хоккей"}
-    - {id: 420, cat: TV/Sport, desc: " |- ЧМ 2021 /  IIHF WС 2021"}
-    - {id: 501, cat: TV/Sport, desc: " |- ЧМ 2021 U-20 / IIHF WС 2021 U-20"}
-    - {id: 391, cat: TV/Sport, desc: " |- NHL 2020/21"}
-    - {id: 207, cat: TV/Sport, desc: " |- КХЛ 2020/21"}
-    - {id: 445, cat: TV/Sport, desc: " |- NHL 2019/20"}
-    - {id: 444, cat: TV/Sport, desc: " |- КХЛ 2019/20"}
-    - {id: 151, cat: TV/Sport, desc: " |- NHL до 2020"}
-    - {id: 47, cat: TV/Sport, desc: " |- КХЛ до 2020"}
-    - {id: 460, cat: TV/Sport, desc: " |- World Championships until 2021"}
-    - {id: 206, cat: TV/Sport, desc: " |- European club championships"}
-    - {id: 222, cat: TV/Sport, desc: " |- Euro Hockey Tour"}
-    - {id: 49, cat: TV/Sport, desc: " |- International tournaments"}
-    - {id: 468, cat: TV/Sport, desc: " |- СССР - Канада"}
-    - {id: 20, cat: TV/Sport, desc: "Баскетбол"}
-    - {id: 50, cat: TV/Sport, desc: " |- NBA 2020/21"}
-    - {id: 453, cat: TV/Sport, desc: " |- NCAA"}
-    - {id: 204, cat: TV/Sport, desc: " |- WNBA"}
-    - {id: 150, cat: TV/Sport, desc: " |- NBA до 2020"}
-    - {id: 51, cat: TV/Sport, desc: " |- European club basketball"}
-    - {id: 197, cat: TV/Sport, desc: " |- World Championships. Men"}
-    - {id: 379, cat: TV/Sport, desc: " |- World Championships. Women"}
-    - {id: 446, cat: TV/Sport, desc: " |- European Championships"}
-    - {id: 171, cat: TV/Sport, desc: " |- International tournaments"}
-    - {id: 203, cat: TV/Sport, desc: " |- Women&#039;s basketball"}
-    - {id: 22, cat: TV/Sport, desc: "Теннис"}
-    - {id: 227, cat: TV/Sport, desc: " |- Australian Open 2021"}
-    - {id: 248, cat: TV/Sport, desc: " |- Roland Garros 2021"}
-    - {id: 388, cat: TV/Sport, desc: " |- Wimbledon 2021"}
-    - {id: 459, cat: TV/Sport, desc: " |- US Open 2021"}
-    - {id: 505, cat: TV/Sport, desc: " |- ATP 1000 WT Masters 2021"}
-    - {id: 502, cat: TV/Sport, desc: " |- ATP 250/500 World Tour 2021"}
-    - {id: 504, cat: TV/Sport, desc: " |- WTA Tour 2021"}
-    - {id: 503, cat: TV/Sport, desc: " |- Team Season 2021"}
-    - {id: 128, cat: TV/Sport, desc: " |- Grand Slam Tournaments up to 2020"}
-    - {id: 127, cat: TV/Sport, desc: " |- ATP WT Masters 1000 up to 2020"}
-    - {id: 125, cat: TV/Sport, desc: " |- ATP World Tour up to 2020"}
-    - {id: 126, cat: TV/Sport, desc: " |- WTA Tour up to 2020"}
-    - {id: 130, cat: TV/Sport, desc: " |- Team Season up to 2020"}
-    - {id: 129, cat: TV/Sport, desc: " |- Matches of previous years"}
-    - {id: 274, cat: TV/Sport, desc: " |- VIP-Extra Tennis"}
-    - {id: 44, cat: TV/Sport, desc: "Биатлон"}
-    - {id: 498, cat: TV/Sport, desc: " |- Season 2021"}
-    - {id: 455, cat: TV/Sport, desc: " |- Seasons until 2020"}
-    - {id: 82, cat: TV/Sport, desc: "Гандбол"}
-    - {id: 548, cat: TV/Sport, desc: " |- VIP-Extra Handball"}
-    - {id: 205, cat: TV/Sport, desc: " |- VIP Handball"}
-    - {id: 469, cat: TV/Sport, desc: " |- WC&#039;s and EURO&#039;s. Men"}
-    - {id: 547, cat: TV/Sport, desc: " |- WC&#039;s and EURO&#039;s. Women"}
-    - {id: 397, cat: TV/Sport, desc: " |- European club handball"}
-    - {id: 398, cat: TV/Sport, desc: " |- International tournaments"}
-    - {id: 38, cat: TV/Sport, desc: "Волейбол"}
-    - {id: 261, cat: TV/Sport, desc: " |- Лига наций"}
-    - {id: 262, cat: TV/Sport, desc: " |- Клубный волейбол"}
-    - {id: 170, cat: TV/Sport, desc: " |- Международные турниры"}
-    - {id: 169, cat: TV/Sport, desc: " |- Пляжный волейбол"}
-    - {id: 25, cat: TV/Sport, desc: "Боевые единоборства"}
-    - {id: 98, cat: TV/Sport, desc: " |- Бокс"}
-    - {id: 101, cat: TV/Sport, desc: " |- Рестлинг"}
-    - {id: 100, cat: TV/Sport, desc: " |- Mixed Martial Arts"}
-    - {id: 99, cat: TV/Sport, desc: " |- Ultimate Fighting Championship"}
-    - {id: 97, cat: TV/Sport, desc: " |- Боевые искусства"}
-    - {id: 137, cat: TV/Sport, desc: "Легкая атлетика"}
-    - {id: 139, cat: TV/Sport, desc: "Тяжелая атлетика"}
-    - {id: 122, cat: TV/Sport, desc: "Бильярд"}
-    - {id: 123, cat: TV/Sport, desc: " |- Снукер"}
-    - {id: 106, cat: TV/Sport, desc: "Покер"}
-    - {id: 140, cat: TV/Sport, desc: "Велоспорт"}
-    - {id: 141, cat: TV/Sport, desc: "Гимнастика"}
-    - {id: 24, cat: TV/Sport, desc: "Зимние виды спорта"}
-    - {id: 142, cat: TV/Sport, desc: " |- Фигурное катание"}
-    - {id: 105, cat: TV/Sport, desc: " |- Лыжи"}
-    - {id: 104, cat: TV/Sport, desc: " |- Горные лыжи"}
-    - {id: 149, cat: TV/Sport, desc: " |- Фристайл"}
-    - {id: 103, cat: TV/Sport, desc: " |- Прыжки с трамплина"}
-    - {id: 148, cat: TV/Sport, desc: " |- Кёрлинг"}
-    - {id: 96, cat: TV/Sport, desc: " |- Всемирные зимние Универсиады"}
-    - {id: 192, cat: TV/Sport, desc: "Летние виды спорта"}
-    - {id: 143, cat: TV/Sport, desc: " |- Бадминтон"}
-    - {id: 144, cat: TV/Sport, desc: " |- Настольный теннис"}
-    - {id: 147, cat: TV/Sport, desc: " |- Гольф"}
-    - {id: 439, cat: TV/Sport, desc: " |- Всемирные летние Универсиады"}
-    - {id: 138, cat: TV/Sport, desc: "Водные виды спорта"}
-    - {id: 121, cat: TV/Sport, desc: "Бейсбол"}
-    - {id: 145, cat: TV/Sport, desc: "Американский футбол"}
-    - {id: 541, cat: TV/Sport, desc: " |- VIP-Extra American football"}
-    - {id: 26, cat: TV/Sport, desc: "Другие виды спорта"}
-    - {id: 146, cat: TV/Sport, desc: " |- Регби"}
-    - {id: 95, cat: TV/Sport, desc: "Информационно-аналитические..."}
-    - {id: 180, cat: TV/Sport, desc: "Разное о спорте"}
-    - {id: 182, cat: TV/Sport, desc: " |- Спортивная литература"}
-    - {id: 181, cat: TV/Sport, desc: " |- Спортивное видео"}
-    - {id: 183, cat: TV/Sport, desc: " |- Обучающее видео"}
-    # Олимпийские игры / Olympic Games
-    - {id: 465, cat: TV/Sport, desc: "Зимние Олимпийские игры / Winter..."}
-    - {id: 473, cat: TV/Sport, desc: " |- Церемонии"}
-    - {id: 483, cat: TV/Sport, desc: " |- Биатлон"}
-    - {id: 485, cat: TV/Sport, desc: " |- Фигурное катание"}
-    - {id: 467, cat: TV/Sport, desc: " |- Лыжный спорт"}
-    - {id: 474, cat: TV/Sport, desc: " |- Хоккей"}
-    - {id: 475, cat: TV/Sport, desc: " |- Конькобежный спорт"}
-    - {id: 484, cat: TV/Sport, desc: " |- Бобслей/Санный спорт/Скелетон"}
-    - {id: 481, cat: TV/Sport, desc: " |- Сноуборд/Фристайл/Шорт-трек/Кё<D09A>..."}
-    - {id: 482, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
-    - {id: 476, cat: TV/Sport, desc: " |- Архив"}
-    - {id: 464, cat: TV/Sport, desc: "Летние Олимпийские игры / Summer..."}
-    - {id: 486, cat: TV/Sport, desc: " |- Церемонии"}
-    - {id: 487, cat: TV/Sport, desc: " |- Футбол"}
-    - {id: 489, cat: TV/Sport, desc: " |- Баскетбол"}
-    - {id: 491, cat: TV/Sport, desc: " |- Волейбол"}
-    - {id: 500, cat: TV/Sport, desc: " |- Гандбол"}
-    - {id: 488, cat: TV/Sport, desc: " |- Теннис"}
-    - {id: 490, cat: TV/Sport, desc: " |- Бокс"}
-    - {id: 331, cat: TV/Sport, desc: " |- Лёгкая атлетика"}
-    - {id: 330, cat: TV/Sport, desc: " |- Тяжёлая атлетика"}
-    - {id: 329, cat: TV/Sport, desc: " |- Водные виды спорта и гребля"}
-    - {id: 323, cat: TV/Sport, desc: " |- Велоспорт"}
-    - {id: 324, cat: TV/Sport, desc: " |- Гимнастика"}
-    - {id: 327, cat: TV/Sport, desc: " |- Борьба и единоборства"}
-    - {id: 292, cat: TV/Sport, desc: " |- Другие виды спорта"}
-    - {id: 304, cat: TV/Sport, desc: " |- Обзорные и тематические..."}
    # Разное / Other
    - {id: 229, cat: TV/Sport, desc: "Тестовый форум"}
    # Администраторский
-    - {id: 48, cat: TV/Sport, desc: "2021-22 UEFA Champions League"}
    - {id: 417, cat: TV/Sport, desc: "2021-22 UEFA Europa League"}
+    - {id: 527, cat: TV/Sport, desc: " |- VIP-Extra UEL 2017-18"}
+    - {id: 202, cat: TV/Sport, desc: " |- VIP-Extra UCL 2016-17"}
+    - {id: 431, cat: TV/Sport, desc: " |- VIP-Extra UEL 2016-17"}
+    - {id: 440, cat: TV/Sport, desc: " |- VIP-Extra UСL 2015-16"}
+    - {id: 381, cat: TV/Sport, desc: " |- VIP-Extra UEL 2015-16"}
+    - {id: 557, cat: TV/Sport, desc: " |- VIP-Extra UCL 2014-15"}
+    - {id: 556, cat: TV/Sport, desc: " |- VIP-Extra UEL 2014-15"}
+    - {id: 514, cat: TV/Sport, desc: " |- VIP-Extra UСL 2013-14"}
+    - {id: 513, cat: TV/Sport, desc: " |- VIP-Extra UEL 2013-14"}
    - {id: 508, cat: TV/Sport, desc: " |- VIP 2021 Copa America"}
    # Приватные разделы
    - {id: 429, cat: TV/Sport, desc: " |- VIP-Extra Real Madrid 2020-21"}
--- a/src/Jackett.Common/Definitions/skipthecommercials-api.yml
+++ b/src/Jackett.Common/Definitions/skipthecommercials-api.yml
@@ -68,7 +68,7 @@ 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
    api_token: "{{ .Config.apikey }}"
    name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
@@ -154,4 +154,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 6.4.1
+# json UNIT3D 6.5.0
--- a/src/Jackett.Common/Definitions/sktorrent.yml
+++ b/src/Jackett.Common/Definitions/sktorrent.yml
@@ -197,12 +197,12 @@ search:
      selector: a[href^="details.php?name="]
      attribute: href
    size:
-      selector: div > div
+      selector: div:has(a)
      filters:
        - name: regexp
          args: "Velkost (.+?) \\|"
    date:
-      selector: div > div
+      selector: div:has(a)
      # auto adjusted by site account profile
      filters:
        - name: regexp
@@ -210,17 +210,17 @@ search:
        - name: dateparse
          args: "02/01/2006"
    seeders:
-      selector: div > div
+      selector: div:has(a)
      filters:
        - name: regexp
          args: "Odosielaju : (\\d+)"
    leechers:
-      selector: div > div
+      selector: div:has(a)
      filters:
        - name: regexp
          args: "Stahuju : (\\d+)"
    genre:
-      selector: div > div
+      selector: div:has(a)
      filters:
        - name: replace
          args: ["\n", ""]
--- a/src/Jackett.Common/Definitions/torrentleech.yml
+++ b/src/Jackett.Common/Definitions/torrentleech.yml
@@ -5,6 +5,7 @@ description: "not here _ not scene"
 language: en-US
 type: private
 encoding: UTF-8
+requestDelay: 2.4 # #13796
 links:
  - https://www.torrentleech.org/
  - https://www.torrentleech.cc/
--- a/src/Jackett.Common/Definitions/torrentqq.yml
+++ b/src/Jackett.Common/Definitions/torrentqq.yml
@@ -7,10 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq234.com/
+  - https://torrentqq236.com/
 legacylinks:
-  - https://torrentqq219.com/
-  - https://torrentqq220.com/
  - https://torrentqq221.com/
  - https://torrentqq222.com/
  - https://torrentqq223.com/
@@ -24,6 +22,8 @@ legacylinks:
  - https://torrentqq231.com/
  - https://torrentqq232.com/
  - https://torrentqq233.com/
+  - https://torrentqq234.com/
+  - https://torrentqq235.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentsir.yml
+++ b/src/Jackett.Common/Definitions/torrentsir.yml
@@ -7,13 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir85.com/
+  - https://torrentsir87.com/
 legacylinks:
-  - https://torrentsir73.com/
-  - http://torrentsir74.com/
-  - https://torrentsir74.com/
-  - http://torrentsir75.com/
-  - https://torrentsir75.com/
  - http://torrentsir76.com/
  - https://torrentsir76.com/
  - http://torrentsir77.com/
@@ -31,6 +26,10 @@ legacylinks:
  - http://torrentsir83.com/
  - https://torrentsir83.com/
  - http://torrentsir85.com/
+  - https://torrentsir85.com/
+  - http://torrentsir86.com/
+  - https://torrentsir86.com/
+  - http://torrentsir87.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/turktorrent.yml
+++ b/src/Jackett.Common/Definitions/turktorrent.yml
@@ -62,6 +62,8 @@ caps:
    - {id: 2, cat: Console, desc: "Oyun"}
    - {id: 46, cat: Console, desc: "Oyun PC"}
    - {id: 16, cat: Console, desc: "Oyun Konsol"}
+    - {id: 57, cat: Other, desc: "VIP"}
+    - {id: 66, cat: Other, desc: "VIP Vip"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/world-of-tomorrow.yml
+++ b/src/Jackett.Common/Definitions/world-of-tomorrow.yml
@@ -5,6 +5,8 @@ description: "World-of-Tomorrow is a Private German tracker"
 language: de-DE
 type: private
 encoding: ISO-8859-1
+certificates:
+  - 824f6e356ee0189eb9517a90c695b7ac8508495c # expired 26 December 2022
 links:
  - https://world-of-tomorrow.eu/

--- a/src/Jackett.Common/Definitions/yggcookie.yml
+++ b/src/Jackett.Common/Definitions/yggcookie.yml
@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www5.yggtorrent.fi/
+  - https://www6.yggtorrent.lol/
 legacylinks:
  - https://yggtorrent.com/
  - https://ww1.yggtorrent.com/
@@ -45,6 +45,8 @@ legacylinks:
  - https://www3.yggtorrent.re/
  - https://www3.yggtorrent.la/
  - https://www5.yggtorrent.la/
+  - https://www5.yggtorrent.fi/
+  - https://yggtorrent.lol/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/yggtorrent.yml
+++ b/src/Jackett.Common/Definitions/yggtorrent.yml
@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www5.yggtorrent.fi/
+  - https://www6.yggtorrent.lol/
 legacylinks:
  - https://yggtorrent.com/
  - https://ww1.yggtorrent.com/
@@ -45,6 +45,8 @@ legacylinks:
  - https://www3.yggtorrent.re/
  - https://www3.yggtorrent.la/
  - https://www5.yggtorrent.la/
+  - https://www5.yggtorrent.fi/
+  - https://yggtorrent.lol/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Indexers/BroadcasTheNet.cs
+++ b/src/Jackett.Common/Indexers/BroadcasTheNet.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Jackett.Common.Models;
 using Jackett.Common.Models.IndexerConfig;
@@ -96,6 +97,7 @@ namespace Jackett.Common.Indexers
        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
        {
            var searchString = query.GetQueryString();
+            searchString = Regex.Replace(searchString, @"(?i)\bS0*(\d+)\b", "Season $1");
            var btnResults = query.Limit;
            if (btnResults == 0)
                btnResults = (int)TorznabCaps.LimitsDefault;
--- a/src/Jackett.Common/Indexers/DonTorrent.cs
+++ b/src/Jackett.Common/Indexers/DonTorrent.cs
@@ -39,7 +39,7 @@ namespace Jackett.Common.Indexers
        private const string SearchUrl = "buscar/";

        public override string[] AlternativeSiteLinks { get; protected set; } = {
-            "https://dontorrent.mba/",
+            "https://dontorrent.army/",
            "https://todotorrents.net/",
            "https://tomadivx.net/",
            "https://seriesblanco.one/",
@@ -48,9 +48,6 @@ namespace Jackett.Common.Indexers
        };

        public override string[] LegacySiteLinks { get; protected set; } = {
-            "https://dontorrent.bid/",
-            "https://dontorrent.pet/",
-            "https://dontorrent.soy/",
            "https://dontorrent.moe/",
            "https://dontorrent.pub/",
            "https://dontorrent.tf/",
@@ -64,7 +61,8 @@ namespace Jackett.Common.Indexers
            "https://dontorrent.gy/",
            "https://dontorrent.click/",
            "https://dontorrent.fail/",
-            "https://dontorrent.futbol/"
+            "https://dontorrent.futbol/",
+            "https://dontorrent.mba/"
        };

        private static Dictionary<string, string> CategoriesMap => new Dictionary<string, string>
@@ -82,7 +80,7 @@ namespace Jackett.Common.Indexers
            : base(id: "dontorrent",
                   name: "DonTorrent",
                   description: "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL",
-                   link: "https://dontorrent.mba/",
+                   link: "https://dontorrent.army/",
                   caps: new TorznabCapabilities
                   {
                       TvSearchParams = new List<TvSearchParam>
--- a/src/Jackett.Common/Indexers/Libble.cs
+++ b/src/Jackett.Common/Indexers/Libble.cs
@@ -98,6 +98,7 @@ namespace Jackett.Common.Indexers
                        {
                            {"username", configData.Username.Value},
                            {"password", configData.Password.Value},
+                            {"keeplogged", "1"},
                            {"login", "Login"}
                        };

--- a/src/Jackett.Common/Indexers/PornoLab.cs
+++ b/src/Jackett.Common/Indexers/PornoLab.cs
@@ -62,9 +62,9 @@ namespace Jackett.Common.Indexers
            AddCategoryMapping(508, TorznabCatType.XXX, "Классические фильмы / Classic");
            AddCategoryMapping(555, TorznabCatType.XXX, "Фильмы с сюжетом / Feature & Vignettes");
            AddCategoryMapping(1845, TorznabCatType.XXX, "Гонзо-фильмы 1991-2010 / Gonzo 1991-2010");
-            AddCategoryMapping(1673, TorznabCatType.XXX, "Гонзо-фильмы 2011-2021 / Gonzo 2011-2021");
+            AddCategoryMapping(1673, TorznabCatType.XXX, "Гонзо-фильмы 2011-2023 / Gonzo 2011-2023");
            AddCategoryMapping(1112, TorznabCatType.XXX, "Фильмы без сюжета 1991-2010 / All Sex & Amateur 1991-2010");
-            AddCategoryMapping(1718, TorznabCatType.XXX, "Фильмы без сюжета 2011-2021 / All Sex & Amateur 2011-2021");
+            AddCategoryMapping(1718, TorznabCatType.XXX, "Фильмы без сюжета 2011-2023 / All Sex & Amateur 2011-2023");
            AddCategoryMapping(553, TorznabCatType.XXX, "Лесбо-фильмы / All Girl & Solo");
            AddCategoryMapping(1143, TorznabCatType.XXX, "Этнические фильмы / Ethnic-Themed");
            AddCategoryMapping(1646, TorznabCatType.XXX, "Видео для телефонов и КПК / Pocket РС & Phone Video");
@@ -82,8 +82,8 @@ namespace Jackett.Common.Indexers
            AddCategoryMapping(1675, TorznabCatType.XXXPack, "Паки русских порнороликов / Russian Clips Packs");
            AddCategoryMapping(36, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 1991-2015 / Russian SiteRip's 1991-2015");
            AddCategoryMapping(1830, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 1991-2015 (HD Video) / Russian SiteRip's 1991-2015 (HD Video)");
-            AddCategoryMapping(1803, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 2016-2021 / Russian SiteRip's 2016-2021");
-            AddCategoryMapping(1831, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 2016-2021 (HD Video) / Russian SiteRip's 2016-2021 (HD Video)");
+            AddCategoryMapping(1803, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 2016-2023 / Russian SiteRip's 2016-2023");
+            AddCategoryMapping(1831, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 2016-2023 (HD Video) / Russian SiteRip's 2016-2023 (HD Video)");
            AddCategoryMapping(1741, TorznabCatType.XXX, "Русские Порноролики Разное / Russian Clips (various)");
            AddCategoryMapping(1676, TorznabCatType.XXX, "Русское любительское видео / Russian Amateur Video");

@@ -103,6 +103,7 @@ namespace Jackett.Common.Indexers
            AddCategoryMapping(1842, TorznabCatType.XXX, "Сайтрипы 2020 (HD Video) / SiteRip's 2020 (HD Video)");
            AddCategoryMapping(1846, TorznabCatType.XXX, "Сайтрипы 2021 (HD Video) / SiteRip's 2021 (HD Video)");
            AddCategoryMapping(1857, TorznabCatType.XXX, "Сайтрипы 2022 (HD Video) / SiteRip's 2022 (HD Video)");
+            AddCategoryMapping(1861, TorznabCatType.XXX, "Сайтрипы 2023 (HD Video) / SiteRip's 2023 (HD Video)");
            AddCategoryMapping(1451, TorznabCatType.XXX, "Сайтрипы 1991-2010 / SiteRip's 1991-2010");
            AddCategoryMapping(1788, TorznabCatType.XXX, "Сайтрипы 2011-2012 / SiteRip's 2011-2012");
            AddCategoryMapping(1789, TorznabCatType.XXX, "Сайтрипы 2013 / SiteRip's 2013");
@@ -115,6 +116,7 @@ namespace Jackett.Common.Indexers
            AddCategoryMapping(1843, TorznabCatType.XXX, "Сайтрипы 2020 / SiteRip's 2020");
            AddCategoryMapping(1847, TorznabCatType.XXX, "Сайтрипы 2021 / SiteRip's 2021");
            AddCategoryMapping(1856, TorznabCatType.XXX, "Сайтрипы 2022 / SiteRip's 2022");
+            AddCategoryMapping(1862, TorznabCatType.XXX, "Сайтрипы 2023 / SiteRip's 2023");
            AddCategoryMapping(1707, TorznabCatType.XXX, "Сцены из фильмов / Movie Scenes (кроме SiteRip)");
            AddCategoryMapping(284, TorznabCatType.XXX, "Порноролики Разное / Clips (various)");
            AddCategoryMapping(1853, TorznabCatType.XXX, "Компиляции и Музыкальные порно клипы / Compilations & Porn Music Video (PMV)");
@@ -124,7 +126,7 @@ namespace Jackett.Common.Indexers
            AddCategoryMapping(1801, TorznabCatType.XXXPack, "Паки японских фильмов и сайтрипов / Full Length Japanese Movies Packs & SiteRip's Packs");
            AddCategoryMapping(1719, TorznabCatType.XXX, "Японские фильмы и сайтрипы (DVD и HD Video) / Japanese Movies & SiteRip's (DVD & HD Video)");
            AddCategoryMapping(997, TorznabCatType.XXX, "Японские фильмы и сайтрипы 1991-2014 / Japanese Movies & SiteRip's 1991-2014");
-            AddCategoryMapping(1818, TorznabCatType.XXX, "Японские фильмы и сайтрипы 2015-2021 / Japanese Movies & SiteRip's 2015-2021");
+            AddCategoryMapping(1818, TorznabCatType.XXX, "Японские фильмы и сайтрипы 2015-2023 / Japanese Movies & SiteRip's 2015-2023");
            AddCategoryMapping(1849, TorznabCatType.XXX, "Китайские фильмы и сайтрипы (DVD и HD Video) / Chinese Movies & SiteRip's (DVD & HD Video)");
            AddCategoryMapping(1815, TorznabCatType.XXX, "Архив (Японское и китайское порно)");

@@ -169,6 +171,7 @@ namespace Jackett.Common.Indexers
            AddCategoryMapping(1734, TorznabCatType.XXX, "Фистинг и дилдо / Fisting & Dildo");
            AddCategoryMapping(1791, TorznabCatType.XXX, "Беременные / Pregnant");
            AddCategoryMapping(509, TorznabCatType.XXX, "Буккаке / Bukkake");
+            AddCategoryMapping(1859, TorznabCatType.XXX, "Гэнг-бэнг / GangBang");
            AddCategoryMapping(1685, TorznabCatType.XXX, "Мочеиспускание / Peeing");
            AddCategoryMapping(1762, TorznabCatType.XXX, "Фетиш / Fetish");
            AddCategoryMapping(1681, TorznabCatType.XXX, "Дефекация / Scat");
--- a/src/Jackett.Common/Indexers/PrivateHD.cs
+++ b/src/Jackett.Common/Indexers/PrivateHD.cs
@@ -26,10 +26,6 @@ namespace Jackett.Common.Indexers
                       MovieSearchParams = new List<MovieSearchParam>
                       {
                           MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.Genre
-                       },
-                       MusicSearchParams = new List<MusicSearchParam>
-                       {
-                           MusicSearchParam.Q
                       }
                   },
                   configService: configService,
@@ -47,7 +43,6 @@ namespace Jackett.Common.Indexers
            AddCategoryMapping(2, TorznabCatType.TVUHD);
            AddCategoryMapping(2, TorznabCatType.TVHD);
            AddCategoryMapping(2, TorznabCatType.TVSD);
-            AddCategoryMapping(3, TorznabCatType.Audio);
        }
    }
 }
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -288,6 +288,7 @@ namespace Jackett.Updater
                "Definitions/bigtower.yml",
                "Definitions/bit-titan.yml",
                "Definitions/bitbr.yml",
+                "Definitions/bitcityreloaded.yml",
                "Definitions/bithq.yml",
                "Definitions/bitme.yml",
                "Definitions/bittorrentam.yml",
Author	SHA1	Message	Date
Garfield69	59c2801528	world-of-tomorrow: expired CA	2022-12-26 15:21:33 +13:00
Bogdan	d60ae9f408	digitalcore: hawke-uno: Fix searching by season/episode in combo with imdbid (#13809 )	2022-12-26 12:36:40 +13:00
Garfield69	0c82b4144e	hebits: switch to json. resolves #13808	2022-12-26 07:02:55 +13:00
ilike2burnthing	23f1ea6a7b	broadcity: thank before download. resolves #13807	2022-12-25 06:30:20 +00:00
Garfield69	b415098e5a	rgfootball: refresh cats	2022-12-25 16:32:03 +13:00
Garfield69	7467dc7768	sktorrent: new layout	2022-12-24 14:46:42 +13:00
Garfield69	06956717ad	libble: fix `2b6184c020` #13805	2022-12-24 13:34:59 +13:00
Bogdan	2b6184c020	[libble] Extend login cookie TTL (#13805 )	2022-12-24 13:25:43 +13:00
Garfield69	2afdd4872b	3changtrai: new layout. resolves #13804 added poster, imdbid new comments column bumps other columns out by 1	2022-12-23 19:06:13 +13:00
Garfield69	afdd007a3b	torrentsir: bump domain	2022-12-23 15:26:08 +13:00
Garfield69	8f25af8c16	torrentqq: bump domain	2022-12-23 15:25:56 +13:00
Garfield69	572e422569	desitorrents: -> 6.5.0	2022-12-23 15:25:43 +13:00
Bogdan	fe9586bfdc	anthelion-api: append release group to title and fix media `WEB` (#13801 )	2022-12-23 07:17:12 +13:00
Garfield69	ba0fcef316	dontorrent: new domain	2022-12-22 15:47:54 +13:00
Jimmy06	f2086fae20	requestdelay 2.4s resolves #13796 (#13797 )	2022-12-22 07:29:07 +13:00
Garfield69	d9dd7d4724	turktorrent: oops, removed a couple cats by mistake. not fully awake yet, need coffee!	2022-12-22 06:48:12 +13:00
Garfield69	b9f820f1c1	turktorrent: add new cats. resolves #13798	2022-12-22 06:36:06 +13:00
Garfield69	8fa0e6d3bc	torrentleech: requestdelay 2.1s resolves #13796	2022-12-21 19:53:37 +13:00
ilike2burnthing	d29bcf4301	privatehd: remove audio cat https://github.com/Prowlarr/Prowlarr/issues/1246	2022-12-21 03:47:05 +00:00
ilike2burnthing	5fef170942	ui: direct flaresolverr errors to flaresolverr bug issue template (#13795 )	2022-12-21 02:19:52 +00:00
Garfield69	66c7af1769	animeclipse: lang=Greek. https://github.com/Prowlarr/Indexers/pull/286	2022-12-21 11:06:45 +13:00
ilike2burnthing	07c3f64f01	pornolab: update cats. resolves #13791	2022-12-19 23:59:44 +00:00
Garfield69	84ec02539e	yggtorrent: yggtorrent.lol -> www6.* #13788	2022-12-20 05:33:13 +13:00
Garfield69	65c8c57609	sktorrent: some audio results have additional div	2022-12-19 14:38:14 +13:00
ilike2burnthing	61de21b19a	reelflix-api: upgrade to 6.5.0	2022-12-18 06:43:18 +00:00
ilike2burnthing	75b0cf089d	broadcasthenet: season regex replace. resolves #13786 (#13787 )	2022-12-18 06:00:24 +00:00
ilike2burnthing	f935062818	yggtorrent: change domain www6.*.lol (#13785 )	2022-12-17 05:35:06 +00:00
Garfield69	1da8c25efb	torrentsir: bump domain	2022-12-16 06:58:35 +13:00
Garfield69	9e6dab885a	torrentqq: bump domain	2022-12-16 06:57:20 +13:00
Garfield69	9d51a9c10f	blutopia: fix info `e2b741f918`	2022-12-15 15:46:45 +13:00
Garfield69	ae18515a59	bit-city reloaded. removed. resolves #13728	2022-12-15 15:15:54 +13:00
Garfield69	e2b741f918	blutopia: new domain. resolves #13778	2022-12-15 06:56:42 +13:00
Garfield69	99300a1149	skipthecommercials: upgrade to 6.5.0 upgrade freeleech search to prevent server error 500	2022-12-15 06:51:35 +13:00