diff --git a/src/Jackett.Common/Definitions/twilight.yml b/src/Jackett.Common/Definitions/twilight.yml
index 2e74bea54..b772820fc 100644
--- a/src/Jackett.Common/Definitions/twilight.yml
+++ b/src/Jackett.Common/Definitions/twilight.yml
@@ -37,6 +37,30 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
   login:
     path: login.php
     method: form
@@ -45,7 +69,6 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
       perm_ssl: 1
-      submitme: "X"
     error:
       - selector: h2
         message:
@@ -58,15 +81,16 @@
     paths:
       - path: browse.php      
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
       # 0 active 1 incldead 2 onlydead 3 freeleech
       incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
 
     rows:
       selector: tr[class^="color"]
-#      filters:
-#        - name: andmatch
+
     fields:
       category:
         selector: a[href^="browse.php?cat="]
@@ -105,14 +129,14 @@
         selector: td:nth-of-type(10)
         filters:
           - name: regexp
-            args: "([\\d]+)"
+            args: (\d+)
       seeders:
         selector: td:nth-of-type(11)
       leechers:
         selector: td:nth-of-type(12)
       downloadvolumefactor:
         case:
-          img[src="free.gif"]: "0"
-          "*": "1"
+          img[src="free.gif"]: 0
+          "*": 1
       uploadvolumefactor:
-        text: "1"
+        text: 1