From 75fd4aabd36e2bd22e96e45631e0b64cd64a9950 Mon Sep 17 00:00:00 2001
From: Nicholas Martin <n.martin@movura.co.uk>
Date: Mon, 7 Nov 2016 21:06:16 +0000
Subject: [PATCH 1/2] Removed references to starlight

Starlight has been removed by Razer and replaced with `RESERVED`
---
 Corale.Colore.Tester/MainWindow.xaml          |  10 --
 .../ViewModels/KeyboardViewModel.cs           |  58 ---------
 .../Corale.Colore.Tests.csproj                |   2 -
 .../Razer/Effects/StarlightTests.cs           |  86 -------------
 .../Razer/Keyboard/Effects/StarlightTests.cs  |  68 -----------
 Corale.Colore/Corale.Colore.csproj            |   4 -
 Corale.Colore/Core/GenericDevice.cs           |  31 -----
 Corale.Colore/Core/IGenericDevice.cs          |  25 ----
 Corale.Colore/Core/Keyboard.cs                |   9 --
 Corale.Colore/Razer/Effects/Starlight.cs      | 113 ------------------
 Corale.Colore/Razer/Effects/StarlightType.cs  |  45 -------
 .../Razer/Keyboard/Effects/Starlight.cs       |  78 ------------
 .../Razer/Keyboard/Effects/StarlightType.cs   |  47 --------
 13 files changed, 576 deletions(-)
 delete mode 100644 Corale.Colore.Tests/Razer/Effects/StarlightTests.cs
 delete mode 100644 Corale.Colore.Tests/Razer/Keyboard/Effects/StarlightTests.cs
 delete mode 100644 Corale.Colore/Razer/Effects/Starlight.cs
 delete mode 100644 Corale.Colore/Razer/Effects/StarlightType.cs
 delete mode 100644 Corale.Colore/Razer/Keyboard/Effects/Starlight.cs
 delete mode 100644 Corale.Colore/Razer/Keyboard/Effects/StarlightType.cs

diff --git a/Corale.Colore.Tester/MainWindow.xaml b/Corale.Colore.Tester/MainWindow.xaml
index 54d979c2..518729b7 100644
--- a/Corale.Colore.Tester/MainWindow.xaml
+++ b/Corale.Colore.Tester/MainWindow.xaml
@@ -42,16 +42,6 @@
                                       ItemsSource="{Binding WaveDirectionValues}"
                                       SelectedItem="{Binding SelectedWaveDirection, Mode=TwoWay}" />
                         </StackPanel>
-                        <StackPanel Orientation="Horizontal" Margin="0,6,0,0" HorizontalAlignment="Center">
-                            <Button x:Name="SetStarlightButton" Content="SetStarlight" VerticalAlignment="Top" Width="75"
-                                    Command="{Binding StarlightCommand, Mode=OneWay}" />
-                            <ComboBox Height="22" Margin="8,0,0,0" Width="98"
-                                      ItemsSource="{Binding StarlightTypeValues}"
-                                      SelectedItem="{Binding SelectedStarlightType, Mode=TwoWay}" />
-                            <ComboBox Height="22" Margin="8,0,0,0" Width="98"
-                                      ItemsSource="{Binding StarlightDurationValues}"
-                                      SelectedItem="{Binding SelectedStarlightDuration, Mode=TwoWay}" />
-                        </StackPanel>
                         <Button x:Name="SetKeyboarsStaticButton" Content="SetStatic" VerticalAlignment="Top" Width="75"
                                 Margin="84,6,84,0" Command="{Binding StaticCommand, Mode=OneWay}" />
                         <Button x:Name="ClearButton" Content="Clear" VerticalAlignment="Top" Width="75"
diff --git a/Corale.Colore.Tester/ViewModels/KeyboardViewModel.cs b/Corale.Colore.Tester/ViewModels/KeyboardViewModel.cs
index e5e58285..55846104 100644
--- a/Corale.Colore.Tester/ViewModels/KeyboardViewModel.cs
+++ b/Corale.Colore.Tester/ViewModels/KeyboardViewModel.cs
@@ -49,17 +49,11 @@ public class KeyboardViewModel : INotifyPropertyChanged
         private Duration _selectedReactiveDuration;
         private Direction _selectedWaveDirection;
 
-        private StarlightType _selectedStarlightType;
-
-        private Duration _selectedStarlightDuration;
-
         public KeyboardViewModel()
         {
             SelectedKey = Key.A;
             SelectedReactiveDuration = Duration.Long;
             SelectedWaveDirection = Direction.LeftToRight;
-            SelectedStarlightType = StarlightType.Two;
-            SelectedStarlightDuration = Duration.Long;
             ColorOne.Color = Core.Color.Red.ToWpfColor();
             ColorTwo.Color = Core.Color.Blue.ToWpfColor();
         }
@@ -118,34 +112,6 @@ public Direction SelectedWaveDirection
             }
         }
 
-        public StarlightType SelectedStarlightType
-        {
-            get
-            {
-                return _selectedStarlightType;
-            }
-
-            set
-            {
-                _selectedStarlightType = value;
-                OnPropertyChanged(nameof(SelectedStarlightType));
-            }
-        }
-
-        public Duration SelectedStarlightDuration
-        {
-            get
-            {
-                return _selectedStarlightDuration;
-            }
-
-            set
-            {
-                _selectedStarlightDuration = value;
-                OnPropertyChanged(nameof(SelectedStarlightDuration));
-            }
-        }
-
         public ICommand AllCommand
             => new DelegateCommand(() => Core.Keyboard.Instance.SetAll(ColorOne.Color.ToColoreColor()));
 
@@ -164,8 +130,6 @@ public ICommand ReactiveCommand
         public ICommand WaveCommand
             => new DelegateCommand(SetWaveEffect);
 
-        public ICommand StarlightCommand => new DelegateCommand(SetStarlightEffect);
-
         public ICommand StaticCommand
             => new DelegateCommand(() => Core.Keyboard.Instance.SetStatic(new Static(ColorOne.Color.ToColoreColor())));
 
@@ -181,11 +145,6 @@ public IEnumerable<Key> KeyValues
 
         public IEnumerable<Direction> WaveDirectionValues => Enum.GetValues(typeof(Direction)).Cast<Direction>();
 
-        public IEnumerable<StarlightType> StarlightTypeValues
-            => Enum.GetValues(typeof(StarlightType)).Cast<StarlightType>();
-
-        public IEnumerable<Duration> StarlightDurationValues => Enum.GetValues(typeof(Duration)).Cast<Duration>();
-
         public IEnumerable<Duration> ReactiveDurationValues => Enum.GetValues(typeof(Duration)).Cast<Duration>();
 
         protected virtual void OnPropertyChanged(string propertyName)
@@ -217,23 +176,6 @@ private void SetWaveEffect()
             }
         }
 
-        private void SetStarlightEffect()
-        {
-            try
-            {
-                Core.Keyboard.Instance.SetStarlight(
-                    new Starlight(
-                        SelectedStarlightType,
-                        ColorOne.Color.ToColoreColor(),
-                        ColorTwo.Color.ToColoreColor(),
-                        SelectedStarlightDuration));
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.ToString());
-            }
-        }
-
         private void SetKeyColor()
         {
             try
diff --git a/Corale.Colore.Tests/Corale.Colore.Tests.csproj b/Corale.Colore.Tests/Corale.Colore.Tests.csproj
index 719a9729..737e2285 100644
--- a/Corale.Colore.Tests/Corale.Colore.Tests.csproj
+++ b/Corale.Colore.Tests/Corale.Colore.Tests.csproj
@@ -104,7 +104,6 @@
     <Compile Include="Razer\Effects\NoneTests.cs" />
     <Compile Include="Razer\Effects\ReactiveTests.cs" />
     <Compile Include="Razer\Effects\SpectrumCyclingTests.cs" />
-    <Compile Include="Razer\Effects\StarlightTests.cs" />
     <Compile Include="Razer\Effects\StaticTests.cs" />
     <Compile Include="Razer\Effects\WaveTests.cs" />
     <Compile Include="Razer\Headset\Effects\BreathingTests.cs" />
@@ -112,7 +111,6 @@
     <Compile Include="Razer\Keyboard\Effects\BreathingTests.cs" />
     <Compile Include="Razer\Keyboard\Effects\CustomTests.cs" />
     <Compile Include="Razer\Keyboard\Effects\ReactiveTests.cs" />
-    <Compile Include="Razer\Keyboard\Effects\StarlightTests.cs" />
     <Compile Include="Razer\Keyboard\Effects\StaticTests.cs" />
     <Compile Include="Razer\Keyboard\Effects\WaveTests.cs" />
     <Compile Include="Razer\Keypad\Effects\BreathingTests.cs" />
diff --git a/Corale.Colore.Tests/Razer/Effects/StarlightTests.cs b/Corale.Colore.Tests/Razer/Effects/StarlightTests.cs
deleted file mode 100644
index 64f3ec76..00000000
--- a/Corale.Colore.Tests/Razer/Effects/StarlightTests.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// <copyright file="StarlightTests.cs" company="Corale">
-//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
-//
-//     Permission is hereby granted, free of charge, to any person obtaining a copy of
-//     this software and associated documentation files (the "Software"), to deal in
-//     the Software without restriction, including without limitation the rights to
-//     use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-//     of the Software, and to permit persons to whom the Software is furnished to do
-//     so, subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included in all
-//     copies or substantial portions of the Software.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//     "Razer" is a trademark of Razer USA Ltd.
-// </copyright>
-
-namespace Corale.Colore.Tests.Razer.Effects
-{
-    using Corale.Colore.Core;
-    using Corale.Colore.Razer.Effects;
-
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class StarlightTests
-    {
-        [Test]
-        public void ShouldConstructWithCorrectType()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Two, Duration.Short, Color.Black, Color.Black).Type,
-                Is.EqualTo(StarlightType.Two));
-        }
-
-        [Test]
-        public void ShouldConstructWithCorrectDuration()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Two, Duration.Medium, Color.Black, Color.Black).Duration,
-                Is.EqualTo(Duration.Medium));
-        }
-
-        [Test]
-        public void ShouldConstructWithCorrectFirstColor()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Two, Duration.Short, Color.Red, Color.Blue).First,
-                Is.EqualTo(Color.Red));
-        }
-
-        [Test]
-        public void ShouldConstructWithCorrectSecondColor()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Two, Duration.Short, Color.Red, Color.Blue).Second,
-                Is.EqualTo(Color.Blue));
-        }
-
-        [Test]
-        public void ShouldConstructWithCorrectParameter()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Two, Duration.Short, Color.Black, Color.Black, 42).Parameter,
-                Is.EqualTo(42));
-        }
-
-        [Test]
-        public void ShouldSetTwoTypeWithTwoColors()
-        {
-            Assert.That(new Starlight(Duration.Short, Color.Red, Color.Blue).Type, Is.EqualTo(StarlightType.Two));
-        }
-
-        [Test]
-        public void ShouldSetRandomTypeWithNoColors()
-        {
-            Assert.That(new Starlight(Duration.Short).Type, Is.EqualTo(StarlightType.Random));
-        }
-    }
-}
diff --git a/Corale.Colore.Tests/Razer/Keyboard/Effects/StarlightTests.cs b/Corale.Colore.Tests/Razer/Keyboard/Effects/StarlightTests.cs
deleted file mode 100644
index 01439781..00000000
--- a/Corale.Colore.Tests/Razer/Keyboard/Effects/StarlightTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// ---------------------------------------------------------------------------------------
-// <copyright file="StarlightTests.cs" company="Corale">
-//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
-//
-//     Permission is hereby granted, free of charge, to any person obtaining a copy of
-//     this software and associated documentation files (the "Software"), to deal in
-//     the Software without restriction, including without limitation the rights to
-//     use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-//     of the Software, and to permit persons to whom the Software is furnished to do
-//     so, subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included in all
-//     copies or substantial portions of the Software.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//     "Razer" is a trademark of Razer USA Ltd.
-// </copyright>
-// ---------------------------------------------------------------------------------------
-
-namespace Corale.Colore.Tests.Razer.Keyboard.Effects
-{
-    using Corale.Colore.Core;
-    using Corale.Colore.Razer.Keyboard.Effects;
-
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class StarlightTests
-    {
-        [Test]
-        public void ShouldConstructWithCorrectType()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Two, Color.Black, Color.Black, Duration.Short).Type,
-                Is.EqualTo(StarlightType.Two));
-        }
-
-        [Test]
-        public void ShouldConstructWithCorrectFirstColor()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Random, Color.Red, Color.Black, Duration.Short).FirstColor,
-                Is.EqualTo(Color.Red));
-        }
-
-        [Test]
-        public void ShouldConstructWithCorrectSecondColor()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Random, Color.Black, Color.Red, Duration.Short).SecondColor,
-                Is.EqualTo(Color.Red));
-        }
-
-        [Test]
-        public void ShouldConstructWithCorrectDuration()
-        {
-            Assert.That(
-                new Starlight(StarlightType.Random, Color.Black, Color.Black, Duration.Medium).Duration,
-                Is.EqualTo(Duration.Medium));
-        }
-    }
-}
diff --git a/Corale.Colore/Corale.Colore.csproj b/Corale.Colore/Corale.Colore.csproj
index 6fb29572..73bcfb3c 100644
--- a/Corale.Colore/Corale.Colore.csproj
+++ b/Corale.Colore/Corale.Colore.csproj
@@ -141,8 +141,6 @@
     <Compile Include="Razer\Effects\None.cs" />
     <Compile Include="Razer\Effects\Reactive.cs" />
     <Compile Include="Razer\Effects\SpectrumCycling.cs" />
-    <Compile Include="Razer\Effects\Starlight.cs" />
-    <Compile Include="Razer\Effects\StarlightType.cs" />
     <Compile Include="Razer\Effects\Static.cs" />
     <Compile Include="Razer\Effects\Wave.cs" />
     <Compile Include="Razer\Headset\Effects\Breathing.cs" />
@@ -157,8 +155,6 @@
     <Compile Include="Razer\Keyboard\Effects\Duration.cs" />
     <Compile Include="Razer\Keyboard\Effects\Effect.cs" />
     <Compile Include="Razer\Keyboard\Effects\Reactive.cs" />
-    <Compile Include="Razer\Keyboard\Effects\Starlight.cs" />
-    <Compile Include="Razer\Keyboard\Effects\StarlightType.cs" />
     <Compile Include="Razer\Keyboard\Effects\Static.cs" />
     <Compile Include="Razer\Keyboard\Effects\Wave.cs" />
     <Compile Include="Razer\Keyboard\Key.cs" />
diff --git a/Corale.Colore/Core/GenericDevice.cs b/Corale.Colore/Core/GenericDevice.cs
index eb6ba7b6..1527e941 100644
--- a/Corale.Colore/Core/GenericDevice.cs
+++ b/Corale.Colore/Core/GenericDevice.cs
@@ -228,37 +228,6 @@ public void SetSpectrumCycling(int parameter = 0)
             SetSpectrumCycling(new SpectrumCycling(parameter));
         }
 
-        /// <summary>
-        /// Sets a starlight effect on this device.
-        /// </summary>
-        /// <param name="effect">Effect options.</param>
-        public void SetStarlight(Starlight effect)
-        {
-            SetGuid(NativeWrapper.CreateDeviceEffect(DeviceId, Effect.Starlight, effect));
-        }
-
-        /// <summary>
-        /// Sets a starlight effect on this device, using random colors.
-        /// </summary>
-        /// <param name="duration">Duration of the effect.</param>
-        /// <param name="parameter">Additional effect parameter.</param>
-        public void SetStarlight(Duration duration, int parameter = 0)
-        {
-            SetStarlight(new Starlight(duration, parameter));
-        }
-
-        /// <summary>
-        /// Sets a starlight effect on this device, using specified colors.
-        /// </summary>
-        /// <param name="first">The first color to use.</param>
-        /// <param name="second">The second color to use.</param>
-        /// <param name="duration">Duration of the effect.</param>
-        /// <param name="parameter">Additional effect parameter.</param>
-        public void SetStarlight(Color first, Color second, Duration duration, int parameter = 0)
-        {
-            SetStarlight(new Starlight(duration, first, second, parameter));
-        }
-
         /// <summary>
         /// Sets a static effect on this device.
         /// </summary>
diff --git a/Corale.Colore/Core/IGenericDevice.cs b/Corale.Colore/Core/IGenericDevice.cs
index 44471886..a9f4e1f1 100644
--- a/Corale.Colore/Core/IGenericDevice.cs
+++ b/Corale.Colore/Core/IGenericDevice.cs
@@ -143,31 +143,6 @@ public interface IGenericDevice : IDevice
         [PublicAPI]
         void SetSpectrumCycling(int parameter = 0);
 
-        /// <summary>
-        /// Sets a starlight effect on this device.
-        /// </summary>
-        /// <param name="effect">Effect options.</param>
-        [PublicAPI]
-        void SetStarlight(Starlight effect);
-
-        /// <summary>
-        /// Sets a starlight effect on this device, using random colors.
-        /// </summary>
-        /// <param name="duration">Duration of the effect.</param>
-        /// <param name="parameter">Additional effect parameter.</param>
-        [PublicAPI]
-        void SetStarlight(Duration duration, int parameter = 0);
-
-        /// <summary>
-        /// Sets a starlight effect on this device, using specified colors.
-        /// </summary>
-        /// <param name="first">The first color to use.</param>
-        /// <param name="second">The second color to use.</param>
-        /// <param name="duration">Duration of the effect.</param>
-        /// <param name="parameter">Additional effect parameter.</param>
-        [PublicAPI]
-        void SetStarlight(Color first, Color second, Duration duration, int parameter = 0);
-
         /// <summary>
         /// Sets a static effect on this device.
         /// </summary>
diff --git a/Corale.Colore/Core/Keyboard.cs b/Corale.Colore/Core/Keyboard.cs
index ba0cd913..34bd534c 100644
--- a/Corale.Colore/Core/Keyboard.cs
+++ b/Corale.Colore/Core/Keyboard.cs
@@ -348,15 +348,6 @@ public void SetWave(Wave effect)
             SetGuid(NativeWrapper.CreateKeyboardEffect(Effect.Wave, effect));
         }
 
-        /// <summary>
-        /// Sets a starlight effect on the keyboard.
-        /// </summary>
-        /// <param name="effect">Effect options.</param>
-        public void SetStarlight(Starlight effect)
-        {
-            SetGuid(NativeWrapper.CreateKeyboardEffect(Effect.Starlight, effect));
-        }
-
         /// <summary>
         /// Clears the current effect on the Keyboard.
         /// </summary>
diff --git a/Corale.Colore/Razer/Effects/Starlight.cs b/Corale.Colore/Razer/Effects/Starlight.cs
deleted file mode 100644
index b385a35d..00000000
--- a/Corale.Colore/Razer/Effects/Starlight.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// <copyright file="Starlight.cs" company="Corale">
-//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
-//
-//     Permission is hereby granted, free of charge, to any person obtaining a copy of
-//     this software and associated documentation files (the "Software"), to deal in
-//     the Software without restriction, including without limitation the rights to
-//     use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-//     of the Software, and to permit persons to whom the Software is furnished to do
-//     so, subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included in all
-//     copies or substantial portions of the Software.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//     "Razer" is a trademark of Razer USA Ltd.
-// </copyright>
-
-namespace Corale.Colore.Razer.Effects
-{
-    using System.Runtime.InteropServices;
-
-    using Corale.Colore.Annotations;
-    using Corale.Colore.Core;
-
-    /// <summary>
-    /// Describes the starlight effect for system devices.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct Starlight
-    {
-        /// <summary>
-        /// The size of the struct.
-        /// </summary>
-        [PublicAPI]
-        public readonly int Size;
-
-        /// <summary>
-        /// Additional effect parameter.
-        /// </summary>
-        [PublicAPI]
-        public readonly int Parameter;
-
-        /// <summary>
-        /// The starlight effect type.
-        /// </summary>
-        [PublicAPI]
-        public readonly StarlightType Type;
-
-        /// <summary>
-        /// First color of the effect.
-        /// </summary>
-        [PublicAPI]
-        public readonly Color First;
-
-        /// <summary>
-        /// Second color of the effect.
-        /// </summary>
-        [PublicAPI]
-        public readonly Color Second;
-
-        /// <summary>
-        /// Effect duration.
-        /// </summary>
-        [PublicAPI]
-        public readonly Duration Duration;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Starlight" /> struct.
-        /// </summary>
-        /// <param name="type">The type of starlight effect to make.</param>
-        /// <param name="duration">Duration of the effect.</param>
-        /// <param name="first">First color of the effect.</param>
-        /// <param name="second">Second color of the effect.</param>
-        /// <param name="parameter">Additional effect parameter.</param>
-        public Starlight(StarlightType type, Duration duration, Color first, Color second, int parameter = 0)
-        {
-            Type = type;
-            Duration = duration;
-            First = first;
-            Second = second;
-            Parameter = parameter;
-            Size = Marshal.SizeOf(typeof(Starlight));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Starlight" /> struct.
-        /// </summary>
-        /// <param name="duration">Effect duration.</param>
-        /// <param name="first">First color of the effect.</param>
-        /// <param name="second">Second color of the effect.</param>
-        /// <param name="parameter">Additional effect parameter.</param>
-        public Starlight(Duration duration, Color first, Color second, int parameter = 0)
-            : this(StarlightType.Two, duration, first, second, parameter)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Starlight" /> struct.
-        /// </summary>
-        /// <param name="duration">Effect duration.</param>
-        /// <param name="parameter">Additional effect parameter.</param>
-        public Starlight(Duration duration, int parameter = 0)
-            : this(StarlightType.Random, duration, Color.Black, Color.Black, parameter)
-        {
-        }
-    }
-}
diff --git a/Corale.Colore/Razer/Effects/StarlightType.cs b/Corale.Colore/Razer/Effects/StarlightType.cs
deleted file mode 100644
index d9dff412..00000000
--- a/Corale.Colore/Razer/Effects/StarlightType.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// <copyright file="StarlightType.cs" company="Corale">
-//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
-//
-//     Permission is hereby granted, free of charge, to any person obtaining a copy of
-//     this software and associated documentation files (the "Software"), to deal in
-//     the Software without restriction, including without limitation the rights to
-//     use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-//     of the Software, and to permit persons to whom the Software is furnished to do
-//     so, subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included in all
-//     copies or substantial portions of the Software.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//     "Razer" is a trademark of Razer USA Ltd.
-// </copyright>
-
-namespace Corale.Colore.Razer.Effects
-{
-    using Corale.Colore.Annotations;
-
-    /// <summary>
-    /// Supported starlight effect types for system devices.
-    /// </summary>
-    public enum StarlightType
-    {
-        /// <summary>
-        /// Two colors.
-        /// </summary>
-        [PublicAPI]
-        Two = 1,
-
-        /// <summary>
-        /// Random colors.
-        /// </summary>
-        [PublicAPI]
-        Random
-    }
-}
diff --git a/Corale.Colore/Razer/Keyboard/Effects/Starlight.cs b/Corale.Colore/Razer/Keyboard/Effects/Starlight.cs
deleted file mode 100644
index 293ce84c..00000000
--- a/Corale.Colore/Razer/Keyboard/Effects/Starlight.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// ---------------------------------------------------------------------------------------
-// <copyright file="Starlight.cs" company="Corale">
-//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
-//
-//     Permission is hereby granted, free of charge, to any person obtaining a copy of
-//     this software and associated documentation files (the "Software"), to deal in
-//     the Software without restriction, including without limitation the rights to
-//     use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-//     of the Software, and to permit persons to whom the Software is furnished to do
-//     so, subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included in all
-//     copies or substantial portions of the Software.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//     "Razer" is a trademark of Razer USA Ltd.
-// </copyright>
-// ---------------------------------------------------------------------------------------
-
-namespace Corale.Colore.Razer.Keyboard.Effects
-{
-    using System.Runtime.InteropServices;
-
-    using Corale.Colore.Annotations;
-    using Corale.Colore.Core;
-
-    /// <summary>
-    /// Describes the starlight effect.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct Starlight
-    {
-        /// <summary>
-        /// Effect type.
-        /// </summary>
-        [PublicAPI]
-        public readonly StarlightType Type;
-
-        /// <summary>
-        /// The first color to use.
-        /// </summary>
-        [PublicAPI]
-        public readonly Color FirstColor;
-
-        /// <summary>
-        /// The second color to use.
-        /// </summary>
-        [PublicAPI]
-        public readonly Color SecondColor;
-
-        /// <summary>
-        /// Duration of the effect.
-        /// </summary>
-        [PublicAPI]
-        public readonly Duration Duration;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Starlight" /> struct.
-        /// </summary>
-        /// <param name="type">Effect type.</param>
-        /// <param name="firstColor">First color to use.</param>
-        /// <param name="secondColor">Second color to use.</param>
-        /// <param name="duration">Duration of the effect.</param>
-        public Starlight(StarlightType type, Color firstColor, Color secondColor, Duration duration)
-        {
-            Type = type;
-            FirstColor = firstColor;
-            SecondColor = secondColor;
-            Duration = duration;
-        }
-    }
-}
diff --git a/Corale.Colore/Razer/Keyboard/Effects/StarlightType.cs b/Corale.Colore/Razer/Keyboard/Effects/StarlightType.cs
deleted file mode 100644
index 7d24ac4c..00000000
--- a/Corale.Colore/Razer/Keyboard/Effects/StarlightType.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// ---------------------------------------------------------------------------------------
-// <copyright file="StarlightType.cs" company="Corale">
-//     Copyright © 2015-2016 by Adam Hellberg and Brandon Scott.
-//
-//     Permission is hereby granted, free of charge, to any person obtaining a copy of
-//     this software and associated documentation files (the "Software"), to deal in
-//     the Software without restriction, including without limitation the rights to
-//     use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-//     of the Software, and to permit persons to whom the Software is furnished to do
-//     so, subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included in all
-//     copies or substantial portions of the Software.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//     "Razer" is a trademark of Razer USA Ltd.
-// </copyright>
-// ---------------------------------------------------------------------------------------
-
-namespace Corale.Colore.Razer.Keyboard.Effects
-{
-    using Corale.Colore.Annotations;
-
-    /// <summary>
-    /// Supported starlight effect types for the keyboard.
-    /// </summary>
-    public enum StarlightType
-    {
-        /// <summary>
-        /// Two colors.
-        /// </summary>
-        [PublicAPI]
-        Two = 1,
-
-        /// <summary>
-        /// Random colors.
-        /// </summary>
-        [PublicAPI]
-        Random
-    }
-}

From 90cf67d341cd2cd2d0061c735cbd21209a9d8c44 Mon Sep 17 00:00:00 2001
From: Nicholas Martin <n.martin@movura.co.uk>
Date: Mon, 7 Nov 2016 21:07:16 +0000
Subject: [PATCH 2/2] Removed starlight from keyboard

---
 Corale.Colore/Core/IKeyboard.cs                | 7 -------
 Corale.Colore/Razer/Effect.cs                  | 5 ++---
 Corale.Colore/Razer/Keyboard/Effects/Effect.cs | 4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Corale.Colore/Core/IKeyboard.cs b/Corale.Colore/Core/IKeyboard.cs
index 4a6f5e5b..ad893dbb 100644
--- a/Corale.Colore/Core/IKeyboard.cs
+++ b/Corale.Colore/Core/IKeyboard.cs
@@ -178,12 +178,5 @@ public interface IKeyboard : IDevice
         /// <param name="effect">Effect options.</param>
         [PublicAPI]
         void SetWave(Wave effect);
-
-        /// <summary>
-        /// Sets a starlight effect on the keyboard.
-        /// </summary>
-        /// <param name="effect">Effect options.</param>
-        [PublicAPI]
-        void SetStarlight(Starlight effect);
     }
 }
diff --git a/Corale.Colore/Razer/Effect.cs b/Corale.Colore/Razer/Effect.cs
index 09a3c9a2..11c5a810 100644
--- a/Corale.Colore/Razer/Effect.cs
+++ b/Corale.Colore/Razer/Effect.cs
@@ -82,10 +82,9 @@ public enum Effect
         Custom,
 
         /// <summary>
-        /// The starlight effect.
+        /// Reserved effect.
         /// </summary>
-        [PublicAPI]
-        Starlight,
+        Reserved,
 
         /// <summary>
         /// Invalid effect.
diff --git a/Corale.Colore/Razer/Keyboard/Effects/Effect.cs b/Corale.Colore/Razer/Keyboard/Effects/Effect.cs
index f8258bca..34b11703 100644
--- a/Corale.Colore/Razer/Keyboard/Effects/Effect.cs
+++ b/Corale.Colore/Razer/Keyboard/Effects/Effect.cs
@@ -76,10 +76,10 @@ public enum Effect
         Wave,
 
         /// <summary>
-        /// Starlight effect.
+        /// Reserved effect.
         /// </summary>
         [PublicAPI]
-        Starlight,
+        Reserved,
 
         /// <summary>
         /// Custom effect with keys.