diff --git a/CNAME b/CNAME
new file mode 100644
index 0000000000..e237f86884
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+home-assistant.io
diff --git a/architecture/index.html b/architecture/index.html
index 56b6a3e611..887acf972a 100644
--- a/architecture/index.html
+++ b/architecture/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant/architecture">
+    <link rel="canonical" href="http://home-assistant.io/architecture">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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='/home-assistant/images/ha_architecture.png' style='background-color: white'/></p>
+  <p><img src='/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/atom.xml b/atom.xml
index 3deddd032c..f5556768c3 100644
--- a/atom.xml
+++ b/atom.xml
@@ -2,10 +2,10 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 
   <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-19T07:49:58-08:00</updated>
-  <id>http://balloob.github.io/home-assistant/</id>
+  <link href="http://home-assistant.io/atom.xml" rel="self"/>
+  <link href="http://home-assistant.io/"/>
+  <updated>2014-12-20T12:02:28-08:00</updated>
+  <id>http://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
     
@@ -15,9 +15,9 @@
   
   <entry>
     <title type="html"><![CDATA[Website launched!]]></title>
-    <link href="http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched/"/>
+    <link href="http://home-assistant.io/blog/2014/12/18/website-launched/"/>
     <updated>2014-12-18T23:24:45-08:00</updated>
-    <id>http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched</id>
+    <id>http://home-assistant.io/blog/2014/12/18/website-launched</id>
     <content type="html"><![CDATA[<p>I finally took the time to setup a simple website to help people getting started with Home Assistant. This will make sure that the README on GitHub can be purely focussed on developers.</p>
 ]]></content>
   </entry>
diff --git a/blog/2014/12/18/website-launched/index.html b/blog/2014/12/18/website-launched/index.html
index 51b7ae49b3..9051b9b025 100644
--- a/blog/2014/12/18/website-launched/index.html
+++ b/blog/2014/12/18/website-launched/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched">
+    <link rel="canonical" href="http://home-assistant.io/blog/2014/12/18/website-launched">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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='/home-assistant/blog/categories/website/'>website</a></li>
+        <li><a class='category' href='/blog/categories/website/'>website</a></li>
       
     
     </ul>
@@ -123,7 +123,7 @@
   <ul class="divided">
     
       <li class="post">
-        <a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/blog/archives/index.html b/blog/archives/index.html
index f44d41dc0e..1e7c062f47 100644
--- a/blog/archives/index.html
+++ b/blog/archives/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant/blog/archives">
+    <link rel="canonical" href="http://home-assistant.io/blog/archives">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a></h1>
+    <h1 class="gamma"><a href="/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='/home-assistant/blog/categories/website/'>website</a></li>
+        <li><a class='category' href='/blog/categories/website/'>website</a></li>
       
     
     </ul>
@@ -133,7 +133,7 @@
   <ul class="divided">
     
       <li class="post">
-        <a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 9517cb8366..07e8760ea2 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -2,10 +2,10 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 
   <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-19T07:49:58-08:00</updated>
-  <id>http://balloob.github.io/home-assistant/</id>
+  <link href="http://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
+  <link href="http://home-assistant.io/"/>
+  <updated>2014-12-20T12:02:28-08:00</updated>
+  <id>http://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
     
@@ -15,9 +15,9 @@
   
   <entry>
     <title type="html"><![CDATA[Website launched!]]></title>
-    <link href="http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched/"/>
+    <link href="http://home-assistant.io/blog/2014/12/18/website-launched/"/>
     <updated>2014-12-18T23:24:45-08:00</updated>
-    <id>http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched</id>
+    <id>http://home-assistant.io/blog/2014/12/18/website-launched</id>
     <content type="html"><![CDATA[<p>I finally took the time to setup a simple website to help people getting started with Home Assistant. This will make sure that the README on GitHub can be purely focussed on developers.</p>
 ]]></content>
   </entry>
diff --git a/blog/categories/website/index.html b/blog/categories/website/index.html
index bec1565d8e..e16a8a321d 100644
--- a/blog/categories/website/index.html
+++ b/blog/categories/website/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Category: website">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant/blog/categories/website">
+    <link rel="canonical" href="http://home-assistant.io/blog/categories/website">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a></h1>
+    <h1 class="gamma"><a href="/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='/home-assistant/blog/categories/website/'>website</a></li>
+        <li><a class='category' href='/blog/categories/website/'>website</a></li>
       
     
     </ul>
