diff --git a/img/CREDITS.md b/img/CREDITS.md
index 8c1e9b0..2d5e427 100644
--- a/img/CREDITS.md
+++ b/img/CREDITS.md
@@ -5,3 +5,6 @@
 - rain.jpg (Public domain): George Hodan => http://www.publicdomainpictures.net/view-image.php?image=23191&picture=pluie
 - mist.png (CC by SA 2.0): Montgomery County Plan => https://www.flickr.com/photos/75012107@N05/8609938706/
 - home.png: http://uxrepo.com/icon/home-by-typicons
+- fox.png (Public domain): Adam Schoales => https://flickr.com/photos/adamschoales/20062355286/
+- tornado.png (CC by 2.0): NOAA Photo Library => https://flickr.com/photos/noaaphotolib/5054533468/in/album-72157625053846454/
+- sand.png (CC by 2.0): Florin Chelaru => https://flickr.com/photos/fchelaru/3737318635/
diff --git a/img/fog.png b/img/fog.png
new file mode 100644
index 0000000..ee8af26
Binary files /dev/null and b/img/fog.png differ
diff --git a/img/sand.jpg b/img/sand.jpg
new file mode 100644
index 0000000..1889829
Binary files /dev/null and b/img/sand.jpg differ
diff --git a/img/tornado.jpg b/img/tornado.jpg
new file mode 100644
index 0000000..ac3087c
Binary files /dev/null and b/img/tornado.jpg differ
diff --git a/js/app.js b/js/app.js
index 4f5ab3d..639e741 100644
--- a/js/app.js
+++ b/js/app.js
@@ -42,12 +42,18 @@ app.controller('WeatherController', ['$scope', '$interval', '$timeout', '$compil
 			"Clear": "sun.png",
 			"Clouds": "clouds.png",
 			"Drizzle": "drizzle.jpg",
-			"Extreme": "todo.png",
+			"Smoke": "todo.png",
+      "Dust": "todo.png",
+      "Sand": "todo.png",
+      "Ash": "todo.png",
+      "Squall": "todo.png",
+      "Tornado": "tornado.jpg",
 			"Haze": "mist.png",
 			"Mist": "mist.png",
 			"Rain": "rain.jpg",
 			"Snow": "snow.png",
 			"Thunderstorm": "thunderstorm.png",
+      "Fog": "fog.png",
 		}
 
 		// Reload weather information each minute