diff --git a/CUE.NET.csproj b/CUE.NET.csproj
index 316c99b..57fee7a 100644
--- a/CUE.NET.csproj
+++ b/CUE.NET.csproj
@@ -63,6 +63,8 @@
     <Compile Include="Devices\Generic\Enums\CorsairAccessMode.cs" />
     <Compile Include="Devices\Generic\Enums\CorsairDeviceCaps.cs" />
     <Compile Include="Devices\Generic\Enums\CorsairDeviceType.cs" />
+    <Compile Include="Devices\Keyboard\ColorBrushes\IBrush.cs" />
+    <Compile Include="Devices\Keyboard\ColorBrushes\SolidColorBrush.cs" />
     <Compile Include="Devices\Keyboard\Enums\CorsairLogicalKeyboardLayout.cs" />
     <Compile Include="Devices\Headset\Enums\CorsairHeadsetLedId.cs" />
     <Compile Include="Devices\Keyboard\Enums\CorsairKeyboardKeyId.cs" />
diff --git a/Devices/Keyboard/ColorBrushes/IBrush.cs b/Devices/Keyboard/ColorBrushes/IBrush.cs
index 594ad08..f89ab4d 100644
--- a/Devices/Keyboard/ColorBrushes/IBrush.cs
+++ b/Devices/Keyboard/ColorBrushes/IBrush.cs
@@ -1,10 +1,9 @@
 using System.Drawing;
 
 namespace CUE.NET.Devices.Keyboard.ColorBrushes
-
 {
     public interface IBrush
     {
-		Color getColorAtPoint(Point point);
+        Color GetColorAtPoint(Point point);
     }
 }
\ No newline at end of file
diff --git a/Devices/Keyboard/ColorBrushes/SolidColorBrush.cs b/Devices/Keyboard/ColorBrushes/SolidColorBrush.cs
index 21d0b68..963dcca 100644
--- a/Devices/Keyboard/ColorBrushes/SolidColorBrush.cs
+++ b/Devices/Keyboard/ColorBrushes/SolidColorBrush.cs
@@ -4,33 +4,26 @@ namespace CUE.NET.Devices.Keyboard.ColorBrushes
 {
     public class SolidColorBrush : IBrush
     {
-        Color color;
+        #region Properties & Fields
+
+        public Color Color { get; set; }
+
+        #endregion
 
         #region Constructors
 
         public SolidColorBrush(Color color)
         {
-            this.color = color;
+            this.Color = color;
         }
 
         #endregion
 
         #region Methods
 
-        public Color getColorAtPoint(Point point)
+        public Color GetColorAtPoint(Point point)
         {
-            /* a solid color brush returns the same color no matter the point */
-            return this.color;
-        }
-
-        public Color getColor()
-        {
-            return this.color;
-        }
-
-        public void setColor(Color color)
-        {
-            this.color = color;
+            return Color; // A solid color brush returns the same color no matter the point
         }
 
         #endregion