diff --git a/src/Jackett.Common/Definitions/cinematik.yml b/src/Jackett.Common/Definitions/cinematik.yml
index fb1bbefd3..5b4801560 100644
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -1,39 +1,13 @@
 ---
-# Update by LA5T based on the orignial 'cinematik.yml'
-# 29.07.2018 22:53 UTC+2
-#
 id: cinematik
 name: Cinematik
-description: "Tracker for non-hollywood movies."
+description: "A tracker for full BD and DVD discs of non-mainstream movies, niche cinema and arthouse."
 language: en-us
 type: private
 encoding: UTF-8
 links:
   - https://www.cinematik.net/
 
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: incldead
-    type: select
-    label: Status
-    default: 1
-    options:
-      0: Active
-      1: "Active and Inactive"
-      2: Inactive
-  - name: srchdtls
-    type: checkbox
-    label: "Detailed search"
-  - name: info_results
-    type: info
-    label: "Search results"
-    default: "You can increase the number of search results in your profile.<br />Default is 15."
-
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Comedy"}
@@ -59,9 +33,34 @@ caps:
     search: [q]
     movie-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: incldead
+    type: select
+    label: Status
+    default: 1
+    options:
+      0: Active
+      1: "Active and Inactive"
+      2: Inactive
+  - name: srchdtls
+    type: checkbox
+    label: "Detailed search"
+  - name: info_results
+    type: info
+    label: "Search results"
+    default: "You can increase the number of search results in your profile.<br>Default is 15."
+
 login:
-  path: takelogin.php
-  method: post
+  method: form
+  path: login.php
+  submitpath: takelogin.php
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
@@ -75,34 +74,36 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
+    search: "{{ .Keywords }}"
     incldead: "{{ .Config.incldead }}"
     srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"
+
   rows:
     selector: table[border="1"] tr:not(:first-child)
+
   fields:
     category:
       text: 1
     title:
       selector: td:nth-child(2) a
+    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?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(7)
     grabs:
       selector: td:nth-child(8)
       filters:
         - name: regexp
           args: ([\d,]+)
-    files:
-      selector: td:nth-child(5)
-    size:
-      selector: td:nth-child(7)
     seeders:
       selector: td:nth-child(9)
     leechers:
@@ -111,11 +112,12 @@ search:
       selector: td:nth-child(11) div.addedtor
     downloadvolumefactor:
       case:
-        "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": 0
-        "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": 0.25
-        "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 0
+        img[title^="Golden Torrent"]: 0
+        img[title^="Silver Torrent"]: 0.25
+        img[title^="Platinum Torrent"]: 0
         "*": 1
     uploadvolumefactor:
       case:
-        "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 2
+        img[title^="Platinum Torrent"]: 2
         "*": 1
+# Engine n/a