diff --git a/atom.xml b/atom.xml
index a4b536ace7..9946820261 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 87b1ec1d2d..6c1da283b7 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 ce2a50d070..d525b8f782 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 6f9b310836..e0ce2bb071 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 4ba193cf3d..3ec923474a 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 5ce22b98b6..175842dd01 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 3a781abc95..c5479bcb37 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 1a502280d8..5d4ff283de 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index 8e37a3f691..b7182cb7da 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 0f474b90f9..ac22ac1d5b 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 f0bcf92905..1d563f8f37 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 b64f8a46fd..ebc22eed5e 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 7ed70e55cf..99e297fdbe 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 d8cab5246a..3a121b9ef0 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 942e50edf6..9e9d96419a 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 d76095aef4..5343c4426d 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 bc4504c16f..4920505bd4 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 23fd8feda3..5736631e55 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 faa757f252..a819d1da89 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 f37c7a6ecb..3aef6372d0 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+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 4f8188e5a6..98b7ad4851 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>2017-01-29T14:58:35+00:00</updated>
+  <updated>2017-01-29T15:04:00+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/index.html b/components/index.html
index d13deadea1..01c9156602 100644
--- a/components/index.html
+++ b/components/index.html
@@ -779,8 +779,10 @@ Support for these components is provided by the Home Assistant community.
            style='display: none'>
           <div class='img-container'>
             
+              <img src='/images/supported_brands/avi-on.png'>
+            
           </div>
-          <div class='title'>Avion</div>
+          <div class='title'>Avi-on</div>
           <div class='category'>Light</div>
         </a>
       
diff --git a/components/light.avion/index.html b/components/light.avion/index.html
index 791fe6c414..30c9caa3ce 100644
--- a/components/light.avion/index.html
+++ b/components/light.avion/index.html
@@ -7,26 +7,26 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Avion - Home Assistant</title>
+    <title>Avi-on - Home Assistant</title>
     <meta name="author" content="Home Assistant">
-    <meta name="description" content="Instructions on how to setup GE Avion Bluetooth dimmers within Home Assistant.">
+    <meta name="description" content="Instructions on how to setup GE Avi-on Bluetooth dimmers within Home Assistant.">
     
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="https://home-assistant.io/components/light.avion/">
 
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Avion">
+    <meta property="og:title" content="Avi-on">
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/components/light.avion/">
     <meta property="og:type" content="article">
-    <meta property="og:description" content="Instructions on how to setup GE Avion Bluetooth dimmers within Home Assistant.">
+    <meta property="og:description" content="Instructions on how to setup GE Avi-on Bluetooth dimmers within Home Assistant.">
     <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
     
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:site" content="@home_assistant">
     
-    <meta name="twitter:title" content="Avion">
-    <meta name="twitter:description" content="Instructions on how to setup GE Avion Bluetooth dimmers within Home Assistant.">
+    <meta name="twitter:title" content="Avi-on">
+    <meta name="twitter:description" content="Instructions on how to setup GE Avi-on Bluetooth dimmers within Home Assistant.">
     <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
 
     <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
@@ -84,13 +84,15 @@
   
   <header>
     <h1 class="title indent">
-      Avion
+      Avi-on
     </h1>
   </header>
   <hr class="divider">
   
 
-  <p>Support for the Avion Bluetooth dimmer switch <a href="http://avi-on.com/">Avi-On</a>. To enable these lights, add the following lines to your <code class="highlighter-rouge">configuration.yaml</code> file:</p>
+  <p>Support for the Avi-on Bluetooth dimmer switch <a href="http://avi-on.com/">Avi-On</a>.</p>
+
+<p>To enable these lights, add the following lines to your <code class="highlighter-rouge">configuration.yaml</code> file:</p>
 
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># Example configuration.yaml entry</span>
 <span class="s">light</span><span class="pi">:</span>
@@ -131,6 +133,7 @@
     <section class="aside-module grid__item one-whole lap-one-half">
   <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/light.avion.markdown'>Edit this page on GitHub</a></div>
   <div class='brand-logo-container section'>
+      <img src='/images/supported_brands/avi-on.png' />
   </div>
     <div class='section'>
     IoT class<sup><a href='/blog/2016/02/12/classifying-the-internet-of-things/#classifiers'><i class="icon-info-sign"></i></a></sup>: Assumed State
