diff --git a/src/Jackett.Common/Definitions/carpathians.yml b/src/Jackett.Common/Definitions/carpathians.yml
index 369227414..92234985d 100644
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -54,19 +54,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "5"
+    default: 5
     options:
-      "5": "created"
-      "8": "seeders"
-      "6": "size"
-      "2": "title"
+      5: created
+      8: seeders
+      6: size
+      2: 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/carphunter.yml b/src/Jackett.Common/Definitions/carphunter.yml
index 0ad1ac0a9..7de3554b8 100644
--- a/src/Jackett.Common/Definitions/carphunter.yml
+++ b/src/Jackett.Common/Definitions/carphunter.yml
@@ -69,18 +69,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
+      4: created
+      7: seeders
+      5: 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: takelogin.php
diff --git a/src/Jackett.Common/Definitions/cartoonchaos.yml b/src/Jackett.Common/Definitions/cartoonchaos.yml
index 5b89cf875..2530d24a1 100644
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -26,19 +26,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: 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
 
 caps:
   categorymappings:
diff --git a/src/Jackett.Common/Definitions/casatorrent.yml b/src/Jackett.Common/Definitions/casatorrent.yml
index d474366b4..1853be026 100644
--- a/src/Jackett.Common/Definitions/casatorrent.yml
+++ b/src/Jackett.Common/Definitions/casatorrent.yml
@@ -91,12 +91,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
@@ -104,19 +104,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/casstudiotv.yml b/src/Jackett.Common/Definitions/casstudiotv.yml
index 2472ddb87..a80fe93ac 100644
--- a/src/Jackett.Common/Definitions/casstudiotv.yml
+++ b/src/Jackett.Common/Definitions/casstudiotv.yml
@@ -237,19 +237,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: "d"
+    default: d
     options:
-      "d": "desc"
-      "a": "asc"
+      d: desc
+      a: asc
 
 login:
   path: ucp.php?mode=login
diff --git a/src/Jackett.Common/Definitions/ccfbits.yml b/src/Jackett.Common/Definitions/ccfbits.yml
index cbe6907f8..77e0f4da2 100644
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/src/Jackett.Common/Definitions/ccfbits.yml
@@ -15,25 +15,21 @@ caps:
     - {id: 40, cat: Movies/BluRay, desc: "Blu-ray原盘"}
     - {id: 30, cat: Movies/HD, desc: "高清电影1080p"}
     - {id: 2, cat: Movies/HD, desc: "高清电影720p"}
-
     # 高清电视剧
     - {id: 7, cat: TV/HD, desc: "高清欧美剧"}
     - {id: 32, cat: TV/HD, desc: "高清国产剧"}
     - {id: 34, cat: TV/HD, desc: "高清港台剧"}
     - {id: 36, cat: TV/HD, desc: "高清日韩剧"}
-
     # 其他高清视频
     - {id: 12, cat: TV/Documentary, desc: "高清纪录片"}
     - {id: 11, cat: TV/Sport, desc: "高清体育"}
     - {id: 23, cat: TV/Anime, desc: "高清动漫"}
     - {id: 4, cat: Audio/Video, desc: "高清MV/综艺"}
-
     # 电视剧集包
     - {id: 38, cat: TV/HD, desc: "欧美剧包"}
     - {id: 33, cat: TV/HD, desc: "国产剧包"}
     - {id: 35, cat: TV/HD, desc: "港台剧包"}
     - {id: 37, cat: TV/HD, desc: "日韩剧包"}
-
     # 非高清和其他
     - {id: 43, cat: TV/SD, desc: "HR_HDTV"}
     - {id: 20, cat: Movies/DVD, desc: "DVD"}
