diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
index 1bedbcbab9..c2110964de 100644
--- a/configs/config.json.cluster.example
+++ b/configs/config.json.cluster.example
@@ -98,10 +98,15 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "catch_randomize_reticle_factor": 1.0,
-    "catch_randomize_spin_factor": 1.0,
     "min_ultraball_to_keep": 10,
     "logging_color": true,
+    "catch_throw_parameters": {
+      "excellent_rate": 0.1,
+      "great_rate": 0.5,
+      "nice_rate": 0.3,
+      "normal_rate": 0.1,
+      "spin_success_rate" : 0.6
+    },
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},
diff --git a/configs/config.json.example b/configs/config.json.example
index 838acc1d4b..79c5864e43 100644
--- a/configs/config.json.example
+++ b/configs/config.json.example
@@ -114,15 +114,8 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "catch_randomize_reticle_factor": 1.0,
-    "catch_randomize_spin_factor": 1.0,
     "min_ultraball_to_keep": 10,
     "logging_color": true,
-    "catch": {
-      "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
-      "// Example of always catching Rattata:": {},
-      "// Rattata": { "always_catch" : true }
-    },
     "catch_throw_parameters": {
       "excellent_rate": 0.1,
       "great_rate": 0.5,
@@ -130,6 +123,11 @@
       "normal_rate": 0.1,
       "spin_success_rate" : 0.6
     },
+    "catch": {
+      "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
+      "// Example of always catching Rattata:": {},
+      "// Rattata": { "always_catch" : true }
+    },
     "release": {
       "any": {"release_below_cp": 0, "release_below_iv": 0, "logic": "or"},
       "// Example of always releasing Rattata:": {},
diff --git a/configs/config.json.map.example b/configs/config.json.map.example
index 6051e063cc..eb5be51dfd 100644
--- a/configs/config.json.map.example
+++ b/configs/config.json.map.example
@@ -340,10 +340,15 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "catch_randomize_reticle_factor": 1.0,
-    "catch_randomize_spin_factor": 1.0,
     "min_ultraball_to_keep": 10,
     "logging_color": true,
+    "catch_throw_parameters": {
+      "excellent_rate": 0.1,
+      "great_rate": 0.5,
+      "nice_rate": 0.3,
+      "normal_rate": 0.1,
+      "spin_success_rate" : 0.6
+    },
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},
diff --git a/configs/config.json.optimizer.example b/configs/config.json.optimizer.example
index 2e91f525d8..942a4087e2 100644
--- a/configs/config.json.optimizer.example
+++ b/configs/config.json.optimizer.example
@@ -148,6 +148,13 @@
     "reconnecting_timeout": 15,
     "min_ultraball_to_keep": 10,
     "logging_color": true,
+    "catch_throw_parameters": {
+      "excellent_rate": 0.1,
+      "great_rate": 0.5,
+      "nice_rate": 0.3,
+      "normal_rate": 0.1,
+      "spin_success_rate" : 0.6
+    },
     "catch": {
         "any": {
             "always_catch": true
diff --git a/configs/config.json.path.example b/configs/config.json.path.example
index 2581862b31..f136d4b882 100644
--- a/configs/config.json.path.example
+++ b/configs/config.json.path.example
@@ -100,10 +100,15 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "catch_randomize_reticle_factor": 1.0,
-    "catch_randomize_spin_factor": 1.0,
     "min_ultraball_to_keep": 10,
     "logging_color": true,
+    "catch_throw_parameters": {
+      "excellent_rate": 0.1,
+      "great_rate": 0.5,
+      "nice_rate": 0.3,
+      "normal_rate": 0.1,
+      "spin_success_rate" : 0.6
+    },
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},
diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example
index 2ad81a7369..e438a34fa4 100644
--- a/configs/config.json.pokemon.example
+++ b/configs/config.json.pokemon.example
@@ -106,10 +106,15 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "catch_randomize_reticle_factor": 1.0,
-    "catch_randomize_spin_factor": 1.0,
     "min_ultraball_to_keep": 10,
     "logging_color": true,
+    "catch_throw_parameters": {
+      "excellent_rate": 0.1,
+      "great_rate": 0.5,
+      "nice_rate": 0.3,
+      "normal_rate": 0.1,
+      "spin_success_rate" : 0.6
+    },
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or" },