263 files changed, 521 insertions, 72 deletions

diff --git a/app.py b/app.py
deleted file mode 100644
index 72e74ca..0000000
--- a/app.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-import json, requests, datetime, argparse, pytz, flask
-import library, forms
-
-app = flask.Flask(__name__)
-app.config['SECRET_KEY'] = "hunter2"
-
-@app.route('/', methods=('GET','POST'))
-def index():
-    form = forms.WeatherForm()
-    if form.validate_on_submit():
-        location = form.location.data
-        return flask.redirect(flask.url_for('weather', location=location))
-    return flask.render_template("index.html", form=form)
-
-
-@app.route('/weather', methods=('GET','POST'))
-def weather():
-    location = flask.request.args.get('location', type=str)
-    latitude, longitude = library.get_lat_long(location)
-    data = library.get_data(latitude, longitude)
-    hour = library.get_current_rounded_time(data["timezone"]).hour
-    form = forms.WeatherForm()
-    if form.validate_on_submit():
-        location = form.location.data
-        return flask.redirect(flask.url_for('weather', location=location))
-    return flask.render_template("weather.html", data=data, form=form, weather_codes=library.weather_codes, 
-            weather_icons=library.weather_icons, hour=hour)
-
-if __name__ == "__main__":
-    app.run()
diff --git a/src/app.py b/src/app.py
new file mode 100644
index 0000000..6426b04
--- /dev/null
+++ b/src/app.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+import json, requests, datetime, argparse, pytz, flask
+import library, forms
+
+app = flask.Flask(__name__)
+app.config['SECRET_KEY'] = "JAnmklasd39u2mnwim"
+
+
+def check_submission(location):
+    latitude, longitude = library.get_lat_long(location)
+    if (latitude, longitude) == (0, 0):
+        return flask.redirect(flask.url_for('location', location=location))
+    else:
+        return flask.redirect(flask.url_for('weather', latitude=latitude, longitude=longitude))
+
+
+@app.route('/', methods=('GET','POST'))
+def index():
+    form = forms.WeatherForm()
+    if form.validate_on_submit():
+        location = form.location.data
+        return check_submission(location)
+    else:
+        return flask.render_template("index.html", form=form)
+
+
+@app.route('/weather', methods=('GET','POST'))
+def weather():
+    latitude = flask.request.args.get('latitude', type=str)
+    longitude = flask.request.args.get('longitude', type=str)
+    data = library.get_data(latitude, longitude)
+    hour = library.get_current_rounded_time(data["timezone"]).hour
+    form = forms.WeatherForm()
+    if form.validate_on_submit():
+        location = form.location.data
+        return check_submission(location)
+    else:
+        return flask.render_template("weather.html", data=data, form=form, weather_codes=library.weather_codes, datetime=datetime,
+            weather_icons=library.weather_icons, hour=hour, get_direction_icon=library.get_direction_icon)
+
+
+@app.route('/location', methods=('GET','POST'))
+def location():
+    location = flask.request.args.get('location', type=str)
+    url = f"https://geocoding-api.open-meteo.com/v1/search?name={location}&count=10&language=en&format=json"
+    headers = {"User-Agent": "pywttr 0.1"}
+    data = requests.get(url, headers=headers).json()
+
+    choices = []
+    for i in range(len(data["results"])):
+        point = data["results"][i]
+        choice_str = point["name"] + ", "
+        if "admin1" in point:
+            choice_str += point["admin1"] + ", " 
+        if "country" in point:
+            choice_str += point["country"]
+        choices.append((i, choice_str))
+
+    form = forms.LocationForm()
+    form.location.choices = choices
+    form.location.default = choices[0]
+    if form.is_submitted():
+        location = data["results"][int(form.location.data)]
+        latitude = location["latitude"]
+        longitude = location["longitude"]
+        return flask.redirect(flask.url_for('weather', latitude=latitude, longitude=longitude))
+    else:
+        return flask.render_template("location.html", data=data, form=form)
+
+
+if __name__ == "__main__":
+    app.run(debug=True)
diff --git a/forms.py b/src/forms.py
index e31befd..ee08c0e 100644
--- a/forms.py
+++ b/src/forms.py
@@ -4,3 +4,7 @@ class WeatherForm(flask_wtf.FlaskForm):
     location = wtforms.StringField("Location")
     submit = wtforms.SubmitField("Submit")
 
