diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config
index a339f73ad..81ce6d60e 100644
--- a/Artemis/Artemis/App.config
+++ b/Artemis/Artemis/App.config
@@ -2,19 +2,44 @@
 
 <configuration>
   <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-     <section name="Artemis.Modules.Overlays.VolumeDisplay.VolumeDisplay" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-     <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.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 name="userSettings"
+                  type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Artemis.Modules.Overlays.VolumeDisplay.VolumeDisplay"
+               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <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.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 />
diff --git a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs
index 6cb31f494..3bd6fdb74 100644
--- a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs
+++ b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Threading;
-using System.Windows.Forms;
 using Artemis.KeyboardProviders.Logitech.Utilities;
 
 namespace Artemis.KeyboardProviders.Logitech
diff --git a/Artemis/Artemis/Managers/EffectManager.cs b/Artemis/Artemis/Managers/EffectManager.cs
index 694481b20..15107b191 100644
--- a/Artemis/Artemis/Managers/EffectManager.cs
+++ b/Artemis/Artemis/Managers/EffectManager.cs
@@ -10,8 +10,8 @@ namespace Artemis.Managers
 {
     public class EffectManager
     {
-        private readonly MainManager _mainManager;
         private readonly IEventAggregator _events;
+        private readonly MainManager _mainManager;
 
         public EffectManager(MainManager mainManager, IEventAggregator events)
         {
@@ -121,7 +121,7 @@ namespace Artemis.Managers
             // Don't mess with the ActiveEffect if in the process of changing the effect.
             if (PauseEffect != null)
                 return;
-            
+
             if (ActiveEffect == null)
                 return;
 
diff --git a/Artemis/Artemis/Managers/MainManager.cs b/Artemis/Artemis/Managers/MainManager.cs
index 2133e92d4..9e0ca8ef4 100644
--- a/Artemis/Artemis/Managers/MainManager.cs
+++ b/Artemis/Artemis/Managers/MainManager.cs
@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using System.Windows.Forms;
 using Artemis.Events;
 using Artemis.Models;
 using Artemis.Utilities.GameState;
@@ -28,7 +27,7 @@ namespace Artemis.Managers
 
             _fps = 25;
             UpdateWorker = new BackgroundWorker {WorkerSupportsCancellation = true};
-            ProcessWorker = new BackgroundWorker { WorkerSupportsCancellation = true };
+            ProcessWorker = new BackgroundWorker {WorkerSupportsCancellation = true};
 
             UpdateWorker.DoWork += UpdateWorker_DoWork;
             UpdateWorker.RunWorkerCompleted += BackgroundWorkerExceptionCatcher;
@@ -149,6 +148,13 @@ namespace Artemis.Managers
             Events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled));
         }
 
+        public void Shutdown()
+        {
+            Stop();
+            ProcessWorker.CancelAsync();
+            GameStateWebServer.Stop();
+        }
+
         #region Workers
 
         private void UpdateWorker_DoWork(object sender, DoWorkEventArgs e)
@@ -255,12 +261,5 @@ namespace Artemis.Managers
         }
 
         #endregion
-
-        public void Shutdown()
-        {
-            Stop();
-            ProcessWorker.CancelAsync();
-            GameStateWebServer.Stop();
-        }
     }
 }
