diff --git a/architecture/index.html b/architecture/index.html
index da2ebb71dc2..56b6a3e6117 100644
--- a/architecture/index.html
+++ b/architecture/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant/architecture">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -71,7 +71,7 @@
   <hr class="divider">
   
 
-  <p><img src='/github/images/ha_architecture.png' style='background-color: white'/></p>
+  <p><img src='/home-assistant/images/ha_architecture.png' style='background-color: white'/></p>
 
 <p>The core of Home Assistant exists of the following parts.</p>
 
@@ -132,7 +132,7 @@ In the event of the sun setting:
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/atom.xml b/atom.xml
index a4aa2b23c69..3deddd032cb 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="http://balloob.github.io/home-assistant/atom.xml" rel="self"/>
   <link href="http://balloob.github.io/home-assistant/"/>
-  <updated>2014-12-19T00:20:47-08:00</updated>
+  <updated>2014-12-19T07:49:58-08:00</updated>
   <id>http://balloob.github.io/home-assistant/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/2014/12/18/website-launched/index.html b/blog/2014/12/18/website-launched/index.html
index 50bd259a854..51b7ae49b34 100644
--- a/blog/2014/12/18/website-launched/index.html
+++ b/blog/2014/12/18/website-launched/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -88,7 +88,7 @@
     <ul class="tags unstyled">
     
       
-        <li><a class='category' href='/github/blog/categories/website/'>website</a></li>
+        <li><a class='category' href='/home-assistant/blog/categories/website/'>website</a></li>
       
     
     </ul>
@@ -123,7 +123,7 @@
   <ul class="divided">
     
       <li class="post">
-        <a href="/github/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
       </li>
     
   </ul>
@@ -159,7 +159,7 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/blog/archives/index.html b/blog/archives/index.html
index 2c13113ee2d..f44d41dc0e1 100644
--- a/blog/archives/index.html
+++ b/blog/archives/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant/blog/archives">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -89,7 +89,7 @@
     </time>
   </div>
   <div class="grid__item four-fifths palm-one-whole">
-    <h1 class="gamma"><a href="/github/blog/2014/12/18/website-launched/">Website launched!</a></h1>
+    <h1 class="gamma"><a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a></h1>
     
     <footer class="meta">
       
@@ -99,7 +99,7 @@
     <ul class="tags unstyled">
     
       
-        <li><a class='category' href='/github/blog/categories/website/'>website</a></li>
+        <li><a class='category' href='/home-assistant/blog/categories/website/'>website</a></li>
       
     
     </ul>
@@ -133,7 +133,7 @@
   <ul class="divided">
     
       <li class="post">
-        <a href="/github/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
       </li>
     
   </ul>
@@ -169,7 +169,7 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 9a6ec301901..9517cb83667 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="http://balloob.github.io/home-assistant/blog/categories/website/atom.xml" rel="self"/>
   <link href="http://balloob.github.io/home-assistant/"/>
-  <updated>2014-12-19T00:20:47-08:00</updated>
+  <updated>2014-12-19T07:49:58-08:00</updated>
   <id>http://balloob.github.io/home-assistant/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/website/index.html b/blog/categories/website/index.html
index c19be307756..bec1565d8ed 100644
--- a/blog/categories/website/index.html
+++ b/blog/categories/website/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant/blog/categories/website">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -89,7 +89,7 @@
     </time>
   </div>
   <div class="grid__item four-fifths palm-one-whole">
-    <h1 class="gamma"><a href="/github/blog/2014/12/18/website-launched/">Website launched!</a></h1>
+    <h1 class="gamma"><a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a></h1>
     
     <footer class="meta">
       
@@ -99,7 +99,7 @@
     <ul class="tags unstyled">
     
       
-        <li><a class='category' href='/github/blog/categories/website/'>website</a></li>
+        <li><a class='category' href='/home-assistant/blog/categories/website/'>website</a></li>
       
     
     </ul>
@@ -133,7 +133,7 @@
   <ul class="divided">
     
       <li class="post">
-        <a href="/github/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
       </li>
     
   </ul>
@@ -169,7 +169,7 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/blog/index.html b/blog/index.html
index d7f21ca0e4b..7a37362513a 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant/blog">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -84,7 +84,7 @@
   <ul class="divided">
     
       <li class="post">
