diff --git a/atom.xml b/atom.xml
index 9e9a1645fd..f1d7a4559f 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 013292c41b..b400ca7079 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 6c8c4ba6b3..d86a760e3d 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 78b6b078cb..0066ca76c0 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index da356c7c0e..64db7e784c 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 79650e5403..e56995d1e5 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 94de0ebc2f..8b53160812 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 69b97753f9..e6fc35fd37 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00: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 dbede7e2de..b50ec565c3 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index fd176e0a5c..7031fac093 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index d2592f4e51..e0c915e749 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00: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 c8b9b3efd5..78f7bc9a87 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-04-24T07:48:58+00:00</updated>
+  <updated>2016-04-24T08:46:43+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/getting-started/autostart-systemd/index.html b/getting-started/autostart-systemd/index.html
index 31bc8c392b..98b8c7b791 100644
--- a/getting-started/autostart-systemd/index.html
+++ b/getting-started/autostart-systemd/index.html
@@ -119,10 +119,10 @@ EOF'
 </div>
 </div>
 
-<p>There is also another <a href="https://raw.githubusercontent.com/balloob/home-assistant/master/script/home-assistant%40.service">sample service file</a> available. To use this one, just download it.</p>
+<p>There is also another <a href="https://raw.githubusercontent.com/home-assistant/home-assistant/master/script/home-assistant%40.service">sample service file</a> available. To use this one, just download it.</p>
 
 <div class="highlighter-coderay"><div class="CodeRay">
-  <div class="code"><pre>$ sudo wget https://raw.githubusercontent.com/balloob/home-assistant/master/script/home-assistant%40.service -O /lib/systemd/system/home-assistant@[your user].service
+  <div class="code"><pre>$ sudo wget https://raw.githubusercontent.com/home-assistant/home-assistant/master/script/home-assistant%40.service -O /lib/systemd/system/home-assistant@[your user].service
 </pre></div>
 </div>
 </div>
diff --git a/getting-started/installation-docker/index.html b/getting-started/installation-docker/index.html
index 8c75aebf58..8c6473bcd0 100644
--- a/getting-started/installation-docker/index.html
+++ b/getting-started/installation-docker/index.html
@@ -111,7 +111,7 @@ When using boot2docker on OS X you are unable to map the local time to your Dock
 
 <ul>
   <li><a href="https://community.home-assistant.io">Forum</a> for Home Assistant discussions and questions.</li>
-  <li><a href="https://gitter.im/balloob/home-assistant">Gitter Chat Room</a> for real-time chat about Home Assistant.</li>
+  <li><a href="https://gitter.im/home-assistant/home-assistant">Gitter Chat Room</a> for real-time chat about Home Assistant.</li>
   <li><a href="https://github.com/home-assistant/home-assistant/issues">GitHub Page</a> for issue reporting.</li>
 </ul>
 
diff --git a/getting-started/installation-raspberry-pi/index.html b/getting-started/installation-raspberry-pi/index.html
index ddbc51665b..2170895e18 100644
--- a/getting-started/installation-raspberry-pi/index.html
+++ b/getting-started/installation-raspberry-pi/index.html
@@ -123,7 +123,7 @@ $ hass
 
 <ul>
   <li><a href="https://community.home-assistant.io">Forum</a> for Home Assistant discussions and questions.</li>
-  <li><a href="https://gitter.im/balloob/home-assistant">Gitter Chat Room</a> for real-time chat about Home Assistant.</li>
+  <li><a href="https://gitter.im/home-assistant/home-assistant">Gitter Chat Room</a> for real-time chat about Home Assistant.</li>
   <li><a href="https://github.com/home-assistant/home-assistant/issues">GitHub Page</a> for issue reporting.</li>
 </ul>
 
diff --git a/help/index.html b/help/index.html
index c8932fed3b..988b73bcdd 100644
--- a/help/index.html
+++ b/help/index.html
@@ -97,7 +97,7 @@
 
 <ul>
   <li><a href="https://community.home-assistant.io/">Forum</a></li>
-  <li><a href="https://gitter.im/balloob/home-assistant">Gitter Chatroom</a> for general Home Assistant discussions and questions.</li>
+  <li><a href="https://gitter.im/home-assistant/home-assistant">Gitter Chatroom</a> for general Home Assistant discussions and questions.</li>
   <li>Follow us on <a href="https://twitter.com/home_assistant">Twitter</a>, use @home_assistant</li>
   <li>Join the <a href="https://plus.google.com/u/0/b/110560654828510104551/communities/106562234893511202708">Google+ community</a></li>
 </ul>
diff --git a/help/trivia/index.html b/help/trivia/index.html
index 831a972996..7f8baee287 100644
--- a/help/trivia/index.html
+++ b/help/trivia/index.html
@@ -122,7 +122,7 @@
   </thead>
   <tbody>
     <tr>
-      <td><a href="https://gitter.im/balloob/home-assistant">Gitter.io</a></td>
+      <td><a href="https://gitter.im/home-assistant/home-assistant">Gitter.io</a></td>
       <td>334</td>
     </tr>
     <tr>
diff --git a/sitemap.xml b/sitemap.xml
index d4157739e0..994e4c7495 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1509,18 +1509,18 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-04-24T07:48:04+00:00</lastmod>
+    <lastmod>2016-04-24T08:46:00+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-04-24T07:48:04+00:00</lastmod>
+    <lastmod>2016-04-24T08:46:00+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-04-24T07:48:04+00:00</lastmod>
+    <lastmod>2016-04-24T08:46:00+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-04-24T07:48:05+00:00</lastmod>
+    <lastmod>2016-04-24T08:46:00+00:00</lastmod>
   </url>
 </urlset>