diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js
index bde4b13b0..e99a3624d 100644
--- a/js/defaults_dialog.js
+++ b/js/defaults_dialog.js
@@ -160,70 +160,63 @@ helper.defaultsDialog = (function () {
                 value: "DSHOT300"
             },
             /*
-            Filtering
+            Ez Tune setup
             */
             {
-                key: "gyro_main_lpf_hz",
-                value: 110
-            },
-            {
-                key: "gyro_main_lpf_type",
-                value: "PT1"
+                key: "ez_enabled",
+                value: "ON"
             },
-            /*
-            Dynamic gyro LPF
-            */
             {
-                key: "gyro_use_dyn_lpf",
-                value: "ON"
+                key: "ez_filter_hz",
+                value: 110
             },
             {
-                key: "gyro_dyn_lpf_min_hz",
-                value: 85
+                key: "ez_axis_ratio",
+                value: 110
             },
             {
-                key: "gyro_dyn_lpf_max_hz",
-                value: 300
+                key: "ez_response",
+                value: 92
             },
             {
-                key: "gyro_dyn_lpf_curve_expo",
-                value: 3
+                key: "ez_damping",
+                value: 108
             },
-            /*
-            D-term
-            */
             {
-                key: "dterm_lpf_hz",
+                key: "ez_stability",
                 value: 110
             },
             {
-                key: "dterm_lpf_type",
-                value: "PT3"
+                key: "ez_aggressiveness",
+                value: 80
             },
             {
-                key: "dynamic_gyro_notch_enabled",
-                value: "ON"
+                key: "ez_rate",
+                value: 134
             },
             {
-                key: "dynamic_gyro_notch_q",
-                value: 250
+                key: "ez_expo",
+                value: 118
             },
+            /*
+            Dynamic gyro LPF
+            */
             {
-                key: "dynamic_gyro_notch_min_hz",
-                value: 100
+                key: "gyro_use_dyn_lpf",
+                value: "ON"
             },
             {
-                key: "setpoint_kalman_enabled",
-                value: "ON"
+                key: "gyro_dyn_lpf_min_hz",
+                value: 85
             },
             {
-                key: "setpoint_kalman_q",
-                value: 200
+                key: "gyro_dyn_lpf_max_hz",
+                value: 300
             },
             {
-                key: "smith_predictor_delay",   // Enable Smith Predictor 
-                value: 1.5
-            },   
+                key: "gyro_dyn_lpf_curve_expo",
+                value: 3
+            },
             /*
             Mechanics
             */
@@ -255,64 +248,6 @@ helper.defaultsDialog = (function () {
                 key: "antigravity_accelerator",
                 value: 5
             },
-            /*
-            Rates
-            */
-            {
-                key: "rc_yaw_expo",
-                value: 75
-            },
-            {
-                key: "rc_expo",
-                value: 75
-            },
-            {
-                key: "roll_rate",
-                value: 70
-            },
-            {
-                key: "pitch_rate",
-                value: 70
-            },
-            {
-                key: "yaw_rate",
-                value: 60
-            },
-            /*
-            PIDs
-            */
-            {
-                key: "mc_p_pitch",
-                value: 40
-            },
-            {
-                key: "mc_i_pitch",
-                value: 90
-            },
-            {
-                key: "mc_d_pitch",
-                value: 27
-            },
-            {
-                key: "mc_p_roll",
-                value: 36
-            },
-            {
-                key: "mc_i_roll",
-                value: 80
-            },
-            {
-                key: "mc_d_roll",
-                value: 25
-            },
-            {
-                key: "mc_p_yaw",
-                value: 35
-            },
-            {
-                key: "mc_i_yaw",
-                value: 80
-            },
             /*
              * TPA
              */
@@ -335,11 +270,6 @@ helper.defaultsDialog = (function () {
             {
                 key: "failsafe_procedure",
                 value: "DROP"
-            },
-            // Ez Tune
-            {
-                key: "ez_filter_hz",
-                value: 110
             }
         ]
     },