Addition of additional iconsets, and a python script to aid conversio…

…n of other iconsets. Icons taken from the Cinnamon Weather desklet by Chris Hastie: http://www.oak-wood.co.uk/oss/other/bbcwx
RedNax67 · Mar 7, 2017 · 8145eb2 · 8145eb2
1 parent 7fb3afd
commit 8145eb2
Show file tree

Hide file tree

Showing 397 changed files with 363 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.gitconfig
+*.pyc
diff --git a/MMM-WunderGround.js b/MMM-WunderGround.js
@@ -35,6 +35,7 @@ Module.register("MMM-WunderGround", {
         layout: "vertical",
         sysstat: 0,
         scaletxt: 1,
+        iconset: "VCloudsWeatherIcons",
 
         retryDelay: 2500,
 
@@ -915,7 +916,7 @@ Module.register("MMM-WunderGround", {
             // console.log("Wrap: " + fc_wrap + " Scale: " + fc_scale + " Lines: " + fc_lines + " Length: " + fc_text.length);
 
             this.temperature = this.roundValue(this.temperature);
-            this.weatherTypeTxt = "<img src='./modules/MMM-WunderGround/img/VCloudsWeatherIcons/" +
+            this.weatherTypeTxt = "<img src='./modules/MMM-WunderGround/img/" + this.config.iconset + "/" +
                 data.current_observation.icon_url.replace('http://icons.wxug.com/i/c/k/', '').replace('.gif', '.png') +
                 "' style='vertical-align:middle' class='currentWeatherIcon'>";
 
@@ -957,7 +958,7 @@ Module.register("MMM-WunderGround", {
                 this.windSpd = "wi-wind-beaufort-" + this.ms2Beaufort(forecast.maxwind.kph);
                 this.windSpdMph = forecast.maxwind.mph;
 
-                this.icon_url = "<img style='max-height:100%; max-width:100%; vertical-align:middle' src='./modules/MMM-WunderGround/img/VCloudsWeatherIcons/" +
+                this.icon_url = "<img style='max-height:100%; max-width:100%; vertical-align:middle' src='./modules/MMM-WunderGround/img/" + this.config.iconset + "/" +
                     forecast.icon_url.replace('http://icons.wxug.com/i/c/k/', '').replace('.gif', '.png') + "' class='forecastWeatherIcon'>";
 
                 this.forecast.push({
@@ -1008,7 +1009,7 @@ Module.register("MMM-WunderGround", {
                         hourlyforecast.icon] : this.config.iconTableNight[
                         hourlyforecast.icon];
 
-                    this.ForecastIconUrl = "<img style='max-height:100%; max-width:100%; vertical-align:middle' src='./modules/MMM-WunderGround/img/VCloudsWeatherIcons/" +
+                    this.ForecastIconUrl = "<img style='max-height:100%; max-width:100%; vertical-align:middle' src='./modules/MMM-WunderGround/img/" + this.config.iconset + "/" +
                         hourlyforecast.icon_url.replace('http://icons.wxug.com/i/c/k/', '').replace('.gif', '.png') + "' class='forecastWeatherIcon'>";
 
 
@@ -1180,4 +1181,4 @@ Module.register("MMM-WunderGround", {
 
     }
 
-});
+});
diff --git a/README.md b/README.md
@@ -232,6 +232,13 @@ The following properties can be configured:
 				<br><b>Default value:</b>  <code>"vertical"</code>
 			</td>
 		</tr>
+		<tr>
+			<td><code>iconset</code></td>
+			<td>Selects the style of icons to show<br>
+				<br><b>Possible values:</b> <code>"colourful", "dark", "flat_black", "flat_colourful", "flat_white", "light", "novacon", "sketchy", "VCloudsWeatherIcons", "weezle"</code>
+				<br><b>Default value:</b> <code>"VCloudsWeatherIcons"</code>
+			</td>
+		</tr>
 		<tr>
 			<td><code>sysstat</code></td>
 			<td>Toggle sysinfo display<br>

diff --git a/img/colourful/README b/img/colourful/README
@@ -0,0 +1,6 @@
+Icons in this directory are part of the Plain Weather Icon set and
+are copyright (c) Merlin the Red 2010. They were sourced from
+http://merlinthered.deviantart.com/art/plain-weather-icons-157162192
+
+They are licensed under the  Creative Commons Attribution-NonCommercial-
+ShareAlike license
diff --git a/img/colourful/chanceflurries.png b/img/colourful/chanceflurries.png
diff --git a/img/colourful/chancerain.png b/img/colourful/chancerain.png
diff --git a/img/colourful/chancesleet.png b/img/colourful/chancesleet.png
diff --git a/img/colourful/chancesnow.png b/img/colourful/chancesnow.png
diff --git a/img/colourful/chancetstorms.png b/img/colourful/chancetstorms.png
diff --git a/img/colourful/clear.png b/img/colourful/clear.png
diff --git a/img/colourful/cloudy.png b/img/colourful/cloudy.png
diff --git a/img/colourful/cold.png b/img/colourful/cold.png
diff --git a/img/colourful/flurries.png b/img/colourful/flurries.png
diff --git a/img/colourful/fog.png b/img/colourful/fog.png
diff --git a/img/colourful/hazy.png b/img/colourful/hazy.png
diff --git a/img/colourful/iconmeta.json b/img/colourful/iconmeta.json
@@ -0,0 +1,13 @@
+{
+    "ext": "png", 
+    "aspect": 1,
+    "map" : {
+      "00" : "04",
+      "01" : "02",
+      "03" : "04",
+      "09" : "11",
+      "24" : "23",
+      "25" : "cold",
+      "37" : "38"
+    }
+}
diff --git a/img/colourful/meteoblue.png b/img/colourful/meteoblue.png
diff --git a/img/colourful/mostlycloudy.png b/img/colourful/mostlycloudy.png
diff --git a/img/colourful/mostlysunny.png b/img/colourful/mostlysunny.png
diff --git a/img/colourful/nt_chanceflurries.png b/img/colourful/nt_chanceflurries.png
diff --git a/img/colourful/nt_chancerain.png b/img/colourful/nt_chancerain.png
diff --git a/img/colourful/nt_chancesleet.png b/img/colourful/nt_chancesleet.png
diff --git a/img/colourful/nt_chancesnow.png b/img/colourful/nt_chancesnow.png
diff --git a/img/colourful/nt_chancetstorms.png b/img/colourful/nt_chancetstorms.png
diff --git a/img/colourful/nt_clear.png b/img/colourful/nt_clear.png
diff --git a/img/colourful/nt_cloudy.png b/img/colourful/nt_cloudy.png
diff --git a/img/colourful/nt_flurries.png b/img/colourful/nt_flurries.png
diff --git a/img/colourful/nt_fog.png b/img/colourful/nt_fog.png
diff --git a/img/colourful/nt_hazy.png b/img/colourful/nt_hazy.png
diff --git a/img/colourful/nt_mostlycloudy.png b/img/colourful/nt_mostlycloudy.png
diff --git a/img/colourful/nt_mostlysunny.png b/img/colourful/nt_mostlysunny.png
diff --git a/img/colourful/nt_partlycloudy.png b/img/colourful/nt_partlycloudy.png
diff --git a/img/colourful/nt_partlysunny.png b/img/colourful/nt_partlysunny.png
diff --git a/img/colourful/nt_rain.png b/img/colourful/nt_rain.png
diff --git a/img/colourful/nt_sleet.png b/img/colourful/nt_sleet.png
diff --git a/img/colourful/nt_snow.png b/img/colourful/nt_snow.png
diff --git a/img/colourful/nt_sunny.png b/img/colourful/nt_sunny.png
diff --git a/img/colourful/nt_tstorms.png b/img/colourful/nt_tstorms.png
diff --git a/img/colourful/nt_unknown.png b/img/colourful/nt_unknown.png
diff --git a/img/colourful/partlycloudy.png b/img/colourful/partlycloudy.png
diff --git a/img/colourful/partlysunny.png b/img/colourful/partlysunny.png
diff --git a/img/colourful/rain.png b/img/colourful/rain.png
diff --git a/img/colourful/sleet.png b/img/colourful/sleet.png
diff --git a/img/colourful/snow.png b/img/colourful/snow.png
diff --git a/img/colourful/sunny.png b/img/colourful/sunny.png
diff --git a/img/colourful/tstorms.png b/img/colourful/tstorms.png
diff --git a/img/colourful/unknown.png b/img/colourful/unknown.png
diff --git a/img/colourful/wunderground.png b/img/colourful/wunderground.png
diff --git a/img/dark/README b/img/dark/README
@@ -0,0 +1,6 @@
+Icons in this directory are part of the Plain Weather Icon set and
+are copyright (c) Merlin the Red 2010. They were sourced from
+http://merlinthered.deviantart.com/art/plain-weather-icons-157162192
+
+They are licensed under the  Creative Commons Attribution-NonCommercial-
+ShareAlike license
diff --git a/img/dark/chanceflurries.png b/img/dark/chanceflurries.png
diff --git a/img/dark/chancerain.png b/img/dark/chancerain.png
diff --git a/img/dark/chancesleet.png b/img/dark/chancesleet.png
diff --git a/img/dark/chancesnow.png b/img/dark/chancesnow.png
diff --git a/img/dark/chancetstorms.png b/img/dark/chancetstorms.png
diff --git a/img/dark/clear.png b/img/dark/clear.png
diff --git a/img/dark/cloudy.png b/img/dark/cloudy.png
diff --git a/img/dark/cold.png b/img/dark/cold.png
diff --git a/img/dark/flurries.png b/img/dark/flurries.png
diff --git a/img/dark/fog.png b/img/dark/fog.png
diff --git a/img/dark/hazy.png b/img/dark/hazy.png
diff --git a/img/dark/iconmeta.json b/img/dark/iconmeta.json
@@ -0,0 +1,14 @@
+{
+    "ext": "png", 
+    "aspect": 1,
+    "map" : {
+      "00" : "04",
+      "01" : "02",
+      "03" : "04",
+      "09" : "11",
+      "26d": "26",
+      "24" : "23",
+      "25" : "cold",
+      "37" : "38"
+    }
+}
diff --git a/img/dark/mostlycloudy.png b/img/dark/mostlycloudy.png
diff --git a/img/dark/mostlysunny.png b/img/dark/mostlysunny.png
diff --git a/img/dark/nt_chanceflurries.png b/img/dark/nt_chanceflurries.png
diff --git a/img/dark/nt_chancerain.png b/img/dark/nt_chancerain.png
diff --git a/img/dark/nt_chancesleet.png b/img/dark/nt_chancesleet.png
diff --git a/img/dark/nt_chancesnow.png b/img/dark/nt_chancesnow.png
diff --git a/img/dark/nt_chancetstorms.png b/img/dark/nt_chancetstorms.png
diff --git a/img/dark/nt_clear.png b/img/dark/nt_clear.png
diff --git a/img/dark/nt_cloudy.png b/img/dark/nt_cloudy.png
diff --git a/img/dark/nt_flurries.png b/img/dark/nt_flurries.png
diff --git a/img/dark/nt_fog.png b/img/dark/nt_fog.png
diff --git a/img/dark/nt_hazy.png b/img/dark/nt_hazy.png
diff --git a/img/dark/nt_mostlycloudy.png b/img/dark/nt_mostlycloudy.png
diff --git a/img/dark/nt_mostlysunny.png b/img/dark/nt_mostlysunny.png
diff --git a/img/dark/nt_partlycloudy.png b/img/dark/nt_partlycloudy.png
diff --git a/img/dark/nt_partlysunny.png b/img/dark/nt_partlysunny.png
diff --git a/img/dark/nt_rain.png b/img/dark/nt_rain.png
diff --git a/img/dark/nt_sleet.png b/img/dark/nt_sleet.png
diff --git a/img/dark/nt_snow.png b/img/dark/nt_snow.png
diff --git a/img/dark/nt_sunny.png b/img/dark/nt_sunny.png
diff --git a/img/dark/nt_tstorms.png b/img/dark/nt_tstorms.png
diff --git a/img/dark/nt_unknown.png b/img/dark/nt_unknown.png
diff --git a/img/dark/partlycloudy.png b/img/dark/partlycloudy.png
diff --git a/img/dark/partlysunny.png b/img/dark/partlysunny.png
diff --git a/img/dark/rain.png b/img/dark/rain.png
diff --git a/img/dark/sleet.png b/img/dark/sleet.png
diff --git a/img/dark/snow.png b/img/dark/snow.png
diff --git a/img/dark/sunny.png b/img/dark/sunny.png
diff --git a/img/dark/tstorms.png b/img/dark/tstorms.png
diff --git a/img/dark/unknown.png b/img/dark/unknown.png
diff --git a/img/dark/wunderground.png b/img/dark/wunderground.png
diff --git a/img/flat_black/README b/img/flat_black/README
@@ -0,0 +1,6 @@
+Icons in this directory are part of the Plain Weather Icon set and
+are copyright (c) Merlin the Red 2010. They were sourced from
+http://merlinthered.deviantart.com/art/plain-weather-icons-157162192
+
+They are licensed under the  Creative Commons Attribution-NonCommercial-
+ShareAlike license
diff --git a/img/flat_black/chanceflurries.png b/img/flat_black/chanceflurries.png
diff --git a/img/flat_black/chancerain.png b/img/flat_black/chancerain.png
diff --git a/img/flat_black/chancesleet.png b/img/flat_black/chancesleet.png
diff --git a/img/flat_black/chancesnow.png b/img/flat_black/chancesnow.png
diff --git a/img/flat_black/chancetstorms.png b/img/flat_black/chancetstorms.png
diff --git a/img/flat_black/clear.png b/img/flat_black/clear.png
diff --git a/img/flat_black/cloudy.png b/img/flat_black/cloudy.png
diff --git a/img/flat_black/cold.png b/img/flat_black/cold.png
diff --git a/img/flat_black/flurries.png b/img/flat_black/flurries.png
diff --git a/img/flat_black/fog.png b/img/flat_black/fog.png
diff --git a/img/flat_black/hazy.png b/img/flat_black/hazy.png
diff --git a/img/flat_black/iconmeta.json b/img/flat_black/iconmeta.json
@@ -0,0 +1,14 @@
+{
+    "ext": "png", 
+    "aspect": 1,
+    "map" : {
+      "00" : "04",
+      "01" : "02",
+      "03" : "04",
+      "09" : "11",
+      "24" : "23",
+      "25" : "cold",
+      "26d": "26",
+      "37" : "38"
+    }
+}
diff --git a/img/flat_black/mostlycloudy.png b/img/flat_black/mostlycloudy.png
diff --git a/img/flat_black/mostlysunny.png b/img/flat_black/mostlysunny.png
diff --git a/img/flat_black/nt_chanceflurries.png b/img/flat_black/nt_chanceflurries.png
diff --git a/img/flat_black/nt_chancerain.png b/img/flat_black/nt_chancerain.png
diff --git a/img/flat_black/nt_chancesleet.png b/img/flat_black/nt_chancesleet.png
diff --git a/img/flat_black/nt_chancesnow.png b/img/flat_black/nt_chancesnow.png
diff --git a/img/flat_black/nt_chancetstorms.png b/img/flat_black/nt_chancetstorms.png
diff --git a/img/flat_black/nt_clear.png b/img/flat_black/nt_clear.png
diff --git a/img/flat_black/nt_cloudy.png b/img/flat_black/nt_cloudy.png
diff --git a/img/flat_black/nt_flurries.png b/img/flat_black/nt_flurries.png
diff --git a/img/flat_black/nt_fog.png b/img/flat_black/nt_fog.png
diff --git a/img/flat_black/nt_hazy.png b/img/flat_black/nt_hazy.png
diff --git a/img/flat_black/nt_mostlycloudy.png b/img/flat_black/nt_mostlycloudy.png
diff --git a/img/flat_black/nt_mostlysunny.png b/img/flat_black/nt_mostlysunny.png
diff --git a/img/flat_black/nt_partlycloudy.png b/img/flat_black/nt_partlycloudy.png
diff --git a/img/flat_black/nt_partlysunny.png b/img/flat_black/nt_partlysunny.png
diff --git a/img/flat_black/nt_rain.png b/img/flat_black/nt_rain.png
diff --git a/img/flat_black/nt_sleet.png b/img/flat_black/nt_sleet.png
diff --git a/img/flat_black/nt_snow.png b/img/flat_black/nt_snow.png
diff --git a/img/flat_black/nt_sunny.png b/img/flat_black/nt_sunny.png
diff --git a/img/flat_black/nt_tstorms.png b/img/flat_black/nt_tstorms.png
diff --git a/img/flat_black/nt_unknown.png b/img/flat_black/nt_unknown.png
diff --git a/img/flat_black/partlycloudy.png b/img/flat_black/partlycloudy.png
diff --git a/img/flat_black/partlysunny.png b/img/flat_black/partlysunny.png
diff --git a/img/flat_black/rain.png b/img/flat_black/rain.png
diff --git a/img/flat_black/sleet.png b/img/flat_black/sleet.png
diff --git a/img/flat_black/snow.png b/img/flat_black/snow.png
diff --git a/img/flat_black/sunny.png b/img/flat_black/sunny.png
diff --git a/img/flat_black/tstorms.png b/img/flat_black/tstorms.png
diff --git a/img/flat_black/unknown.png b/img/flat_black/unknown.png
diff --git a/img/flat_black/wunderground.png b/img/flat_black/wunderground.png
diff --git a/img/flat_colourful/README b/img/flat_colourful/README
@@ -0,0 +1,6 @@
+Icons in this directory are part of the Plain Weather Icon set and
+are copyright (c) Merlin the Red 2010. They were sourced from
+http://merlinthered.deviantart.com/art/plain-weather-icons-157162192
+
+They are licensed under the  Creative Commons Attribution-NonCommercial-
+ShareAlike license
diff --git a/img/flat_colourful/chanceflurries.png b/img/flat_colourful/chanceflurries.png
diff --git a/img/flat_colourful/chancerain.png b/img/flat_colourful/chancerain.png
diff --git a/img/flat_colourful/chancesleet.png b/img/flat_colourful/chancesleet.png
diff --git a/img/flat_colourful/chancesnow.png b/img/flat_colourful/chancesnow.png
diff --git a/img/flat_colourful/chancetstorms.png b/img/flat_colourful/chancetstorms.png
diff --git a/img/flat_colourful/clear.png b/img/flat_colourful/clear.png
diff --git a/img/flat_colourful/cloudy.png b/img/flat_colourful/cloudy.png
diff --git a/img/flat_colourful/cold.png b/img/flat_colourful/cold.png
diff --git a/img/flat_colourful/flurries.png b/img/flat_colourful/flurries.png
diff --git a/img/flat_colourful/fog.png b/img/flat_colourful/fog.png
diff --git a/img/flat_colourful/hazy.png b/img/flat_colourful/hazy.png
diff --git a/img/flat_colourful/iconmeta.json b/img/flat_colourful/iconmeta.json
@@ -0,0 +1,13 @@
+{
+    "ext": "png", 
+    "aspect": 1,
+    "map" : {
+      "00" : "04",
+      "01" : "02",
+      "03" : "04",
+      "09" : "11",
+      "24" : "23",
+      "25" : "cold",
+      "37" : "38"
+    }
+}
diff --git a/img/flat_colourful/mostlycloudy.png b/img/flat_colourful/mostlycloudy.png
diff --git a/img/flat_colourful/mostlysunny.png b/img/flat_colourful/mostlysunny.png
diff --git a/img/flat_colourful/nt_chanceflurries.png b/img/flat_colourful/nt_chanceflurries.png
diff --git a/img/flat_colourful/nt_chancerain.png b/img/flat_colourful/nt_chancerain.png
diff --git a/img/flat_colourful/nt_chancesleet.png b/img/flat_colourful/nt_chancesleet.png
diff --git a/img/flat_colourful/nt_chancesnow.png b/img/flat_colourful/nt_chancesnow.png
diff --git a/img/flat_colourful/nt_chancetstorms.png b/img/flat_colourful/nt_chancetstorms.png
diff --git a/img/flat_colourful/nt_clear.png b/img/flat_colourful/nt_clear.png
diff --git a/img/flat_colourful/nt_cloudy.png b/img/flat_colourful/nt_cloudy.png
diff --git a/img/flat_colourful/nt_flurries.png b/img/flat_colourful/nt_flurries.png
diff --git a/img/flat_colourful/nt_fog.png b/img/flat_colourful/nt_fog.png
diff --git a/img/flat_colourful/nt_hazy.png b/img/flat_colourful/nt_hazy.png
diff --git a/img/flat_colourful/nt_mostlycloudy.png b/img/flat_colourful/nt_mostlycloudy.png
diff --git a/img/flat_colourful/nt_mostlysunny.png b/img/flat_colourful/nt_mostlysunny.png
diff --git a/img/flat_colourful/nt_partlycloudy.png b/img/flat_colourful/nt_partlycloudy.png
diff --git a/img/flat_colourful/nt_partlysunny.png b/img/flat_colourful/nt_partlysunny.png
diff --git a/img/flat_colourful/nt_rain.png b/img/flat_colourful/nt_rain.png
diff --git a/img/flat_colourful/nt_sleet.png b/img/flat_colourful/nt_sleet.png
diff --git a/img/flat_colourful/nt_snow.png b/img/flat_colourful/nt_snow.png
diff --git a/img/flat_colourful/nt_sunny.png b/img/flat_colourful/nt_sunny.png
diff --git a/img/flat_colourful/nt_tstorms.png b/img/flat_colourful/nt_tstorms.png
diff --git a/img/flat_colourful/nt_unknown.png b/img/flat_colourful/nt_unknown.png
diff --git a/img/flat_colourful/partlycloudy.png b/img/flat_colourful/partlycloudy.png
diff --git a/img/flat_colourful/partlysunny.png b/img/flat_colourful/partlysunny.png
diff --git a/img/flat_colourful/rain.png b/img/flat_colourful/rain.png
diff --git a/img/flat_colourful/sleet.png b/img/flat_colourful/sleet.png
diff --git a/img/flat_colourful/snow.png b/img/flat_colourful/snow.png
diff --git a/img/flat_colourful/sunny.png b/img/flat_colourful/sunny.png
diff --git a/img/flat_colourful/tstorms.png b/img/flat_colourful/tstorms.png
diff --git a/img/flat_colourful/unknown.png b/img/flat_colourful/unknown.png
diff --git a/img/flat_colourful/wunderground.png b/img/flat_colourful/wunderground.png
diff --git a/img/flat_white/README b/img/flat_white/README
@@ -0,0 +1,6 @@
+Icons in this directory are part of the Plain Weather Icon set and
+are copyright (c) Merlin the Red 2010. They were sourced from
+http://merlinthered.deviantart.com/art/plain-weather-icons-157162192
+
+They are licensed under the  Creative Commons Attribution-NonCommercial-
+ShareAlike license
diff --git a/img/flat_white/chanceflurries.png b/img/flat_white/chanceflurries.png
diff --git a/img/flat_white/chancerain.png b/img/flat_white/chancerain.png
diff --git a/img/flat_white/chancesleet.png b/img/flat_white/chancesleet.png
diff --git a/img/flat_white/chancesnow.png b/img/flat_white/chancesnow.png
diff --git a/img/flat_white/chancetstorms.png b/img/flat_white/chancetstorms.png
diff --git a/img/flat_white/clear.png b/img/flat_white/clear.png
diff --git a/img/flat_white/cloudy.png b/img/flat_white/cloudy.png
diff --git a/img/flat_white/cold.png b/img/flat_white/cold.png
diff --git a/img/flat_white/flurries.png b/img/flat_white/flurries.png
diff --git a/img/flat_white/fog.png b/img/flat_white/fog.png
diff --git a/img/flat_white/hazy.png b/img/flat_white/hazy.png
diff --git a/img/flat_white/iconmeta.json b/img/flat_white/iconmeta.json
@@ -0,0 +1,14 @@
+{
+    "ext": "png", 
+    "aspect": 1,
+    "map" : {
+      "00" : "04",
+      "01" : "02",
+      "03" : "04",
+      "09" : "11",
+      "24" : "23",
+      "25" : "cold",
+      "26d": "26",
+      "37" : "38"
+    }
+}
diff --git a/img/flat_white/mostlycloudy.png b/img/flat_white/mostlycloudy.png
diff --git a/img/flat_white/mostlysunny.png b/img/flat_white/mostlysunny.png
diff --git a/img/flat_white/nt_chanceflurries.png b/img/flat_white/nt_chanceflurries.png
diff --git a/img/flat_white/nt_chancerain.png b/img/flat_white/nt_chancerain.png
diff --git a/img/flat_white/nt_chancesleet.png b/img/flat_white/nt_chancesleet.png
diff --git a/img/flat_white/nt_chancesnow.png b/img/flat_white/nt_chancesnow.png
diff --git a/img/flat_white/nt_chancetstorms.png b/img/flat_white/nt_chancetstorms.png
diff --git a/img/flat_white/nt_clear.png b/img/flat_white/nt_clear.png
diff --git a/img/flat_white/nt_cloudy.png b/img/flat_white/nt_cloudy.png
diff --git a/img/flat_white/nt_flurries.png b/img/flat_white/nt_flurries.png
diff --git a/img/flat_white/nt_fog.png b/img/flat_white/nt_fog.png
diff --git a/img/flat_white/nt_hazy.png b/img/flat_white/nt_hazy.png
diff --git a/img/flat_white/nt_mostlycloudy.png b/img/flat_white/nt_mostlycloudy.png
diff --git a/img/flat_white/nt_mostlysunny.png b/img/flat_white/nt_mostlysunny.png
diff --git a/img/flat_white/nt_partlycloudy.png b/img/flat_white/nt_partlycloudy.png
diff --git a/img/flat_white/nt_partlysunny.png b/img/flat_white/nt_partlysunny.png
diff --git a/img/flat_white/nt_rain.png b/img/flat_white/nt_rain.png
diff --git a/img/flat_white/nt_sleet.png b/img/flat_white/nt_sleet.png
diff --git a/img/flat_white/nt_snow.png b/img/flat_white/nt_snow.png
diff --git a/img/flat_white/nt_sunny.png b/img/flat_white/nt_sunny.png
diff --git a/img/flat_white/nt_tstorms.png b/img/flat_white/nt_tstorms.png
diff --git a/img/flat_white/nt_unknown.png b/img/flat_white/nt_unknown.png
diff --git a/img/flat_white/partlycloudy.png b/img/flat_white/partlycloudy.png
diff --git a/img/flat_white/partlysunny.png b/img/flat_white/partlysunny.png
diff --git a/img/flat_white/rain.png b/img/flat_white/rain.png
diff --git a/img/flat_white/sleet.png b/img/flat_white/sleet.png
diff --git a/img/flat_white/snow.png b/img/flat_white/snow.png
diff --git a/img/flat_white/sunny.png b/img/flat_white/sunny.png
diff --git a/img/flat_white/tstorms.png b/img/flat_white/tstorms.png
diff --git a/img/flat_white/unknown.png b/img/flat_white/unknown.png
diff --git a/img/flat_white/wunderground.png b/img/flat_white/wunderground.png
diff --git a/img/iconremap.py b/img/iconremap.py
@@ -0,0 +1,162 @@
+# iconremap.py
+# William Skellenger <wskellenger@gmail.com>
+# 6-March-2017
+#
+# Utility to remap weather numeric types to wunderground descriptive names.
+# Mapping technique taken from the bbcwx desklet for the Cinnamon desktop, Chris Hastie
+#
+# ----
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import shutil, os, json
+
+#lots of varying info on these codes.
+#from: https://apidev.accuweather.com/developers/weatherIcons
+#also: https://developer.accuweather.com/weather-icons
+#also: https://gist.github.com/aloncarmel/8575527
+#also: https://github.com/ikromin/jphotoframe/blob/master/src/net/igorkromin/WeatherConditionCodes.java
+
+yahoo_codes = {
+        "00": "tornado",
+        "01": "tropical_storm",
+        "02": "hurricane",
+        "03": "severe_thunderstoms",
+        "04": "thunderstoms",
+        "05": "mixed_rain_and_snow",
+        "06": "mixed_rain_and_sleet",
+        "07": "mixed_snow_and_sleet",
+        "08": "freezing_drizzle",
+        "09": "drizzle",
+        "10": "freezing_rain",
+        "11": "showers1",
+        "12": "showers2",
+        "13": "snow_flurries",
+        "14": "light_snow_showers",
+        "15": "blowing_snow",
+        "16": "snow",
+        "17": "hail",
+        "18": "sleet",
+        "19": "dust",
+        "20": "foggy",
+        "21": "haze",
+        "22": "smoky",
+        "23": "blustery",
+        "24": "windy",
+        "25": "cold",
+        "26": "cloudy",
+        "27": "mostly_cloudy_night",
+        "28": "mostly_cloudy_day",
+        "29": "partly_cloudy_night",
+        "30": "partly_cloudy_day",
+        "31": "clear_night",
+        "32": "sunny",
+        "33": "fair_night",
+        "34": "fair_day",
+        "35": "mixed_rain_and_hail",
+        "36": "hot",
+        "37": "isolated_thunderstorms",
+        "38": "scattered_thunderstorms1",
+        "39": "scattered_thunderstorms2",
+        "40": "scattered_showers",
+        "41": "heavy_snow1",
+        "42": "scatterd_snow_showers",
+        "43": "heavy_snow2",
+        "44": "partly_cloudy",
+        "45": "thundershowers",   #night?
+        "46": "snow_showers",     #night?
+        "47": "isolated_thundershowers",
+        "3200": "not_available",
+        }
+
+#see: https://www.wunderground.com/weather/api/d/docs?d=resources/phrase-glossary&_ga=1.30437887.153121224.1487080712
+DAY=0
+NIGHT=1
+
+wunderground = {
+        "chanceflurries": ["13", "46"],
+        "chancerain":     ["39", "45"],	
+        "chancesleet":    ["06", "45"],
+        "chancesnow":     ["41", "46"],
+        "chancetstorms":  ["37", "47"],
+        "clear":          ["32", "31"],
+        "cloudy":         ["26", "27"],
+        "flurries":       ["13", "46"],
+        "fog":            ["20", "20"],
+        "hazy":           ["22", "22"],
+        "mostlycloudy":   ["28", "27"],
+        "mostlysunny":    ["34", "27"],
+        "partlycloudy":   ["30", "29"],
+        "partlysunny":    ["30", "29"],
+        "sleet":          ["18", "45"],
+        "rain":           ["12", "45"],
+        "snow":           ["16", "46"],
+        "sunny":          ["32", "31"],
+        "tstorms":        ["04", "47"],
+        "unknown":        ["na", "na"],
+        }
+
+
+#the files in removelist will be deleted at the end of the run
+removelist = []
+
+def copyfile(src, dest):
+    try:
+        shutil.copyfile(src, dest)
+    except IOError:
+        print "ERROR IN COPY %s --> %s" %(src, dest)
+        print "  * %s doesn't exist" %(src)
+        pass
+
+def getjsonmap():
+    jf = open('iconmeta.json')
+    j = json.load(jf)
+    jf.close()
+    return j['map']
+
+
+def main():
+
+    #create missing files from jsonmap if necessary
+    jsonmap = getjsonmap()
+
+    #create files if they are missing
+    for newnumeric in jsonmap.keys():
+        copyfile(jsonmap[newnumeric] + ".png", newnumeric + ".png")
+
+    print "-----"
+
+    #look for a .png file with the given name
+    for descriptivename in wunderground.keys():
+
+        numericname = wunderground[descriptivename][DAY]
+        nightnumericname = wunderground[descriptivename][NIGHT]
+
+        #copy the numeric name --> descriptive name
+        copyfile(numericname + '.png', descriptivename + '.png')
+        removelist.append(numericname + '.png')
+
+        #copy night numeric name --> "nt_" + descriptive name
+        copyfile(nightnumericname + '.png', 'nt_' + descriptivename + '.png')
+        removelist.append(nightnumericname + '.png')
+
+    #delete the files we don't need anymore
+    for oldfile in removelist:
+        print "Removing %s" %(oldfile)
+        try:
+            os.remove(oldfile)
+        except OSError:
+            pass  #if we can't delete the file, don't care
+
+main()
diff --git a/img/light/README b/img/light/README
@@ -0,0 +1,6 @@
+Icons in this directory are part of the Plain Weather Icon set and
+are copyright (c) Merlin the Red 2010. They were sourced from
+http://merlinthered.deviantart.com/art/plain-weather-icons-157162192
+
+They are licensed under the  Creative Commons Attribution-NonCommercial-
+ShareAlike license
diff --git a/img/light/chanceflurries.png b/img/light/chanceflurries.png
diff --git a/img/light/chancerain.png b/img/light/chancerain.png
diff --git a/img/light/chancesleet.png b/img/light/chancesleet.png
diff --git a/img/light/chancesnow.png b/img/light/chancesnow.png
diff --git a/img/light/chancetstorms.png b/img/light/chancetstorms.png
diff --git a/img/light/clear.png b/img/light/clear.png
diff --git a/img/light/cloudy.png b/img/light/cloudy.png
diff --git a/img/light/cold.png b/img/light/cold.png
diff --git a/img/light/flurries.png b/img/light/flurries.png
diff --git a/img/light/fog.png b/img/light/fog.png
diff --git a/img/light/hazy.png b/img/light/hazy.png
diff --git a/img/light/iconmeta.json b/img/light/iconmeta.json
@@ -0,0 +1,14 @@
+{
+    "ext": "png", 
+    "aspect": 1,
+    "map" : {
+      "00" : "04",
+      "01" : "02",
+      "03" : "04",
+      "09" : "11",
+      "24" : "23",
+      "25" : "cold",
+      "26d": "26",
+      "37" : "38"
+    }
+}
diff --git a/img/light/mostlycloudy.png b/img/light/mostlycloudy.png
diff --git a/img/light/mostlysunny.png b/img/light/mostlysunny.png
diff --git a/img/light/nt_chanceflurries.png b/img/light/nt_chanceflurries.png
diff --git a/img/light/nt_chancerain.png b/img/light/nt_chancerain.png
diff --git a/img/light/nt_chancesleet.png b/img/light/nt_chancesleet.png
diff --git a/img/light/nt_chancesnow.png b/img/light/nt_chancesnow.png
diff --git a/img/light/nt_chancetstorms.png b/img/light/nt_chancetstorms.png
diff --git a/img/light/nt_clear.png b/img/light/nt_clear.png
diff --git a/img/light/nt_cloudy.png b/img/light/nt_cloudy.png
diff --git a/img/light/nt_flurries.png b/img/light/nt_flurries.png
diff --git a/img/light/nt_fog.png b/img/light/nt_fog.png
diff --git a/img/light/nt_hazy.png b/img/light/nt_hazy.png
diff --git a/img/light/nt_mostlycloudy.png b/img/light/nt_mostlycloudy.png
diff --git a/img/light/nt_mostlysunny.png b/img/light/nt_mostlysunny.png
diff --git a/img/light/nt_partlycloudy.png b/img/light/nt_partlycloudy.png
diff --git a/img/light/nt_partlysunny.png b/img/light/nt_partlysunny.png
diff --git a/img/light/nt_rain.png b/img/light/nt_rain.png
diff --git a/img/light/nt_sleet.png b/img/light/nt_sleet.png
diff --git a/img/light/nt_snow.png b/img/light/nt_snow.png
diff --git a/img/light/nt_sunny.png b/img/light/nt_sunny.png
diff --git a/img/light/nt_tstorms.png b/img/light/nt_tstorms.png
diff --git a/img/light/nt_unknown.png b/img/light/nt_unknown.png
diff --git a/img/light/partlycloudy.png b/img/light/partlycloudy.png
diff --git a/img/light/partlysunny.png b/img/light/partlysunny.png
diff --git a/img/light/rain.png b/img/light/rain.png
diff --git a/img/light/sleet.png b/img/light/sleet.png
diff --git a/img/light/snow.png b/img/light/snow.png
diff --git a/img/light/sunny.png b/img/light/sunny.png
diff --git a/img/light/tstorms.png b/img/light/tstorms.png
diff --git a/img/light/unknown.png b/img/light/unknown.png
diff --git a/img/light/wunderground.png b/img/light/wunderground.png
diff --git a/img/novacon/README b/img/novacon/README
@@ -0,0 +1,6 @@
+Icons in this directory are copyright (c) digitalchet 2004 and 
+sourced from
+http://digitalchet.deviantart.com/art/Novacons-Weather-Icons-13133337
+
+They are licensed under the  Creative Commons Attribution-NonCommercial-
+ShareAlike license
diff --git a/img/novacon/chanceflurries.png b/img/novacon/chanceflurries.png
diff --git a/img/novacon/chancerain.png b/img/novacon/chancerain.png
diff --git a/img/novacon/chancesleet.png b/img/novacon/chancesleet.png
diff --git a/img/novacon/chancesnow.png b/img/novacon/chancesnow.png
diff --git a/img/novacon/chancetstorms.png b/img/novacon/chancetstorms.png
diff --git a/img/novacon/clear.png b/img/novacon/clear.png
diff --git a/img/novacon/cloudy.png b/img/novacon/cloudy.png
diff --git a/img/novacon/flurries.png b/img/novacon/flurries.png
diff --git a/img/novacon/fog.png b/img/novacon/fog.png
diff --git a/img/novacon/hazy.png b/img/novacon/hazy.png
diff --git a/img/novacon/iconmeta.json b/img/novacon/iconmeta.json
@@ -0,0 +1,15 @@
+{
+    "ext": "png", 
+    "aspect": 1,
+    "map" : {
+      "00" : "04",
+      "01" : "02",
+      "03" : "04",
+      "06" : "07",
+      "21" : "20",
+      "22" : "20",
+      "24" : "23",
+      "26d" : "26",
+      "38" : "37"
+    }
+}
diff --git a/img/novacon/mostlycloudy.png b/img/novacon/mostlycloudy.png
diff --git a/img/novacon/mostlysunny.png b/img/novacon/mostlysunny.png
diff --git a/img/novacon/nt_chanceflurries.png b/img/novacon/nt_chanceflurries.png
diff --git a/img/novacon/nt_chancerain.png b/img/novacon/nt_chancerain.png
diff --git a/img/novacon/nt_chancesleet.png b/img/novacon/nt_chancesleet.png
diff --git a/img/novacon/nt_chancesnow.png b/img/novacon/nt_chancesnow.png
diff --git a/img/novacon/nt_chancetstorms.png b/img/novacon/nt_chancetstorms.png
diff --git a/img/novacon/nt_clear.png b/img/novacon/nt_clear.png
diff --git a/img/novacon/nt_cloudy.png b/img/novacon/nt_cloudy.png
diff --git a/img/novacon/nt_flurries.png b/img/novacon/nt_flurries.png
diff --git a/img/novacon/nt_fog.png b/img/novacon/nt_fog.png
diff --git a/img/novacon/nt_hazy.png b/img/novacon/nt_hazy.png
diff --git a/img/novacon/nt_mostlycloudy.png b/img/novacon/nt_mostlycloudy.png
diff --git a/img/novacon/nt_mostlysunny.png b/img/novacon/nt_mostlysunny.png
diff --git a/img/novacon/nt_partlycloudy.png b/img/novacon/nt_partlycloudy.png
diff --git a/img/novacon/nt_partlysunny.png b/img/novacon/nt_partlysunny.png
diff --git a/img/novacon/nt_rain.png b/img/novacon/nt_rain.png
diff --git a/img/novacon/nt_sleet.png b/img/novacon/nt_sleet.png
diff --git a/img/novacon/nt_snow.png b/img/novacon/nt_snow.png