diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config
index 34e59e882..9a3c84fc5 100644
--- a/Artemis/Artemis/App.config
+++ b/Artemis/Artemis/App.config
@@ -1,233 +1,237 @@
-<?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>
-      <setting name="Autorun" serializeAs="String">
-        <value>True</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>
+      <setting name="Autorun" serializeAs="String">
+        <value>True</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>
+      <dependentAssembly>
+        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
 </configuration>
\ No newline at end of file
diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 131a161a0..a7974f5cd 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -115,24 +115,28 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.0.0-rc1-177\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Caliburn.Micro, Version=2.0.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Caliburn.Micro.Core.2.0.2\lib\net45\Caliburn.Micro.dll</HintPath>
+      <HintPath>..\packages\Caliburn.Micro.Core.3.0.0-beta2\lib\net45\Caliburn.Micro.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Caliburn.Micro.Autofac, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Caliburn.Micro.AutofacBootstrap.2.0.8\lib\net40\Caliburn.Micro.Autofac.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Autofac, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Caliburn.Micro.AutofacBootstrap.2.0.9-beta\lib\net40\Caliburn.Micro.Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Caliburn.Micro.Platform, Version=2.0.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
+      <HintPath>..\packages\Caliburn.Micro.3.0.0-beta2\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Corale.Colore, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Colore.3.0.2\lib\net35\Corale.Colore.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Platform.Core, Version=2.0.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Caliburn.Micro.3.0.0-beta2\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Corale.Colore, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Colore.4.0.0\lib\net35\Corale.Colore.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CUE.NET, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -151,8 +155,8 @@
       <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.2.4.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.3.0.37, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.3.0-ALPHA037\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -173,7 +177,7 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\MahApps.Metro.1.3.0-ALPHA037\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index 8d572046e..b621be89b 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -1,15 +1,15 @@
 <?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="Autofac" version="4.0.0-rc1-177" targetFramework="net452" />
+  <package id="Caliburn.Micro" version="3.0.0-beta2" targetFramework="net452" />
+  <package id="Caliburn.Micro.AutofacBootstrap" version="2.0.9-beta" targetFramework="net452" />
+  <package id="Caliburn.Micro.Core" version="3.0.0-beta2" targetFramework="net452" />
+  <package id="Colore" version="4.0.0" 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" version="1.3.0-ALPHA037" 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" />