diff --git a/include/user_config_override-template.h b/include/user_config_override-template.h
index 2f1fd4a7..fd01a783 100644
--- a/include/user_config_override-template.h
+++ b/include/user_config_override-template.h
@@ -9,6 +9,8 @@
 //
 // To use: Save a copy as user_config_override.h
 ***************************************************/
+#ifndef HASP_USER_CONFIG_OVERRIDE_H
+#define HASP_USER_CONFIG_OVERRIDE_H
 
 #define SERIAL_SPEED 115200
 
@@ -48,6 +50,19 @@
 #define SYSLOG_PORT 514
 #define APP_NAME "HASP"
 
+/***************************************************
+ *        Timezone Settings
+ **************************************************/
+#define MYTZ "CET-1CEST,M3.5.0,M10.5.0/3"            // A full list with possible timezones can be found here https://gist.github.com/alwynallan/24d96091655391107939
+
+/***************************************************
+ *        Interface Language Settings
+ **************************************************/
+#define HASP_LANGUAGE en_US                          // English
+// #define HASP_LANGUAGE nl_NL                       // Dutch
+// #define HASP_LANGUAGE hu_HU                       // Hungarian
+// #define HASP_LANGUAGE ro_RO                       // Romanian
+
 /***************************************************
  *        Web interface coloring
  **************************************************/
@@ -77,3 +92,5 @@
  *        Other Settings
  **************************************************/
 //#define HASP_USE_HA                                 // Enable Home Assistant auto-discovery
+
+#endif
\ No newline at end of file
diff --git a/src/user_config_override_sample.h b/src/user_config_override_sample.h
deleted file mode 100644
index 25429883..00000000
--- a/src/user_config_override_sample.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef HASP_USER_CONFIG_OVERRIDE_H
-#define HASP_USER_CONFIG_OVERRIDE_H
-/***************************************************
-   Setup WiFi Settings
- **************************************************/
-// #define WIFI_SSID ""                                 // WiFi SSID
-// #define WIFI_PASSW ""                                // WiFi Password
-
-/***************************************************
-           MQTT Settings
- **************************************************/
-// #define MQTT_HOST ""                                 // MQTT server Address
-// #define MQTT_PORT 1883                               // MQTT server Port
-// #define MQTT_USER ""                                 // Optional Username
-// #define MQTT_PASSW ""                                // Optional Password
-// #define MQTT_GROUPNAME "plates"                      // MQTT Group topic for all plates to listen on, default: plates
-// #define MQTT_PREFIX "hasp"                           // Prefix for all MQTT topics, default: hasp
-
-/***************************************************
-           SYSLOG Settings
- **************************************************/
-// #define SYSLOG_SERVER ""                             // Syslog server Address
-// #define SYSLOG_PORT 514                              // Syslog server Port
-
-/***************************************************
-          Timezone Settings
- **************************************************/
-// #define MYTZ "CET-1CEST,M3.5.0,M10.5.0/3"            // A full list with possible timezones can be found here https://gist.github.com/alwynallan/24d96091655391107939
-
-/***************************************************
-          Interface Language Settings
- **************************************************/
-// #define HASP_LANGUAGE en_US                          // English
-// #define HASP_LANGUAGE nl_NL                          // Dutch
-// #define HASP_LANGUAGE hu_HU                          // Hungarian
-// #define HASP_LANGUAGE ro_RO                          // Romanian
-
-/***************************************************
-          Web Interface Templates
- **************************************************/
-/*
-//default theme
-#define D_HTTP_COLOR_TEXT               "#000"          // Global text color - Black
-#define D_HTTP_COLOR_BACKGROUND         "#fff"          // Global background color - White
-#define D_HTTP_COLOR_INPUT_TEXT         "#000"          // Input text color - Black
-#define D_HTTP_COLOR_INPUT              "#fff"          // Input background color - White
-#define D_HTTP_COLOR_INPUT_WARNING      "#f00"          // Warning text color - Red
-#define D_HTTP_COLOR_BUTTON_TEXT        "#fff"          // Button text color - White
-#define D_HTTP_COLOR_BUTTON             "#1fa3ec"       // Button color - Vivid blue
-#define D_HTTP_COLOR_BUTTON_RESET       "#f00"          // Restart/Reset/Delete button color - red
-*/
-/*
-// Dark theme
-#define D_HTTP_COLOR_TEXT               "#eaeaea"       // Global text color - Very light gray
-#define D_HTTP_COLOR_BACKGROUND         "#252525"       // Global background color - Very dark gray (mostly black)
-#define D_HTTP_COLOR_INPUT_TEXT         "#000"          // Input text color - Black
-#define D_HTTP_COLOR_INPUT              "#ddd"          // Input background color - Very light gray
-#define D_HTTP_COLOR_INPUT_WARNING      "#ff5661"       // Warning text color - Brick Red
-#define D_HTTP_COLOR_BUTTON_TEXT        "#faffff"       // Button text color - Very pale (mostly white) cyan
-#define D_HTTP_COLOR_BUTTON             "#1fa3ec"       // Button color - Vivid blue
-#define D_HTTP_COLOR_BUTTON_RESET       "#d43535"       // Restart/Reset/Delete button color - Strong red
-*/
-/*
-// Purple theme
-#define D_HTTP_COLOR_TEXT               "#eaeaea"
-#define D_HTTP_COLOR_BACKGROUND         "#252525"
-#define D_HTTP_COLOR_INPUT_TEXT         "#eaeaea"
-#define D_HTTP_COLOR_INPUT              "#282531"
-#define D_HTTP_COLOR_INPUT_WARNING      "#ff5661"
-#define D_HTTP_COLOR_BUTTON_TEXT        "#faffff"
-#define D_HTTP_COLOR_BUTTON             "#694fa8"
-#define D_HTTP_COLOR_BUTTON_RESET       "#b73d5d"
-*/
-/*
-// Green theme
-#define D_HTTP_COLOR_TEXT               "#edddd4"
-#define D_HTTP_COLOR_BACKGROUND         "#283d3b"
-#define D_HTTP_COLOR_INPUT_TEXT         "#edddd4"
-#define D_HTTP_COLOR_INPUT              "#197278"
-#define D_HTTP_COLOR_INPUT_WARNING      "#772e25"
-#define D_HTTP_COLOR_BUTTON_TEXT        "#edddd4"
-#define D_HTTP_COLOR_BUTTON             "#197278"
-#define D_HTTP_COLOR_BUTTON_RESET       "#c44536"
-*/
-#endif
\ No newline at end of file