+class LocationForm(flask_wtf.FlaskForm):
+    location = wtforms.SelectField("Location")
+    submit = wtforms.SubmitField("Submit")
+
diff --git a/library.py b/src/library.py
index 5c17e96..38217fc 100644
--- a/library.py
+++ b/src/library.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import datetime, requests, json, pytz, sys
-from geopy.geocoders import Nominatim, GeoNames
 
 weather_codes = {0:"Clear Sky", 1:"Mainly Clear",2:"Partly Cloudy",3:"Overcast",45:"Fog",48:"Fog",51:"Light Drizzle",\
                  53:"Moderate Drizzle",55:"Dense Drizzle",56:"Light Freezing Drizzle",57:"Freezing Drizzle",\
@@ -20,14 +19,29 @@ weather_icons = {0:('wi-day-sunny','wi-night-clear'), 1:('wi-day-sunny','wi-nigh
                  85:('wi-day-snow','wi-night-snow'),86:('wi-day-snow','wi-night-snow'),95:('wi-day-storm-showers','wi-night-storm-showers'),\
                  96:('wi-day-storm-showers','wi-night-storm-showers'),99:('wi-day-storm-showers','wi-night-storm-showers')}
 
+
+def get_direction_icon(degrees):
+    directions = ['N','NNE','NE','ENE','E','ESE','SE','SSE','S','SSW','SW','WSW','W','NWN','NW','NNW','N']
+    icons = {'N':'north','NNE':None,'NE':'north-east','ENE':None,'E':'east','ESE':None,'SE':'south-east','SSE':None,\
+            'S':'south','SSW':None,'SW':'south-west','WSW':None,'W':'west','NWN':None,'NW':'north-west','NNW':None,'N':'north'}
+    points = 8
+    step = 360 / points
+    index = (round((degrees + step / 2) / step) * 16) / points;
+    direction = directions[int(index)]
+    return icons[direction]
+
+
 def get_lat_long(location):
     # Converts a location into latitude and longitude
-    url = f"https://geocoding-api.open-meteo.com/v1/search?name={location}&count=1&language=en&format=json"
+    url = f"https://geocoding-api.open-meteo.com/v1/search?name={location}&count=10&language=en&format=json"
     headers = {"User-Agent": "pywttr 0.1"}
     data = requests.get(url, headers=headers).json()
-    latitude = data["results"][0]["latitude"]
-    longitude = data["results"][0]["longitude"]
-    return latitude, longitude
+    if len(data["results"]) > 1:
+        return 0,0
+    else:
+        latitude = data["results"][0]["latitude"]
+        longitude = data["results"][0]["longitude"]
+        return latitude, longitude
 
 
 def get_data(latitude, longitude):
diff --git a/src/run.sh b/src/run.sh
new file mode 100755
index 0000000..0d36b89
--- /dev/null
+++ b/src/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+flask run
diff --git a/static/icons/backup/celsius.svg b/src/static/icons/backup/celsius.svg
index 57db2e9..57db2e9 100644
--- a/static/icons/backup/celsius.svg
+++ b/src/static/icons/backup/celsius.svg
diff --git a/static/icons/backup/fahrenheit.svg b/src/static/icons/backup/fahrenheit.svg
index 9e21987..9e21987 100644
--- a/static/icons/backup/fahrenheit.svg
+++ b/src/static/icons/backup/fahrenheit.svg
diff --git a/static/icons/backup/fog.svg b/src/static/icons/backup/fog.svg
index c66e82d..c66e82d 100644
--- a/static/icons/backup/fog.svg
+++ b/src/static/icons/backup/fog.svg
diff --git a/static/icons/backup/hail.svg b/src/static/icons/backup/hail.svg
index d8dfb7f..d8dfb7f 100644
--- a/static/icons/backup/hail.svg
+++ b/src/static/icons/backup/hail.svg
diff --git a/static/icons/backup/hazy.svg b/src/static/icons/backup/hazy.svg
index 44678b2..44678b2 100644
--- a/static/icons/backup/hazy.svg
+++ b/src/static/icons/backup/hazy.svg
diff --git a/static/icons/backup/humidity.svg b/src/static/icons/backup/humidity.svg
index 3835684..3835684 100644
--- a/static/icons/backup/humidity.svg
+++ b/src/static/icons/backup/humidity.svg
diff --git a/static/icons/backup/lightning-rainy.svg b/src/static/icons/backup/lightning-rainy.svg
index 45cd3e0..45cd3e0 100644
--- a/static/icons/backup/lightning-rainy.svg
+++ b/src/static/icons/backup/lightning-rainy.svg
diff --git a/static/icons/backup/lightning.svg b/src/static/icons/backup/lightning.svg
index 2ee1433..2ee1433 100644
--- a/static/icons/backup/lightning.svg
+++ b/src/static/icons/backup/lightning.svg
diff --git a/static/icons/backup/night-clear.svg b/src/static/icons/backup/night-clear.svg
index ee464aa..ee464aa 100644
--- a/static/icons/backup/night-clear.svg
+++ b/src/static/icons/backup/night-clear.svg
diff --git a/static/icons/backup/night-partly-cloudy.svg b/src/static/icons/backup/night-partly-cloudy.svg
index 4f00227..4f00227 100644
--- a/static/icons/backup/night-partly-cloudy.svg
+++ b/src/static/icons/backup/night-partly-cloudy.svg
diff --git a/static/icons/backup/partly-cloudy.svg b/src/static/icons/backup/partly-cloudy.svg
index eaf9db4..eaf9db4 100644
--- a/static/icons/backup/partly-cloudy.svg
+++ b/src/static/icons/backup/partly-cloudy.svg
diff --git a/static/icons/backup/partly-rainy.svg b/src/static/icons/backup/partly-rainy.svg
index ef65f20..ef65f20 100644
--- a/static/icons/backup/partly-rainy.svg
+++ b/src/static/icons/backup/partly-rainy.svg
diff --git a/static/icons/backup/partly-snowy-rainy.svg b/src/static/icons/backup/partly-snowy-rainy.svg
index 1138075..1138075 100644
--- a/static/icons/backup/partly-snowy-rainy.svg
+++ b/src/static/icons/backup/partly-snowy-rainy.svg
diff --git a/static/icons/backup/pouring.svg b/src/static/icons/backup/pouring.svg
index 5fc77b4..5fc77b4 100644
--- a/static/icons/backup/pouring.svg
+++ b/src/static/icons/backup/pouring.svg
diff --git a/static/icons/backup/snow.svg b/src/static/icons/backup/snow.svg
index f52b984..f52b984 100644
--- a/static/icons/backup/snow.svg
+++ b/src/static/icons/backup/snow.svg
diff --git a/static/icons/backup/snowy-heavy.svg b/src/static/icons/backup/snowy-heavy.svg
index 4602c8c..4602c8c 100644
--- a/static/icons/backup/snowy-heavy.svg
+++ b/src/static/icons/backup/snowy-heavy.svg
diff --git a/static/icons/backup/snowy.svg b/src/static/icons/backup/snowy.svg
index 5fc77b4..5fc77b4 100644
--- a/static/icons/backup/snowy.svg
+++ b/src/static/icons/backup/snowy.svg
diff --git a/static/icons/backup/sunny.svg b/src/static/icons/backup/sunny.svg
index d2e94e4..d2e94e4 100644
--- a/static/icons/backup/sunny.svg
+++ b/src/static/icons/backup/sunny.svg
diff --git a/static/icons/backup/sunrise.svg b/src/static/icons/backup/sunrise.svg
index c831541..c831541 100644
--- a/static/icons/backup/sunrise.svg
+++ b/src/static/icons/backup/sunrise.svg
diff --git a/static/icons/backup/sunset.svg b/src/static/icons/backup/sunset.svg
index 207aa1e..207aa1e 100644
--- a/static/icons/backup/sunset.svg
+++ b/src/static/icons/backup/sunset.svg
diff --git a/static/icons/backup/thermometer.svg b/src/static/icons/backup/thermometer.svg
index 0a332bd..0a332bd 100644
--- a/static/icons/backup/thermometer.svg
+++ b/src/static/icons/backup/thermometer.svg
diff --git a/static/icons/backup/water-percent.svg b/src/static/icons/backup/water-percent.svg
index 9e4f40c..9e4f40c 100644
--- a/static/icons/backup/water-percent.svg
+++ b/src/static/icons/backup/water-percent.svg
diff --git a/static/icons/backup/windy.svg b/src/static/icons/backup/windy.svg
index 8b38bdc..8b38bdc 100644
--- a/static/icons/backup/windy.svg
+++ b/src/static/icons/backup/windy.svg
diff --git a/static/icons/clock.svg b/src/static/icons/clock.svg
index 56c6b94..56c6b94 100644
--- a/static/icons/clock.svg
+++ b/src/static/icons/clock.svg
diff --git a/static/icons/directions/east.svg b/src/static/icons/directions/east.svg
index e708757..e708757 100644
--- a/static/icons/directions/east.svg
+++ b/src/static/icons/directions/east.svg
diff --git a/static/icons/directions/north-east.svg b/src/static/icons/directions/north-east.svg
index a5b842c..a5b842c 100644
--- a/static/icons/directions/north-east.svg
+++ b/src/static/icons/directions/north-east.svg
diff --git a/static/icons/directions/north-west.svg b/src/static/icons/directions/north-west.svg
index e18211c..e18211c 100644
--- a/static/icons/directions/north-west.svg
+++ b/src/static/icons/directions/north-west.svg
diff --git a/static/icons/directions/north.svg b/src/static/icons/directions/north.svg
index cb15d38..cb15d38 100644
--- a/static/icons/directions/north.svg
+++ b/src/static/icons/directions/north.svg
diff --git a/static/icons/directions/south-east.svg b/src/static/icons/directions/south-east.svg
index b8fb1c9..b8fb1c9 100644
--- a/static/icons/directions/south-east.svg
+++ b/src/static/icons/directions/south-east.svg
diff --git a/static/icons/directions/south-west.svg b/src/static/icons/directions/south-west.svg
index dba0fe1..dba0fe1 100644
--- a/static/icons/directions/south-west.svg
+++ b/src/static/icons/directions/south-west.svg
diff --git a/static/icons/directions/south.svg b/src/static/icons/directions/south.svg
index 4be2792..4be2792 100644
--- a/static/icons/directions/south.svg
+++ b/src/static/icons/directions/south.svg
diff --git a/static/icons/directions/west.svg b/src/static/icons/directions/west.svg
index 4de4b71..4de4b71 100644
--- a/static/icons/directions/west.svg
+++ b/src/static/icons/directions/west.svg
diff --git a/static/icons/svg/wi-alien.svg b/src/static/icons/svg/wi-alien.svg
index e9c0226..e9c0226 100644
--- a/static/icons/svg/wi-alien.svg
+++ b/src/static/icons/svg/wi-alien.svg
diff --git a/static/icons/svg/wi-barometer.svg b/src/static/icons/svg/wi-barometer.svg
index ced7e29..ced7e29 100644
--- a/static/icons/svg/wi-barometer.svg
+++ b/src/static/icons/svg/wi-barometer.svg
diff --git a/static/icons/svg/wi-celsius.svg b/src/static/icons/svg/wi-celsius.svg
index 31dc639..31dc639 100644
--- a/static/icons/svg/wi-celsius.svg
+++ b/src/static/icons/svg/wi-celsius.svg
diff --git a/static/icons/svg/wi-cloud-down.svg b/src/static/icons/svg/wi-cloud-down.svg
index dcd6678..dcd6678 100644
--- a/static/icons/svg/wi-cloud-down.svg
+++ b/src/static/icons/svg/wi-cloud-down.svg
diff --git a/static/icons/svg/wi-cloud-refresh.svg b/src/static/icons/svg/wi-cloud-refresh.svg
index 3f3888f..3f3888f 100644
--- a/static/icons/svg/wi-cloud-refresh.svg
+++ b/src/static/icons/svg/wi-cloud-refresh.svg
diff --git a/static/icons/svg/wi-cloud-up.svg b/src/static/icons/svg/wi-cloud-up.svg
index bff0317..bff0317 100644
--- a/static/icons/svg/wi-cloud-up.svg
+++ b/src/static/icons/svg/wi-cloud-up.svg
diff --git a/static/icons/svg/wi-cloud.svg b/src/static/icons/svg/wi-cloud.svg
index fa77599..fa77599 100644
--- a/static/icons/svg/wi-cloud.svg
+++ b/src/static/icons/svg/wi-cloud.svg
diff --git a/static/icons/svg/wi-cloudy-gusts.svg b/src/static/icons/svg/wi-cloudy-gusts.svg
index 4300a1c..4300a1c 100644
--- a/static/icons/svg/wi-cloudy-gusts.svg
+++ b/src/static/icons/svg/wi-cloudy-gusts.svg
diff --git a/static/icons/svg/wi-cloudy-windy.svg b/src/static/icons/svg/wi-cloudy-windy.svg
index 013929c..013929c 100644
--- a/static/icons/svg/wi-cloudy-windy.svg
+++ b/src/static/icons/svg/wi-cloudy-windy.svg
diff --git a/static/icons/svg/wi-cloudy.svg b/src/static/icons/svg/wi-cloudy.svg
index c3eaf41..c3eaf41 100644
--- a/static/icons/svg/wi-cloudy.svg
+++ b/src/static/icons/svg/wi-cloudy.svg
diff --git a/static/icons/svg/wi-day-cloudy-gusts.svg b/src/static/icons/svg/wi-day-cloudy-gusts.svg
index 287acc9..287acc9 100644
--- a/static/icons/svg/wi-day-cloudy-gusts.svg
+++ b/src/static/icons/svg/wi-day-cloudy-gusts.svg
diff --git a/static/icons/svg/wi-day-cloudy-high.svg b/src/static/icons/svg/wi-day-cloudy-high.svg
index 81649a0..81649a0 100644
--- a/static/icons/svg/wi-day-cloudy-high.svg
+++ b/src/static/icons/svg/wi-day-cloudy-high.svg
diff --git a/static/icons/svg/wi-day-cloudy-windy.svg b/src/static/icons/svg/wi-day-cloudy-windy.svg
index d1a49bf..d1a49bf 100644
--- a/static/icons/svg/wi-day-cloudy-windy.svg
+++ b/src/static/icons/svg/wi-day-cloudy-windy.svg
diff --git a/static/icons/svg/wi-day-cloudy.svg b/src/static/icons/svg/wi-day-cloudy.svg
index cf63543..cf63543 100644
--- a/static/icons/svg/wi-day-cloudy.svg
+++ b/src/static/icons/svg/wi-day-cloudy.svg
diff --git a/static/icons/svg/wi-day-fog.svg b/src/static/icons/svg/wi-day-fog.svg
index 3da78ca..3da78ca 100644
--- a/static/icons/svg/wi-day-fog.svg
+++ b/src/static/icons/svg/wi-day-fog.svg
diff --git a/static/icons/svg/wi-day-hail.svg b/src/static/icons/svg/wi-day-hail.svg
index b813a6f..b813a6f 100644
--- a/static/icons/svg/wi-day-hail.svg
+++ b/src/static/icons/svg/wi-day-hail.svg
diff --git a/static/icons/svg/wi-day-haze.svg b/src/static/icons/svg/wi-day-haze.svg
index e19bf13..e19bf13 100644
--- a/static/icons/svg/wi-day-haze.svg
+++ b/src/static/icons/svg/wi-day-haze.svg
diff --git a/static/icons/svg/wi-day-light-wind.svg b/src/static/icons/svg/wi-day-light-wind.svg
index 535c6a4..535c6a4 100644
--- a/static/icons/svg/wi-day-light-wind.svg
+++ b/src/static/icons/svg/wi-day-light-wind.svg
diff --git a/static/icons/svg/wi-day-lightning.svg b/src/static/icons/svg/wi-day-lightning.svg
index 18413ed..18413ed 100644
--- a/static/icons/svg/wi-day-lightning.svg
+++ b/src/static/icons/svg/wi-day-lightning.svg
diff --git a/static/icons/svg/wi-day-rain-mix.svg b/src/static/icons/svg/wi-day-rain-mix.svg
index 8a5582d..8a5582d 100644
--- a/static/icons/svg/wi-day-rain-mix.svg
+++ b/src/static/icons/svg/wi-day-rain-mix.svg
diff --git a/static/icons/svg/wi-day-rain-wind.svg b/src/static/icons/svg/wi-day-rain-wind.svg
index db5b02b..db5b02b 100644
--- a/static/icons/svg/wi-day-rain-wind.svg
+++ b/src/static/icons/svg/wi-day-rain-wind.svg
diff --git a/static/icons/svg/wi-day-rain.svg b/src/static/icons/svg/wi-day-rain.svg
index 12b1219..12b1219 100644
--- a/static/icons/svg/wi-day-rain.svg
+++ b/src/static/icons/svg/wi-day-rain.svg
diff --git a/static/icons/svg/wi-day-showers.svg b/src/static/icons/svg/wi-day-showers.svg
index cd0cb0a..cd0cb0a 100644
--- a/static/icons/svg/wi-day-showers.svg
+++ b/src/static/icons/svg/wi-day-showers.svg
diff --git a/static/icons/svg/wi-day-sleet-storm.svg b/src/static/icons/svg/wi-day-sleet-storm.svg
index a7ff6e6..a7ff6e6 100644
--- a/static/icons/svg/wi-day-sleet-storm.svg
+++ b/src/static/icons/svg/wi-day-sleet-storm.svg
diff --git a/static/icons/svg/wi-day-sleet.svg b/src/static/icons/svg/wi-day-sleet.svg
index 42df1df..42df1df 100644
--- a/static/icons/svg/wi-day-sleet.svg
+++ b/src/static/icons/svg/wi-day-sleet.svg
diff --git a/static/icons/svg/wi-day-snow-thunderstorm.svg b/src/static/icons/svg/wi-day-snow-thunderstorm.svg
index b1e3f20..b1e3f20 100644
--- a/static/icons/svg/wi-day-snow-thunderstorm.svg
+++ b/src/static/icons/svg/wi-day-snow-thunderstorm.svg
diff --git a/static/icons/svg/wi-day-snow-wind.svg b/src/static/icons/svg/wi-day-snow-wind.svg
index 6a632dc..6a632dc 100644
--- a/static/icons/svg/wi-day-snow-wind.svg
+++ b/src/static/icons/svg/wi-day-snow-wind.svg
diff --git a/static/icons/svg/wi-day-snow.svg b/src/static/icons/svg/wi-day-snow.svg
index c1f1c71..c1f1c71 100644
--- a/static/icons/svg/wi-day-snow.svg
+++ b/src/static/icons/svg/wi-day-snow.svg
diff --git a/static/icons/svg/wi-day-sprinkle.svg b/src/static/icons/svg/wi-day-sprinkle.svg
index 5294fca..5294fca 100644
--- a/static/icons/svg/wi-day-sprinkle.svg
+++ b/src/static/icons/svg/wi-day-sprinkle.svg
diff --git a/static/icons/svg/wi-day-storm-showers.svg b/src/static/icons/svg/wi-day-storm-showers.svg
index 0166299..0166299 100644
--- a/static/icons/svg/wi-day-storm-showers.svg
+++ b/src/static/icons/svg/wi-day-storm-showers.svg
diff --git a/static/icons/svg/wi-day-sunny-overcast.svg b/src/static/icons/svg/wi-day-sunny-overcast.svg
index 4873b05..4873b05 100644
--- a/static/icons/svg/wi-day-sunny-overcast.svg
+++ b/src/static/icons/svg/wi-day-sunny-overcast.svg
diff --git a/static/icons/svg/wi-day-sunny.svg b/src/static/icons/svg/wi-day-sunny.svg
index eafcd77..eafcd77 100644
--- a/static/icons/svg/wi-day-sunny.svg
+++ b/src/static/icons/svg/wi-day-sunny.svg
diff --git a/static/icons/svg/wi-day-thunderstorm.svg b/src/static/icons/svg/wi-day-thunderstorm.svg
index 006a8e5..006a8e5 100644
--- a/static/icons/svg/wi-day-thunderstorm.svg
+++ b/src/static/icons/svg/wi-day-thunderstorm.svg
diff --git a/static/icons/svg/wi-day-windy.svg b/src/static/icons/svg/wi-day-windy.svg
index ea09d42..ea09d42 100644
--- a/static/icons/svg/wi-day-windy.svg
+++ b/src/static/icons/svg/wi-day-windy.svg
diff --git a/static/icons/svg/wi-degrees.svg b/src/static/icons/svg/wi-degrees.svg
index ba3de70..ba3de70 100644
--- a/static/icons/svg/wi-degrees.svg
+++ b/src/static/icons/svg/wi-degrees.svg
diff --git a/static/icons/svg/wi-direction-down-left.svg b/src/static/icons/svg/wi-direction-down-left.svg
index e5a46ff..e5a46ff 100644
--- a/static/icons/svg/wi-direction-down-left.svg
+++ b/src/static/icons/svg/wi-direction-down-left.svg
diff --git a/static/icons/svg/wi-direction-down-right.svg b/src/static/icons/svg/wi-direction-down-right.svg
index ecf35cc..ecf35cc 100644
--- a/static/icons/svg/wi-direction-down-right.svg
+++ b/src/static/icons/svg/wi-direction-down-right.svg
diff --git a/static/icons/svg/wi-direction-down.svg b/src/static/icons/svg/wi-direction-down.svg
index 17d7048..17d7048 100644
--- a/static/icons/svg/wi-direction-down.svg
+++ b/src/static/icons/svg/wi-direction-down.svg
diff --git a/static/icons/svg/wi-direction-left.svg b/src/static/icons/svg/wi-direction-left.svg
index bf3f5be..bf3f5be 100644
--- a/static/icons/svg/wi-direction-left.svg
+++ b/src/static/icons/svg/wi-direction-left.svg
diff --git a/static/icons/svg/wi-direction-right.svg b/src/static/icons/svg/wi-direction-right.svg
index 8f02b00..8f02b00 100644
--- a/static/icons/svg/wi-direction-right.svg
+++ b/src/static/icons/svg/wi-direction-right.svg
diff --git a/static/icons/svg/wi-direction-up-left.svg b/src/static/icons/svg/wi-direction-up-left.svg
index 884b611..884b611 100644
--- a/static/icons/svg/wi-direction-up-left.svg
+++ b/src/static/icons/svg/wi-direction-up-left.svg
diff --git a/static/icons/svg/wi-direction-up-right.svg b/src/static/icons/svg/wi-direction-up-right.svg
index 45d8f72..45d8f72 100644
--- a/static/icons/svg/wi-direction-up-right.svg
+++ b/src/static/icons/svg/wi-direction-up-right.svg
diff --git a/static/icons/svg/wi-direction-up.svg b/src/static/icons/svg/wi-direction-up.svg
index 668a152..668a152 100644
--- a/static/icons/svg/wi-direction-up.svg
+++ b/src/static/icons/svg/wi-direction-up.svg
diff --git a/static/icons/svg/wi-dust.svg b/src/static/icons/svg/wi-dust.svg
index aa90229..aa90229 100644
--- a/static/icons/svg/wi-dust.svg
+++ b/src/static/icons/svg/wi-dust.svg
diff --git a/static/icons/svg/wi-earthquake.svg b/src/static/icons/svg/wi-earthquake.svg
index c7c752d..c7c752d 100644
--- a/static/icons/svg/wi-earthquake.svg
+++ b/src/static/icons/svg/wi-earthquake.svg
diff --git a/static/icons/svg/wi-fahrenheit.svg b/src/static/icons/svg/wi-fahrenheit.svg
index dffa947..dffa947 100644
--- a/static/icons/svg/wi-fahrenheit.svg
+++ b/src/static/icons/svg/wi-fahrenheit.svg
diff --git a/static/icons/svg/wi-fire.svg b/src/static/icons/svg/wi-fire.svg
index 33b0502..33b0502 100644
--- a/static/icons/svg/wi-fire.svg
+++ b/src/static/icons/svg/wi-fire.svg
diff --git a/static/icons/svg/wi-flood.svg b/src/static/icons/svg/wi-flood.svg
index 48e218e..48e218e 100644
--- a/static/icons/svg/wi-flood.svg
+++ b/src/static/icons/svg/wi-flood.svg
diff --git a/static/icons/svg/wi-fog.svg b/src/static/icons/svg/wi-fog.svg
index cf06f8f..cf06f8f 100644
--- a/static/icons/svg/wi-fog.svg
+++ b/src/static/icons/svg/wi-fog.svg
diff --git a/static/icons/svg/wi-gale-warning.svg b/src/static/icons/svg/wi-gale-warning.svg
index 5e2f40d..5e2f40d 100644
--- a/static/icons/svg/wi-gale-warning.svg
+++ b/src/static/icons/svg/wi-gale-warning.svg
diff --git a/static/icons/svg/wi-hail.svg b/src/static/icons/svg/wi-hail.svg
index 26c4b0d..26c4b0d 100644
--- a/static/icons/svg/wi-hail.svg
+++ b/src/static/icons/svg/wi-hail.svg
diff --git a/static/icons/svg/wi-horizon-alt.svg b/src/static/icons/svg/wi-horizon-alt.svg
index ff423f3..ff423f3 100644
--- a/static/icons/svg/wi-horizon-alt.svg
+++ b/src/static/icons/svg/wi-horizon-alt.svg
diff --git a/static/icons/svg/wi-horizon.svg b/src/static/icons/svg/wi-horizon.svg
index feef2ef..feef2ef 100644
--- a/static/icons/svg/wi-horizon.svg
+++ b/src/static/icons/svg/wi-horizon.svg
diff --git a/static/icons/svg/wi-hot.svg b/src/static/icons/svg/wi-hot.svg
index 66faa3a..66faa3a 100644
--- a/static/icons/svg/wi-hot.svg
+++ b/src/static/icons/svg/wi-hot.svg
diff --git a/static/icons/svg/wi-humidity.svg b/src/static/icons/svg/wi-humidity.svg
index 9c75750..9c75750 100644
--- a/static/icons/svg/wi-humidity.svg
+++ b/src/static/icons/svg/wi-humidity.svg
diff --git a/static/icons/svg/wi-hurricane-warning.svg b/src/static/icons/svg/wi-hurricane-warning.svg
index 1365a44..1365a44 100644
--- a/static/icons/svg/wi-hurricane-warning.svg
+++ b/src/static/icons/svg/wi-hurricane-warning.svg
diff --git a/static/icons/svg/wi-hurricane.svg b/src/static/icons/svg/wi-hurricane.svg
index 3d2b4fd..3d2b4fd 100644
--- a/static/icons/svg/wi-hurricane.svg
+++ b/src/static/icons/svg/wi-hurricane.svg
diff --git a/static/icons/svg/wi-lightning.svg b/src/static/icons/svg/wi-lightning.svg
index 0709cf3..0709cf3 100644
--- a/static/icons/svg/wi-lightning.svg
+++ b/src/static/icons/svg/wi-lightning.svg
diff --git a/static/icons/svg/wi-lunar-eclipse.svg b/src/static/icons/svg/wi-lunar-eclipse.svg
index 7e86183..7e86183 100644
--- a/static/icons/svg/wi-lunar-eclipse.svg
+++ b/src/static/icons/svg/wi-lunar-eclipse.svg
diff --git a/static/icons/svg/wi-meteor.svg b/src/static/icons/svg/wi-meteor.svg
index 4da65ab..4da65ab 100644
--- a/static/icons/svg/wi-meteor.svg
+++ b/src/static/icons/svg/wi-meteor.svg
diff --git a/static/icons/svg/wi-moon-alt-first-quarter.svg b/src/static/icons/svg/wi-moon-alt-first-quarter.svg
index 26d9400..26d9400 100644
--- a/static/icons/svg/wi-moon-alt-first-quarter.svg
+++ b/src/static/icons/svg/wi-moon-alt-first-quarter.svg
diff --git a/static/icons/svg/wi-moon-alt-full.svg b/src/static/icons/svg/wi-moon-alt-full.svg
index 20fd7b4..20fd7b4 100644
--- a/static/icons/svg/wi-moon-alt-full.svg
+++ b/src/static/icons/svg/wi-moon-alt-full.svg
diff --git a/static/icons/svg/wi-moon-alt-new.svg b/src/static/icons/svg/wi-moon-alt-new.svg
index 75b89ac..75b89ac 100644
--- a/static/icons/svg/wi-moon-alt-new.svg
+++ b/src/static/icons/svg/wi-moon-alt-new.svg
diff --git a/static/icons/svg/wi-moon-alt-third-quarter.svg b/src/static/icons/svg/wi-moon-alt-third-quarter.svg
index 964d559..964d559 100644
--- a/static/icons/svg/wi-moon-alt-third-quarter.svg
+++ b/src/static/icons/svg/wi-moon-alt-third-quarter.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-crescent-1.svg b/src/static/icons/svg/wi-moon-alt-waning-crescent-1.svg
index 5e7d3a4..5e7d3a4 100644
--- a/static/icons/svg/wi-moon-alt-waning-crescent-1.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-crescent-1.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-crescent-2.svg b/src/static/icons/svg/wi-moon-alt-waning-crescent-2.svg
index 8386927..8386927 100644
--- a/static/icons/svg/wi-moon-alt-waning-crescent-2.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-crescent-2.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-crescent-3.svg b/src/static/icons/svg/wi-moon-alt-waning-crescent-3.svg
index aa2b4db..aa2b4db 100644
--- a/static/icons/svg/wi-moon-alt-waning-crescent-3.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-crescent-3.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-crescent-4.svg b/src/static/icons/svg/wi-moon-alt-waning-crescent-4.svg
index bb09c26..bb09c26 100644
--- a/static/icons/svg/wi-moon-alt-waning-crescent-4.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-crescent-4.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-crescent-5.svg b/src/static/icons/svg/wi-moon-alt-waning-crescent-5.svg
index 0f5b9be..0f5b9be 100644
--- a/static/icons/svg/wi-moon-alt-waning-crescent-5.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-crescent-5.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-crescent-6.svg b/src/static/icons/svg/wi-moon-alt-waning-crescent-6.svg
index ff23247..ff23247 100644
--- a/static/icons/svg/wi-moon-alt-waning-crescent-6.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-crescent-6.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-gibbous-1.svg b/src/static/icons/svg/wi-moon-alt-waning-gibbous-1.svg
index 4e7a6f6..4e7a6f6 100644
--- a/static/icons/svg/wi-moon-alt-waning-gibbous-1.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-gibbous-1.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-gibbous-2.svg b/src/static/icons/svg/wi-moon-alt-waning-gibbous-2.svg
index 0a363af..0a363af 100644
--- a/static/icons/svg/wi-moon-alt-waning-gibbous-2.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-gibbous-2.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-gibbous-3.svg b/src/static/icons/svg/wi-moon-alt-waning-gibbous-3.svg
index a8df601..a8df601 100644
--- a/static/icons/svg/wi-moon-alt-waning-gibbous-3.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-gibbous-3.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-gibbous-4.svg b/src/static/icons/svg/wi-moon-alt-waning-gibbous-4.svg
index 8df81ae..8df81ae 100644
--- a/static/icons/svg/wi-moon-alt-waning-gibbous-4.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-gibbous-4.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-gibbous-5.svg b/src/static/icons/svg/wi-moon-alt-waning-gibbous-5.svg
index 9a0354e..9a0354e 100644
--- a/static/icons/svg/wi-moon-alt-waning-gibbous-5.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-gibbous-5.svg
diff --git a/static/icons/svg/wi-moon-alt-waning-gibbous-6.svg b/src/static/icons/svg/wi-moon-alt-waning-gibbous-6.svg
index fffae24..fffae24 100644
--- a/static/icons/svg/wi-moon-alt-waning-gibbous-6.svg
+++ b/src/static/icons/svg/wi-moon-alt-waning-gibbous-6.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-crescent-1.svg b/src/static/icons/svg/wi-moon-alt-waxing-crescent-1.svg
index a6516f9..a6516f9 100644
--- a/static/icons/svg/wi-moon-alt-waxing-crescent-1.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-crescent-1.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-crescent-2.svg b/src/static/icons/svg/wi-moon-alt-waxing-crescent-2.svg
index 696ea78..696ea78 100644
--- a/static/icons/svg/wi-moon-alt-waxing-crescent-2.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-crescent-2.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-crescent-3.svg b/src/static/icons/svg/wi-moon-alt-waxing-crescent-3.svg
index 6aff9d5..6aff9d5 100644
--- a/static/icons/svg/wi-moon-alt-waxing-crescent-3.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-crescent-3.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-crescent-4.svg b/src/static/icons/svg/wi-moon-alt-waxing-crescent-4.svg
index b5ef2bc..b5ef2bc 100644
--- a/static/icons/svg/wi-moon-alt-waxing-crescent-4.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-crescent-4.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-crescent-5.svg b/src/static/icons/svg/wi-moon-alt-waxing-crescent-5.svg
index e6cb75d..e6cb75d 100644
--- a/static/icons/svg/wi-moon-alt-waxing-crescent-5.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-crescent-5.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-crescent-6.svg b/src/static/icons/svg/wi-moon-alt-waxing-crescent-6.svg
index 8677cc4..8677cc4 100644
--- a/static/icons/svg/wi-moon-alt-waxing-crescent-6.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-crescent-6.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-gibbous-1.svg b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-1.svg
index 41be53a..41be53a 100644
--- a/static/icons/svg/wi-moon-alt-waxing-gibbous-1.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-1.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-gibbous-2.svg b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-2.svg
index cc6c51d..cc6c51d 100644
--- a/static/icons/svg/wi-moon-alt-waxing-gibbous-2.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-2.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-gibbous-3.svg b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-3.svg
index 2c969dc..2c969dc 100644
--- a/static/icons/svg/wi-moon-alt-waxing-gibbous-3.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-3.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-gibbous-4.svg b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-4.svg
index 4db9816..4db9816 100644
--- a/static/icons/svg/wi-moon-alt-waxing-gibbous-4.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-4.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-gibbous-5.svg b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-5.svg
index 68df9e6..68df9e6 100644
--- a/static/icons/svg/wi-moon-alt-waxing-gibbous-5.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-5.svg
diff --git a/static/icons/svg/wi-moon-alt-waxing-gibbous-6.svg b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-6.svg
index 17ac239..17ac239 100644
--- a/static/icons/svg/wi-moon-alt-waxing-gibbous-6.svg
+++ b/src/static/icons/svg/wi-moon-alt-waxing-gibbous-6.svg
diff --git a/static/icons/svg/wi-moon-first-quarter.svg b/src/static/icons/svg/wi-moon-first-quarter.svg
index 22ba6c6..22ba6c6 100644
--- a/static/icons/svg/wi-moon-first-quarter.svg
+++ b/src/static/icons/svg/wi-moon-first-quarter.svg
diff --git a/static/icons/svg/wi-moon-full.svg b/src/static/icons/svg/wi-moon-full.svg
index 75b89ac..75b89ac 100644
--- a/static/icons/svg/wi-moon-full.svg
+++ b/src/static/icons/svg/wi-moon-full.svg
diff --git a/static/icons/svg/wi-moon-new.svg b/src/static/icons/svg/wi-moon-new.svg
index 20fd7b4..20fd7b4 100644
--- a/static/icons/svg/wi-moon-new.svg
+++ b/src/static/icons/svg/wi-moon-new.svg
diff --git a/static/icons/svg/wi-moon-third-quarter.svg b/src/static/icons/svg/wi-moon-third-quarter.svg
index 031a231..031a231 100644
--- a/static/icons/svg/wi-moon-third-quarter.svg
+++ b/src/static/icons/svg/wi-moon-third-quarter.svg
diff --git a/static/icons/svg/wi-moon-waning-crescent-1.svg b/src/static/icons/svg/wi-moon-waning-crescent-1.svg
index 7ae5d02..7ae5d02 100644
--- a/static/icons/svg/wi-moon-waning-crescent-1.svg
+++ b/src/static/icons/svg/wi-moon-waning-crescent-1.svg
diff --git a/static/icons/svg/wi-moon-waning-crescent-2.svg b/src/static/icons/svg/wi-moon-waning-crescent-2.svg
index 6e8ed9c..6e8ed9c 100644
--- a/static/icons/svg/wi-moon-waning-crescent-2.svg
+++ b/src/static/icons/svg/wi-moon-waning-crescent-2.svg
diff --git a/static/icons/svg/wi-moon-waning-crescent-3.svg b/src/static/icons/svg/wi-moon-waning-crescent-3.svg
index b2224d0..b2224d0 100644
--- a/static/icons/svg/wi-moon-waning-crescent-3.svg
+++ b/src/static/icons/svg/wi-moon-waning-crescent-3.svg
diff --git a/static/icons/svg/wi-moon-waning-crescent-4.svg b/src/static/icons/svg/wi-moon-waning-crescent-4.svg
index c5f85fd..c5f85fd 100644
--- a/static/icons/svg/wi-moon-waning-crescent-4.svg
+++ b/src/static/icons/svg/wi-moon-waning-crescent-4.svg
diff --git a/static/icons/svg/wi-moon-waning-crescent-5.svg b/src/static/icons/svg/wi-moon-waning-crescent-5.svg
index 350c227..350c227 100644
--- a/static/icons/svg/wi-moon-waning-crescent-5.svg
+++ b/src/static/icons/svg/wi-moon-waning-crescent-5.svg
diff --git a/static/icons/svg/wi-moon-waning-crescent-6.svg b/src/static/icons/svg/wi-moon-waning-crescent-6.svg
index e3fb6e7..e3fb6e7 100644
--- a/static/icons/svg/wi-moon-waning-crescent-6.svg
+++ b/src/static/icons/svg/wi-moon-waning-crescent-6.svg
diff --git a/static/icons/svg/wi-moon-waning-gibbous-1.svg b/src/static/icons/svg/wi-moon-waning-gibbous-1.svg
index ae14407..ae14407 100644
--- a/static/icons/svg/wi-moon-waning-gibbous-1.svg
+++ b/src/static/icons/svg/wi-moon-waning-gibbous-1.svg
diff --git a/static/icons/svg/wi-moon-waning-gibbous-2.svg b/src/static/icons/svg/wi-moon-waning-gibbous-2.svg
index 558ba54..558ba54 100644
--- a/static/icons/svg/wi-moon-waning-gibbous-2.svg
+++ b/src/static/icons/svg/wi-moon-waning-gibbous-2.svg
diff --git a/static/icons/svg/wi-moon-waning-gibbous-3.svg b/src/static/icons/svg/wi-moon-waning-gibbous-3.svg
index 17924cf..17924cf 100644
--- a/static/icons/svg/wi-moon-waning-gibbous-3.svg
+++ b/src/static/icons/svg/wi-moon-waning-gibbous-3.svg
diff --git a/static/icons/svg/wi-moon-waning-gibbous-4.svg b/src/static/icons/svg/wi-moon-waning-gibbous-4.svg
index 2e4c400..2e4c400 100644
--- a/static/icons/svg/wi-moon-waning-gibbous-4.svg
+++ b/src/static/icons/svg/wi-moon-waning-gibbous-4.svg
diff --git a/static/icons/svg/wi-moon-waning-gibbous-5.svg b/src/static/icons/svg/wi-moon-waning-gibbous-5.svg
index db387c5..db387c5 100644
--- a/static/icons/svg/wi-moon-waning-gibbous-5.svg
+++ b/src/static/icons/svg/wi-moon-waning-gibbous-5.svg
diff --git a/static/icons/svg/wi-moon-waning-gibbous-6.svg b/src/static/icons/svg/wi-moon-waning-gibbous-6.svg
index edcc9d6..edcc9d6 100644
--- a/static/icons/svg/wi-moon-waning-gibbous-6.svg
+++ b/src/static/icons/svg/wi-moon-waning-gibbous-6.svg
diff --git a/static/icons/svg/wi-moon-waxing-6.svg b/src/static/icons/svg/wi-moon-waxing-6.svg
index 6e9af39..6e9af39 100644
--- a/static/icons/svg/wi-moon-waxing-6.svg
+++ b/src/static/icons/svg/wi-moon-waxing-6.svg
diff --git a/static/icons/svg/wi-moon-waxing-crescent-1.svg b/src/static/icons/svg/wi-moon-waxing-crescent-1.svg
index f510a0d..f510a0d 100644
--- a/static/icons/svg/wi-moon-waxing-crescent-1.svg
+++ b/src/static/icons/svg/wi-moon-waxing-crescent-1.svg
diff --git a/static/icons/svg/wi-moon-waxing-crescent-2.svg b/src/static/icons/svg/wi-moon-waxing-crescent-2.svg
index 6b86718..6b86718 100644
--- a/static/icons/svg/wi-moon-waxing-crescent-2.svg
+++ b/src/static/icons/svg/wi-moon-waxing-crescent-2.svg
diff --git a/static/icons/svg/wi-moon-waxing-crescent-3.svg b/src/static/icons/svg/wi-moon-waxing-crescent-3.svg
index 8560f6b..8560f6b 100644
--- a/static/icons/svg/wi-moon-waxing-crescent-3.svg
+++ b/src/static/icons/svg/wi-moon-waxing-crescent-3.svg
diff --git a/static/icons/svg/wi-moon-waxing-crescent-4.svg b/src/static/icons/svg/wi-moon-waxing-crescent-4.svg
index 5f78502..5f78502 100644
--- a/static/icons/svg/wi-moon-waxing-crescent-4.svg
+++ b/src/static/icons/svg/wi-moon-waxing-crescent-4.svg
diff --git a/static/icons/svg/wi-moon-waxing-crescent-5.svg b/src/static/icons/svg/wi-moon-waxing-crescent-5.svg
index 6e9af39..6e9af39 100644
--- a/static/icons/svg/wi-moon-waxing-crescent-5.svg
+++ b/src/static/icons/svg/wi-moon-waxing-crescent-5.svg
diff --git a/static/icons/svg/wi-moon-waxing-gibbous-1.svg b/src/static/icons/svg/wi-moon-waxing-gibbous-1.svg
index 1de651a..1de651a 100644
--- a/static/icons/svg/wi-moon-waxing-gibbous-1.svg
+++ b/src/static/icons/svg/wi-moon-waxing-gibbous-1.svg
diff --git a/static/icons/svg/wi-moon-waxing-gibbous-2.svg b/src/static/icons/svg/wi-moon-waxing-gibbous-2.svg
index 842d4ac..842d4ac 100644
--- a/static/icons/svg/wi-moon-waxing-gibbous-2.svg
+++ b/src/static/icons/svg/wi-moon-waxing-gibbous-2.svg
diff --git a/static/icons/svg/wi-moon-waxing-gibbous-3.svg b/src/static/icons/svg/wi-moon-waxing-gibbous-3.svg
index 9f77ce3..9f77ce3 100644
--- a/static/icons/svg/wi-moon-waxing-gibbous-3.svg
+++ b/src/static/icons/svg/wi-moon-waxing-gibbous-3.svg
diff --git a/static/icons/svg/wi-moon-waxing-gibbous-4.svg b/src/static/icons/svg/wi-moon-waxing-gibbous-4.svg
index e472de6..e472de6 100644
--- a/static/icons/svg/wi-moon-waxing-gibbous-4.svg
+++ b/src/static/icons/svg/wi-moon-waxing-gibbous-4.svg
diff --git a/static/icons/svg/wi-moon-waxing-gibbous-5.svg b/src/static/icons/svg/wi-moon-waxing-gibbous-5.svg
index 90860cb..90860cb 100644
--- a/static/icons/svg/wi-moon-waxing-gibbous-5.svg
+++ b/src/static/icons/svg/wi-moon-waxing-gibbous-5.svg
diff --git a/static/icons/svg/wi-moon-waxing-gibbous-6.svg b/src/static/icons/svg/wi-moon-waxing-gibbous-6.svg
index 53f9b9e..53f9b9e 100644
--- a/static/icons/svg/wi-moon-waxing-gibbous-6.svg
+++ b/src/static/icons/svg/wi-moon-waxing-gibbous-6.svg
diff --git a/static/icons/svg/wi-moonrise.svg b/src/static/icons/svg/wi-moonrise.svg
index 5d7ddb0..5d7ddb0 100644
--- a/static/icons/svg/wi-moonrise.svg
+++ b/src/static/icons/svg/wi-moonrise.svg
diff --git a/static/icons/svg/wi-moonset.svg b/src/static/icons/svg/wi-moonset.svg
index d78fa29..d78fa29 100644
--- a/static/icons/svg/wi-moonset.svg
+++ b/src/static/icons/svg/wi-moonset.svg
diff --git a/static/icons/svg/wi-na.svg b/src/static/icons/svg/wi-na.svg
index 0a3d369..0a3d369 100644
--- a/static/icons/svg/wi-na.svg
+++ b/src/static/icons/svg/wi-na.svg
diff --git a/static/icons/svg/wi-night-alt-cloudy-gusts.svg b/src/static/icons/svg/wi-night-alt-cloudy-gusts.svg
index 0453d3c..0453d3c 100644
--- a/static/icons/svg/wi-night-alt-cloudy-gusts.svg
+++ b/src/static/icons/svg/wi-night-alt-cloudy-gusts.svg
diff --git a/static/icons/svg/wi-night-alt-cloudy-high.svg b/src/static/icons/svg/wi-night-alt-cloudy-high.svg
index 6b1777b..6b1777b 100644
--- a/static/icons/svg/wi-night-alt-cloudy-high.svg
+++ b/src/static/icons/svg/wi-night-alt-cloudy-high.svg
diff --git a/static/icons/svg/wi-night-alt-cloudy-windy.svg b/src/static/icons/svg/wi-night-alt-cloudy-windy.svg
index f6a291e..f6a291e 100644
--- a/static/icons/svg/wi-night-alt-cloudy-windy.svg
+++ b/src/static/icons/svg/wi-night-alt-cloudy-windy.svg
diff --git a/static/icons/svg/wi-night-alt-cloudy.svg b/src/static/icons/svg/wi-night-alt-cloudy.svg
index fcd1496..fcd1496 100644
--- a/static/icons/svg/wi-night-alt-cloudy.svg
+++ b/src/static/icons/svg/wi-night-alt-cloudy.svg
diff --git a/static/icons/svg/wi-night-alt-hail.svg b/src/static/icons/svg/wi-night-alt-hail.svg
index 38550e4..38550e4 100644
--- a/static/icons/svg/wi-night-alt-hail.svg
+++ b/src/static/icons/svg/wi-night-alt-hail.svg
diff --git a/static/icons/svg/wi-night-alt-lightning.svg b/src/static/icons/svg/wi-night-alt-lightning.svg
index f01d745..f01d745 100644
--- a/static/icons/svg/wi-night-alt-lightning.svg
+++ b/src/static/icons/svg/wi-night-alt-lightning.svg
diff --git a/static/icons/svg/wi-night-alt-partly-cloudy.svg b/src/static/icons/svg/wi-night-alt-partly-cloudy.svg
index 2b36834..2b36834 100644
--- a/static/icons/svg/wi-night-alt-partly-cloudy.svg
+++ b/src/static/icons/svg/wi-night-alt-partly-cloudy.svg
diff --git a/static/icons/svg/wi-night-alt-rain-mix.svg b/src/static/icons/svg/wi-night-alt-rain-mix.svg
index 4ce81bc..4ce81bc 100644
--- a/static/icons/svg/wi-night-alt-rain-mix.svg
+++ b/src/static/icons/svg/wi-night-alt-rain-mix.svg
diff --git a/static/icons/svg/wi-night-alt-rain-wind.svg b/src/static/icons/svg/wi-night-alt-rain-wind.svg
index f90a680..f90a680 100644
--- a/static/icons/svg/wi-night-alt-rain-wind.svg
+++ b/src/static/icons/svg/wi-night-alt-rain-wind.svg
diff --git a/static/icons/svg/wi-night-alt-rain.svg b/src/static/icons/svg/wi-night-alt-rain.svg
index b4d8065..b4d8065 100644
--- a/static/icons/svg/wi-night-alt-rain.svg
+++ b/src/static/icons/svg/wi-night-alt-rain.svg
diff --git a/static/icons/svg/wi-night-alt-showers.svg b/src/static/icons/svg/wi-night-alt-showers.svg
index dd917e0..dd917e0 100644
--- a/static/icons/svg/wi-night-alt-showers.svg
+++ b/src/static/icons/svg/wi-night-alt-showers.svg
diff --git a/static/icons/svg/wi-night-alt-sleet-storm.svg b/src/static/icons/svg/wi-night-alt-sleet-storm.svg
index afd111d..afd111d 100644
--- a/static/icons/svg/wi-night-alt-sleet-storm.svg
+++ b/src/static/icons/svg/wi-night-alt-sleet-storm.svg
diff --git a/static/icons/svg/wi-night-alt-sleet.svg b/src/static/icons/svg/wi-night-alt-sleet.svg
index 3fbdd15..3fbdd15 100644
--- a/static/icons/svg/wi-night-alt-sleet.svg
+++ b/src/static/icons/svg/wi-night-alt-sleet.svg
diff --git a/static/icons/svg/wi-night-alt-snow-thunderstorm.svg b/src/static/icons/svg/wi-night-alt-snow-thunderstorm.svg
index 304a7eb..304a7eb 100644
--- a/static/icons/svg/wi-night-alt-snow-thunderstorm.svg
+++ b/src/static/icons/svg/wi-night-alt-snow-thunderstorm.svg
diff --git a/static/icons/svg/wi-night-alt-snow-wind.svg b/src/static/icons/svg/wi-night-alt-snow-wind.svg
index f35566a..f35566a 100644
--- a/static/icons/svg/wi-night-alt-snow-wind.svg
+++ b/src/static/icons/svg/wi-night-alt-snow-wind.svg
diff --git a/static/icons/svg/wi-night-alt-snow.svg b/src/static/icons/svg/wi-night-alt-snow.svg
index b314bdd..b314bdd 100644
--- a/static/icons/svg/wi-night-alt-snow.svg
+++ b/src/static/icons/svg/wi-night-alt-snow.svg
diff --git a/static/icons/svg/wi-night-alt-sprinkle.svg b/src/static/icons/svg/wi-night-alt-sprinkle.svg
index 47dfcb1..47dfcb1 100644
--- a/static/icons/svg/wi-night-alt-sprinkle.svg
+++ b/src/static/icons/svg/wi-night-alt-sprinkle.svg
diff --git a/static/icons/svg/wi-night-alt-storm-showers.svg b/src/static/icons/svg/wi-night-alt-storm-showers.svg
index 6747df2..6747df2 100644
--- a/static/icons/svg/wi-night-alt-storm-showers.svg
+++ b/src/static/icons/svg/wi-night-alt-storm-showers.svg
diff --git a/static/icons/svg/wi-night-alt-thunderstorm.svg b/src/static/icons/svg/wi-night-alt-thunderstorm.svg
index 0af7a15..0af7a15 100644
--- a/static/icons/svg/wi-night-alt-thunderstorm.svg
+++ b/src/static/icons/svg/wi-night-alt-thunderstorm.svg
diff --git a/static/icons/svg/wi-night-clear.svg b/src/static/icons/svg/wi-night-clear.svg
index 053b2de..053b2de 100644
--- a/static/icons/svg/wi-night-clear.svg
+++ b/src/static/icons/svg/wi-night-clear.svg
diff --git a/static/icons/svg/wi-night-cloudy-gusts.svg b/src/static/icons/svg/wi-night-cloudy-gusts.svg
index e502c48..e502c48 100644
--- a/static/icons/svg/wi-night-cloudy-gusts.svg
+++ b/src/static/icons/svg/wi-night-cloudy-gusts.svg
diff --git a/static/icons/svg/wi-night-cloudy-high.svg b/src/static/icons/svg/wi-night-cloudy-high.svg
index 8235377..8235377 100644
--- a/static/icons/svg/wi-night-cloudy-high.svg
+++ b/src/static/icons/svg/wi-night-cloudy-high.svg
diff --git a/static/icons/svg/wi-night-cloudy-windy.svg b/src/static/icons/svg/wi-night-cloudy-windy.svg
index 3a6137a..3a6137a 100644
--- a/static/icons/svg/wi-night-cloudy-windy.svg
+++ b/src/static/icons/svg/wi-night-cloudy-windy.svg
diff --git a/static/icons/svg/wi-night-cloudy.svg b/src/static/icons/svg/wi-night-cloudy.svg
index 8b76dba..8b76dba 100644
--- a/static/icons/svg/wi-night-cloudy.svg
+++ b/src/static/icons/svg/wi-night-cloudy.svg
diff --git a/static/icons/svg/wi-night-fog.svg b/src/static/icons/svg/wi-night-fog.svg
index a895dac..a895dac 100644
--- a/static/icons/svg/wi-night-fog.svg
+++ b/src/static/icons/svg/wi-night-fog.svg
diff --git a/static/icons/svg/wi-night-hail.svg b/src/static/icons/svg/wi-night-hail.svg
index 249ed64..249ed64 100644
--- a/static/icons/svg/wi-night-hail.svg
+++ b/src/static/icons/svg/wi-night-hail.svg
diff --git a/static/icons/svg/wi-night-lightning.svg b/src/static/icons/svg/wi-night-lightning.svg
index 55ac76e..55ac76e 100644
--- a/static/icons/svg/wi-night-lightning.svg
+++ b/src/static/icons/svg/wi-night-lightning.svg
diff --git a/static/icons/svg/wi-night-partly-cloudy.svg b/src/static/icons/svg/wi-night-partly-cloudy.svg
index e4d2f99..e4d2f99 100644
--- a/static/icons/svg/wi-night-partly-cloudy.svg
+++ b/src/static/icons/svg/wi-night-partly-cloudy.svg
diff --git a/static/icons/svg/wi-night-rain-mix.svg b/src/static/icons/svg/wi-night-rain-mix.svg
index f5883d7..f5883d7 100644
--- a/static/icons/svg/wi-night-rain-mix.svg
+++ b/src/static/icons/svg/wi-night-rain-mix.svg
diff --git a/static/icons/svg/wi-night-rain-wind.svg b/src/static/icons/svg/wi-night-rain-wind.svg
index 8d8ccf7..8d8ccf7 100644
--- a/static/icons/svg/wi-night-rain-wind.svg
+++ b/src/static/icons/svg/wi-night-rain-wind.svg
diff --git a/static/icons/svg/wi-night-rain.svg b/src/static/icons/svg/wi-night-rain.svg
index 3d4e6dc..3d4e6dc 100644
--- a/static/icons/svg/wi-night-rain.svg
+++ b/src/static/icons/svg/wi-night-rain.svg
diff --git a/static/icons/svg/wi-night-showers.svg b/src/static/icons/svg/wi-night-showers.svg
index 4829c81..4829c81 100644
--- a/static/icons/svg/wi-night-showers.svg
+++ b/src/static/icons/svg/wi-night-showers.svg
diff --git a/static/icons/svg/wi-night-sleet-storm.svg b/src/static/icons/svg/wi-night-sleet-storm.svg
index 7638b54..7638b54 100644
--- a/static/icons/svg/wi-night-sleet-storm.svg
+++ b/src/static/icons/svg/wi-night-sleet-storm.svg
diff --git a/static/icons/svg/wi-night-sleet.svg b/src/static/icons/svg/wi-night-sleet.svg
index 0ff3e36..0ff3e36 100644
--- a/static/icons/svg/wi-night-sleet.svg
+++ b/src/static/icons/svg/wi-night-sleet.svg
diff --git a/static/icons/svg/wi-night-snow-thunderstorm.svg b/src/static/icons/svg/wi-night-snow-thunderstorm.svg
index ec98dd8..ec98dd8 100644
--- a/static/icons/svg/wi-night-snow-thunderstorm.svg
+++ b/src/static/icons/svg/wi-night-snow-thunderstorm.svg
diff --git a/static/icons/svg/wi-night-snow-wind.svg b/src/static/icons/svg/wi-night-snow-wind.svg
index d34c39f..d34c39f 100644
--- a/static/icons/svg/wi-night-snow-wind.svg
+++ b/src/static/icons/svg/wi-night-snow-wind.svg
diff --git a/static/icons/svg/wi-night-snow.svg b/src/static/icons/svg/wi-night-snow.svg
index c4bab74..c4bab74 100644
--- a/static/icons/svg/wi-night-snow.svg
+++ b/src/static/icons/svg/wi-night-snow.svg
diff --git a/static/icons/svg/wi-night-sprinkle.svg b/src/static/icons/svg/wi-night-sprinkle.svg
index 2793da3..2793da3 100644
--- a/static/icons/svg/wi-night-sprinkle.svg
+++ b/src/static/icons/svg/wi-night-sprinkle.svg
diff --git a/static/icons/svg/wi-night-storm-showers.svg b/src/static/icons/svg/wi-night-storm-showers.svg
index 1cf5202..1cf5202 100644
--- a/static/icons/svg/wi-night-storm-showers.svg
+++ b/src/static/icons/svg/wi-night-storm-showers.svg
diff --git a/static/icons/svg/wi-night-thunderstorm.svg b/src/static/icons/svg/wi-night-thunderstorm.svg
index b9541cb..b9541cb 100644
--- a/static/icons/svg/wi-night-thunderstorm.svg
+++ b/src/static/icons/svg/wi-night-thunderstorm.svg
diff --git a/static/icons/svg/wi-rain-mix.svg b/src/static/icons/svg/wi-rain-mix.svg
index 51cf189..51cf189 100644
--- a/static/icons/svg/wi-rain-mix.svg
+++ b/src/static/icons/svg/wi-rain-mix.svg
diff --git a/static/icons/svg/wi-rain-wind.svg b/src/static/icons/svg/wi-rain-wind.svg
index aef262a..aef262a 100644
--- a/static/icons/svg/wi-rain-wind.svg
+++ b/src/static/icons/svg/wi-rain-wind.svg
diff --git a/static/icons/svg/wi-rain.svg b/src/static/icons/svg/wi-rain.svg
index 7ecef3f..7ecef3f 100644
--- a/static/icons/svg/wi-rain.svg
+++ b/src/static/icons/svg/wi-rain.svg
diff --git a/static/icons/svg/wi-raindrop.svg b/src/static/icons/svg/wi-raindrop.svg
index d24aee4..d24aee4 100644
--- a/static/icons/svg/wi-raindrop.svg
+++ b/src/static/icons/svg/wi-raindrop.svg
diff --git a/static/icons/svg/wi-raindrops.svg b/src/static/icons/svg/wi-raindrops.svg
index 157ddf0..157ddf0 100644
--- a/static/icons/svg/wi-raindrops.svg
+++ b/src/static/icons/svg/wi-raindrops.svg
diff --git a/static/icons/svg/wi-refresh-alt.svg b/src/static/icons/svg/wi-refresh-alt.svg
index 33c9b18..33c9b18 100644
--- a/static/icons/svg/wi-refresh-alt.svg
+++ b/src/static/icons/svg/wi-refresh-alt.svg
diff --git a/static/icons/svg/wi-refresh.svg b/src/static/icons/svg/wi-refresh.svg
index 32e09a8..32e09a8 100644
--- a/static/icons/svg/wi-refresh.svg
+++ b/src/static/icons/svg/wi-refresh.svg
diff --git a/static/icons/svg/wi-sandstorm.svg b/src/static/icons/svg/wi-sandstorm.svg
index cbdad2a..cbdad2a 100644
--- a/static/icons/svg/wi-sandstorm.svg
+++ b/src/static/icons/svg/wi-sandstorm.svg
diff --git a/static/icons/svg/wi-showers.svg b/src/static/icons/svg/wi-showers.svg
index 3cb7e31..3cb7e31 100644
--- a/static/icons/svg/wi-showers.svg
+++ b/src/static/icons/svg/wi-showers.svg
diff --git a/static/icons/svg/wi-sleet.svg b/src/static/icons/svg/wi-sleet.svg
index b97bc09..b97bc09 100644
--- a/static/icons/svg/wi-sleet.svg
+++ b/src/static/icons/svg/wi-sleet.svg
diff --git a/static/icons/svg/wi-small-craft-advisory.svg b/src/static/icons/svg/wi-small-craft-advisory.svg
index ab6f45e..ab6f45e 100644
--- a/static/icons/svg/wi-small-craft-advisory.svg
+++ b/src/static/icons/svg/wi-small-craft-advisory.svg
diff --git a/static/icons/svg/wi-smog.svg b/src/static/icons/svg/wi-smog.svg
index a2f0d89..a2f0d89 100644
--- a/static/icons/svg/wi-smog.svg
+++ b/src/static/icons/svg/wi-smog.svg
diff --git a/static/icons/svg/wi-smoke.svg b/src/static/icons/svg/wi-smoke.svg
index 82e8fdc..82e8fdc 100644
--- a/static/icons/svg/wi-smoke.svg
+++ b/src/static/icons/svg/wi-smoke.svg
diff --git a/static/icons/svg/wi-snow-wind.svg b/src/static/icons/svg/wi-snow-wind.svg
index 950aeac..950aeac 100644
--- a/static/icons/svg/wi-snow-wind.svg
+++ b/src/static/icons/svg/wi-snow-wind.svg
diff --git a/static/icons/svg/wi-snow.svg b/src/static/icons/svg/wi-snow.svg
index 56afebf..56afebf 100644
--- a/static/icons/svg/wi-snow.svg
+++ b/src/static/icons/svg/wi-snow.svg
diff --git a/static/icons/svg/wi-snowflake-cold.svg b/src/static/icons/svg/wi-snowflake-cold.svg
index 0f117b9..0f117b9 100644
--- a/static/icons/svg/wi-snowflake-cold.svg
+++ b/src/static/icons/svg/wi-snowflake-cold.svg
diff --git a/static/icons/svg/wi-solar-eclipse.svg b/src/static/icons/svg/wi-solar-eclipse.svg
index 19c62a8..19c62a8 100644
--- a/static/icons/svg/wi-solar-eclipse.svg
+++ b/src/static/icons/svg/wi-solar-eclipse.svg
diff --git a/static/icons/svg/wi-sprinkle.svg b/src/static/icons/svg/wi-sprinkle.svg
index c26b207..c26b207 100644
--- a/static/icons/svg/wi-sprinkle.svg
+++ b/src/static/icons/svg/wi-sprinkle.svg
diff --git a/static/icons/svg/wi-stars.svg b/src/static/icons/svg/wi-stars.svg
index 76e7003..76e7003 100644
--- a/static/icons/svg/wi-stars.svg
+++ b/src/static/icons/svg/wi-stars.svg
diff --git a/static/icons/svg/wi-storm-showers.svg b/src/static/icons/svg/wi-storm-showers.svg
index df3fe0f..df3fe0f 100644
--- a/static/icons/svg/wi-storm-showers.svg
+++ b/src/static/icons/svg/wi-storm-showers.svg
diff --git a/static/icons/svg/wi-storm-warning.svg b/src/static/icons/svg/wi-storm-warning.svg
index db146c1..db146c1 100644
--- a/static/icons/svg/wi-storm-warning.svg
+++ b/src/static/icons/svg/wi-storm-warning.svg
diff --git a/static/icons/svg/wi-strong-wind.svg b/src/static/icons/svg/wi-strong-wind.svg
index 70dda9c..70dda9c 100644
--- a/static/icons/svg/wi-strong-wind.svg
+++ b/src/static/icons/svg/wi-strong-wind.svg
diff --git a/static/icons/svg/wi-sunrise.svg b/src/static/icons/svg/wi-sunrise.svg
index 5718ac3..5718ac3 100644
--- a/static/icons/svg/wi-sunrise.svg
+++ b/src/static/icons/svg/wi-sunrise.svg
diff --git a/static/icons/svg/wi-sunset.svg b/src/static/icons/svg/wi-sunset.svg
index cc82902..cc82902 100644
--- a/static/icons/svg/wi-sunset.svg
+++ b/src/static/icons/svg/wi-sunset.svg
diff --git a/static/icons/svg/wi-thermometer-exterior.svg b/src/static/icons/svg/wi-thermometer-exterior.svg
index e0d345d..e0d345d 100644
--- a/static/icons/svg/wi-thermometer-exterior.svg
+++ b/src/static/icons/svg/wi-thermometer-exterior.svg
diff --git a/static/icons/svg/wi-thermometer-internal.svg b/src/static/icons/svg/wi-thermometer-internal.svg
index b590a9f..b590a9f 100644
--- a/static/icons/svg/wi-thermometer-internal.svg
+++ b/src/static/icons/svg/wi-thermometer-internal.svg
diff --git a/static/icons/svg/wi-thermometer.svg b/src/static/icons/svg/wi-thermometer.svg
index a0fa8d0..a0fa8d0 100644
--- a/static/icons/svg/wi-thermometer.svg
+++ b/src/static/icons/svg/wi-thermometer.svg
diff --git a/static/icons/svg/wi-thunderstorm.svg b/src/static/icons/svg/wi-thunderstorm.svg
index 52555ec..52555ec 100644
--- a/static/icons/svg/wi-thunderstorm.svg
+++ b/src/static/icons/svg/wi-thunderstorm.svg
diff --git a/static/icons/svg/wi-time-1.svg b/src/static/icons/svg/wi-time-1.svg
index c5ea658..c5ea658 100644
--- a/static/icons/svg/wi-time-1.svg
+++ b/src/static/icons/svg/wi-time-1.svg
diff --git a/static/icons/svg/wi-time-10.svg b/src/static/icons/svg/wi-time-10.svg
index 3a02d59..3a02d59 100644
--- a/static/icons/svg/wi-time-10.svg
+++ b/src/static/icons/svg/wi-time-10.svg
diff --git a/static/icons/svg/wi-time-11.svg b/src/static/icons/svg/wi-time-11.svg
index 1625390..1625390 100644
--- a/static/icons/svg/wi-time-11.svg
+++ b/src/static/icons/svg/wi-time-11.svg
diff --git a/static/icons/svg/wi-time-12.svg b/src/static/icons/svg/wi-time-12.svg
index 32cc7f0..32cc7f0 100644
--- a/static/icons/svg/wi-time-12.svg
+++ b/src/static/icons/svg/wi-time-12.svg
diff --git a/static/icons/svg/wi-time-2.svg b/src/static/icons/svg/wi-time-2.svg
index 9e874a3..9e874a3 100644
--- a/static/icons/svg/wi-time-2.svg
+++ b/src/static/icons/svg/wi-time-2.svg
diff --git a/static/icons/svg/wi-time-3.svg b/src/static/icons/svg/wi-time-3.svg
index 5c0cd90..5c0cd90 100644
--- a/static/icons/svg/wi-time-3.svg
+++ b/src/static/icons/svg/wi-time-3.svg
diff --git a/static/icons/svg/wi-time-4.svg b/src/static/icons/svg/wi-time-4.svg
index 7dda4d2..7dda4d2 100644
--- a/static/icons/svg/wi-time-4.svg
+++ b/src/static/icons/svg/wi-time-4.svg
diff --git a/static/icons/svg/wi-time-5.svg b/src/static/icons/svg/wi-time-5.svg
index fb8f8a5..fb8f8a5 100644
--- a/static/icons/svg/wi-time-5.svg
+++ b/src/static/icons/svg/wi-time-5.svg
diff --git a/static/icons/svg/wi-time-6.svg b/src/static/icons/svg/wi-time-6.svg
index 8bbe6b0..8bbe6b0 100644
--- a/static/icons/svg/wi-time-6.svg
+++ b/src/static/icons/svg/wi-time-6.svg
diff --git a/static/icons/svg/wi-time-7.svg b/src/static/icons/svg/wi-time-7.svg
index 079551e..079551e 100644
--- a/static/icons/svg/wi-time-7.svg
+++ b/src/static/icons/svg/wi-time-7.svg
diff --git a/static/icons/svg/wi-time-8.svg b/src/static/icons/svg/wi-time-8.svg
index 6d65af2..6d65af2 100644
--- a/static/icons/svg/wi-time-8.svg
+++ b/src/static/icons/svg/wi-time-8.svg
diff --git a/static/icons/svg/wi-time-9.svg b/src/static/icons/svg/wi-time-9.svg
index b1437c3..b1437c3 100644
--- a/static/icons/svg/wi-time-9.svg
+++ b/src/static/icons/svg/wi-time-9.svg
diff --git a/static/icons/svg/wi-tornado.svg b/src/static/icons/svg/wi-tornado.svg
index 095ad95..095ad95 100644
--- a/static/icons/svg/wi-tornado.svg
+++ b/src/static/icons/svg/wi-tornado.svg
diff --git a/static/icons/svg/wi-train.svg b/src/static/icons/svg/wi-train.svg
index ded2460..ded2460 100644
--- a/static/icons/svg/wi-train.svg
+++ b/src/static/icons/svg/wi-train.svg
diff --git a/static/icons/svg/wi-tsunami.svg b/src/static/icons/svg/wi-tsunami.svg
index 2044e99..2044e99 100644
--- a/static/icons/svg/wi-tsunami.svg
+++ b/src/static/icons/svg/wi-tsunami.svg
diff --git a/static/icons/svg/wi-umbrella.svg b/src/static/icons/svg/wi-umbrella.svg
index e125bca..e125bca 100644
--- a/static/icons/svg/wi-umbrella.svg
+++ b/src/static/icons/svg/wi-umbrella.svg
diff --git a/static/icons/svg/wi-volcano.svg b/src/static/icons/svg/wi-volcano.svg
index cd8dcf3..cd8dcf3 100644
--- a/static/icons/svg/wi-volcano.svg
+++ b/src/static/icons/svg/wi-volcano.svg
diff --git a/static/icons/svg/wi-wind-beaufort-0.svg b/src/static/icons/svg/wi-wind-beaufort-0.svg
index 7ec3dba..7ec3dba 100644
--- a/static/icons/svg/wi-wind-beaufort-0.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-0.svg
diff --git a/static/icons/svg/wi-wind-beaufort-1.svg b/src/static/icons/svg/wi-wind-beaufort-1.svg
index 2bab866..2bab866 100644
--- a/static/icons/svg/wi-wind-beaufort-1.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-1.svg
diff --git a/static/icons/svg/wi-wind-beaufort-10.svg b/src/static/icons/svg/wi-wind-beaufort-10.svg
index f1256c6..f1256c6 100644
--- a/static/icons/svg/wi-wind-beaufort-10.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-10.svg
diff --git a/static/icons/svg/wi-wind-beaufort-11.svg b/src/static/icons/svg/wi-wind-beaufort-11.svg
index d209021..d209021 100644
--- a/static/icons/svg/wi-wind-beaufort-11.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-11.svg
diff --git a/static/icons/svg/wi-wind-beaufort-12.svg b/src/static/icons/svg/wi-wind-beaufort-12.svg
index 0cbf35d..0cbf35d 100644
--- a/static/icons/svg/wi-wind-beaufort-12.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-12.svg
diff --git a/static/icons/svg/wi-wind-beaufort-2.svg b/src/static/icons/svg/wi-wind-beaufort-2.svg
index 740f2af..740f2af 100644
--- a/static/icons/svg/wi-wind-beaufort-2.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-2.svg
diff --git a/static/icons/svg/wi-wind-beaufort-3.svg b/src/static/icons/svg/wi-wind-beaufort-3.svg
index 165b116..165b116 100644
--- a/static/icons/svg/wi-wind-beaufort-3.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-3.svg
diff --git a/static/icons/svg/wi-wind-beaufort-4.svg b/src/static/icons/svg/wi-wind-beaufort-4.svg
index c2143d4..c2143d4 100644
--- a/static/icons/svg/wi-wind-beaufort-4.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-4.svg
diff --git a/static/icons/svg/wi-wind-beaufort-5.svg b/src/static/icons/svg/wi-wind-beaufort-5.svg
index fc34ea4..fc34ea4 100644
--- a/static/icons/svg/wi-wind-beaufort-5.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-5.svg
diff --git a/static/icons/svg/wi-wind-beaufort-6.svg b/src/static/icons/svg/wi-wind-beaufort-6.svg
index e6471f4..e6471f4 100644
--- a/static/icons/svg/wi-wind-beaufort-6.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-6.svg
diff --git a/static/icons/svg/wi-wind-beaufort-7.svg b/src/static/icons/svg/wi-wind-beaufort-7.svg
index f77fcec..f77fcec 100644
--- a/static/icons/svg/wi-wind-beaufort-7.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-7.svg
diff --git a/static/icons/svg/wi-wind-beaufort-8.svg b/src/static/icons/svg/wi-wind-beaufort-8.svg
index 5f08fed..5f08fed 100644
--- a/static/icons/svg/wi-wind-beaufort-8.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-8.svg
diff --git a/static/icons/svg/wi-wind-beaufort-9.svg b/src/static/icons/svg/wi-wind-beaufort-9.svg
index 41b7d41..41b7d41 100644
--- a/static/icons/svg/wi-wind-beaufort-9.svg
+++ b/src/static/icons/svg/wi-wind-beaufort-9.svg
diff --git a/static/icons/svg/wi-wind-deg.svg b/src/static/icons/svg/wi-wind-deg.svg
index 3007410..3007410 100644
--- a/static/icons/svg/wi-wind-deg.svg
+++ b/src/static/icons/svg/wi-wind-deg.svg
diff --git a/static/icons/svg/wi-windy.svg b/src/static/icons/svg/wi-windy.svg
index de5488a..de5488a 100644
--- a/static/icons/svg/wi-windy.svg
+++ b/src/static/icons/svg/wi-windy.svg
diff --git a/static/style.css b/src/static/style.css
index d6983a6..1ea44f5 100644
--- a/static/style.css
+++ b/src/static/style.css
@@ -28,6 +28,24 @@ html, body, .container {
         font-size: 12pt;
 }
 
+.index-title {
+        display: flex;
+        align-self: center;
+        justify-content: center;
+        width: 100%;
+
+}
+
+.content-noborder {
+        display: flex;
+        align-items: center;
+        align-content: flex-start;
+        flex-flow: row wrap;
+        margin: 2%;
+        height: auto;
+        justify-content: center;
+}
+
 .content {
         display: flex;
         align-items: center;
@@ -35,7 +53,7 @@ html, body, .container {
         flex-flow: row wrap;
         margin: 2%;
         border-radius: 15px;
-        height: 100%;
+        height: auto;
         justify-content: center;
         border: 3px solid var(--accent);
 }
@@ -51,30 +69,41 @@ div.searchbar {
 
 div.current {
         display: flex;
-        flex-flow: column wrap;
-        height: 15%;
-        flex-shrink: 1;
+        flex-flow: row nowrap;
+        align-items: flex-start;
+        justify-content: center;
+}
+
+div.current-info {
+        display: flex;
+        flex-flow: column nowrap;
+        margin-right: 10%;
+        flex-shrink: 0;
 }
 
 div.current-icon {
-        width: 100%;
-        height: 100%;
+        display: flex;
+        margin-left: 10%;
+        flex-shrink: 0;
 }
 
 img.weather-icon {
-        display: inline-block;
+        display: flex;
+        filter: invert(97%) sepia(23%) saturate(6990%) hue-rotate(304deg) brightness(116%) contrast(84%);
+}
+
+img.wind-icon {
+        filter: invert(94%) sepia(11%) saturate(78%) hue-rotate(179deg) brightness(101%) contrast(93%);
 }
 
 div.current-temp {
         display: inline-block;
         font-size: 18pt;
         text-align: left;
-        width: 100%
 }
 
 div.current-weather {
         display: inline-block;
-        width: 100%;
         font-size: 16pt;
         margin-bottom: 5px;
         text-align: left;
@@ -82,14 +111,12 @@ div.current-weather {
 
 div.current-wind {
         display: inline-block;
-        width: 100%;
         font-size: 14pt;
         text-align: left;
 }
 
 div.current-sunrise, div.current-sunset {
         display: inline-block;
-        width: 100%;
         font-size: 14pt;
 }
 
@@ -107,7 +134,7 @@ h2.forecast-header {
         width: 100%
 }
 
-.daily, .hourly {
+div.daily, div.hourly {
         display: flex;
         flex-flow: row nowrap;
         align-items: center;
@@ -115,23 +142,24 @@ h2.forecast-header {
         overflow-y: hidden;
         white-space: nowrap;
         width: 100%;
-
+        margin-left: 5px;
+        height: auto;
 }
 
-.hourly-box, .daily-box {
+div.hourly-box, div.daily-box {
         display: flex;
-        flex-flow: column wrap;
-        flex-grow: 1;
-        justify-content: center;
+        flex-flow: row wrap;
+        flex-shrink: 0;
     align-items: flex-start;
-
-        padding: 1em;
         overflow-wrap: normal;
-        min-width: 15%;
-        white-space: normal;
+        min-width: 20%;
         margin: 5px;
 }
 
+div.hourly-icon, div.daily-icon {
+                display: inline-block;
+}
+
 input, select, textarea {
         margin: 5px;
         padding: 5px;
diff --git a/src/static/temp.js b/src/static/temp.js
new file mode 100644
index 0000000..6eeeba7
--- /dev/null
+++ b/src/static/temp.js
@@ -0,0 +1,325 @@
+e strict';
+
+class Color {
+                  constructor(r, g, b) {
+                                      this.set(r, g, b);
+                                    }
+                  
+                  toString() {
+                                      return `rgb(${Math.round(this.r)}, ${Math.round(this.g)}, ${Math.round(this.b)})`;
+                                    }
+
+                  set(r, g, b) {
+                                      this.r = this.clamp(r);
+                                      this.g = this.clamp(g);
+                                      this.b = this.clamp(b);
+                                    }
+
+                  hueRotate(angle = 0) {
+                                      angle = angle / 180 * Math.PI;
+                                      const sin = Math.sin(angle);
+                                      const cos = Math.cos(angle);
+
+                                      this.multiply([
+                                                                0.213 + cos * 0.787 - sin * 0.213,
+                                                                0.715 - cos * 0.715 - sin * 0.715,
+                                                                0.072 - cos * 0.072 + sin * 0.928,
+                                                                0.213 - cos * 0.213 + sin * 0.143,
+                                                                0.715 + cos * 0.285 + sin * 0.140,
+                                                                0.072 - cos * 0.072 - sin * 0.283,
+                                                                0.213 - cos * 0.213 - sin * 0.787,
+                                                                0.715 - cos * 0.715 + sin * 0.715,
+                                                                0.072 + cos * 0.928 + sin * 0.072,
+                                                              ]);
+                                    }
+
+                  grayscale(value = 1) {
+                                      this.multiply([
+                                                                0.2126 + 0.7874 * (1 - value),
+                                                                0.7152 - 0.7152 * (1 - value),
+                                                                0.0722 - 0.0722 * (1 - value),
+                                                                0.2126 - 0.2126 * (1 - value),
+                                                                0.7152 + 0.2848 * (1 - value),
+                                                                0.0722 - 0.0722 * (1 - value),
+                                                                0.2126 - 0.2126 * (1 - value),
+                                                                0.7152 - 0.7152 * (1 - value),
+                                                                0.0722 + 0.9278 * (1 - value),
+                                                              ]);
+                                    }
+
+                  sepia(value = 1) {
+                                      this.multiply([
+                                                                0.393 + 0.607 * (1 - value),
+                                                                0.769 - 0.769 * (1 - value),
+                                                                0.189 - 0.189 * (1 - value),
+                                                                0.349 - 0.349 * (1 - value),
+                                                                0.686 + 0.314 * (1 - value),
+                                                                0.168 - 0.168 * (1 - value),
+                                                                0.272 - 0.272 * (1 - value),
+                                                                0.534 - 0.534 * (1 - value),
+                                                                0.131 + 0.869 * (1 - value),
+                                                              ]);
+                                    }
+
+                  saturate(value = 1) {
+                                      this.multiply([
+                                                                0.213 + 0.787 * value,
+                                                                0.715 - 0.715 * value,
+                                                                0.072 - 0.072 * value,
+                                                                0.213 - 0.213 * value,
+                                                                0.715 + 0.285 * value,
+                                                                0.072 - 0.072 * value,
+                                                                0.213 - 0.213 * value,
+                                                                0.715 - 0.715 * value,
+                                                                0.072 + 0.928 * value,
+                                                              ]);
+                                    }
+
+                  multiply(matrix) {
+                                      const newR = this.clamp(this.r * matrix[0] + this.g * matrix[1] + this.b * matrix[2]);
+                                      const newG = this.clamp(this.r * matrix[3] + this.g * matrix[4] + this.b * matrix[5]);
+                                      const newB = this.clamp(this.r * matrix[6] + this.g * matrix[7] + this.b * matrix[8]);
+                                      this.r = newR;
+                                      this.g = newG;
+                                      this.b = newB;
+                                    }
+
+                  brightness(value = 1) {
+                                      this.linear(value);
+                                    }
+                  contrast(value = 1) {
+                                      this.linear(value, -(0.5 * value) + 0.5);
+                                    }
+
+                  linear(slope = 1, intercept = 0) {
+                                      this.r = this.clamp(this.r * slope + intercept * 255);
+                                      this.g = this.clamp(this.g * slope + intercept * 255);
+                                      this.b = this.clamp(this.b * slope + intercept * 255);
+                                    }
+
+                  invert(value = 1) {
+                                      this.r = this.clamp((value + this.r / 255 * (1 - 2 * value)) * 255);
+                                      this.g = this.clamp((value + this.g / 255 * (1 - 2 * value)) * 255);
+                                      this.b = this.clamp((value + this.b / 255 * (1 - 2 * value)) * 255);
+                                    }
+
+                  hsl() {
+                                      const r = this.r / 255;
+                                      const g = this.g / 255;
+                                      const b = this.b / 255;
+                                      const max = Math.max(r, g, b);
+                                      const min = Math.min(r, g, b);
+                                      let h, s, l = (max + min) / 2;
+
+                                      if (max === min) {
+                                                                h = s = 0;
+                                                              } else {
+                                                                                        const d = max - min;
+                                                                                        s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+                                                                                        switch (max) {
+                                                                                                                        case r:
+                                                                                                                                          h = (g - b) / d + (g < b ? 6 : 0);
+                                                                                                                                          break;
+
+                                                                                                                                        case g:
+                                                                                                                                          h = (b - r) / d + 2;
+                                                                                                                                          break;
+
+                                                                                                                                        case b:
+                                                                                                                                          h = (r - g) / d + 4;
+                                                                                                                                          break;
+                                                                                                                                      }
+                                                                                        h /= 6;
+                                                                                      }
+
+                                      return {
+                                                                h: h * 100,
+                                                                s: s * 100,
+                                                                l: l * 100,
+                                                              };
+                                    }
+
+                  clamp(value) {
+                                      if (value > 255) {
+                                                                value = 255;
+                                                              } else if (value < 0) {
+                                                                                        value = 0;
+                                                                                      }
+                                      return value;
+                                    }
+}
+
+class Solver {
+                  constructor(target, baseColor) {
+                                      this.target = target;
+                                      this.targetHSL = target.hsl();
+                                      this.reusedColor = new Color(0, 0, 0);
+                                    }
+
+                  solve() {
+                                      const result = this.solveNarrow(this.solveWide());
+                                      return {
+                                                                values: result.values,
+                                                                loss: result.loss,
+                                                                filter: this.css(result.values),
+                                                              };
+                                    }
+
+                  solveWide() {
+                                      const A = 5;
+                                      const c = 15;
+                                      const a = [60, 180, 18000, 600, 1.2, 1.2];
+
+                                      let best = { loss: Infinity };
+                                      for (let i = 0; best.loss > 25 && i < 3; i++) {
+                                                                const initial = [50, 20, 3750, 50, 100, 100];
+                                                                const result = this.spsa(A, a, c, initial, 1000);
+                                                                if (result.loss < best.loss) {
+                                                                                                best = result;
+                                                                                              }
+                                                              }
+                                      return best;
+                                    }
+
+                  solveNarrow(wide) {
+                                      const A = wide.loss;
+                                      const c = 2;
+                                      const A1 = A + 1;
+                                      const a = [0.25 * A1, 0.25 * A1, A1, 0.25 * A1, 0.2 * A1, 0.2 * A1];
+                                      return this.spsa(A, a, c, wide.values, 500);
+                                    }
+
+                  spsa(A, a, c, values, iters) {
+                                      const alpha = 1;
+                                      const gamma = 0.16666666666666666;
+
+                                      let best = null;
+                                      let bestLoss = Infinity;
+                                      const deltas = new Array(6);
+                                      const highArgs = new Array(6);
+                                      const lowArgs = new Array(6);
+
+                                      for (let k = 0; k < iters; k++) {
+                                                                const ck = c / Math.pow(k + 1, gamma);
+                                                                for (let i = 0; i < 6; i++) {
+                                                                                                deltas[i] = Math.random() > 0.5 ? 1 : -1;
+                                                                                                highArgs[i] = values[i] + ck * deltas[i];
+                                                                                                lowArgs[i] = values[i] - ck * deltas[i];
+                                                                                              }
+
+                                                                const lossDiff = this.loss(highArgs) - this.loss(lowArgs);
+                                                                for (let i = 0; i < 6; i++) {
+                                                                                                const g = lossDiff / (2 * ck) * deltas[i];
+                                                                                                const ak = a[i] / Math.pow(A + k + 1, alpha);
+                                                                                                values[i] = fix(values[i] - ak * g, i);
+                                                                                              }
+
+                                                                const loss = this.loss(values);
+                                                                if (loss < bestLoss) {
+                                                                                                best = values.slice(0);
+                                                                                                bestLoss = loss;
+                                                                                              }
+                                                              }
+                                      return { values: best, loss: bestLoss };
+
+                                      function fix(value, idx) {
+                                                                let max = 100;
+                                                                if (idx === 2 /* saturate */) {
+                                                                                                max = 7500;
+                                                                                              } else if (idx === 4 /* brightness */ || idx === 5 /* contrast */) {
+                                                                                                                          max = 200;
+                                                                                                                        }
+
+                                                                if (idx === 3 /* hue-rotate */) {
+                                                                                                if (value > max) {
+                                                                                                                                  value %= max;
+                                                                                                                                } else if (value < 0) {
+                                                                                                                                                                  value = max + value % max;
+                                                                                                                                                                }
+                                                                                              } else if (value < 0) {
+                                                                                                                          value = 0;
+                                                                                                                        } else if (value > max) {
+                                                                                                                                                        value = max;
+                                                                                                                                                      }
+                                                                return value;
+                                                              }
+                                    }
+
+                  loss(filters) {
+                                      // Argument is array of percentages.
+                                      const color = this.reusedColor;
+                                      color.set(0, 0, 0);
+
+                                      color.invert(filters[0] / 100);
+                                      color.sepia(filters[1] / 100);
+                                      color.saturate(filters[2] / 100);
+                                      color.hueRotate(filters[3] * 3.6);
+                                      color.brightness(filters[4] / 100);
+                                      color.contrast(filters[5] / 100);
+
+                                      const colorHSL = color.hsl();
+                                      return (
+                                                                Math.abs(color.r - this.target.r) +
+                                                                Math.abs(color.g - this.target.g) +
+                                                                Math.abs(color.b - this.target.b) +
+                                                                Math.abs(colorHSL.h - this.targetHSL.h) +
+                                                                Math.abs(colorHSL.s - this.targetHSL.s) +
+                                                                Math.abs(colorHSL.l - this.targetHSL.l)
+                                                              );
+                                    }
+
+                  css(filters) {
+                                      function fmt(idx, multiplier = 1) {
+                                                                return Math.round(filters[idx] * multiplier);
+                                                              }
+                                      return `filter: invert(${fmt(0)}%) sepia(${fmt(1)}%) saturate(${fmt(2)}%) hue-rotate(${fmt(3, 3.6)}deg) brightness(${fmt(4)}%) contrast(${fmt(5)}%);`;
+                                    }
+}
+
+function hexToRgb(hex) {
+                  // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
+                  const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+                  hex = hex.replace(shorthandRegex, (m, r, g, b) => {
+                                      return r + r + g + g + b + b;
+                                    });
+
+                  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+                  return result
+                    ? [
+                                              parseInt(result[1], 16),
+                                              parseInt(result[2], 16),
+                                              parseInt(result[3], 16),
+                                            ]
+                    : null;
+}
+
+$(document).ready(() => {
+                  $('button.execute').click(() => {
+                                      const rgb = hexToRgb($('input.target').val());
+                                      if (rgb.length !== 3) {
+                                                                alert('Invalid format!');
+                                                                return;
+                                                              }
+
+                                      const color = new Color(rgb[0], rgb[1], rgb[2]);
+                                      const solver = new Solver(color);
+                                      const result = solver.solve();
+
+                                      let lossMsg;
+                                      if (result.loss < 1) {
+                                                                lossMsg = 'This is a perfect result.';
+                                                              } else if (result.loss < 5) {
+                                                                                        lossMsg = 'The is close enough.';
+                                                                                      } else if (result.loss < 15) {
+                                                                                                                lossMsg = 'The color is somewhat off. Consider running it again.';
+                                                                                                              } else {
+                                                                                                                                        lossMsg = 'The color is extremely off. Run it again!';
+                                                                                                                                      }
+
+                                      $('.realPixel').css('background-color', color.toString());
+                                      $('.filterPixel').attr('style', result.filter);
+                                      $('.filterDetail').text(result.filter);
+                                      $('.lossDetail').html(`Loss: ${result.loss.toFixed(1)}. <b>${lossMsg}</b>`);
+                                    });
+});
+
diff --git a/templates/base.html b/src/templates/base.html
index 6fe776a..a909aca 100644
--- a/templates/base.html
+++ b/src/templates/base.html
@@ -2,6 +2,7 @@
 <html>
                 <head>
                         <meta charset="utf-8">
+                        <meta name="viewport" content="width=device-width, initial-scale=1.0">
                         <title>{% block title %} {% endblock %}</title>
                         <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}">
                         <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css' ) }}">
diff --git a/src/templates/index.html b/src/templates/index.html
new file mode 100644
index 0000000..da2a19a
--- /dev/null
+++ b/src/templates/index.html
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+{% block content %}
+<div class=content-noborder>
+                <div class=index-title>
+                                <h1>Enter a Location</h1>
+                </div>
+                <div class=index-form>
+                                <form method="post">
+                                        {{ form.csrf_token }}
+                                        {{ form.location }}
+                                        {{ form.submit() }}
+                                </form>
+                </div>
+</div>
+{% endblock %}
diff --git a/src/templates/location.html b/src/templates/location.html
new file mode 100644
index 0000000..fa691ea
--- /dev/null
+++ b/src/templates/location.html
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+{% block content %}
+<div class=content-noborder>
+                <div class=index-title>
+                                <h1>Select a Location</h1>
+                </div>
+                <div class=index-form>
+                                <form method="post">
+                                        {{ form.csrf_token }}
+                                        {{ form.location }}
+                                        {{ form.submit() }}
+                                </form>
+                </div>
+</div>
+{% endblock %}
diff --git a/templates/weather.html b/src/templates/weather.html
index 24819dc..64aabbd 100644
--- a/templates/weather.html
+++ b/src/templates/weather.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% block content %}
-{% set is_day = data["current_weather"]["is_day"] %}
 <div class=content>
                 <div class=searchbar>
                                 <form method="post">
@@ -10,11 +9,15 @@
                                 </form>
                 </div>
                 <div class=current>
+                                {% set is_day = data["current_weather"]["is_day"] %}
                                 {% set weather_code = data["current_weather"]["weathercode"] %}
                                 <div class=current-info>
                                                 <div class=current-weather>{{ weather_codes[weather_code] }}</div>
                                                 <div class=current-temp> {{ data["current_weather"]["temperature"]}}°F </div>
-                                                <div class=current-wind>Wind: {{ data["current_weather"]["windspeed"] }} MPH {{ data["current_weather"]["winddirection"] }}</div>
+                                                <div class=current-wind>
+                                                                Wind: {{ data["current_weather"]["windspeed"] }} MPH 
+                                                                <img class=wind-icon src="/static/icons/directions/{{get_direction_icon(data["current_weather"]["winddirection"])}}.svg">
+                                                </div>
                                                 <div class=current-sunrise>Sunrise: {{ data["daily"]["sunrise"][0] }} </div>
                                                 <div class=current-sunset>Sunset: {{ data["daily"]["sunset"][0] }} </div>
                                 </div>          
@@ -36,11 +39,22 @@
                                                                 </div>
                                                                 <div class=hourly-temp>{{ data["hourly"]["temperature_2m"][i]}}°F</div>
                                                                 <div class=hourly-humidity>Humidity: {{ data["hourly"]["relativehumidity_2m"][i] }}%</div>
-                                                                <div class=hourly-wind>Wind: {{ data["hourly"]["windspeed_10m"][i] }}MPH {{ data["hourly"]["winddirection_10m"][i] }}</div>
+                                                                <div class=hourly-wind>
+                                                                                Wind: {{ data["hourly"]["windspeed_10m"][i] }}MPH 
+                                                                                <img class=wind-icon src="/static/icons/directions/{{get_direction_icon(data["hourly"]["winddirection_10m"][i])}}.svg">
+                                                                </div>
                                                 </div>
                                                 <div class=hourly-icon>
+                                                                {% set time = datetime.datetime.strptime(data["hourly"]["time"][i], "%a %x %I:%M %p") %}
+                                                                {% set sunrise = datetime.datetime.strptime(data["daily"]["sunrise"][0], "%I:%M %p").replace(year=time.year, month=time.month, day=time.day) %}
+                                                                
+                                                                {% set sunset = datetime.datetime.strptime(data["daily"]["sunset"][0], "%I:%M %p").replace(year=time.year, month=time.month, day=time.day) %}
+                                                                {% set is_day = 1 %}
+                                                                {% if time > sunrise and time < sunset %}
+                                                                        {% set is_day = 0 %}
+                                                                {% endif %}
                                                                 {% set weather_code = data["hourly"]["weathercode"][i] %}
-                                                                <img class=weather-icon src="/static/icons/svg/{{ weather_icons[weather_code][is_day]}}.svg" width=100px height=100px>
+                                                                <img class=weather-icon src="/static/icons/svg/{{weather_icons[weather_code][is_day]}}.svg" width=100px height=100px>
                                                 </div>
                                 </div>
                                 {% endfor %}
@@ -66,7 +80,7 @@
                                                 </div>
                                                 <div class=daily-icon>
                                                                 {% set weather_code = data["daily"]["weathercode"][i] %}
-                                                                <img class=weather-icon src="/static/icons/svg/{{ weather_icons[weather_code][is_day]}}.svg" width=100px height=100px>
+                                                                <img class=weather-icon src="/static/icons/svg/{{ weather_icons[weather_code][0]}}.svg" width=100px height=100px>
                                                 </div>
                                 </div>
                                 {% endfor %}
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index a877fef..0000000
--- a/templates/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-<h1>{% block title %}  Enter a Location {% endblock %}</h1>
-<form method="post">
-        {{ form.csrf_token }}
-        {{ form.location }}
-        {{ form.submit() }}
-</form>
-{% endblock %}