diff --git a/modules/default/weather/current.html b/modules/default/weather/current.html
index 949d2fbc..416926b2 100644
--- a/modules/default/weather/current.html
+++ b/modules/default/weather/current.html
@@ -1,16 +1,18 @@
-<div class="normal medium">
-    <span class="wi wi-strong-wind dimmed"></span>
-    <span>
-        {{current.windSpeed}} <!-- should be converted to wind speed in correct unit ... -->
-        <sup>{{current.cardinalWindDirection()}}</sup>
-    </span>
-    <span class="wi dimmed wi-sunset"></span> <!-- hard coded, should use logic ... -->
-    <span> 00:00</span> <!-- hard coded, should use logic ... -->
-</div>
-<div class="large light">
-    <span class="wi weathericon wi-{{current.weatherType}}"></span>
-    <span class="bright"> {{current.temperature}}°</span></div> <!-- should show in correct number of decimals -->
-</div>
+{% if current %}
+    <div class="normal medium">
+        <span class="wi wi-strong-wind dimmed"></span>
+        <span>
+            {{current.windSpeed}} <!-- should be converted to wind speed in correct unit ... -->
+            <sup>{{current.cardinalWindDirection()}}</sup>
+        </span>
+        <span class="wi dimmed wi-sunset"></span> <!-- hard coded, should use logic ... -->
+        <span> 00:00</span> <!-- hard coded, should use logic ... -->
+    </div>
+    <div class="large light">
+        <span class="wi weathericon wi-{{current.weatherType}}"></span>
+        <span class="bright"> {{current.temperature | round(1)}}°</span></div> <!-- should show in correct number of decimals -->
+    </div>
+{% endif %}
 
 <!-- Unclomment the line below to see the contents of the `current` object. -->
 <!-- <div style="word-wrap:break-word" class="xsmall dimmed">{{current | dump}}</div> -->
\ No newline at end of file
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 614c3243..6a0eec54 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -14,7 +14,40 @@ Module.register("weather",{
 		weatherProvider: "openweathermap",
 		units: config.units,
 		roundTemp: false,
-		type: "current" //current, forecast
+		type: "current", //current, forecast
+
+		//
+
+		location: false,
+		locationID: false,
+		appid: "",
+		units: config.units,
+		updateInterval: 10 * 60 * 1000, // every 10 minutes
+		animationSpeed: 1000,
+		timeFormat: config.timeFormat,
+		showPeriod: true,
+		showPeriodUpper: false,
+		showWindDirection: true,
+		showWindDirectionAsArrow: false,
+		useBeaufort: true,
+		lang: config.language,
+		showHumidity: false,
+		degreeLabel: false,
+		showIndoorTemperature: false,
+		showIndoorHumidity: false,
+
+		initialLoadDelay: 0, // 0 seconds delay
+		retryDelay: 2500,
+
+		apiVersion: "2.5",
+		apiBase: "http://api.openweathermap.org/data/",
+		weatherEndpoint: "weather",
+
+		appendLocationNameToHeader: true,
+		calendarClass: "calendar",
+
+		onlyTemp: false,
+		roundTemp: false
 	},
 
 	// Module properties.
@@ -60,7 +93,8 @@ Module.register("weather",{
 		return {
 			config: this.config,
 			current: this.weatherProvider.currentWeather(),
-			forecast: this.weatherProvider.weatherForecast()
+			forecast: this.weatherProvider.weatherForecast(),
+			myBoolean: true
 		}
 	},