diff --git a/src/Jackett.Common/Definitions/rptorrents.yml b/src/Jackett.Common/Definitions/rptorrents.yml
index f25c794fc..412b40f31 100644
--- a/src/Jackett.Common/Definitions/rptorrents.yml
+++ b/src/Jackett.Common/Definitions/rptorrents.yml
@@ -33,19 +33,46 @@
       - {id: 23, cat: Audio, desc: "Music Pack"}
       - {id: 22, cat: Audio/Video, desc: "Music Video"}
       - {id: 35, cat: PC/Games, desc: "Games Pack"}
-      - {id: 29, cat: XXX, desc: "Movie XXX"}
+      - {id: 36, cat: XXX, desc: "Movie XXX"}
+      - {id: 37, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 38, cat: Books/Ebook, desc: "Books eBooks"}
+      - {id: 39, cat: Audio/Audiobook, desc: "Books Audio"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "id"
+      options:
+        "is": "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
     method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: "yes"
+      remember: yes
     error:
       - selector: div.myFrame-caption:contains("Access Denied")
         message:
@@ -53,16 +80,29 @@
     test:
       path: torrents-search.php
       selector: a[href="account-logout.php"]
+
   search:
     paths:
       - path: torrents-search.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
       # 0 name & desc 1 name 2 desc 3 genre
       incldesc: 1
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 0 inclfree 1 notfree 2 onlyfree
+      freeleech: 0
+      # 0 both 1 localonly 2 extonly
+      inclexternal: 0
+      # 0 all 1 English 2 etc...
+      lang: 0
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"
+
     rows:
       selector: tr.t-row
+
     fields:
       category:
         selector: a[href^="torrents.php?cat="]
@@ -94,10 +134,10 @@
         selector: td:nth-child(9)
       downloadvolumefactor:
         case:
-          img[src="images/free.gif"]: "0"
-          img[src="images/t_extern.png"]: "0"
-          "*": "1"
+          img[src="images/free.gif"]: 0
+          img[src="images/t_extern.png"]: 0
+          "*": 1
       uploadvolumefactor:
         case:
-          img[src="images/t_extern.png"]: "0"
-          "*": "1"
+          img[src="images/t_extern.png"]: 0
+          "*": 1