@@ -57,19 +53,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      added: 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: takelogin.php
diff --git a/src/Jackett.Common/Definitions/channelx.yml b/src/Jackett.Common/Definitions/channelx.yml
index b793e06ea..8ade825ea 100644
--- a/src/Jackett.Common/Definitions/channelx.yml
+++ b/src/Jackett.Common/Definitions/channelx.yml
@@ -36,19 +36,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/chdbits.yml b/src/Jackett.Common/Definitions/chdbits.yml
index 8e47f5b90..90849b6db 100644
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -45,19 +45,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/chilebt.yml b/src/Jackett.Common/Definitions/chilebt.yml
index e17cb5996..b5d14ceef 100644
--- a/src/Jackett.Common/Definitions/chilebt.yml
+++ b/src/Jackett.Common/Definitions/chilebt.yml
@@ -43,19 +43,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/cinemamovies.yml b/src/Jackett.Common/Definitions/cinemamovies.yml
index aad9b874a..26a174d2a 100644
--- a/src/Jackett.Common/Definitions/cinemamovies.yml
+++ b/src/Jackett.Common/Definitions/cinemamovies.yml
@@ -56,19 +56,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "created"
-      "5": "seeders"
-      "3": "size"
-      "1": "title"
+      2: created
+      5: seeders
+      3: 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:
   method: cookie
diff --git a/src/Jackett.Common/Definitions/concen.yml b/src/Jackett.Common/Definitions/concen.yml
index ed49dba9d..252f81a7f 100644
--- a/src/Jackett.Common/Definitions/concen.yml
+++ b/src/Jackett.Common/Definitions/concen.yml
@@ -19,19 +19,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created"
+    default: created
     options:
-      "created": "created"
-      "seeds": "seeders"
-      "size": "size"
-      "title": "title"
+      created: created
+      seeds: seeders
+      size: size
+      title: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 search:
   paths:
diff --git a/src/Jackett.Common/Definitions/concertos.yml b/src/Jackett.Common/Definitions/concertos.yml
index c7b4fd0a6..5378c2787 100644
--- a/src/Jackett.Common/Definitions/concertos.yml
+++ b/src/Jackett.Common/Definitions/concertos.yml
@@ -38,18 +38,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
+      created_at: 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
diff --git a/src/Jackett.Common/Definitions/cpabien.yml b/src/Jackett.Common/Definitions/cpabien.yml
index e71eee0fc..4bf54e88d 100644
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -85,12 +85,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
diff --git a/src/Jackett.Common/Definitions/cpasbienclone.yml b/src/Jackett.Common/Definitions/cpasbienclone.yml
index f246c3650..e1043f4be 100644
--- a/src/Jackett.Common/Definitions/cpasbienclone.yml
+++ b/src/Jackett.Common/Definitions/cpasbienclone.yml
@@ -49,12 +49,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
@@ -62,16 +62,16 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site (Only works for searches with Keywords)
-    default: "?trie-date-d"
+    default: ?trie-date-d
     options:
-      "?trie-date-d": "created desc"
-      "?trie-date-a": "created asc"
-      "?trie-seeds-d": "seeders desc"
-      "?trie-seeds-a": "seeders asc"
-      "?trie-poid-d": "size desc"
-      "?trie-poid-a": "size asc"
-      "?trie-nom-d": "title desc"
-      "?trie-nom-a": "title asc"
+      ?trie-date-d: created desc
+      ?trie-date-a: created asc
+      ?trie-seeds-d: seeders desc
+      ?trie-seeds-a: seeders asc
+      ?trie-poid-d: size desc
+      ?trie-poid-a: size asc
+      ?trie-nom-d: title desc
+      ?trie-nom-a: title asc
 
 download:
   selector: a[href^="magnet:"]
diff --git a/src/Jackett.Common/Definitions/crazyhd.yml b/src/Jackett.Common/Definitions/crazyhd.yml
index a0ff58632..15c0c2992 100644
--- a/src/Jackett.Common/Definitions/crazyhd.yml
+++ b/src/Jackett.Common/Definitions/crazyhd.yml
@@ -103,19 +103,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: 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/crazyspirits.yml b/src/Jackett.Common/Definitions/crazyspirits.yml
index db38c8b62..e24dd1e68 100644
--- a/src/Jackett.Common/Definitions/crazyspirits.yml
+++ b/src/Jackett.Common/Definitions/crazyspirits.yml
@@ -127,12 +127,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
@@ -140,19 +140,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:
   method: cookie
diff --git a/src/Jackett.Common/Definitions/crnaberza.yml b/src/Jackett.Common/Definitions/crnaberza.yml
index 55c06714a..dcad7c60e 100644
--- a/src/Jackett.Common/Definitions/crnaberza.yml
+++ b/src/Jackett.Common/Definitions/crnaberza.yml
@@ -69,19 +69,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: login.php