\ No newline at end of file
diff --git a/Artemis/Artemis/Models/EffectModel.cs b/Artemis/Artemis/Models/EffectModel.cs
index d41fc862d..2c6aae812 100644
--- a/Artemis/Artemis/Models/EffectModel.cs
+++ b/Artemis/Artemis/Models/EffectModel.cs
@@ -8,9 +8,10 @@ namespace Artemis.Models
     {
         public delegate void SettingsUpdateHandler(EffectSettings settings);
 
+        public bool Initialized;
+
         public MainManager MainManager;
         public string Name;
-        public bool Initialized;
 
         protected EffectModel(MainManager mainManager)
         {
diff --git a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs
index 9211b2c72..3452c7c04 100644
--- a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs
+++ b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs
@@ -17,10 +17,10 @@ namespace Artemis.Modules.Effects.AudioVisualizer
     {
         private const int FftLength = 2048;
         private readonly SampleAggregator _sampleAggregator = new SampleAggregator(FftLength);
-        private bool _generating;
-        private IWaveIn _waveIn;
-        private int _sensitivity;
         private bool _fromBottom;
+        private bool _generating;
+        private int _sensitivity;
+        private IWaveIn _waveIn;
 
         public AudioVisualizerModel(MainManager mainManager, AudioVisualizerSettings settings) : base(mainManager)
         {
@@ -92,7 +92,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
         }
 
         public override void Update()
-        {      
+        {
             // Start filling the model
             _generating = true;
 
@@ -118,7 +118,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
                     height = (int) Math.Round(SpectrumData[i]/2.55);
 
                 // Apply Sensitivity setting
-                height = height* _sensitivity;
+                height = height*_sensitivity;
                 var keyboardHeight =
                     (int) Math.Round(MainManager.KeyboardManager.ActiveKeyboard.Height/100.00*height*Scale);
                 if (keyboardHeight > SoundRectangles[i].Height)
diff --git a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
index a5a22d8b9..517f9705f 100644
--- a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
+++ b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
@@ -37,8 +37,8 @@
                     <Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
                     <ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
                                   Style="{DynamicResource MetroCircleToggleButtonStyle}"
-                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]" 
-                                  ToolTip="Note: You can't enable an effect when Artemis is disabled"/>
+                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]"
+                                  ToolTip="Note: You can't enable an effect when Artemis is disabled" />
                 </StackPanel>
             </StackPanel>
             <!-- Top color -->
diff --git a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml
index 0a1dfff8a..02b601d2f 100644
--- a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml
+++ b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml
@@ -35,9 +35,9 @@
                     <Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
                     <ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
                                   Style="{DynamicResource MetroCircleToggleButtonStyle}"
-                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]" 
+                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]"
                                   ToolTip="Note: You can't enable an effect when Artemis is disabled"
-                                  ToolTipService.ShowOnDisabled="True"/>
+                                  ToolTipService.ShowOnDisabled="True" />
                 </StackPanel>
             </StackPanel>
 
diff --git a/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml b/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml
index 1fb37d5d7..9b7a587e4 100644
--- a/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml
+++ b/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml
@@ -37,7 +37,8 @@
                            IsOpen="{Binding Path=ShowDisabledPopup, Mode=TwoWay}" Placement="Left" VerticalOffset="-10"
                            PopupAnimation="Fade" StaysOpen="False">
                         <Border Margin="1">
-                            <TextBlock Background="{DynamicResource AccentColorBrush}" Foreground="{DynamicResource IdealForegroundColorBrush}"
+                            <TextBlock Background="{DynamicResource AccentColorBrush}"
+                                       Foreground="{DynamicResource IdealForegroundColorBrush}"
                                        Text="You can't enable an effect when Artemis is disabled" Padding="4" />
                         </Border>
                     </Popup>
diff --git a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml
index 04c1ffa9f..89527794a 100644
--- a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml
+++ b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml
@@ -40,7 +40,8 @@
                            IsOpen="{Binding Path=ShowDisabledPopup, Mode=TwoWay}" Placement="Left" VerticalOffset="-10"
                            PopupAnimation="Fade" StaysOpen="False">
                         <Border Margin="1">
-                            <TextBlock Background="{DynamicResource AccentColorBrush}" Foreground="{DynamicResource IdealForegroundColorBrush}"
+                            <TextBlock Background="{DynamicResource AccentColorBrush}"
+                                       Foreground="{DynamicResource IdealForegroundColorBrush}"
                                        Text="You can't enable an effect when Artemis is disabled" Padding="4" />
                         </Border>
                     </Popup>
diff --git a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.settings b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.settings
index 45108356e..6ad6a4586 100644
--- a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.settings
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrike.settings
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Games.CounterStrike" GeneratedClassName="CounterStrike">
+
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
+              GeneratedClassNamespace="Artemis.Modules.Games.CounterStrike" GeneratedClassName="CounterStrike">
   <Profiles />
   <Settings>
     <Setting Name="Enabled" Type="System.Boolean" Scope="User">
diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings
index abcdfce78..f4cbd44c9 100644
--- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings
+++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Games.RocketLeague" GeneratedClassName="RocketLeague">
+
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
+              GeneratedClassNamespace="Artemis.Modules.Games.RocketLeague" GeneratedClassName="RocketLeague">
   <Profiles />
   <Settings>
     <Setting Name="Enabled" Type="System.Boolean" Scope="User">
diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs
index 6873f9a9c..fa9fc1037 100644
--- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs
+++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs
@@ -32,7 +32,6 @@ namespace Artemis.Modules.Games.RocketLeague
             Scale = 4;
             Enabled = Settings.Enabled;
             Initialized = false;
-
         }
 
         public RocketLeagueSettings Settings { get; set; }
