diff --git a/atom.xml b/atom.xml
index bf26942731..9302d17272 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index abd826e452..1062b3148d 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index c3bc917501..a54313cffe 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index ceffd46917..7138f2758b 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 3723b1dd36..0049387b51 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 1c2de70ef1..a83d8d2be4 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index bbb621d260..f30e339872 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 04680ffa35..5879c60208 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index f2a4a93f83..4d07b8a33b 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index e16c6aa7bc..bc926d4c8c 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 7b68b1c4a8..40b63c86f9 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 8104746a95..f43a23a903 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index aec9264046..ffb2e1deac 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index afeff697c7..09fdd1773f 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index be8a2e1dd7..cfc3a5f925 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 887d51d24b..8d32817035 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index d24a87e554..09b94d9fde 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index b2ab204985..d11d02d845 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index d367ab094e..5d4b5e75a4 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index 28e7ce543e..0d4fd1c891 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index af5ac47070..a67851d2d0 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-19T19:44:24+00:00</updated>
+  <updated>2017-01-19T21:43:28+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/binary_sensor.nest/index.html b/components/binary_sensor.nest/index.html
index 126b7dbc27..36b274846a 100644
--- a/components/binary_sensor.nest/index.html
+++ b/components/binary_sensor.nest/index.html
@@ -185,9 +185,6 @@ You must have the <a href="/components/nest/">Nest component</a> configured to u
         <li><a href='/components/camera.nest/'>
           Nest Camera
         </a></li>
-        <li><a href='/components/fan.nest/'>
-          Nest Fan
-        </a></li>
         <li><a href='/components/sensor.nest/'>
           Nest Sensor
         </a></li>
diff --git a/components/camera.nest/index.html b/components/camera.nest/index.html
index 9cc7d85186..97570d95de 100644
--- a/components/camera.nest/index.html
+++ b/components/camera.nest/index.html
@@ -128,9 +128,6 @@ You must have the <a href="/components/nest/">Nest component</a> configured to u
         <li><a href='/components/binary_sensor.nest/'>
           Nest Binary Sensor
         </a></li>
-        <li><a href='/components/fan.nest/'>
-          Nest Fan
-        </a></li>
         <li><a href='/components/sensor.nest/'>
           Nest Sensor
         </a></li>
diff --git a/components/climate.nest/index.html b/components/climate.nest/index.html
index 3a7cc624ce..c4bf1ad9e7 100644
--- a/components/climate.nest/index.html
+++ b/components/climate.nest/index.html
@@ -133,9 +133,6 @@ You must have the <a href="/components/nest/">Nest component</a> configured to u
         <li><a href='/components/camera.nest/'>
           Nest Camera
         </a></li>
-        <li><a href='/components/fan.nest/'>
-          Nest Fan
-        </a></li>
         <li><a href='/components/sensor.nest/'>
           Nest Sensor
         </a></li>
diff --git a/components/fan.isy994/index.html b/components/fan.isy994/index.html
index 856a5d8997..3046cea993 100644
--- a/components/fan.isy994/index.html
+++ b/components/fan.isy994/index.html
@@ -152,9 +152,6 @@
         <li>
             <a href='/components/fan.mqtt/'>MQTT Fan</a>
         </li>
-        <li>
-            <a href='/components/fan.nest/'>Nest Fan</a>
-        </li>
         <li>
             <a href='/components/fan.wink/'>Wink Fan</a>
         </li>
diff --git a/components/fan.mqtt/index.html b/components/fan.mqtt/index.html
index dc75549ca9..943a157061 100644
--- a/components/fan.mqtt/index.html
+++ b/components/fan.mqtt/index.html
@@ -241,9 +241,6 @@ Make sure that your topic is an exact match. <code class="highlighter-rouge">som
         <li>
             MQTT Fan
         </li>
-        <li>
-            <a href='/components/fan.nest/'>Nest Fan</a>
-        </li>
         <li>
             <a href='/components/fan.wink/'>Wink Fan</a>
         </li>