-        <a href="/github/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
       </li>
     
   </ul>
@@ -120,7 +120,7 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/contributing/index.html b/contributing/index.html
index f835e8568a8..caed08e68e1 100644
--- a/contributing/index.html
+++ b/contributing/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant/contributing">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -170,7 +170,7 @@ Contains the code to interact with Tellstick switches. Called if platform=tellst
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/getting-started/index.html b/getting-started/index.html
index 18d91ac341b..1f7fa8cb9bd 100644
--- a/getting-started/index.html
+++ b/getting-started/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant/getting-started">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -187,7 +187,7 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/index.html b/index.html
index 0e0923853f0..c54caeaa8de 100644
--- a/index.html
+++ b/index.html
@@ -17,9 +17,9 @@
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="http://balloob.github.io/home-assistant">
     
-    <link href="/github/favicon.png" rel="icon">
-    <link href="/github/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
-    <link href="/github/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link href="/home-assistant/favicon.png" rel="icon">
+    <link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
   </head>
 
 
@@ -30,7 +30,7 @@
   <div class="grid">
 
     <div class="grid__item three-tenths lap-four-sixths palm-one-whole">
-  <a href="/github/" class="site-title">Home Assistant</a>
+  <a href="/home-assistant/" class="site-title">Home Assistant</a>
 </div>
 
 <div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
@@ -38,10 +38,10 @@
     <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="/github/getting-started">Getting started</a></li>
-  <li><a href="/github/architecture">Architecture</a></li>
-  <li><a href="/github/contributing">Contributing</a></li>
-  <li><a href="/github/blog/2014/12/18/website-launched/">Blog</a></li>
+  <li><a href="/home-assistant/getting-started">Getting started</a></li>
+  <li><a href="/home-assistant/architecture">Architecture</a></li>
+  <li><a href="/home-assistant/contributing">Contributing</a></li>
+  <li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
   <li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
 </ul>
   </nav>
@@ -57,7 +57,7 @@
   <div class="grid-wrapper">
     <div class="grid flex">
       <div class="grid__item flex__item two-fifths palm-one-whole">
-        <img src="/github/images/hero_screenshot.png" alt="Home Assistant screenshot">
+        <img src="/home-assistant/images/hero_screenshot.png" alt="Home Assistant screenshot">
       </div>
       <div class="grid__item flex__item three-fifths palm-one-whole">
        <h1>Bring life to your home</h1>
@@ -66,7 +66,7 @@
 Home Assistant is an open-source home automation platform running on Python 3. The goal of Home Assistant is to be able to track and control all devices at home and offer a platform for automating control.
 </p>
 <p>
-  <a href='/github/getting-started' class='btn' style='margin: 0 50px 10px 0;'>Get started</a>
+  <a href='/home-assistant/getting-started' class='btn' style='margin: 0 50px 10px 0;'>Get started</a>
   <a href='https://www.github.com/balloob/home-assistant' class='btn'>Browse code on GitHub</a>
 </p>
       </div>
@@ -191,7 +191,7 @@ Home Assistant will track the state of all the devices in your home, so you don&
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
-<script defer src="/github/javascripts/octopress.js"></script>
+<script defer src="/home-assistant/javascripts/octopress.js"></script>
 
 
 
diff --git a/sitemap.xml b/sitemap.xml
index c728ff7c653..5bf28216faf 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -7,37 +7,37 @@
   </url>
   <url>
     <loc>http://balloob.github.io/home-assistant/blog/archives/</loc>
-    <lastmod>2014-12-19T00:20:47-08:00</lastmod>
+    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>http://balloob.github.io/home-assistant/blog/</loc>
-    <lastmod>2014-12-19T00:20:47-08:00</lastmod>
+    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>http://balloob.github.io/home-assistant/</loc>
-    <lastmod>2014-12-19T00:20:47-08:00</lastmod>
+    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>http://balloob.github.io/home-assistant/contributing/</loc>
-    <lastmod>2014-12-19T00:20:47-08:00</lastmod>
+    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>http://balloob.github.io/home-assistant/getting-started/</loc>
-    <lastmod>2014-12-19T00:20:47-08:00</lastmod>
+    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>http://balloob.github.io/home-assistant/architecture/</loc>
-    <lastmod>2014-12-19T00:20:47-08:00</lastmod>
+    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>