diff --git a/atom.xml b/atom.xml
index 427357bc27..39f83b6b39 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>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/architecture/atom.xml b/blog/categories/architecture/atom.xml
index 0074a56074..2bbc25055f 100644
--- a/blog/categories/architecture/atom.xml
+++ b/blog/categories/architecture/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: architecture | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/architecture/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/branding/atom.xml b/blog/categories/branding/atom.xml
index f5e2e831a5..95b4e2a1a8 100644
--- a/blog/categories/branding/atom.xml
+++ b/blog/categories/branding/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: branding | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/branding/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/component/atom.xml b/blog/categories/component/atom.xml
index f1cdb0efae..114c5ec8c5 100644
--- a/blog/categories/component/atom.xml
+++ b/blog/categories/component/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: component | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/component/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/core/atom.xml b/blog/categories/core/atom.xml
index 6414821a2e..33106a4993 100644
--- a/blog/categories/core/atom.xml
+++ b/blog/categories/core/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: core | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/core/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/frontend/atom.xml b/blog/categories/frontend/atom.xml
index 8d684f0538..c1341f160c 100644
--- a/blog/categories/frontend/atom.xml
+++ b/blog/categories/frontend/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: frontend | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/frontend/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 2443ce69d2..905ced62b0 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>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 4de11a4d0c..81ce5b4b29 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>2015-03-14T13:03:35-07:00</updated>
+  <updated>2015-03-15T01:01:47-07:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/components/configurator.html b/components/configurator.html
new file mode 100644
index 0000000000..676ab4394a
--- /dev/null
+++ b/components/configurator.html
@@ -0,0 +1,152 @@
+<!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>Configurator - Home Assistant</title>
+    <meta name="author" content="Paulus Schoutsen">
+    
+    <meta name="description" content="Instructions how to integrate the configurator in your components.">
+    
+    <meta name="viewport" content="width=device-width">
+    <link rel="canonical" href="https://home-assistant.io">
+    
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Configurator">
+    <meta property="og:site_name" content="Home Assistant">
+    <meta property="og:url" content="https://home-assistant.io/components/configurator.html/">
+    <meta property="og:type" content="website">
+    <meta property="og:description" content="Instructions how to integrate the configurator in your components.">
+    
+    
+    
+    <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='/images/favicon-192x192.png'> Home Assistant
+  </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="/developers/">Developers</a>
+    <ul>
+      <li><a href="/developers/architecture.html">Architecture</a></li>
+      <li><a href="/developers/frontend.html">Frontend development</a></li>
+      <li><a href="/developers/creating_components.html">
+        Creating components
+      </a></li>
+      <li><a href="/developers/add_new_platform.html">
+        Adding platform support
+      </a></li>
+      <li><a href="/developers/api.html">Rest API</a></li>
+    </ul>
+  </li>
+  <li><a href="/blog/">Blog</a></li>
+  <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">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">
+      Configurator
+    </h1>
+  </header>
+  <hr class="divider">
+  
+
+  <p class='note'>
+This component is intended for developers.
+</p>
+
+
+<p>The configurator component allows components to request information from the user. It is currently implemented as the minimum viable product: it supports showing a text, image and button to the user. It will trigger a callback when the button is pressed.</p>
+
+<p>The Hue component in <a href="/demo">the demo</a> is implemented using the configurator. See <a href="https://github.com/balloob/home-assistant/blob/master/homeassistant/components/demo.py#L72">the source of the demo component</a> for a simple example.</p>
+
+<p>See <a href="https://github.com/balloob/home-assistant/blob/master/homeassistant/components/configurator.py#L39">the source</a> for more details on how to use the configurator component.</p>
+
+
+</article>
+
+
+        </div>
+
+        
+      </div>
+    </div>
+
+    <footer>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item">
+      <p class="copyright">
+  <span class="credit">Powered by <a href="http://octopress.org">Octopress</a>, <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>. Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.</span>
+</p>
+    </div>
+  </div>
+</div>
+
+    </footer>
+
+    <!--[if lt IE 7]>
+      <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+    <![endif]-->
+
+    
+
+
+<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/tellstick_sensor.html b/components/conversation.html
similarity index 83%
rename from components/tellstick_sensor.html
rename to components/conversation.html
index 5d7fd5ac36..d158bb886a 100644
--- a/components/tellstick_sensor.html
+++ b/components/conversation.html
@@ -9,20 +9,20 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Tellstick Sensors - Home Assistant</title>
+    <title>Conversation - Home Assistant</title>
     <meta name="author" content="Paulus Schoutsen">
     
-    <meta name="description" content="Instructions how to setup tellstick sensors with Home Assistant.">
+    <meta name="description" content="Instructions how to have conversations with your Home Assistant.">
     
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="https://home-assistant.io">
     
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Tellstick Sensors">
+    <meta property="og:title" content="Conversation">
     <meta property="og:site_name" content="Home Assistant">
