diff --git a/RGB.NET.Core/Devices/Layout/DeviceLayout.cs b/RGB.NET.Core/Devices/Layout/DeviceLayout.cs
index eceb38d..e522209 100644
--- a/RGB.NET.Core/Devices/Layout/DeviceLayout.cs
+++ b/RGB.NET.Core/Devices/Layout/DeviceLayout.cs
@@ -51,10 +51,10 @@ namespace RGB.NET.Core.Layout
         public string Model { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="LayoutShape"/> of the <see cref="DeviceLayout"/>.
+        /// Gets or sets the <see cref="Core.Shape"/> of the <see cref="DeviceLayout"/>.
         /// </summary>
         [XmlElement("Shape")]
-        public LayoutShape Shape { get; set; }
+        public Shape Shape { get; set; }
 
         /// <summary>
         /// Gets or sets the width of the <see cref="DeviceLayout"/>.
diff --git a/RGB.NET.Core/Devices/Layout/LedLayout.cs b/RGB.NET.Core/Devices/Layout/LedLayout.cs
index 9224240..5f46dcc 100644
--- a/RGB.NET.Core/Devices/Layout/LedLayout.cs
+++ b/RGB.NET.Core/Devices/Layout/LedLayout.cs
@@ -19,10 +19,10 @@ namespace RGB.NET.Core.Layout
         public string Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="LayoutShape"/> of the <see cref="LedLayout"/>.
+        /// Gets or sets the <see cref="RGB.NET.Core.Shape"/> of the <see cref="LedLayout"/>.
         /// </summary>
         [XmlElement("Shape")]
-        public LayoutShape Shape { get; set; }
+        public Shape Shape { get; set; }
 
         /// <summary>
         /// Gets or sets the x-position of the <see cref="LedLayout"/>.
diff --git a/RGB.NET.Core/Leds/Led.cs b/RGB.NET.Core/Leds/Led.cs
index 42479e1..020cf5e 100644
--- a/RGB.NET.Core/Leds/Led.cs
+++ b/RGB.NET.Core/Leds/Led.cs
@@ -22,6 +22,16 @@ namespace RGB.NET.Core
         /// </summary>
         public ILedId Id { get; }
 
+        private Shape _shape = Shape.Rectangle;
+        /// <summary>
+        /// Gets or sets the <see cref="Core.Shape"/> of the <see cref="Led"/>.
+        /// </summary>
+        public Shape Shape
+        {
+            get { return _shape; }
+            set { SetProperty(ref _shape, value); }
+        }
+
         /// <summary>
         /// Gets a rectangle representing the physical location of the <see cref="Led"/> relative to the <see cref="Device"/>.
         /// </summary>
diff --git a/RGB.NET.Core/Devices/Layout/LayoutShape.cs b/RGB.NET.Core/Positioning/Shape.cs
similarity index 56%
rename from RGB.NET.Core/Devices/Layout/LayoutShape.cs
rename to RGB.NET.Core/Positioning/Shape.cs
index db6b081..1d7384d 100644
--- a/RGB.NET.Core/Devices/Layout/LayoutShape.cs
+++ b/RGB.NET.Core/Positioning/Shape.cs
@@ -1,16 +1,22 @@
 using System;
+using RGB.NET.Core.Layout;
 
-namespace RGB.NET.Core.Layout
+namespace RGB.NET.Core
 {
     /// <summary>
     /// Contains a list of different shapes used by <see cref="DeviceLayout"/>.
     /// </summary>
     [Serializable]
-    public enum LayoutShape
+    public enum Shape
     {
         /// <summary>
         /// A simple rectangle.
         /// </summary>
-        Rectangle = 0
+        Rectangle = 0,
+
+        /// <summary>
+        /// A simple circle.
+        /// </summary>
+        Circle = 1
     }
 }
diff --git a/RGB.NET.Core/RGB.NET.Core.csproj b/RGB.NET.Core/RGB.NET.Core.csproj
index 4cb9e54..eef0e49 100644
--- a/RGB.NET.Core/RGB.NET.Core.csproj
+++ b/RGB.NET.Core/RGB.NET.Core.csproj
@@ -49,7 +49,7 @@
     <Compile Include="ColorCorrection\IColorCorrection.cs" />
     <Compile Include="Devices\AbstractRGBDevice.cs" />
     <Compile Include="Devices\RGBDeviceLighting.cs" />
-    <Compile Include="Devices\Layout\LayoutShape.cs" />
+    <Compile Include="Positioning\Shape.cs" />
     <Compile Include="Devices\Layout\LedLayout.cs" />
     <Compile Include="Devices\Layout\DeviceLayout.cs" />
     <Compile Include="Devices\RGBDeviceType.cs" />
diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
index 1eaf65d..3c63407 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using RGB.NET.Core;
 using RGB.NET.Core.Layout;
@@ -82,6 +80,8 @@ namespace RGB.NET.Devices.Corsair
                                 led.LedRectangle.Location.Y = layoutLed.Y;
                                 led.LedRectangle.Size.Width = layoutLed.Width;
                                 led.LedRectangle.Size.Height = layoutLed.Height;
+
+                                led.Shape = layoutLed.Shape;
                             }
                         }
                     }
diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
index b8d9a84..ab528bf 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
@@ -34,6 +34,9 @@ namespace RGB.NET.Devices.Corsair
         /// <inheritdoc />
         public Uri Image { get; protected set; }
 
+        /// <inheritdoc />
+        public RGBDeviceLighting Lighting => RGBDeviceLighting.Key;
+
         /// <summary>
         /// Gets a flag that describes device capabilities. (<see cref="CorsairDeviceCaps" />)
         /// </summary>
diff --git a/RGB.NET.Devices.Corsair/Headset/CorsairHeadsetRGBDevice.cs b/RGB.NET.Devices.Corsair/Headset/CorsairHeadsetRGBDevice.cs
index 626193d..a6d8ca5 100644
--- a/RGB.NET.Devices.Corsair/Headset/CorsairHeadsetRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Headset/CorsairHeadsetRGBDevice.cs
@@ -1,11 +1,9 @@
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable UnusedMember.Global
 
-using System;
 using System.IO;
 using System.Reflection;
 using RGB.NET.Core;
-using RGB.NET.Core.Layout;
 
 namespace RGB.NET.Devices.Corsair
 {
diff --git a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs
index 3e1203b..b62192a 100644
--- a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs
@@ -59,7 +59,7 @@ namespace RGB.NET.Devices.Corsair
             }
 
             ApplyLayoutFromFile(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location),
-                $@"Layouts\Corsair\Keyboards\{KeyboardDeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}\{KeyboardDeviceInfo.LogicalLayout.ToString().ToUpper()}.xml"));
+                $@"Layouts\Corsair\Keyboards\{KeyboardDeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}\{KeyboardDeviceInfo.PhysicalLayout.ToString().ToUpper()}.xml"));
         }
 
         #endregion