@@ -92,12 +91,12 @@ namespace Artemis.Modules.Games.RocketLeague
 
             if (ContextualColor)
             {
-                if(_boostAmount < 33)
-                    _boostRect.Colors = new List<Color>{ Color.Red };
-                else if(_boostAmount >= 33 && _boostAmount < 66)
-                    _boostRect.Colors = new List<Color> { Color.Yellow };
-                else if(_boostAmount >= 66)
-                    _boostRect.Colors = new List<Color> { Color.Lime };
+                if (_boostAmount < 33)
+                    _boostRect.Colors = new List<Color> {Color.Red};
+                else if (_boostAmount >= 33 && _boostAmount < 66)
+                    _boostRect.Colors = new List<Color> {Color.Yellow};
+                else if (_boostAmount >= 66)
+                    _boostRect.Colors = new List<Color> {Color.Lime};
             }
             else
             {
diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml
index ff3f7da8a..7db442dbb 100644
--- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml
+++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml
@@ -76,9 +76,10 @@
                 Tip: To find a color combination you like, start an exhibition match, pickup 100 boost and play around with the colors.
                 They'll appear on your keyboard immediately! Once you're satisfied don't forget to click save changes.
             </TextBlock>
-            <TextBlock x:Name="VersionText" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
+            <TextBlock x:Name="VersionText" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center"
+                       Margin="0,8"
                        TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
-                       Foreground="{DynamicResource HighlightBrush}" MaxWidth="510" TextAlignment="Justify"/>
+                       Foreground="{DynamicResource HighlightBrush}" MaxWidth="510" TextAlignment="Justify" />
 
             <!-- Buttons -->
             <StackPanel Grid.Column="0" Grid.Row="9" Orientation="Horizontal" VerticalAlignment="Bottom">
diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueViewModel.cs b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueViewModel.cs
index c7b9787e3..b9914fd70 100644
--- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueViewModel.cs
+++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueViewModel.cs
@@ -2,7 +2,6 @@
 using Artemis.Models;
 using Artemis.Settings;
 using Artemis.Utilities;
-using Artemis.Utilities.Memory;
 using Caliburn.Micro;
 using Newtonsoft.Json;
 
diff --git a/Artemis/Artemis/Modules/Games/Witcher3/Witcher3.settings b/Artemis/Artemis/Modules/Games/Witcher3/Witcher3.settings
index 1a68809bc..2d3da15e3 100644
--- a/Artemis/Artemis/Modules/Games/Witcher3/Witcher3.settings
+++ b/Artemis/Artemis/Modules/Games/Witcher3/Witcher3.settings
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Games.Witcher3" GeneratedClassName="Witcher3">
+
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
+              GeneratedClassNamespace="Artemis.Modules.Games.Witcher3" GeneratedClassName="Witcher3">
   <Profiles />
   <Settings>
     <Setting Name="Enabled" Type="System.Boolean" Scope="User">
diff --git a/Artemis/Artemis/Modules/Games/Witcher3/Witcher3Model.cs b/Artemis/Artemis/Modules/Games/Witcher3/Witcher3Model.cs
index 955ceac7b..6344b6aa3 100644
--- a/Artemis/Artemis/Modules/Games/Witcher3/Witcher3Model.cs
+++ b/Artemis/Artemis/Modules/Games/Witcher3/Witcher3Model.cs
@@ -26,7 +26,7 @@ namespace Artemis.Modules.Games.Witcher3
             Scale = 4;
             Enabled = Settings.Enabled;
             Initialized = false;
-            
+
             _updateSw = new Stopwatch();
             _signRegex = new Regex("ActiveSign=(.*)", RegexOptions.Compiled);
         }
@@ -87,21 +87,21 @@ namespace Artemis.Modules.Games.Witcher3
                 return;
             var sign = signRes.Groups[1].Value;
 