@@ -146,7 +149,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            Avion
+            Avi-on
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.blinksticklight/index.html b/components/light.blinksticklight/index.html
index 9b47e03ef1..accaa7d410 100644
--- a/components/light.blinksticklight/index.html
+++ b/components/light.blinksticklight/index.html
@@ -136,7 +136,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.decora/index.html b/components/light.decora/index.html
index 1404c6b1ca..f78db45223 100644
--- a/components/light.decora/index.html
+++ b/components/light.decora/index.html
@@ -150,7 +150,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.enocean/index.html b/components/light.enocean/index.html
index c3720cd8bc..8b66b05390 100644
--- a/components/light.enocean/index.html
+++ b/components/light.enocean/index.html
@@ -154,7 +154,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.flux_led/index.html b/components/light.flux_led/index.html
index 177654cb06..bd1387fb65 100644
--- a/components/light.flux_led/index.html
+++ b/components/light.flux_led/index.html
@@ -228,7 +228,7 @@ The component defaults to rgbw. If your device has a separate white channel, you
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.homematic/index.html b/components/light.homematic/index.html
index 3aaaa03503..74b6d07b5c 100644
--- a/components/light.homematic/index.html
+++ b/components/light.homematic/index.html
@@ -147,7 +147,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.hue/index.html b/components/light.hue/index.html
index 18b03f543f..453c1cfbeb 100644
--- a/components/light.hue/index.html
+++ b/components/light.hue/index.html
@@ -211,7 +211,7 @@ Name. Use the values of Room name and Scene name that you see in the app. You ca
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.hyperion/index.html b/components/light.hyperion/index.html
index 414412ac11..e24a527282 100644
--- a/components/light.hyperion/index.html
+++ b/components/light.hyperion/index.html
@@ -137,7 +137,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.insteon_hub/index.html b/components/light.insteon_hub/index.html
index 5ee9e294c1..154dcd2bc7 100644
--- a/components/light.insteon_hub/index.html
+++ b/components/light.insteon_hub/index.html
@@ -129,7 +129,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.insteon_local/index.html b/components/light.insteon_local/index.html
index 16fbc470d3..b9b556d65f 100644
--- a/components/light.insteon_local/index.html
+++ b/components/light.insteon_local/index.html
@@ -146,7 +146,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.isy994/index.html b/components/light.isy994/index.html
index 51c49333f1..8deba53b81 100644
--- a/components/light.isy994/index.html
+++ b/components/light.isy994/index.html
@@ -147,7 +147,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.lifx/index.html b/components/light.lifx/index.html
index 1d7af19e9a..8b7bab0868 100644
--- a/components/light.lifx/index.html
+++ b/components/light.lifx/index.html
@@ -138,7 +138,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.limitlessled/index.html b/components/light.limitlessled/index.html
index 9a6612a5c9..9ce9ea0435 100644
--- a/components/light.limitlessled/index.html
+++ b/components/light.limitlessled/index.html
@@ -194,7 +194,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.litejet/index.html b/components/light.litejet/index.html
index 7d66f5326d..ce9c058f23 100644
--- a/components/light.litejet/index.html
+++ b/components/light.litejet/index.html
@@ -132,7 +132,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.mqtt/index.html b/components/light.mqtt/index.html
index 0515c09c79..da90bc9582 100644
--- a/components/light.mqtt/index.html
+++ b/components/light.mqtt/index.html
@@ -242,7 +242,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.mqtt_json/index.html b/components/light.mqtt_json/index.html
index 8ea56aa418..51f8df0d7a 100644
--- a/components/light.mqtt_json/index.html
+++ b/components/light.mqtt_json/index.html
@@ -207,7 +207,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.mqtt_template/index.html b/components/light.mqtt_template/index.html
index 1aa4f21ce2..0f4aa185f1 100644
--- a/components/light.mqtt_template/index.html
+++ b/components/light.mqtt_template/index.html
@@ -225,7 +225,7 @@ It is format-agnostic so you can use any data format you want (i.e. string, JSON
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.mysensors/index.html b/components/light.mysensors/index.html
index 2d82122de0..73523b1dd4 100644
--- a/components/light.mysensors/index.html
+++ b/components/light.mysensors/index.html
@@ -400,7 +400,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.osramlightify/index.html b/components/light.osramlightify/index.html
index 421bcd09c2..9fecea5ab3 100644
--- a/components/light.osramlightify/index.html
+++ b/components/light.osramlightify/index.html
@@ -132,7 +132,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.piglow/index.html b/components/light.piglow/index.html
index 1ce2c33360..5a97a081b2 100644
--- a/components/light.piglow/index.html
+++ b/components/light.piglow/index.html
@@ -127,7 +127,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.qwikswitch/index.html b/components/light.qwikswitch/index.html
index b79c8aa5cc..2a3f8f085b 100644
--- a/components/light.qwikswitch/index.html
+++ b/components/light.qwikswitch/index.html
@@ -135,7 +135,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.rfxtrx/index.html b/components/light.rfxtrx/index.html
index ee3878cd99..12cd4375c3 100644
--- a/components/light.rfxtrx/index.html
+++ b/components/light.rfxtrx/index.html
@@ -184,7 +184,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.scsgate/index.html b/components/light.scsgate/index.html
index 9def121bbc..5e9f096276 100644
--- a/components/light.scsgate/index.html
+++ b/components/light.scsgate/index.html
@@ -151,7 +151,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.tellstick/index.html b/components/light.tellstick/index.html
index cf8640e1f1..d0043e9c84 100644
--- a/components/light.tellstick/index.html
+++ b/components/light.tellstick/index.html
@@ -141,7 +141,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.tikteck/index.html b/components/light.tikteck/index.html
index 9b5e5fb75c..3cb6f26509 100644
--- a/components/light.tikteck/index.html
+++ b/components/light.tikteck/index.html
@@ -146,7 +146,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.vera/index.html b/components/light.vera/index.html
index 85004b3465..ac031eb883 100644
--- a/components/light.vera/index.html
+++ b/components/light.vera/index.html
@@ -153,7 +153,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.wemo/index.html b/components/light.wemo/index.html
index 316d46de75..b78caffbf6 100644
--- a/components/light.wemo/index.html
+++ b/components/light.wemo/index.html
@@ -138,7 +138,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             Belkin WeMo Lights
diff --git a/components/light.wink/index.html b/components/light.wink/index.html
index 84a4eb1e28..8fdf99eaae 100644
--- a/components/light.wink/index.html
+++ b/components/light.wink/index.html
@@ -164,7 +164,7 @@ The above devices are confimed to work, but others may work as well.
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.x10/index.html b/components/light.x10/index.html
index 512fe997bd..e7585fc189 100644
--- a/components/light.x10/index.html
+++ b/components/light.x10/index.html
@@ -143,7 +143,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.yeelight/index.html b/components/light.yeelight/index.html
index 2a28a933d2..b5a5cbc9f0 100644
--- a/components/light.yeelight/index.html
+++ b/components/light.yeelight/index.html
@@ -150,7 +150,7 @@ Tests are only made with a YLDP03YL model. Because it’s the only hardware deve
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.zengge/index.html b/components/light.zengge/index.html
index 2602fbaac8..4864f7877e 100644
--- a/components/light.zengge/index.html
+++ b/components/light.zengge/index.html
@@ -144,7 +144,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.zigbee/index.html b/components/light.zigbee/index.html
index acfc9735dc..85cb3aed78 100644
--- a/components/light.zigbee/index.html
+++ b/components/light.zigbee/index.html
@@ -157,7 +157,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light.zwave/index.html b/components/light.zwave/index.html
index de1310e9d4..74a9bee909 100644
--- a/components/light.zwave/index.html
+++ b/components/light.zwave/index.html
@@ -142,7 +142,7 @@
     <h1 class="title delta">Category Light</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/light.avion/'>Avion</a>
+            <a href='/components/light.avion/'>Avi-on</a>
         </li>
         <li>
             <a href='/components/light.wemo/'>Belkin WeMo Lights</a>
diff --git a/components/light/index.html b/components/light/index.html
index 5c1518d68c..f3ee0e65b3 100644
--- a/components/light/index.html
+++ b/components/light/index.html
@@ -276,7 +276,7 @@ in Home Assistant.</p>
             <h1 class='title delta'>Platforms</h1>
             <ul class='divided'>
           <li><a href='/components/light.avion/'>
-            Avion
+            Avi-on
           </a></li>
           <li><a href='/components/light.wemo/'>
             Belkin WeMo Lights
diff --git a/images/supported_brands/avi-on.png b/images/supported_brands/avi-on.png
new file mode 100644
index 0000000000..c1c65f77e6
Binary files /dev/null and b/images/supported_brands/avi-on.png differ
diff --git a/sitemap.xml b/sitemap.xml
index 287ae16c76..5d2bbd3931 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2705,62 +2705,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:13+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-01-29T14:57:52+00:00</lastmod>
+<lastmod>2017-01-29T15:03:14+00:00</lastmod>
 </url>
 </urlset>