diff --git a/homeassistant/components/weather/yweather.py b/homeassistant/components/weather/yweather.py
index 8e638895660..5987cf7621f 100644
--- a/homeassistant/components/weather/yweather.py
+++ b/homeassistant/components/weather/yweather.py
@@ -32,27 +32,20 @@ DEFAULT_NAME = 'Yweather'
 SCAN_INTERVAL = timedelta(minutes=10)
 
 CONDITION_CLASSES = {
-    'clear-night': [31, 33],
-    'sunny': [32, 34, 25, 36],
-    'windy': [24],
-    'fair': [34],
-    'fair-night': [33],
-    'cloudy': [26],
-    'mostly-cloudy': [28],
-    'mostly-cloudy-night': [27],
-    'partly-cloudy': [30, 44],
-    'partly-cloudy-night': [29],
+    'clear-night': [31],
+    'cloudy': [26, 27, 28, 29, 30],
     'fog': [19, 20, 21, 22, 23],
     'hail': [17, 18, 35],
-    'light-rain': [8, 9],
-    'light-snow': [14],
-    'heavy-rain': [11, 12, 45, 40],
-    'heavy-snow': [41, 42, 43, 46],
-    'snowy': [13, 15, 16],
-    'rainy': [10],
-    'snowy-rainy': [5, 6, 7, 10],
-    'lightning': [3, 4, 37, 38, 39],
-    'lightning-rainy': [45, 47],
+    'lightning': [37],
+    'lightning-rainy': [3, 4, 38, 39, 47],
+    'partlycloudy': [44],
+    'pouring': [40, 45],
+    'rainy': [9, 11, 12],
+    'snowy': [8, 13, 14, 15, 16, 41, 42, 43],
+    'snowy-rainy': [5, 6, 7, 10, 46],
+    'sunny': [32, 33, 34, 25, 36],
+    'windy': [24],
+    'windy-variant': [],
     'exceptional': [0, 1, 2],
 }