diff --git a/homeassistant/components/frontend/www_static/home-assistant-polymer b/homeassistant/components/frontend/www_static/home-assistant-polymer
index 378f9cc5eb2..576c04efb49 160000
--- a/homeassistant/components/frontend/www_static/home-assistant-polymer
+++ b/homeassistant/components/frontend/www_static/home-assistant-polymer
@@ -1 +1 @@
-Subproject commit 378f9cc5eb2cc81ed07d9bc79e7726fe228ca6da
+Subproject commit 576c04efb49a8a5f7f35734458ffc93f874dd68d
diff --git a/homeassistant/components/light/limitlessled.py b/homeassistant/components/light/limitlessled.py
index 3c06607b86f..e4eb588688c 100644
--- a/homeassistant/components/light/limitlessled.py
+++ b/homeassistant/components/light/limitlessled.py
@@ -24,7 +24,9 @@ light:
 import logging
 
 from homeassistant.const import DEVICE_DEFAULT_NAME
-from homeassistant.components.light import Light, ATTR_BRIGHTNESS
+from homeassistant.components.light import (Light, ATTR_BRIGHTNESS,
+                                            ATTR_XY_COLOR)
+from homeassistant.util.color import color_RGB_to_xy
 
 _LOGGER = logging.getLogger(__name__)
 REQUIREMENTS = ['ledcontroller>=1.0.7']
@@ -57,6 +59,29 @@ class LimitlessLED(Light):
         self._name = name or DEVICE_DEFAULT_NAME
         self._state = False
         self._brightness = 100
+        self._xy_color = color_RGB_to_xy(255, 255, 255)
+
+        # Build a color table that maps an RGB color to a color string
+        # recognized by LedController's set_color method
+        self._color_table = [(color_RGB_to_xy(*x[0]), x[1]) for x in [
+            ((0xFF, 0xFF, 0xFF), 'white'),
+            ((0xEE, 0x82, 0xEE), 'violet'),
+            ((0x41, 0x69, 0xE1), 'royal_blue'),
+            ((0x87, 0xCE, 0xFA), 'baby_blue'),
+            ((0x00, 0xFF, 0xFF), 'aqua'),
+            ((0x7F, 0xFF, 0xD4), 'royal_mint'),
+            ((0x2E, 0x8B, 0x57), 'seafoam_green'),
+            ((0x00, 0x80, 0x00), 'green'),
+            ((0x32, 0xCD, 0x32), 'lime_green'),
+            ((0xFF, 0xFF, 0x00), 'yellow'),
+            ((0xDA, 0xA5, 0x20), 'yellow_orange'),
+            ((0xFF, 0xA5, 0x00), 'orange'),
+            ((0xFF, 0x00, 0x00), 'red'),
+            ((0xFF, 0xC0, 0xCB), 'pink'),
+            ((0xFF, 0x00, 0xFF), 'fusia'),
+            ((0xDA, 0x70, 0xD6), 'lilac'),
+            ((0xE6, 0xE6, 0xFA), 'lavendar'),
+        ]]
 
     @property
     def should_poll(self):
@@ -72,6 +97,22 @@ class LimitlessLED(Light):
     def brightness(self):
         return self._brightness
 
+    @property
+    def color_xy(self):
+        return self._xy_color
+
+    def _xy_to_led_color(self, xy_color):
+        """ Convert an XY color to the closest LedController color string """
+        def abs_dist_squared(p_0, p_1):
+            """ Returns the absolute value of the squared distance """
+            return abs((p_0[0] - p_1[0])**2 + (p_0[1] - p_1[1])**2)
+
+        candidates = [(abs_dist_squared(xy_color, x[0]), x[1]) for x in
+                      self._color_table]
+
+        # First candidate in the sorted list is closest to desired color:
+        return sorted(candidates)[0][1]
+
     @property
     def is_on(self):
         """ True if device is on. """
@@ -84,6 +125,10 @@ class LimitlessLED(Light):
         if ATTR_BRIGHTNESS in kwargs:
             self._brightness = kwargs[ATTR_BRIGHTNESS]
 
+        if ATTR_XY_COLOR in kwargs:
+            self._xy_color = kwargs[ATTR_XY_COLOR]
+
+        self.led.set_color(self._xy_to_led_color(self._xy_color), self.group)
         self.led.set_brightness(self._brightness / 255.0, self.group)
         self.update_ha_state()