diff --git a/inc/config.h b/inc/config.h
--- a/inc/config.h
+++ b/inc/config.h
@@ -23,6 +23,7 @@
 // Interval of PID calculations
 #define PID_PERIOD 120
 
+#define MAX_SETPOINTS 10
 
 //////////////////////////////////////////////////////
 // Other settings
@@ -36,17 +37,19 @@
 // Default Settings
 //////////////////////////////////////////////////////
 
+//TODO: add defaults for all settings
 #define DEFAULT_BOOT_TO_BREW 0
 #define DEFAULT_TEMP_UNITS TEMP_UNITS_FAHRENHEIT
-#define DEFAULT_WINDUP_GUARD 10
-#define DEFAULT_K_P 10
-#define DEFAULT_K_I 1
-#define DEFAULT_K_D 1
+#define DEFAULT_WINDUP_GUARD 300
+#define DEFAULT_K_P 100
+#define DEFAULT_K_I 2
+#define DEFAULT_K_D 0
 #define DEFAULT_TEMP_OFFSET 0
 #define DEFAULT_IGNORE_ERROR 0
-#define DEFAULT_SETPOINT_BREW 70
-#define DEFAULT_SETPOINT_STEAM 70
+#define DEFAULT_SETPOINT 70
 #define DEFAULT_HYSTERESIS 1
+#define DEFAULT_SETPOINT_COUNT 1
+#define DEFAULT_SETPOINT_AUX_SELECT_ENABLE 0
 
 
 //////////////////////////////////////////////////////