diff --git a/FeroxRev b/FeroxRev
index 3ff1579e7..31f14b96c 160000
--- a/FeroxRev
+++ b/FeroxRev
@@ -1 +1 @@
-Subproject commit 3ff1579e7bdc05b1abea112112495d015a65c586
+Subproject commit 31f14b96ce746f7a10e2a39e38743cc1323c229e
diff --git a/PoGo.NecroBot.Logic/Settings.cs b/PoGo.NecroBot.Logic/Settings.cs
index 21c0afd05..fe4b6d21f 100644
--- a/PoGo.NecroBot.Logic/Settings.cs
+++ b/PoGo.NecroBot.Logic/Settings.cs
@@ -182,13 +182,13 @@ public class GlobalSettings
         public int TotalAmountOfPotionsToKeep = 80;
         public int TotalAmountOfRevivesToKeep = 60;
         //balls
-        public int UseGreatBallAboveCp = 1000;
-        public int UseUltraBallAboveCp = 1250;
+        public int UseGreatBallAboveCp = 750;
+        public int UseUltraBallAboveCp = 1000;
         public int UseMasterBallAboveCp = 1500;
         public int UseGreatBallAboveIv = 85;
-        public int UseUltraBallAboveIv = 90;
-        public double UseGreatBallBelowCatchProbability = 0.3;
-        public double UseUltraBallBelowCatchProbability = 0.2;
+        public int UseUltraBallAboveIv = 95;
+        public double UseGreatBallBelowCatchProbability = 0.2;
+        public double UseUltraBallBelowCatchProbability = 0.1;
         public double UseMasterBallBelowCatchProbability = 0.05;
         //transfer
         public bool TransferDuplicatePokemon = true;
@@ -548,6 +548,31 @@ public static GlobalSettings Load(string path)
                 settings.UseMasterBallBelowCatchProbability = Default.UseMasterBallBelowCatchProbability;
             }
 
+            if (settings.UseMasterBallAboveCp < 0)
+            {
+                settings.UseMasterBallAboveCp = Default.UseMasterBallAboveCp;
+            }
+
+            if (settings.UseUltraBallAboveCp < 0)
+            {
+                settings.UseUltraBallAboveCp = Default.UseUltraBallAboveCp;
+            }
+
+            if (settings.UseUltraBallAboveIv < 0)
+            {
+                settings.UseUltraBallAboveIv = Default.UseUltraBallAboveCp;
+            }
+
+            if (settings.UseGreatBallAboveCp < 0)
+            {
+                settings.UseGreatBallAboveCp = Default.UseGreatBallAboveCp;
+            }
+
+            if (settings.UseUltraBallAboveIv < 0)
+            {
+                settings.UseGreatBallAboveIv = Default.UseGreatBallAboveIv;
+            }
+
             if (settings.UseBerriesMinCp < 0)
             {
                 settings.UseBerriesMinCp = Default.UseBerriesMinCp;