diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b0c39dccd..4dfd9258c 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -533,29 +533,34 @@
   // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
 
   //FIND YOUR OWN: "M303 U1 E0 S200 C8" HOTEND PID
-  #if ENABLED (I3PROW) || ENABLED (I3PROA)  || ENABLED (I3PROC) || ENABLED (I3PROX) || ENABLED (GTM201)  
-  #define  DEFAULT_Kp 22.2
-  #define  DEFAULT_Ki 1.08
-  #define  DEFAULT_Kd 114
-  #elif ENABLED (I3PROB)
-  #define DEFAULT_Kp 12.33
-  #define DEFAULT_Ki 0.51
-  #define DEFAULT_Kd 74.50
-  #elif ENABLED (MECREATOR2)
-  #define  DEFAULT_Kp 14.94
-  #define  DEFAULT_Ki 0.74
-  #define  DEFAULT_Kd 74.98
-  #elif ENABLED (MIX) || ENABLED (MIXT) || ENABLED (CYCLOPS) || ENABLED (CYCLOPST)  || ENABLED (DUELEX) || ENABLED (GTA30) || ENABLED (GTE180) || ENABLED (GTD200)
-  #define  DEFAULT_Kp 45.8
-  #define  DEFAULT_Ki 3.61
-  #define  DEFAULT_Kd 145.39
-  #else
-  #define  DEFAULT_Kp 32.59
-  #define  DEFAULT_Ki 3.72
-  #define  DEFAULT_Kd 71.43
+  // #if ENABLED (I3PROW) || ENABLED (I3PROA)  || ENABLED (I3PROC) || ENABLED (I3PROX) || ENABLED (GTM201)  
+  // #define  DEFAULT_Kp 22.2
+  // #define  DEFAULT_Ki 1.08
+  // #define  DEFAULT_Kd 114
+  // #elif ENABLED (I3PROB)
+  // #define DEFAULT_Kp 12.33
+  // #define DEFAULT_Ki 0.51
+  // #define DEFAULT_Kd 74.50
+  // #elif ENABLED (MECREATOR2)
+  // #define  DEFAULT_Kp 14.94
+  // #define  DEFAULT_Ki 0.74
+  // #define  DEFAULT_Kd 74.98
+  // #elif ENABLED (MIX) || ENABLED (MIXT) || ENABLED (CYCLOPS) || ENABLED (CYCLOPST)  || ENABLED (DUELEX) || ENABLED (GTA30) || ENABLED (GTE180) || ENABLED (GTD200)
+  // #define  DEFAULT_Kp 45.8
+  // #define  DEFAULT_Ki 3.61
+  // #define  DEFAULT_Kd 145.39
+  // #else
+  // #define  DEFAULT_Kp 32.59
+  // #define  DEFAULT_Ki 3.72
+  // #define  DEFAULT_Kd 71.43
 
+  #define  DEFAULT_Kp 75.55
+  #define  DEFAULT_Ki 7.69
+  #define  DEFAULT_Kd 185.67
+
+
+// #endif
 #endif // PIDTEMP
-#endif
 //===========================================================================
 //====================== PID > Bed Temperature Control ======================
 //===========================================================================
@@ -589,30 +594,34 @@
 #if ENABLED(PIDTEMPBED)
   //#define MIN_BED_POWER 0
   //#define PID_BED_DEBUG // Sends debug data to the serial port.
-  #if ENABLED (I3PROW) || ENABLED (I3PROA)  || ENABLED (I3PROC) || ENABLED (I3PROX) || ENABLED (GTM201) 
-  #define  DEFAULT_bedKp 10.00
-  #define  DEFAULT_bedKi .023
-  #define  DEFAULT_bedKd 305.4
-  #elif ENABLED (I3PROB)
-  #define DEFAULT_bedKp 234.88
-  #define DEFAULT_bedKi 42.79
-  #define DEFAULT_bedKd 322.28
-  #elif ENABLED (MECREATOR2)
-  #define  DEFAULT_bedKp 129.40
-  #define  DEFAULT_bedKi 25.07
-  #define  DEFAULT_bedKd 166.96
-  #elif ENABLED (GTA30) || ENABLED (GTD200)
-  #define  DEFAULT_bedKp 369.610
-  #define  DEFAULT_bedKi 54.132
-  #define  DEFAULT_bedKd 602.870
-  #elif ENABLED (GTA10) || ENABLED (GTA20)
-  #define  DEFAULT_bedKp 200.24
-  #define  DEFAULT_bedKi 39.43 
-  #define  DEFAULT_bedKd 254.26
+  // #if ENABLED (I3PROW) || ENABLED (I3PROA)  || ENABLED (I3PROC) || ENABLED (I3PROX) || ENABLED (GTM201) 
+  // #define  DEFAULT_bedKp 10.00
+  // #define  DEFAULT_bedKi .023
+  // #define  DEFAULT_bedKd 305.4
+  // #elif ENABLED (I3PROB)
+  // #define DEFAULT_bedKp 234.88
+  // #define DEFAULT_bedKi 42.79
+  // #define DEFAULT_bedKd 322.28
+  // #elif ENABLED (MECREATOR2)
+  // #define  DEFAULT_bedKp 129.40
+  // #define  DEFAULT_bedKi 25.07
+  // #define  DEFAULT_bedKd 166.96
+  // #elif ENABLED (GTA30) || ENABLED (GTD200)
+  // #define  DEFAULT_bedKp 369.610
+  // #define  DEFAULT_bedKi 54.132
+  // #define  DEFAULT_bedKd 602.870
+  // #elif ENABLED (GTA10) || ENABLED (GTA20)
+  // #define  DEFAULT_bedKp 200.24
+  // #define  DEFAULT_bedKi 39.43 
+  // #define  DEFAULT_bedKd 254.26
 
   // FIND YOUR OWN: "M303 U1 E-1 S90 C8" to run autotune on the bed at 90 degreesC for 8 cycles.
+
+  #define  DEFAULT_bedKp 34.63
+  #define  DEFAULT_bedKi  6.71
+  #define  DEFAULT_bedKd 119.13
+// #endif
 #endif // PIDTEMPBED
-#endif
 // @section extruder
 
 /**
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index c2f4c031c..5298670b4 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1730,7 +1730,7 @@
                                                   // This short retract is done immediately, before parking the nozzle.
   #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     60  // (mm/s) Unload filament feedrate. This can be pretty fast.
   #define FILAMENT_CHANGE_UNLOAD_ACCEL         5  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #define FILAMENT_CHANGE_UNLOAD_LENGTH      450  // (mm) The length of filament for a complete unload.
+  #define FILAMENT_CHANGE_UNLOAD_LENGTH      525  // (mm) The length of filament for a complete unload.
                                                   //   For Bowden, the full length of the tube and nozzle.
                                                   //   For direct drive, the full length of the nozzle.
                                                   //   Set to 0 for manual unloading.