diff --git a/components/fan.nest/index.html b/components/fan.nest/index.html
deleted file mode 100644
index 61c32325fb..0000000000
--- a/components/fan.nest/index.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!doctype html>
-  <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-  <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
-  <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-  <!--[if gt IE 8]><!--> <html> <!--<![endif]-->
-
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Nest Fan - Home Assistant</title>
-    <meta name="author" content="Home Assistant">
-    <meta name="description" content="Instructions how to integrate Nest fans within Home Assistant.">
-    
-    <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="https://home-assistant.io/components/fan.nest/">
-
-    <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Nest Fan">
-    <meta property="og:site_name" content="Home Assistant">
-    <meta property="og:url" content="https://home-assistant.io/components/fan.nest/">
-    <meta property="og:type" content="article">
-    <meta property="og:description" content="Instructions how to integrate Nest fans within Home Assistant.">
-    <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
-    
-    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:site" content="@home_assistant">
-    
-    <meta name="twitter:title" content="Nest Fan">
-    <meta name="twitter:description" content="Instructions how to integrate Nest fans within Home Assistant.">
-    <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
-
-    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
-    <link rel='shortcut icon' href='/images/favicon.ico' />
-    <link rel='icon' type='image/png' href='/images/favicon-192x192.png' sizes='192x192' />
-  </head>
-
-  <body >
-
-    <header>
-      <div class="grid-wrapper">
-  <div class="grid">
-
-    <div class="grid__item three-tenths lap-two-sixths palm-one-whole ha-title">
-  <a href="/" class="site-title">
-    <img width='40' src='/demo/favicon-192x192.png'>
-    <span>Home Assistant</span>
-  </a>
-</div>
-
-<div class="grid__item seven-tenths lap-four-sixths palm-one-whole">
-  <nav>
-    <input type="checkbox" id="toggle">
-<label for="toggle" class="toggle" data-open="Main Menu" data-close="Close Menu"></label>
-<ul class="menu pull-right">
-  
-  <li><a href="/getting-started/">Getting started</a></li>
-  <li><a href="/components/">Components</a></li>
-  <li><a href="/ecosystem/">Ecosystem</a></li>
-  <li><a href="/cookbook/">Examples</a></li>
-  <li><a href="/developers/">Developers</a></li>
-  <li><a href="/blog/">Blog</a></li>
-  <li><a href="/help/">Need help?</a></li>
-</ul>
-  </nav>
-</div>
-
-  </div>
-</div>
-    </header>
-
-    
-
-    <div class="grid-wrapper">
-      <div class="grid grid-center">
-        
-        <div class="grid__item two-thirds lap-one-whole palm-one-whole">
-        
-
-          <article class="page">
-  
-  
-
-  
-  <header>
-    <h1 class="title indent">
-      Nest Fan
-    </h1>
-  </header>
-  <hr class="divider">
-  
-
-  <p>The <code class="highlighter-rouge">nest</code> fan platform let you control a fan from <a href="https://nest.com">Nest</a>.</p>
-
-<p class="note">
-You must have the <a href="/components/nest/">Nest component</a> configured to use those thermostats.
-</p>
-
-<p>To set it up, add the following information to your <code class="highlighter-rouge">configuration.yaml</code> file:</p>
-
-<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># Example configuration.yaml entry</span>
-<span class="s">fan</span><span class="pi">:</span>
-  <span class="pi">-</span> <span class="s">platform</span><span class="pi">:</span> <span class="s">nest</span>
-</code></pre>
-</div>
-
-
-
-</article>
-
-
-        </div>
-
-        
-        <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
-          <div class="grid">
-  
-  
-    <section class="aside-module grid__item one-whole lap-one-half">
-  <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/fan.nest.markdown'>Edit this page on GitHub</a></div>
-  <div class='brand-logo-container section'>
-      <img src='/images/supported_brands/nest.png' />
-  </div>
-    <div class='section'>
-    IoT class<sup><a href='/blog/2016/02/12/classifying-the-internet-of-things/#classifiers'><i class="icon-info-sign"></i></a></sup>: Local Polling
-    </div>
-    <div class='section'>
-    Introduced in release: 0.29
-    </div>
-    <div class='section'>
-      This is a platform for
-      <a href='/components/fan/'>the Fan component</a>.
-    </div>
-          <div class='section'>
-          <h1 class='title delta'>Related components</h1>
-          <ul class='divided'>
-        <li><a href='/components/nest/'>
-          Nest
-        </a></li>
-        <li><a href='/components/binary_sensor.nest/'>
-          Nest Binary Sensor
-        </a></li>
-        <li><a href='/components/camera.nest/'>
-          Nest Camera
-        </a></li>
-        <li><a href='/components/sensor.nest/'>
-          Nest Sensor
-        </a></li>
-        <li><a href='/components/climate.nest/'>
-          Nest Thermostat
-        </a></li>
-    </ul>
-    </div>
-    <div class='section'>
-    <h1 class="title delta">Category Fan</h1>
-    <ul class='divided'>
-        <li>
-            <a href='/components/fan.isy994/'>ISY994 Fan</a>
-        </li>
-        <li>
-            <a href='/components/fan.mqtt/'>MQTT Fan</a>
-        </li>
-        <li>
-            Nest Fan
-        </li>
-        <li>
-            <a href='/components/fan.wink/'>Wink Fan</a>
-        </li>
-    </ul>
-    </div>
-</section>
-  
-</div>
-        </aside>
-        
-      </div>
-    </div>
-
-    <footer>
-      <div class="grid-wrapper">
-  <div class="grid">
-    <div class="grid__item">
-      <div class="copyright">
-  <a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
-  <a rel="me" href='https://facebook.com/homeassistantio'><i class="icon-facebook"></i></a>
-  <a rel="me" href='https://plus.google.com/110560654828510104551'><i class="icon-google-plus"></i></a>
-  <a rel="me" href='https://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
-
-  <div class="credit">
-    Contact us at <a href='mailto:hello@home-assistant.io'>hello@home-assistant.io</a>.<br>
-    Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.<br />
-    Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.
-  </div>
-</div>
-    </div>
-  </div>
-</div>
-    </footer>
-
-    <script>
-  var _gaq=[['_setAccount','UA-57927901-1'],['_trackPageview']];
-  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-  s.parentNode.insertBefore(g,s)}(document,'script'));
-</script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/components/fan.wink/index.html b/components/fan.wink/index.html
index f33fd305d0..9442951cfc 100644
--- a/components/fan.wink/index.html
+++ b/components/fan.wink/index.html
@@ -156,9 +156,6 @@
         <li>
             <a href='/components/fan.mqtt/'>MQTT Fan</a>
         </li>