@@ -133,7 +133,7 @@
   <ul class="divided">
     
       <li class="post">
-        <a href="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/blog/index.html b/blog/index.html
index 7a37362513..9bc5b88bcf 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant/blog">
+    <link rel="canonical" href="http://home-assistant.io/blog">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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="/home-assistant/blog/2014/12/18/website-launched/">Website launched!</a>
+        <a href="/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/contributing/index.html b/contributing/index.html
index caed08e68e..0c5363554c 100644
--- a/contributing/index.html
+++ b/contributing/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant/contributing">
+    <link rel="canonical" href="http://home-assistant.io/contributing">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/getting-started/index.html b/getting-started/index.html
index 1f7fa8cb9b..d3f2ed52d9 100644
--- a/getting-started/index.html
+++ b/getting-started/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant/getting-started">
+    <link rel="canonical" href="http://home-assistant.io/getting-started">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/index.html b/index.html
index c54caeaa8d..5801f867dc 100644
--- a/index.html
+++ b/index.html
@@ -15,11 +15,11 @@
     <meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="http://balloob.github.io/home-assistant">
+    <link rel="canonical" href="http://home-assistant.io">
     
-    <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">
+    <link href="/favicon.png" rel="icon">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/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="/home-assistant/" class="site-title">Home Assistant</a>
+  <a href="/" 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="/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="/getting-started">Getting started</a></li>
+  <li><a href="/architecture">Architecture</a></li>
+  <li><a href="/contributing">Contributing</a></li>
+  <li><a href="/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="/home-assistant/images/hero_screenshot.png" alt="Home Assistant screenshot">
+        <img src="/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='/home-assistant/getting-started' class='btn' style='margin: 0 50px 10px 0;'>Get started</a>
+  <a href='/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="/home-assistant/javascripts/octopress.js"></script>
+<script defer src="/javascripts/octopress.js"></script>
 
 
 
diff --git a/robots.txt b/robots.txt
index 12b23a0acc..2b5dbd39c9 100644
--- a/robots.txt
+++ b/robots.txt
@@ -1,4 +1,4 @@
 User-agent: *
 Disallow: 
 
-Sitemap: http://balloob.github.io/home-assistant/sitemap.xml 
\ No newline at end of file
+Sitemap: http://home-assistant.io/sitemap.xml 
\ No newline at end of file
diff --git a/sitemap.xml b/sitemap.xml
index 5bf28216fa..b04e28ae1e 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
-    <loc>http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched/</loc>
+    <loc>http://home-assistant.io/blog/2014/12/18/website-launched/</loc>
     <lastmod>2014-12-18T23:24:45-08:00</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
-    <loc>http://balloob.github.io/home-assistant/blog/archives/</loc>
-    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
+    <loc>http://home-assistant.io/blog/archives/</loc>
+    <lastmod>2014-12-20T12:02:28-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
-    <loc>http://balloob.github.io/home-assistant/blog/</loc>
-    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
+    <loc>http://home-assistant.io/blog/</loc>
+    <lastmod>2014-12-20T12:02:28-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
-    <loc>http://balloob.github.io/home-assistant/</loc>
-    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
+    <loc>http://home-assistant.io/</loc>
+    <lastmod>2014-12-20T12:02:28-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
-    <loc>http://balloob.github.io/home-assistant/contributing/</loc>
-    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
+    <loc>http://home-assistant.io/contributing/</loc>
+    <lastmod>2014-12-20T12:02:28-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-19T07:49:58-08:00</lastmod>
+    <loc>http://home-assistant.io/getting-started/</loc>
+    <lastmod>2014-12-20T12:02:28-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
   <url>
-    <loc>http://balloob.github.io/home-assistant/architecture/</loc>
-    <lastmod>2014-12-19T07:49:58-08:00</lastmod>
+    <loc>http://home-assistant.io/architecture/</loc>
+    <lastmod>2014-12-20T12:02:28-08:00</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>