diff --git a/src/Jackett.Common/Definitions/classix.yml b/src/Jackett.Common/Definitions/classix.yml
index 58bd8c90d..637a80143 100644
--- a/src/Jackett.Common/Definitions/classix.yml
+++ b/src/Jackett.Common/Definitions/classix.yml
@@ -1,7 +1,7 @@
 ---
 id: classix
 name: Classix
-description: "Classic movie tracker"
+description: "Classix is a Private Torrent Tracker for classic MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
@@ -10,11 +10,92 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 59, cat: PC/0day, desc: "Apps: Movies: Misc"}
+    - {id: 55, cat: PC/0day, desc: "Apps: Graphics Editing GNU/Linux"}
+    - {id: 53, cat: PC/0day, desc: "Apps: Apps DVD/Blu-Ray Copy Mac"}
+    - {id: 57, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copy GNU/Linux"}
+    - {id: 51, cat: PC/0day, desc: "Apps: Graphics Editing Mac"}
+    - {id: 58, cat: PC/0day, desc: "Apps: Music Editing & Recording GNU/"}
+    - {id: 52, cat: PC/0day, desc: "Apps: Apps DVD Editing Mac"}
+    - {id: 56, cat: PC/0day, desc: "Apps: DVD Editing GNU/Linux"}
+    - {id: 54, cat: PC/0day, desc: "Apps: Music Editing & Recording Mac"}
+    - {id: 18, cat: PC/0day, desc: "Apps: Graphics Editing PC"}
+    - {id: 19, cat: PC/0day, desc: "Apps: DVD Editing PC"}
+    - {id: 20, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copying PC"}
+    - {id: 21, cat: PC/0day, desc: "Apps: Music Editing & Recording PC"}
+    - {id: 66, cat: Other, desc: "grumpyman: pending torrents"}
+    - {id: 67, cat: Books/EBook, desc: "Media: pdf"}
+    - {id: 49, cat: Movies/HD, desc: "Movies: HD-Compressed Or Stripped"}
+    - {id: 47, cat: Movies/Other, desc: "Movies: Covers & Artwork"}
+    - {id: 48, cat: Movies/SD, desc: "Movies: DVD-Compressed Or Stripped"}
+    - {id: 1, cat: Movies/DVD, desc: "Movies: DVD-Untouched"}
+    - {id: 50, cat: Movies, desc: "Movies: Made For TV"}
+    - {id: 2, cat: Movies/SD, desc: "Movies: Divx/Xvid/Avi"}
+    - {id: 60, cat: Movies/HD, desc: "Movies: HD-mkv/mts"}
+    - {id: 65, cat: Movies/Foreign, desc: "Movies: Movies - w/additional lang/sub"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: HD-Untouched"}
+    - {id: 3, cat: Movies/SD, desc: "Movies: SVCD/VCD"}
+    - {id: 71, cat: Movies/UHD, desc: "Movies: 4K-Untouched"}
+    - {id: 4, cat: Movies/Other, desc: "Movies: Other"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: Lossless"}
+    - {id: 24, cat: Audio/Video, desc: "Music: DVD"}
+    - {id: 70, cat: Audio/Video, desc: "Music: HD"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio/Other, desc: "Music: Other"}
+    - {id: 63, cat: Other, desc: "Other: Educational/Instructional"}
+    - {id: 61, cat: Books/EBook, desc: "Other: Related Material"}
+    - {id: 37, cat: Other, desc: "Other: Images"}
+    - {id: 62, cat: TV, desc: "TV: Mini-Series"}
+    - {id: 64, cat: TV/Other, desc: "TV: Covers & Art Work"}
+    - {id: 69, cat: TV/SD, desc: "TV: Series - Compressed"}
+    - {id: 5, cat: TV/SD, desc: "TV: Series: DVD"}
+    - {id: 73, cat: TV/HD, desc: "TV: Complete Series HD"}
+    - {id: 72, cat: TV/SD, desc: "TV: Complete Series DVD"}
+    - {id: 41, cat: TV/HD, desc: "TV: Series: HD"}
+    - {id: 74, cat: TV, desc: "TV: Series Compilation: DVD or HD"}
+    - {id: 6, cat: TV/SD, desc: "TV: Divx/Xvid/AVI"}
+    - {id: 7, cat: TV/SD, desc: "TV: SVCD/VCD"}
+    - {id: 68, cat: TV, desc: "TV: .mkv"}
 
   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: Search freeleech only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech at Classix
+    default: This appears to only be uploads by the admin <b>grumpyman57</b>.
+  - 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
@@ -28,43 +109,72 @@ login:
     path: index.php
     selector: a[href="account-logout.php"]
 
-download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
 search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
+# category search returns results from unrelated categories
+#     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all, 1 english, etc
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid search and does not return imdb link in results
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", "+$1"] # prepend + to each word
 
   rows:
     selector: table > tbody > tr:has(a[href^="torrents.php?cat="])
 
   fields:
     category:
-      text: 1
-    title:
-      selector: td:nth-child(3)
-    download:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="torrents.php?cat="]
       attribute: href
       filters:
-        - name: replace
-          args: ["torrents-details.php?id=", "download.php?id="]
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
     details:
       selector: a[href^="torrents-details.php?id="]
       attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Date Added: </b>(\\d{2}-\\d{2}-\\d{4})<br />"
+        - name: dateparse
+          args: "dd-MM-yyyy"
     size:
       selector: td:nth-child(7)
     seeders:
       selector: td:nth-child(8)
     leechers:
       selector: td:nth-child(9)
+    genre:
+      selector: a[href^="torrents.php?gen="]
+    description:
+      text: "{{ .Result.genre }}"
     downloadvolumefactor:
-      text: 1
+      # returned results not marked as freeleech
+      text: "{{ if .Config.freeleech }}0{{ else }}1{{ end }}"
     uploadvolumefactor:
       text: 1
-# engine tbd
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine TorrentTrader v2-svn