diff --git a/source/Core/Inc/configuration.h b/source/Core/Inc/configuration.h
index 6c692165..0f85e170 100644
--- a/source/Core/Inc/configuration.h
+++ b/source/Core/Inc/configuration.h
@@ -78,8 +78,8 @@
 #else
 #define POWER_PULSE_DEFAULT 5
 #endif
-#define POWER_PULSE_WAIT_DEFAULT     4; // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
-#define POWER_PULSE_DURATION_DEFAULT 1; // Default duration of the power pulse: 1*250 = 250 ms
+#define POWER_PULSE_WAIT_DEFAULT     4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
+#define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms
 
 /**
  * OLED Orientation Sensitivity on Automatic mode!
diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
index 6c99d409..a112a032 100644
--- a/source/Core/Src/Settings.cpp
+++ b/source/Core/Src/Settings.cpp
@@ -41,39 +41,39 @@ typedef struct {
 } SettingConstants;
 static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = {
     //{min,max,increment,default}
-    {0, 0, 0, 0},                                                    // SolderingTemp
-    {10, 580, 0, 0},                                                 // SleepTemp
-    {0, 16, 1, 0},                                                   // SleepTime
-    {0, 5, 1, 0},                                                    // MinDCVoltageCells
-    {24, 38, 1, 31},                                                 // MinVoltageCells
-    {0, QC_SETTINGS_MAX, 1, 0},                                      // QCIdealVoltage
-    {0, 0, 0, 0},                                                    // OrientationMode
-    {0, 10, 0, 0},                                                   // Sensitivity
-    {0, 1, 1, 1},                                                    // AnimationLoop
-    {0, settingOffSpeed_t::MAX_VALUE, 1, settingOffSpeed_t::MEDIUM}, // AnimationSpeed
-    {0, 4, 1, 0},                                                    // AutoStartMode
-    {0, 60, 1, 0},                                                   // ShutdownTime
-    {0, 1, 1, 0},                                                    // CoolingTempBlink
-    {0, 1, 1, 0},                                                    // DetailedIDLE
-    {0, 1, 1, 0},                                                    // DetailedSoldering
-    {0, 1, 1, 0},                                                    // TemperatureInF
-    {0, 0, 0, 0},                                                    // DescriptionScrollSpeed
-    {0, 3, 1, 0},                                                    // LockingMode
-    {0, 100, 1, 0},                                                  // KeepAwakePulse
-    {1, POWER_PULSE_WAIT_MAX, 1, 0},                                 // KeepAwakePulseWait
-    {1, POWER_PULSE_DURATION_MAX, 1, 0},                             // KeepAwakePulseDuration
-    {360, 900, 1, 0},                                                // VoltageDiv
-    {0, 0, 0, 0},                                                    // BoostTemp
-    {0, 0, 0, 0},                                                    // CalibrationOffset
-    {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, 0},                      // PowerLimit
-    {0, 1, 1, 0},                                                    // ReverseButtonTempChangeEnabled
-    {5, 90, 5, 10},                                                  // TempChangeLongStep
-    {1, TEMP_CHANGE_SHORT_STEP_MAX, 1, 1},                           // TempChangeShortStep
-    {0, 4, 1, 0},                                                    // HallEffectSensitivity
-    {0, 10, 1, 0},                                                   // AccelMissingWarningCounter
-    {0, 10, 1, 0},                                                   // PDMissingWarningCounter
-    {0, 0, 0, 0},                                                    // UILanguage
-    {0, 50, 1, 0},                                                   // PDNegTimeout
+    {10, 580, 5, 320},                                              // SolderingTemp
+    {10, 580, 5, 150},                                              // SleepTemp
+    {0, 16, 1, SLEEP_TIME},                                         // SleepTime
+    {0, 5, 1, CUT_OUT_SETTING},                                     // MinDCVoltageCells
+    {24, 38, 1, RECOM_VOL_CELL},                                    // MinVoltageCells
+    {0, QC_SETTINGS_MAX, 1, 0},                                     // QCIdealVoltage
+    {0, 3, 1, ORIENTATION_MODE},                                    // OrientationMode
+    {0, 10, 1, SENSITIVITY},                                        // Sensitivity
+    {0, 1, 1, ANIMATION_LOOP},                                      // AnimationLoop
+    {0, settingOffSpeed_t::MAX_VALUE, 1, ANIMATION_SPEED},          // AnimationSpeed
+    {0, 4, 1, AUTO_START_MODE},                                     // AutoStartMode
+    {0, 60, 1, SHUTDOWN_TIME},                                      // ShutdownTime
+    {0, 1, 1, COOLING_TEMP_BLINK},                                  // CoolingTempBlink
+    {0, 1, 1, DETAILED_IDLE},                                       // DetailedIDLE
+    {0, 1, 1, DETAILED_SOLDERING},                                  // DetailedSoldering
+    {0, 1, 1, TEMPERATURE_INF},                                     // TemperatureInF
+    {0, 1, 1, DESCRIPTION_SCROLL_SPEED},                            // DescriptionScrollSpeed
+    {0, 3, 1, LOCKING_MODE},                                        // LockingMode
+    {0, 100, 1, POWER_PULSE_DEFAULT},                               // KeepAwakePulse
+    {1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT},         // KeepAwakePulseWait
+    {1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration
+    {360, 900, 1, VOLTAGE_DIV},                                     // VoltageDiv
+    {0, 0, 0, BOOST_TEMP},                                          // BoostTemp
+    {0, 0, 0, CALIBRATION_OFFSET},                                  // CalibrationOffset
+    {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT},           // PowerLimit
+    {0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE},                          // ReverseButtonTempChangeEnabled
+    {5, TEMP_CHANGE_LONG_STEP_MAX, 5, TEMP_CHANGE_LONG_STEP},       // TempChangeLongStep
+    {1, TEMP_CHANGE_SHORT_STEP_MAX, 1, TEMP_CHANGE_SHORT_STEP},     // TempChangeShortStep
+    {0, 4, 1, 1},                                                   // HallEffectSensitivity
+    {0, 10, 1, 0},                                                  // AccelMissingWarningCounter
+    {0, 10, 1, 0},                                                  // PDMissingWarningCounter
+    {0, 0, 0, 0},                                                   // UILanguage
+    {0, 50, 1, 0},                                                  // PDNegTimeout
 
 };