diff --git a/atom.xml b/atom.xml
index 88fbfc1280..f52cb29688 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 bfc89565ac..ae88c2cd5a 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 bbfc711a59..0be7672944 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 2b747bf6b0..d910631c80 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 6d8d4e3344..4dadffdafc 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 1ddb34e25b..a6bb0d5dae 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 1a268398c9..48171573a4 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 da66c8c730..ca316e2422 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 8a75cf2511..781395cfdb 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 5b8fac8a6d..9203624b4e 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 addb525628..37b9314f66 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 aafdf74237..4faf8d4210 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 0ca939b51f..a4235ca34e 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 3f78b9701a..c23615df79 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 507163e53a..fbdf32aeb6 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 187f1035e1..99272d550c 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 66eba1363b..84796a9a9e 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 994515d8af..c5db44a3b5 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 ff4fd4b44d..a91569b31c 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+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 9138ecc110..f59442e912 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>2016-08-28T20:59:07+00:00</updated>
+  <updated>2016-08-29T03:09:41+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/media_player/index.html b/components/media_player/index.html
index 46e68c7ef9..1a22119e41 100644
--- a/components/media_player/index.html
+++ b/components/media_player/index.html
@@ -94,7 +94,7 @@
 <h2><a class="title-link" name="services" href="#services"></a> Services</h2>
 
 <h3><a class="title-link" name="media-control-services" href="#media-control-services"></a> Media control services</h3>
-<p>Available services: <code class="highlighter-rouge">turn_on</code>, <code class="highlighter-rouge">turn_off</code>, <code class="highlighter-rouge">toggle</code>, <code class="highlighter-rouge">volume_up</code>, <code class="highlighter-rouge">volume_down</code>, <code class="highlighter-rouge">media_play_pause</code>, <code class="highlighter-rouge">media_play</code>, <code class="highlighter-rouge">media_pause</code>, <code class="highlighter-rouge">media_next_track</code>, <code class="highlighter-rouge">media_previous_track</code>, <code class="highlighter-rouge">clear_playlist</code></p>
+<p>Available services: <code class="highlighter-rouge">turn_on</code>, <code class="highlighter-rouge">turn_off</code>, <code class="highlighter-rouge">toggle</code>, <code class="highlighter-rouge">volume_up</code>, <code class="highlighter-rouge">volume_down</code>, <code class="highlighter-rouge">media_play_pause</code>, <code class="highlighter-rouge">media_play</code>, <code class="highlighter-rouge">media_pause</code>, <code class="highlighter-rouge">media_stop</code>, <code class="highlighter-rouge">media_next_track</code>, <code class="highlighter-rouge">media_previous_track</code>, <code class="highlighter-rouge">clear_playlist</code></p>
 
 <table>
   <thead>
@@ -113,7 +113,7 @@
   </tbody>
 </table>
 
-<h4><a class="title-link" name="service-media_playermute_volume" href="#service-media_playermute_volume"></a> Service <code class="highlighter-rouge">media_player/mute_volume</code></h4>
+<h4><a class="title-link" name="service-media_playervolume_mute" href="#service-media_playervolume_mute"></a> Service <code class="highlighter-rouge">media_player/volume_mute</code></h4>
 
 <table>
   <thead>
@@ -130,14 +130,14 @@
       <td>Target a specific media player. Defaults to all.</td>
     </tr>
     <tr>
-      <td><code class="highlighter-rouge">mute</code></td>
+      <td><code class="highlighter-rouge">is_volume_muted</code></td>
       <td>no</td>
       <td>True/false for mute/unmute</td>
     </tr>
   </tbody>
 </table>
 
-<h4><a class="title-link" name="service-media_playerset_volume_level" href="#service-media_playerset_volume_level"></a> Service <code class="highlighter-rouge">media_player/set_volume_level</code></h4>
+<h4><a class="title-link" name="service-media_playervolume_set" href="#service-media_playervolume_set"></a> Service <code class="highlighter-rouge">media_player/volume_set</code></h4>
 
 <table>
   <thead>
@@ -154,7 +154,7 @@
       <td>Target a specific media player. Defaults to all.</td>
     </tr>
     <tr>
-      <td><code class="highlighter-rouge">volume</code></td>
+      <td><code class="highlighter-rouge">volume_level</code></td>
       <td>no</td>
       <td>Integer for volume level</td>
     </tr>
@@ -178,7 +178,7 @@
       <td>Target a specific media player. Defaults to all.</td>
     </tr>
     <tr>
-      <td><code class="highlighter-rouge">position</code></td>
+      <td><code class="highlighter-rouge">seek_position</code></td>
       <td>no</td>
       <td>Position to seek to. The format is platform dependent.</td>
     </tr>
diff --git a/sitemap.xml b/sitemap.xml
index ebc20a9354..6abe9f6b36 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1976,62 +1976,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2016-08-28T20:58:06+00:00</lastmod>
+<lastmod>2016-08-29T03:08:56+00:00</lastmod>
 </url>
 </urlset>