-        <li>
-            <a href='/components/fan.nest/'>Nest Fan</a>
-        </li>
         <li>
             Wink Fan
         </li>
diff --git a/components/fan/index.html b/components/fan/index.html
index b545224613..a6605606b7 100644
--- a/components/fan/index.html
+++ b/components/fan/index.html
@@ -124,9 +124,6 @@
           <li><a href='/components/fan.mqtt/'>
             MQTT Fan
           </a></li>
-          <li><a href='/components/fan.nest/'>
-            Nest Fan
-          </a></li>
           <li><a href='/components/fan.wink/'>
             Wink Fan
           </a></li>
diff --git a/components/image_processing.openalpr_cloud/index.html b/components/image_processing.openalpr_cloud/index.html
index 8da0f11dc2..cc3d20ad36 100644
--- a/components/image_processing.openalpr_cloud/index.html
+++ b/components/image_processing.openalpr_cloud/index.html
@@ -146,6 +146,9 @@
         <li>
             OpenALPR Cloud
         </li>
+        <li>
+            <a href='/components/image_processing.openalpr_local/'>OpenALPR Local</a>
+        </li>
     </ul>
     </div>
 </section>
diff --git a/components/image_processing.openalpr_local/index.html b/components/image_processing.openalpr_local/index.html
index dcc1b9f3f4..00a7c25e1e 100644
--- a/components/image_processing.openalpr_local/index.html
+++ b/components/image_processing.openalpr_local/index.html
@@ -159,8 +159,11 @@
       <a href='/components/image_processing/'>the Image Processing component</a>.
     </div>
     <div class='section'>
-    <h1 class="title delta">Category Image_Processing</h1>
+    <h1 class="title delta">Category Image Processing</h1>
     <ul class='divided'>
+        <li>
+            <a href='/components/image_processing.openalpr_cloud/'>OpenALPR Cloud</a>
+        </li>
         <li>
             OpenALPR Local
         </li>
diff --git a/components/index.html b/components/index.html
index 42321e8880..3610fb7c4a 100644
--- a/components/index.html
+++ b/components/index.html
@@ -111,7 +111,7 @@ Support for these components is provided by the Home Assistant community.
   <div class="grid__item one-sixth lap-one-whole palm-one-whole">
 
     <div class="filter-button-group">
-      <a href='#all' class="btn">All (526)</a>
+      <a href='#all' class="btn">All (525)</a>
       <a href='#featured' class="btn featured">Featured</a>
       <a href='#added_in_current_version' class="btn added_in_current_version">Added in 0.36 (26)</a>
       <a href='#added_one_version_ago' class="btn added_one_version_ago">Added in 0.35 (14)</a>
@@ -200,7 +200,7 @@ Support for these components is provided by the Home Assistant community.
         
           <a href='#fan' class="btn">
             Fan
-            (4)
+            (3)
           </a>
         
       
@@ -242,14 +242,7 @@ Support for these components is provided by the Home Assistant community.
         
           <a href='#image-processing' class="btn">
             Image Processing
-            (1)
-          </a>
-        
-      
-        
-          <a href='#image-processing' class="btn">
-            Image_Processing
-            (1)
+            (2)
           </a>
         
       
@@ -4625,22 +4618,6 @@ Support for these components is provided by the Home Assistant community.
       
       
       
-        <a href='/components/fan.nest/'
-           class='fan'
-           style='display: none'>
-          <div class='img-container'>
-            
-              <img src='/images/supported_brands/nest.png'>
-            
-          </div>
-          <div class='title'>Nest Fan</div>
-          <div class='category'>Fan</div>
-        </a>
-      
-    
-      
-      
-      
         <a href='/components/sensor.nest/'
            class='sensor'
            style='display: none'>
@@ -5068,7 +5045,7 @@ Support for these components is provided by the Home Assistant community.
             
           </div>
           <div class='title'>OpenALPR Local</div>
-          <div class='category'>Image_Processing</div>
+          <div class='category'>Image Processing</div>
         </a>
       
     
diff --git a/components/nest/index.html b/components/nest/index.html
index e75549e743..0da593a584 100644
--- a/components/nest/index.html
+++ b/components/nest/index.html
@@ -174,9 +174,6 @@
         <li><a href='/components/camera.nest/'>
           Nest Camera
         </a></li>
-        <li><a href='/components/fan.nest/'>
-          Nest Fan
-        </a></li>
         <li><a href='/components/sensor.nest/'>
           Nest Sensor
         </a></li>
diff --git a/components/sensor.nest/index.html b/components/sensor.nest/index.html
index 651f9c0439..1ef600f0cd 100644
--- a/components/sensor.nest/index.html
+++ b/components/sensor.nest/index.html
@@ -168,9 +168,6 @@ You must have the <a href="/components/nest/">Nest component</a> configured to u
         <li><a href='/components/camera.nest/'>
           Nest Camera
         </a></li>
-        <li><a href='/components/fan.nest/'>
-          Nest Fan
-        </a></li>
         <li><a href='/components/climate.nest/'>
           Nest Thermostat
         </a></li>
diff --git a/sitemap.xml b/sitemap.xml
index 2307e90364..2b7b009b62 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -854,9 +854,6 @@
 <loc>https://home-assistant.io/components/device_tracker.ubus/</loc>
 </url>
 <url>
-<loc>https://home-assistant.io/components/fan.nest/</loc>
-</url>
-<url>
 <loc>https://home-assistant.io/components/group/</loc>
 </url>
 <url>
@@ -2619,62 +2616,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-01-19T19:43:39+00:00</lastmod>
+<lastmod>2017-01-19T21:42:43+00:00</lastmod>
 </url>
 </urlset>