diff --git a/esp8266-weather-station-color.ino b/esp8266-weather-station-color.ino
index a998846..014213f 100644
--- a/esp8266-weather-station-color.ino
+++ b/esp8266-weather-station-color.ino
@@ -17,7 +17,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 See more at https://blog.squix.org
 */
- 
+
 #include <Arduino.h>
 #include <SPI.h>
 #include <ESP8266WiFi.h>
@@ -50,7 +50,7 @@ See more at https://blog.squix.org
  * Important: see settings.h to configure your settings!!!
  * ***************************/
 #include "settings.h"
- 
+
 
 #define MINI_BLACK 0
 #define MINI_WHITE 1
@@ -163,7 +163,7 @@ void setup() {
   carousel.disableAllIndicators();
 
   //Manual Wifi
-  WiFi.begin("yourssid", "yourpassw0rd");
+  WiFi.begin(WIFI_SSID, WIFI_PASS);
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
     Serial.print(".");
@@ -551,7 +551,7 @@ const char* getMeteoconIconFromProgmem(String iconText) {
   if (iconText == "snow") return snow;
   if (iconText == "sunny") return sunny;
   if (iconText == "tstorms") return tstorms;
-  
+
 
   return unknown;
 }
diff --git a/settings.h b/settings.h
index 69c3c5f..5130b96 100644
--- a/settings.h
+++ b/settings.h
@@ -32,7 +32,8 @@ const int UPDATE_INTERVAL_SECS = 10 * 60; // Update every 10 minutes
 #define TOUCH_CS D3
 #define TOUCH_IRQ  D4
 
-
+#define WIFI_SSID "yourssid"
+#define WIFI_PASS "yourpassw0rd"
 // Wunderground Settings
 // To check your settings first try them out in your browser:
 // http://api.wunderground.com/api/WUNDERGROUND_API_KEY/conditions/q/WUNDERGROUND_COUNTTRY/WUNDERGROUND_CITY.json
@@ -40,7 +41,7 @@ const int UPDATE_INTERVAL_SECS = 10 * 60; // Update every 10 minutes
 // e.g. http://api.wunderground.com/api/808ba87ed77c4511/conditions/q/CA/SAN_FRANCISCO.json <- note that in the US you use the state instead of country code
 
 const String DISPLAYED_CITY_NAME = "Zürich";
-const String WUNDERGRROUND_API_KEY = "<WUNDERGROUND KEY>";
+const String WUNDERGRROUND_API_KEY = "WUNDERGROUND_API_KEY";
 const String WUNDERGRROUND_LANGUAGE = "EN";
 const String WUNDERGROUND_COUNTRY = "CH";
 const String WUNDERGROUND_CITY = "Zurich";