diff --git a/src/Jackett.Common/Definitions/racing4everyone.yml b/src/Jackett.Common/Definitions/racing4everyone.yml
index 5fc141c81..127662d1e 100644
--- a/src/Jackett.Common/Definitions/racing4everyone.yml
+++ b/src/Jackett.Common/Definitions/racing4everyone.yml
@@ -64,19 +64,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
diff --git a/src/Jackett.Common/Definitions/racingforme.yml b/src/Jackett.Common/Definitions/racingforme.yml
index 3855d3648..f80ad6313 100644
--- a/src/Jackett.Common/Definitions/racingforme.yml
+++ b/src/Jackett.Common/Definitions/racingforme.yml
@@ -157,16 +157,16 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "date_desc"
+    default: date_desc
     options:
-      "date_desc": "created desc"
-      "date_asc": "created asc"
-      "sd_desc": "seeders desc"
-      "sd_asc": "seeders asc"
-      "sz_desc": "size desc"
-      "sz_asc": "size asc"
-      "name_desc": "title desc"
-      "name_asc": "title asc"
+      date_desc: "created desc"
+      date_asc: "created asc"
+      sd_desc: 'seeders desc"
+      sd_asc: "seeders asc"
+      sz_desc: "size desc"
+      sz_asc: "size asc"
+      name_desc: "title desc"
+      name_asc: "title asc"
 
 login:
   path: login
diff --git a/src/Jackett.Common/Definitions/rainbowtracker.yml b/src/Jackett.Common/Definitions/rainbowtracker.yml
index 519380669..54bad400d 100644
--- a/src/Jackett.Common/Definitions/rainbowtracker.yml
+++ b/src/Jackett.Common/Definitions/rainbowtracker.yml
@@ -89,19 +89,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 login:
   path: forum/profile.php?mode=register
diff --git a/src/Jackett.Common/Definitions/rapidzona.yml b/src/Jackett.Common/Definitions/rapidzona.yml
index e81de1e45..6ac11d86d 100644
--- a/src/Jackett.Common/Definitions/rapidzona.yml
+++ b/src/Jackett.Common/Definitions/rapidzona.yml
@@ -58,24 +58,22 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "date"
+    default: date
     options:
-      "date": "created"
-      "title": "title"
+      date: created
+      title: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 
 download:
diff --git a/src/Jackett.Common/Definitions/retroflix.yml b/src/Jackett.Common/Definitions/retroflix.yml
index c068e000c..84f6e2a92 100644
--- a/src/Jackett.Common/Definitions/retroflix.yml
+++ b/src/Jackett.Common/Definitions/retroflix.yml
@@ -41,19 +41,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info_tpp
     type: info
     label: Results Per Page
diff --git a/src/Jackett.Common/Definitions/rintor.yml b/src/Jackett.Common/Definitions/rintor.yml
index c2eb75cdb..31dfcf515 100644
--- a/src/Jackett.Common/Definitions/rintor.yml
+++ b/src/Jackett.Common/Definitions/rintor.yml
@@ -73,19 +73,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "1"
+    default: 1
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 login:
   path: login.php
diff --git a/src/Jackett.Common/Definitions/rintornet.yml b/src/Jackett.Common/Definitions/rintornet.yml
index 66abca157..3e9824b00 100644
--- a/src/Jackett.Common/Definitions/rintornet.yml
+++ b/src/Jackett.Common/Definitions/rintornet.yml
@@ -31,8 +31,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings: []
 
diff --git a/src/Jackett.Common/Definitions/riperam.yml b/src/Jackett.Common/Definitions/riperam.yml
index 94079ce0b..947d67357 100644
--- a/src/Jackett.Common/Definitions/riperam.yml
+++ b/src/Jackett.Common/Definitions/riperam.yml
@@ -846,19 +846,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "t"
+    default: t
     options:
-      "t": "created"
-      "ts": "seeders"
-      "sz": "size"
-      "i": "title"
+      t: created
+      ts: seeders
+      sz: size
+      i: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "d": "desc"
-      "a": "asc"
+      d: desc
+      a: asc
 
 
 login:
diff --git a/src/Jackett.Common/Definitions/rockbox.yml b/src/Jackett.Common/Definitions/rockbox.yml
index 7d52e9e02..1ad558177 100644
--- a/src/Jackett.Common/Definitions/rockbox.yml
+++ b/src/Jackett.Common/Definitions/rockbox.yml
@@ -10,7 +10,7 @@ links:
 
 caps:
   categories:
-    "Music": Audio
+    Music: Audio
 
   modes:
     search: [q]
diff --git a/src/Jackett.Common/Definitions/romanianmetaltorrents.yml b/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
index 2272ccc5d..f6951e902 100644
--- a/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
+++ b/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
@@ -12,7 +12,7 @@ legacylinks:
 
 caps:
   categories:
-    "Music": Audio
+    Music: Audio
 
   modes:
     search: [q]
diff --git a/src/Jackett.Common/Definitions/rptorrents.yml b/src/Jackett.Common/Definitions/rptorrents.yml
index 0989ad98f..84c0522db 100644
--- a/src/Jackett.Common/Definitions/rptorrents.yml
+++ b/src/Jackett.Common/Definitions/rptorrents.yml
@@ -59,19 +59,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: account-login.php
diff --git a/src/Jackett.Common/Definitions/rus-media.yml b/src/Jackett.Common/Definitions/rus-media.yml
index 1e678ca92..cb9188835 100644
--- a/src/Jackett.Common/Definitions/rus-media.yml
+++ b/src/Jackett.Common/Definitions/rus-media.yml
@@ -66,7 +66,6 @@ caps:
     - {id: 182, cat: Other, desc: "Разное"}
     - {id: 789, cat: Other, desc: "Автомобильный раздел"}
     - {id: 797, cat: Other, desc: "Караоке Онлайн"}
-
     - {id: 137, cat: Other, desc: "Форумы"}
     - {id: 138, cat: Other, desc: "О нашем сайте"}
     - {id: 140, cat: Other, desc: "Новости трекера"}
@@ -285,17 +284,17 @@ settings:
     label: Sort requested from site
     default: "t"
     options:
-      "t": "created"
-      "ts": "seeders"
-      "sz": "size"
-      "i": "title"
+      t: created
+      ts: seeders
+      sz: size
+      i: title
   - name: type
     type: select
     label: Order requested from site
-    default: "d"
+    default: d
     options:
-      "d": "desc"
-      "a": "asc"
+      d: desc
+      a: asc
 
 download:
   selector: a[href^="./download/file.php?id="]
diff --git a/src/Jackett.Common/Definitions/rustorka.yml b/src/Jackett.Common/Definitions/rustorka.yml
index 8e07ec34f..614e14296 100644
--- a/src/Jackett.Common/Definitions/rustorka.yml
+++ b/src/Jackett.Common/Definitions/rustorka.yml
@@ -785,19 +785,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 login:
   method: cookie
diff --git a/src/Jackett.Common/Definitions/rutor.yml b/src/Jackett.Common/Definitions/rutor.yml
index 0b2a1791e..936ae5476 100644
--- a/src/Jackett.Common/Definitions/rutor.yml
+++ b/src/Jackett.Common/Definitions/rutor.yml
@@ -44,16 +44,16 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site (Applies only to Search with Keywords)
-    default: "0"
+    default: 0
     options:
-      "0": "created desc"
-      "1": "created asc"
-      "2": "seeders desc"
-      "3": "seeders asc"
-      "6": "size desc"
-      "7": "size asc"
-      "8": "title desc"
-      "9": "title asc"
+      0: "created desc"
+      1: "created asc"
+      2: "seeders desc"
+      3: "seeders asc"
+      6: "size desc"
+      7: "size asc"
+      8: "title desc"
+      9: "title asc"
 
 search:
   paths:
diff --git a/src/Jackett.Common/Definitions/rutracker-ru.yml b/src/Jackett.Common/Definitions/rutracker-ru.yml
index bbae436b0..ea4047611 100644
--- a/src/Jackett.Common/Definitions/rutracker-ru.yml
+++ b/src/Jackett.Common/Definitions/rutracker-ru.yml
@@ -362,19 +362,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 search:
   paths: