diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config
index af623241d..ecad2e917 100644
--- a/Artemis/Artemis/App.config
+++ b/Artemis/Artemis/App.config
@@ -1,255 +1,230 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="userSettings"
-                  type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="Artemis.Modules.Games.RocketLeague.RocketLeague"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Settings.Offsets"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Modules.Games.Witcher3.Witcher3"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Modules.Games.CounterStrike.CounterStrike"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Settings.CounterStrike"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Settings.VolumeDisplay"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Settings.AudioVisualization"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Settings.RocketLeague"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Properties.Settings"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Settings.TypeWave"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="Artemis.Settings.General"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-  <connectionStrings />
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-  </startup>
-  <userSettings>
-    <Artemis.Modules.Games.RocketLeague.RocketLeague>
-      <setting name="Enabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="MainColor" serializeAs="String">
-        <value>#FFFF5000</value>
-      </setting>
-      <setting name="SecondaryColor" serializeAs="String">
-        <value>#FFFF0000</value>
-      </setting>
-    </Artemis.Modules.Games.RocketLeague.RocketLeague>
-    <Artemis.Settings.Offsets>
-      <setting name="RocketLeague" serializeAs="String">
-        <value>{"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]}</value>
-      </setting>
-      <setting name="Witcher3" serializeAs="String">
-        <value>{"Game":"Witcher3","GameVersion":"1.11","GameAddresses":[{"Description":"Sign","BasePointer":{"value":42942304},"Offsets":[40,16,32,3008]}]}</value>
-      </setting>
-    </Artemis.Settings.Offsets>
-    <Artemis.Modules.Games.Witcher3.Witcher3>
-      <setting name="Enabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-    </Artemis.Modules.Games.Witcher3.Witcher3>
-    <Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
-      <setting name="Sensitivity" serializeAs="String">
-        <value>4</value>
-      </setting>
-      <setting name="Bars" serializeAs="String">
-        <value>21</value>
-      </setting>
-      <setting name="FromBottom" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="FadeSpeed" serializeAs="String">
-        <value>3</value>
-      </setting>
-      <setting name="TopColor" serializeAs="String">
-        <value>#FFF90000</value>
-      </setting>
-      <setting name="MiddleColor" serializeAs="String">
-        <value>#FFFF761E</value>
-      </setting>
-      <setting name="BottomColor" serializeAs="String">
-        <value>#FF00DF00</value>
-      </setting>
-    </Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
-    <Artemis.Modules.Games.CounterStrike.CounterStrike>
-      <setting name="GameDirectory" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="AmmoEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="AmmoMainColor" serializeAs="String">
-        <value>#FFFF2900</value>
-      </setting>
-      <setting name="AmmoSecondaryColor" serializeAs="String">
-        <value>#FF26F600</value>
-      </setting>
-      <setting name="TeamColorEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="FlashEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="SmokeEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="LowHpEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="Enabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-    </Artemis.Modules.Games.CounterStrike.CounterStrike>
-    <Artemis.Settings.CounterStrike>
-      <setting name="GameDirectory" serializeAs="String">
-        <value>C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</value>
-      </setting>
-      <setting name="AmmoEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="AmmoMainColor" serializeAs="String">
-        <value>#FFFF2900</value>
-      </setting>
-      <setting name="AmmoSecondaryColor" serializeAs="String">
-        <value>#FF26F600</value>
-      </setting>
-      <setting name="TeamColorEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="FlashEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="SmokeEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="LowHpEnabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-    </Artemis.Settings.CounterStrike>
-    <Artemis.Settings.VolumeDisplay>
-      <setting name="MainColor" serializeAs="String">
-        <value>#FFFF2900</value>
-      </setting>
-      <setting name="SecondaryColor" serializeAs="String">
-        <value>#FF26F600</value>
-      </setting>
-      <setting name="Enabled" serializeAs="String">
-        <value>True</value>
-      </setting>
-    </Artemis.Settings.VolumeDisplay>
-    <Artemis.Settings.AudioVisualization>
-      <setting name="Sensitivity" serializeAs="String">
-        <value>4</value>
-      </setting>
-      <setting name="Bars" serializeAs="String">
-        <value>21</value>
-      </setting>
-      <setting name="Spread" serializeAs="String">
-        <value>1</value>
-      </setting>
-      <setting name="FadeSpeed" serializeAs="String">
-        <value>3</value>
-      </setting>
-      <setting name="MainColor" serializeAs="String">
-        <value>#FF0000FF</value>
-      </setting>
-      <setting name="SecondaryColor" serializeAs="String">
-        <value>#FF1E90FF</value>
-      </setting>
-    </Artemis.Settings.AudioVisualization>
-    <Artemis.Settings.RocketLeague>
-      <setting name="Enabled" serializeAs="String">
-        <value>False</value>
-      </setting>
-      <setting name="MainColor" serializeAs="String">
-        <value>#FFFF5000</value>
-      </setting>
-      <setting name="SecondaryColor" serializeAs="String">
-        <value>#FFFF0000</value>
-      </setting>
-    </Artemis.Settings.RocketLeague>
-    <Artemis.Properties.Settings>
-      <setting name="LastEffect" serializeAs="String">
-        <value>TypeWave</value>
-      </setting>
-    </Artemis.Properties.Settings>
-    <Artemis.Settings.TypeWave>
-      <setting name="IsRandomColors" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="WaveColor" serializeAs="String">
-        <value>#FFFF0000</value>
-      </setting>
-      <setting name="IsShiftColors" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="ShiftColorSpeed" serializeAs="String">
-        <value>20</value>
-      </setting>
-      <setting name="TimeToLive" serializeAs="String">
-        <value>500</value>
-      </setting>
-      <setting name="SpreadSpeed" serializeAs="String">
-        <value>4</value>
-      </setting>
-    </Artemis.Settings.TypeWave>
-    <Artemis.Settings.General>
-      <setting name="LastEffect" serializeAs="String">
-        <value>TypeWave</value>
-      </setting>
-      <setting name="LastKeyboard" serializeAs="String">
-        <value>Corsair Gaming K95 RGB</value>
-      </setting>
-      <setting name="EnablePointersUpdate" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="GamestatePort" serializeAs="String">
-        <value>51364</value>
-      </setting>
-    </Artemis.Settings.General>
-  </userSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Caliburn.Micro.Platform" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Artemis.Modules.Games.RocketLeague.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Settings.Offsets" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Modules.Games.Witcher3.Witcher3" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Modules.Games.CounterStrike.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Settings.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Settings.VolumeDisplay" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Settings.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Settings.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Settings.TypeWave" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Artemis.Settings.General" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <connectionStrings />
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+  <userSettings>
+    <Artemis.Modules.Games.RocketLeague.RocketLeague>
+      <setting name="Enabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="MainColor" serializeAs="String">
+        <value>#FFFF5000</value>
+      </setting>
+      <setting name="SecondaryColor" serializeAs="String">
+        <value>#FFFF0000</value>
+      </setting>
+    </Artemis.Modules.Games.RocketLeague.RocketLeague>
+    <Artemis.Settings.Offsets>
+      <setting name="RocketLeague" serializeAs="String">
+        <value>{"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]}</value>
+      </setting>
+      <setting name="Witcher3" serializeAs="String">
+        <value>{"Game":"Witcher3","GameVersion":"1.11","GameAddresses":[{"Description":"Sign","BasePointer":{"value":42942304},"Offsets":[40,16,32,3008]}]}</value>
+      </setting>
+    </Artemis.Settings.Offsets>
+    <Artemis.Modules.Games.Witcher3.Witcher3>
+      <setting name="Enabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </Artemis.Modules.Games.Witcher3.Witcher3>
+    <Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
+      <setting name="Sensitivity" serializeAs="String">
+        <value>4</value>
+      </setting>
+      <setting name="Bars" serializeAs="String">
+        <value>21</value>
+      </setting>
+      <setting name="FromBottom" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="FadeSpeed" serializeAs="String">
+        <value>3</value>
+      </setting>
+      <setting name="TopColor" serializeAs="String">
+        <value>#FFF90000</value>
+      </setting>
+      <setting name="MiddleColor" serializeAs="String">
+        <value>#FFFF761E</value>
+      </setting>
+      <setting name="BottomColor" serializeAs="String">
+        <value>#FF00DF00</value>
+      </setting>
+    </Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
+    <Artemis.Modules.Games.CounterStrike.CounterStrike>
+      <setting name="GameDirectory" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="AmmoEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="AmmoMainColor" serializeAs="String">
+        <value>#FFFF2900</value>
+      </setting>
+      <setting name="AmmoSecondaryColor" serializeAs="String">
+        <value>#FF26F600</value>
+      </setting>
+      <setting name="TeamColorEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="FlashEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="SmokeEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="LowHpEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="Enabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </Artemis.Modules.Games.CounterStrike.CounterStrike>
+    <Artemis.Settings.CounterStrike>
+      <setting name="GameDirectory" serializeAs="String">
+        <value>C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</value>
+      </setting>
+      <setting name="AmmoEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="AmmoMainColor" serializeAs="String">
+        <value>#FFFF2900</value>
+      </setting>
+      <setting name="AmmoSecondaryColor" serializeAs="String">
+        <value>#FF26F600</value>
+      </setting>
+      <setting name="TeamColorEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="FlashEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="SmokeEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="LowHpEnabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </Artemis.Settings.CounterStrike>
+    <Artemis.Settings.VolumeDisplay>
+      <setting name="MainColor" serializeAs="String">
+        <value>#FFFF2900</value>
+      </setting>
+      <setting name="SecondaryColor" serializeAs="String">
+        <value>#FF26F600</value>
+      </setting>
+      <setting name="Enabled" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </Artemis.Settings.VolumeDisplay>
+    <Artemis.Settings.AudioVisualization>
+      <setting name="Sensitivity" serializeAs="String">
+        <value>4</value>
+      </setting>
+      <setting name="Bars" serializeAs="String">
+        <value>21</value>
+      </setting>
+      <setting name="Spread" serializeAs="String">
+        <value>1</value>
+      </setting>
+      <setting name="FadeSpeed" serializeAs="String">
+        <value>3</value>
+      </setting>
+      <setting name="MainColor" serializeAs="String">
+        <value>#FF0000FF</value>
+      </setting>
+      <setting name="SecondaryColor" serializeAs="String">
+        <value>#FF1E90FF</value>
+      </setting>
+    </Artemis.Settings.AudioVisualization>
+    <Artemis.Settings.RocketLeague>
+      <setting name="Enabled" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="MainColor" serializeAs="String">
+        <value>#FFFF5000</value>
+      </setting>
+      <setting name="SecondaryColor" serializeAs="String">
+        <value>#FFFF0000</value>
+      </setting>
+    </Artemis.Settings.RocketLeague>
+    <Artemis.Properties.Settings>
+      <setting name="LastEffect" serializeAs="String">
+        <value>TypeWave</value>
+      </setting>
+    </Artemis.Properties.Settings>
+    <Artemis.Settings.TypeWave>
+      <setting name="IsRandomColors" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="WaveColor" serializeAs="String">
+        <value>#FFFF0000</value>
+      </setting>
+      <setting name="IsShiftColors" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="ShiftColorSpeed" serializeAs="String">
+        <value>20</value>
+      </setting>
+      <setting name="TimeToLive" serializeAs="String">
+        <value>500</value>
+      </setting>
+      <setting name="SpreadSpeed" serializeAs="String">
+        <value>4</value>
+      </setting>
+    </Artemis.Settings.TypeWave>
+    <Artemis.Settings.General>
+      <setting name="LastEffect" serializeAs="String">
+        <value>TypeWave</value>
+      </setting>
+      <setting name="LastKeyboard" serializeAs="String">
+        <value>Corsair Gaming K95 RGB</value>
+      </setting>
+      <setting name="EnablePointersUpdate" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="GamestatePort" serializeAs="String">
+        <value>51364</value>
+      </setting>
+    </Artemis.Settings.General>
+  </userSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Caliburn.Micro.Platform" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
 </configuration>
\ No newline at end of file
diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index db806ab53..da42f7242 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -135,8 +135,8 @@
       <HintPath>..\packages\Colore.3.0.2\lib\net35\Corale.Colore.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CUE.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CUE.NET.1.0.0\lib\net45\CUE.NET.dll</HintPath>
+    <Reference Include="CUE.NET, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CUE.NET.1.0.2\lib\net45\CUE.NET.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Gma.System.MouseKeyHook, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -527,12 +527,12 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets')" />
+  <Import Project="..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets'))" />
+    <Error Condition="!Exists('..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Artemis/Artemis/KeyboardProviders/Corsair/K70.cs b/Artemis/Artemis/KeyboardProviders/Corsair/K70.cs
index 765381193..792cc2d48 100644
--- a/Artemis/Artemis/KeyboardProviders/Corsair/K70.cs
+++ b/Artemis/Artemis/KeyboardProviders/Corsair/K70.cs
@@ -1,88 +1,89 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using Artemis.Utilities;
-using CUE.NET;
-using CUE.NET.Devices.Generic.Enums;
-using CUE.NET.Devices.Keyboard;
-using CUE.NET.Exceptions;
-
-namespace Artemis.KeyboardProviders.Corsair
-{
-    internal class K70 : KeyboardProvider
-    {
-        private CorsairKeyboard _keyboard;
-
-        public K70()
-        {
-            Name = "Corsair Gaming K70 RGB";
-        }
-
-        public override bool CanEnable()
-        {
-            try
-            {
-                CueSDK.Initialize();
-            }
-            catch (CUEException e)
-            {
-                if (e.Error == CorsairError.ServerNotFound)
-                    return false;
-                throw;
-            }
-
-            return true;
-
-        }
-
-        /// <summary>
-        ///     Enables the SDK and sets updatemode to manual as well as the color of the background to black.
-        /// </summary>
-        public override void Enable()
-        {
-            try
-            {
-                CueSDK.Initialize();
-            }
-            catch (WrapperException)
-            {
-                /*CUE is already initialized*/
-            }
-            _keyboard = CueSDK.KeyboardSDK;
-            Height = (int)_keyboard.KeyboardRectangle.Height;
-            Width = (int)_keyboard.KeyboardRectangle.Width;
-
-            // _keyboard.UpdateMode = UpdateMode.Manual;
-            _keyboard.Update(true);
-        }
-
-        public override void Disable()
-        {
-        }
-
-        /// <summary>
-        ///     Properly resizes any size bitmap to the keyboard by creating a rectangle whose size is dependent on the bitmap
-        ///     size.
-        ///     Does not reset the color each time. Uncomment line 48 for collor reset.
-        /// </summary>
-        /// <param name="bitmap//"></param>
-        public override void DrawBitmap(Bitmap bitmap)
-        {
-            using (
-                var resized = ImageUtilities.ResizeImage(bitmap,
-                    (int)_keyboard.KeyboardRectangle.Width,
-                    (int)_keyboard.KeyboardRectangle.Height)
-                )
-            {
-                foreach (var item in _keyboard.Keys)
-                {
-                    var ledColor = resized.GetPixel((int)item.KeyRectangle.X, (int)item.KeyRectangle.Y);
-                    if (ledColor == Color.FromArgb(0, 0, 0, 0))
-                        ledColor = Color.Black;
-                    item.Led.Color = ledColor;
-                }
-            }
-            _keyboard.Update(true);
-        }
-    }
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using Artemis.Utilities;
+using CUE.NET;
+using CUE.NET.Devices.Generic.Enums;
+using CUE.NET.Devices.Keyboard;
+using CUE.NET.Exceptions;
+
+namespace Artemis.KeyboardProviders.Corsair
+{
+    internal class K70 : KeyboardProvider
+    {
+        private CorsairKeyboard _keyboard;
+
+        public K70()
+        {
+            Name = "Corsair Gaming K70 RGB";
+        }
+
+        public override bool CanEnable()
+        {
+            try
+            {
+                CueSDK.Initialize();
+            }
+            catch (CUEException e)
+            {
+                if (e.Error == CorsairError.ServerNotFound)
+                    return false;
+                throw;
+            }
+
+            return true;
+
+        }
+
+        /// <summary>
+        ///     Enables the SDK and sets updatemode to manual as well as the color of the background to black.
+        /// </summary>
+        public override void Enable()
+        {
+            try
+            {
+                CueSDK.Initialize();
+            }
+            catch (WrapperException)
+            {
+                /*CUE is already initialized*/
+            }
+            _keyboard = CueSDK.KeyboardSDK;
+            Height = 7; //(int) _keyboard.KeyboardRectangle.Height;
+            Width = 21; //(int) _keyboard.KeyboardRectangle.Width;
+
+            // _keyboard.UpdateMode = UpdateMode.Manual;
+            _keyboard.Update(true);
+        }
+
+        public override void Disable()
+        {
+            CueSDK.Reinitialize();
+        }
+
+        /// <summary>
+        ///     Properly resizes any size bitmap to the keyboard by creating a rectangle whose size is dependent on the bitmap
+        ///     size.
+        ///     Does not reset the color each time. Uncomment line 48 for collor reset.
+        /// </summary>
+        /// <param name="bitmap"></param>
+        public override void DrawBitmap(Bitmap bitmap)
+        {
+            using (
+                var resized = ImageUtilities.ResizeImage(bitmap,
+                    (int)_keyboard.KeyboardRectangle.Width,
+                    (int)_keyboard.KeyboardRectangle.Height)
+                )
+            {
+                foreach (var item in _keyboard.Keys)
+                {
+                    var ledColor = resized.GetPixel((int)item.KeyRectangle.X, (int)item.KeyRectangle.Y);
+                    if (ledColor == Color.FromArgb(0, 0, 0, 0))
+                        ledColor = Color.Black;
+                    item.Led.Color = ledColor;
+                }
+            }
+            _keyboard.Update(true);
+        }
+    }
 }
\ No newline at end of file
diff --git a/Artemis/Artemis/KeyboardProviders/Corsair/K95.cs b/Artemis/Artemis/KeyboardProviders/Corsair/K95.cs
index 02184d6d9..3fba9ab96 100644
--- a/Artemis/Artemis/KeyboardProviders/Corsair/K95.cs
+++ b/Artemis/Artemis/KeyboardProviders/Corsair/K95.cs
@@ -49,8 +49,8 @@ namespace Artemis.KeyboardProviders.Corsair
                 /*CUE is already initialized*/
             }
             _keyboard = CueSDK.KeyboardSDK;
-            Height = (int) _keyboard.KeyboardRectangle.Height;
-            Width = (int) _keyboard.KeyboardRectangle.Width;
+            Height = 7; //(int) _keyboard.KeyboardRectangle.Height;
+            Width = 24; //(int) _keyboard.KeyboardRectangle.Width;
 
             // _keyboard.UpdateMode = UpdateMode.Manual;
             _keyboard.Update(true);
@@ -58,6 +58,7 @@ namespace Artemis.KeyboardProviders.Corsair
 
         public override void Disable()
         {
+            CueSDK.Reinitialize();
         }
 
         /// <summary>
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index c171ffc0c..8d572046e 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<packages>
-  <package id="Autofac" version="3.5.2" targetFramework="net452" />
-  <package id="Caliburn.Micro" version="2.0.2" targetFramework="net452" />
-  <package id="Caliburn.Micro.AutofacBootstrap" version="2.0.8" targetFramework="net452" />
-  <package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="net452" />
-  <package id="Colore" version="3.0.2" targetFramework="net452" />
-  <package id="CUE.NET" version="1.0.0" targetFramework="net452" />
-  <package id="Extended.Wpf.Toolkit" version="2.6" targetFramework="net452" />
-  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.5" targetFramework="net452" />
-  <package id="MahApps.Metro" version="1.3.0-ALPHA017" targetFramework="net452" />
-  <package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net452" />
-  <package id="MouseKeyHook" version="5.4.0" targetFramework="net452" />
-  <package id="NAudio" version="1.7.3" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
-  <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Autofac" version="3.5.2" targetFramework="net452" />
+  <package id="Caliburn.Micro" version="2.0.2" targetFramework="net452" />
+  <package id="Caliburn.Micro.AutofacBootstrap" version="2.0.8" targetFramework="net452" />
+  <package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="net452" />
+  <package id="Colore" version="3.0.2" targetFramework="net452" />
+  <package id="CUE.NET" version="1.0.2" targetFramework="net452" />
+  <package id="Extended.Wpf.Toolkit" version="2.6" targetFramework="net452" />
+  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net452" />
+  <package id="log4net" version="2.0.5" targetFramework="net452" />
+  <package id="MahApps.Metro" version="1.3.0-ALPHA017" targetFramework="net452" />
+  <package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net452" />
+  <package id="MouseKeyHook" version="5.4.0" targetFramework="net452" />
+  <package id="NAudio" version="1.7.3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
+  <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
 </packages>
\ No newline at end of file