diff --git a/src/Jackett.Common/Definitions/xwtorrents.yml b/src/Jackett.Common/Definitions/xwtorrents.yml
index ab9e3ff8c..d1167a027 100644
--- a/src/Jackett.Common/Definitions/xwtorrents.yml
+++ b/src/Jackett.Common/Definitions/xwtorrents.yml
@@ -76,11 +76,26 @@
       type: checkbox
       label: "Use SeedBox Download Link"
       default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
 
   login:
-    path: login.php
-    method: form
-    form: form[action="tlogin.php"]
+    path: tlogin.php
+    method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
@@ -90,7 +105,7 @@
           selector: table tr td.text
     test:
       path: browse.php
-      selector: div#wel-messeng:has(a[href="logout.php"])
+      selector: a[href="logout.php"]
 
   ratio:
     path: browse.php
@@ -98,16 +113,18 @@
 
   search:
     paths:
-      # http://xtremewrestlingtorrents.net/browse.php?search=halftime+heat&c16=1&c65=1&c10=1&c54=1&c76=1&c46=1&c51=1&c31=1&c11=1&incldead=1
+      # http://xtremewrestlingtorrents.net/browse.php?search=halftime+heat&c46=1&c51=1&c31=1&c11=1&incldead=1
       - path: browse.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      incldead: "1"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      incldead: 1
       search: "{{ .Keywords }}"
-      sort: "4" # date
-      type: "desc"
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
     rows:
       selector: table[border="0"][cellspacing="0"][cellpadding="5"] tr:has(a[href^="download.php?id="])
+
     fields:
       category:
         selector: a[href^="browse.php?cat="]
@@ -134,10 +151,8 @@
       grabs:
         selector: td:nth-child(7)
         filters:
-          - name: replace
-            args: ["times", ""]
-          - name: replace
-            args: ["time", ""]
+          - name: regexp
+            args: (\d+)
       size:
         selector: td:nth-child(6)
       seeders:
@@ -151,8 +166,8 @@
             args: "2006-01-0215:04:05"
       downloadvolumefactor:
         case:
-          img[src="pic/freeleech.png"]: "0"
-          "*": "1"
+          img[src="pic/freeleech.png"]: 0
+          "*": 1
       uploadvolumefactor:
         case:
-          "*": "1"
\ No newline at end of file
+          "*": 1
\ No newline at end of file