-            switch (sign)
-            {
-                case "ST_Aard\r":
+            switch (sign)
+            {
+                case "ST_Aard\r":
                     _signRect.Colors = new List<Color> {Color.DeepSkyBlue, Color.Blue};
                     break;
-                case "ST_Yrden\r":
+                case "ST_Yrden\r":
                     _signRect.Colors = new List<Color> {Color.Purple, Color.DeepPink};
                     break;
-                case "ST_Igni\r":
+                case "ST_Igni\r":
                     _signRect.Colors = new List<Color> {Color.DarkOrange, Color.Red};
                     break;
-                case "ST_Quen\r":
+                case "ST_Quen\r":
                     _signRect.Colors = new List<Color> {Color.DarkOrange, Color.FromArgb(232, 193, 0)};
                     break;
-                case "ST_Axii\r":
+                case "ST_Axii\r":
                     _signRect.Colors = new List<Color> {Color.LawnGreen, Color.DarkGreen};
                     break;
             }
diff --git a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.settings b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.settings
index 88f34366e..086ed27ae 100644
--- a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.settings
+++ b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.settings
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Overlays.VolumeDisplay" GeneratedClassName="VolumeDisplay">
+
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
+              GeneratedClassNamespace="Artemis.Modules.Overlays.VolumeDisplay" GeneratedClassName="VolumeDisplay">
   <Profiles />
   <Settings>
     <Setting Name="Enabled" Type="System.Boolean" Scope="User">
diff --git a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
index 7700e93e6..9a1645084 100644
--- a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
+++ b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
@@ -55,12 +55,12 @@
             <xctk:ColorPicker x:Name="SecondaryColor"
                               SelectedColor="{Binding Path=VolumeDisplaySettings.SecondaryColor, Mode=TwoWay}"
                               Grid.Row="2" Grid.Column="1" Width="110" HorizontalAlignment="Right"
-                              VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" >
-                <xctk:ColorPicker.Template>
-                    <ControlTemplate>
-                        <Rectangle ></Rectangle>
-                    </ControlTemplate>
-                </xctk:ColorPicker.Template>
+                              VerticalAlignment="Center" Margin="0,5,-1,5" Height="22">
+                <xctk:ColorPicker.Template>
+                    <ControlTemplate>
+                        <Rectangle />
+                    </ControlTemplate>
+                </xctk:ColorPicker.Template>
             </xctk:ColorPicker>
 
             <TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
diff --git a/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs b/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs
index 70034782b..e2f574d0d 100644
--- a/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs
+++ b/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs
@@ -34,7 +34,7 @@ namespace Artemis.Utilities.GameState
             _listener.Prefixes.Add($"http://localhost:{Port}/");
 
             _listener.Start();
-            
+
             ThreadPool.QueueUserWorkItem(o =>
             {
                 try
diff --git a/Artemis/Artemis/Utilities/Memory/MemoryHelpers.cs b/Artemis/Artemis/Utilities/Memory/MemoryHelpers.cs
index a36f3eb9c..47cf6cdad 100644
--- a/Artemis/Artemis/Utilities/Memory/MemoryHelpers.cs
+++ b/Artemis/Artemis/Utilities/Memory/MemoryHelpers.cs
@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Net;
 using System.Runtime.InteropServices;
-using Artemis.Models;
-using Artemis.Settings;
-using Newtonsoft.Json;
 
 namespace Artemis.Utilities.Memory
 {
diff --git a/Artemis/Artemis/ViewModels/ShellViewModel.cs b/Artemis/Artemis/ViewModels/ShellViewModel.cs
index 8f9700e33..c545250c1 100644
--- a/Artemis/Artemis/ViewModels/ShellViewModel.cs
+++ b/Artemis/Artemis/ViewModels/ShellViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Windows;
+using System.Linq;
 using Artemis.Managers;
 using Artemis.ViewModels.Flyouts;
 using Caliburn.Micro;
diff --git a/Artemis/Artemis/ViewModels/SystemTrayViewModel.cs b/Artemis/Artemis/ViewModels/SystemTrayViewModel.cs
index 25b25a4c2..b951d5a46 100644
--- a/Artemis/Artemis/ViewModels/SystemTrayViewModel.cs
+++ b/Artemis/Artemis/ViewModels/SystemTrayViewModel.cs
@@ -1,13 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using System.Windows;
 using Artemis.Events;
 using Artemis.Utilities;
 using Caliburn.Micro;
-using Newtonsoft.Json.Linq;
-using Application = System.Windows.Application;
-using Screen = Caliburn.Micro.Screen;
 
 namespace Artemis.ViewModels
 {
diff --git a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
index c57c18d87..1ce4d86da 100644
--- a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
+++ b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
@@ -32,7 +32,7 @@
                Content="Enable Artemis:" />
         <controls:ToggleSwitch Grid.Row="0" Grid.Column="1" Margin="5" OnLabel="Yes" OffLabel="No"
                                VerticalAlignment="Center" HorizontalAlignment="Right" Width="125"
-                               IsChecked="{Binding Path=Enabled, Mode=TwoWay}"/>
+                               IsChecked="{Binding Path=Enabled, Mode=TwoWay}" />
 
         <!-- Startup with Windows -->
         <Label Grid.Row="1" Grid.Column="0" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"
diff --git a/Artemis/Artemis/Views/WelcomeView.xaml b/Artemis/Artemis/Views/WelcomeView.xaml
index b70fee0a6..3914660b9 100644
--- a/Artemis/Artemis/Views/WelcomeView.xaml
+++ b/Artemis/Artemis/Views/WelcomeView.xaml
@@ -28,8 +28,8 @@
             </Label>
 
             <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
-                       TextWrapping="Wrap" HorizontalAlignment="Left" 
-                        MaxWidth="520" TextAlignment="Justify">
+                       TextWrapping="Wrap" HorizontalAlignment="Left"
+                       MaxWidth="520" TextAlignment="Justify">
                 Hello, <LineBreak /><LineBreak />
                 Thanks a bunch for downloading this application. You're going to enjoy this! :)<LineBreak />
                 <LineBreak />
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index ae3a0a987..1a670ab2d 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="Autofac" version="4.0.0-rc1-177" targetFramework="net452" />
   <package id="Caliburn.Micro" version="2.0.2" targetFramework="net452" />