-    <meta property="og:url" content="https://home-assistant.io/components/tellstick_sensor.html/">
+    <meta property="og:url" content="https://home-assistant.io/components/conversation.html/">
     <meta property="og:type" content="website">
-    <meta property="og:description" content="Instructions how to setup tellstick sensors with Home Assistant.">
+    <meta property="og:description" content="Instructions how to have conversations with your Home Assistant.">
     
     
     
@@ -89,24 +89,22 @@
   
   <header>
     <h1 class="title indent">
-      Tellstick Sensors
+      Conversation
     </h1>
   </header>
   <hr class="divider">
   
 
-  <p>Shows the values of that sensors that is connected to your Tellstick.</p>
-
-<p>To enable it, add the following lines to your <code>configuration.yaml</code>:</p>
+  <p>The conversation component can process sentences into commands for Home Assistant. It is currently limited to parsing commands in the format <code>turn &lt;Friendly Name&gt; &lt;on/off&gt;</code>.</p>
 
 <figure class='code'><div class="highlight"><table><tr><td class="gutter"><pre class="line-numbers"><span class='line-number'>1</span>
-</pre></td><td class='code'><pre><code class=''><span class='line'>tellstick_sensor:</span></code></pre></td></tr></table></div></figure>
+</pre></td><td class='code'><pre><code class=''><span class='line'>conversation:</span></code></pre></td></tr></table></div></figure>
 
 
+<p>When this component is active and you are using a supported browser voice commands will be activated in the frontend. Browse to <a href="/demo/">the demo</a> in Chrome to see it in action.</p>
 
-
-<p class='note warning'>
-This component is going to be merged into the sensor component.
+<p class='img'>
+  <img src="/images/screenshots/voice-commands.png" />
 </p>
 
 
diff --git a/components/index.html b/components/index.html
index 38414e85fb..148e80e81f 100644
--- a/components/index.html
+++ b/components/index.html
@@ -100,18 +100,19 @@
 <ul>
 <li><p><a href="/components/automation.html">Automation</a></p></li>
 <li><p><a href="/components/browser.html">Browser</a></p></li>
-<li><p><a href="/components/chromecast.html">Chromecast</a></p></li>
+<li><p><a href="/components/configurator.html">Configurator</a></p></li>
+<li><p><a href="/components/conversation.html">Conversation</a></p></li>
 <li><p><a href="/components/device_sun_light_trigger.html">Device sun light trigger</a></p></li>
 <li><p><a href="/components/device_tracker.html">Device tracker</a></p></li>
 <li><p><a href="/components/discovery.html">Discovery</a></p></li>
 <li><p><a href="/components/downloader.html">Downloader</a></p></li>
 <li><p><a href="/components/keyboard.html">Keyboard</a></p></li>
 <li><p><a href="/components/light.html">Light</a></p></li>
+<li><p><a href="/components/media_player.html">Media player</a></p></li>
 <li><p><a href="/components/notify.html">Notify</a></p></li>
 <li><p><a href="/components/simple_alarm.html">Simple alarm</a></p></li>
 <li><p><a href="/components/sun.html">Sun</a></p></li>
 <li><p><a href="/components/switch.html">Switch</a></p></li>
-<li><p><a href="/components/tellstick_sensor.html">Tellstick sensor</a></p></li>
 <li><p><a href="/components/thermostat.html">Thermostat</a></p></li>
 <li><p><a href="/components/wink.html">Wink</a></p></li>
 </ul>
diff --git a/components/chromecast.html b/components/media_player.html
similarity index 81%
rename from components/chromecast.html
rename to components/media_player.html
index 072cc6f9d4..63fabd8508 100644
--- a/components/chromecast.html
+++ b/components/media_player.html
@@ -9,20 +9,20 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Chromecast - Home Assistant</title>
+    <title>Media Player - Home Assistant</title>
     <meta name="author" content="Paulus Schoutsen">
     
-    <meta name="description" content="Instructions how to setup your chromecasts with Home Assistant.">
+    <meta name="description" content="Instructions how to setup your media players with Home Assistant.">
     
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="https://home-assistant.io">
     
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Chromecast">
+    <meta property="og:title" content="Media Player">
     <meta property="og:site_name" content="Home Assistant">
-    <meta property="og:url" content="https://home-assistant.io/components/chromecast.html/">
+    <meta property="og:url" content="https://home-assistant.io/components/media_player.html/">
     <meta property="og:type" content="website">
-    <meta property="og:description" content="Instructions how to setup your chromecasts with Home Assistant.">
+    <meta property="og:description" content="Instructions how to setup your media players with Home Assistant.">
     
     
     
@@ -89,25 +89,29 @@
   
   <header>
     <h1 class="title indent">
-      Chromecast
+      Media Player
     </h1>
   </header>
   <hr class="divider">
   
 
