diff --git a/src/Jackett.Common/Definitions/omgwtftrackr.yml b/src/Jackett.Common/Definitions/omgwtftrackr.yml
index d1efeafee..9d621a4de 100644
--- a/src/Jackett.Common/Definitions/omgwtftrackr.yml
+++ b/src/Jackett.Common/Definitions/omgwtftrackr.yml
@@ -77,18 +77,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "time"
+    default: time
     options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
+      time: created
+      seeders: seeders
+      size: size
   - 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.php
diff --git a/src/Jackett.Common/Definitions/onejav.yml b/src/Jackett.Common/Definitions/onejav.yml
index 2b3d743d7..65c74cc85 100644
--- a/src/Jackett.Common/Definitions/onejav.yml
+++ b/src/Jackett.Common/Definitions/onejav.yml
@@ -14,8 +14,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings: []
 
diff --git a/src/Jackett.Common/Definitions/onlineselfeducation.yml b/src/Jackett.Common/Definitions/onlineselfeducation.yml
index f83fec06f..b6e73af3e 100644
--- a/src/Jackett.Common/Definitions/onlineselfeducation.yml
+++ b/src/Jackett.Common/Definitions/onlineselfeducation.yml
@@ -77,19 +77,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
 
 login:
   path: takelogin.php
diff --git a/src/Jackett.Common/Definitions/onlyscene.yml b/src/Jackett.Common/Definitions/onlyscene.yml
index 778c1c9ec..3f97b972e 100644
--- a/src/Jackett.Common/Definitions/onlyscene.yml
+++ b/src/Jackett.Common/Definitions/onlyscene.yml
@@ -53,12 +53,12 @@ settings:
     label: Replace MULTI by this language
     default: FRENCH
     options:
-      FRENCH: "FRENCH"
-      MULTI.FRENCH: "MULTI.FRENCH"
-      ENGLISH: "ENGLISH"
-      MULTI.ENGLISH: "MULTI.ENGLISH"
-      VOSTFR: "VOSTFR"
-      MULTI.VOSTFR: "MULTI.VOSTFR"
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
   - name: vostfr
     type: checkbox
     label: Replace VOSTFR with ENGLISH
@@ -66,19 +66,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/oshenpt.yml b/src/Jackett.Common/Definitions/oshenpt.yml
index 19a359ebb..3a55849e8 100644
--- a/src/Jackett.Common/Definitions/oshenpt.yml
+++ b/src/Jackett.Common/Definitions/oshenpt.yml
@@ -43,19 +43,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/oxtorrent.yml b/src/Jackett.Common/Definitions/oxtorrent.yml
index 25b055513..b7fe68ea8 100644
--- a/src/Jackett.Common/Definitions/oxtorrent.yml
+++ b/src/Jackett.Common/Definitions/oxtorrent.yml
@@ -63,12 +63,12 @@ settings:
     label: Replace MULTI by this language
     default: FRENCH
     options:
-      FRENCH: "FRENCH"
-      MULTI.FRENCH: "MULTI.FRENCH"
-      ENGLISH: "ENGLISH"
-      MULTI.ENGLISH: "MULTI.ENGLISH"
-      VOSTFR: "VOSTFR"
-      MULTI.VOSTFR: "MULTI.VOSTFR"
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
   - name: vostfr
     type: checkbox
     label: Replace VOSTFR with ENGLISH