-  <p class='note warning'>
+  <p>Interacts with media players on your network. Currently only supports Chromecasts. These will be automatically discovered if you setup <a href="/components/discovery.html">the discovery component</a>. Can also be forced to load by adding the following lines to your <code>configuration.yaml</code>:</p>
+
+<figure class='code'><div class="highlight"><table><tr><td class="gutter"><pre class="line-numbers"><span class='line-number'>1</span>
+<span class='line-number'>2</span>
+</pre></td><td class='code'><pre><code class=''><span class='line'>media_player:
+</span><span class='line'>  platform: chromecast</span></code></pre></td></tr></table></div></figure>
+
+
+
+
+<p class='note warning'>
 Chromecasts have recently received a new API which is not yet supported by Home Assistant. Therefore we currently can only detect them and do not know what they are up to.
 </p>
 
 
 <p></p>
 
-<p>Interacts with Chromecasts on your network. Will be automatically discovered if you setup <a href="/components/discovery.html">the discovery component</a>. Can also be forced to load by adding the following lines to your <code>configuration.yaml</code>:</p>
-
-<figure class='code'><div class="highlight"><table><tr><td class="gutter"><pre class="line-numbers"><span class='line-number'>1</span>
-</pre></td><td class='code'><pre><code class=''><span class='line'>chromecast:</span></code></pre></td></tr></table></div></figure>
-
-
 <h2>Services</h2>
 
 <h3>Media control services</h3>
@@ -126,7 +130,7 @@ Chromecasts have recently received a new API which is not yet supported by Home
 <tr>
 <td> <code>entity_id</code>            </td>
 <td>      yes </td>
-<td> Target a specific chromecast. Defaults to all.</td>
+<td> Target a specific media player. Defaults to all.</td>
 </tr>
 </tbody>
 </table>
@@ -134,11 +138,11 @@ Chromecasts have recently received a new API which is not yet supported by Home
 
 <h3>Media play services</h3>
 
-<p>There are three services to start playing YouTube video&rsquo;s on the ChromeCast.</p>
+<p>There are three services to start playing YouTube video&rsquo;s on the media player.</p>
 
-<h4>Service <code>chromecast/play_youtube_video</code></h4>
+<h4>Service <code>media_player/play_youtube_video</code></h4>
 
-<p>Service to start playing a YouTube vide on the Chromecast.</p>
+<p>Service to start playing a YouTube vide on the media player.</p>
 
 <table>
 <thead>
@@ -152,7 +156,7 @@ Chromecasts have recently received a new API which is not yet supported by Home
 <tr>
 <td> <code>entity_id</code>            </td>
 <td>      yes </td>
-<td> Target a specific chromecast. Defaults to all.</td>
+<td> Target a specific media player. Defaults to all.</td>
 </tr>
 <tr>
 <td> <code>video</code>                </td>
@@ -163,9 +167,9 @@ Chromecasts have recently received a new API which is not yet supported by Home
 </table>
 
 
-<h4>Service <code>chromecast/start_fireplace</code> and <code>chromecast/start_epic_sax</code></h4>
+<h4>Service <code>media_player/start_fireplace</code> and <code>media_player/start_epic_sax</code></h4>
 
-<p>Will either start a fireplace or Epic Sax Guy 10h on the Chromecast.</p>
+<p>Will either start a fireplace or Epic Sax Guy 10h on the media player.</p>
 
 <table>
 <thead>
@@ -179,7 +183,7 @@ Chromecasts have recently received a new API which is not yet supported by Home
 <tr>
 <td> <code>entity_id</code>            </td>
 <td>      yes </td>
-<td> Target a specific chromecast. Defaults to all.</td>
+<td> Target a specific media player. Defaults to all.</td>
 </tr>
 </tbody>
 </table>
diff --git a/images/screenshots/voice-commands.png b/images/screenshots/voice-commands.png
new file mode 100644
index 0000000000..99a909466f
Binary files /dev/null and b/images/screenshots/voice-commands.png differ
diff --git a/sitemap.xml b/sitemap.xml
index c215dc1035..8de9041e5f 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -57,175 +57,181 @@
   </url>
   <url>
     <loc>https://home-assistant.io/developers/add_new_platform.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/android.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/api.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/architecture.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/automation.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/browser.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
-    <loc>https://home-assistant.io/components/chromecast.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <loc>https://home-assistant.io/components/configurator.html</loc>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  <url>
+    <loc>https://home-assistant.io/components/conversation.html</loc>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/creating_components.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_sun_light_trigger.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/discovery.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/downloader.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/frontend.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://home-assistant.io/blog/</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://home-assistant.io/blog/archives/</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
+  <url>
+    <loc>https://home-assistant.io/blog/</loc>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  <url>
+    <loc>https://home-assistant.io/blog/archives/</loc>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>0.7</priority>
+  </url>
   <url>
     <loc>https://home-assistant.io/components/</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/keyboard.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  <url>
+    <loc>https://home-assistant.io/components/media_player.html</loc>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/simple_alarm.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sun.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://home-assistant.io/components/tellstick_sensor.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/thermostat.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/troubleshooting.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://home-assistant.io/components/wink.html</loc>
-    <lastmod>2015-03-14T13:03:35-07:00</lastmod>
+    <lastmod>2015-03-15T01:01:47-07:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>