diff --git a/Artemis/Artemis/Managers/EffectManager.cs b/Artemis/Artemis/Managers/EffectManager.cs
index 0968ebc60..a1688a6f1 100644
--- a/Artemis/Artemis/Managers/EffectManager.cs
+++ b/Artemis/Artemis/Managers/EffectManager.cs
@@ -7,7 +7,6 @@ using Artemis.Modules.Effects.ProfilePreview;
 using Artemis.Settings;
 using Caliburn.Micro;
 using NLog;
-using LogManager = NLog.LogManager;
 
 namespace Artemis.Managers
 {
@@ -16,19 +15,21 @@ namespace Artemis.Managers
     /// </summary>
     public class EffectManager
     {
-        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private readonly IEventAggregator _events;
         private readonly KeyboardManager _keyboardManager;
+        private readonly ILogger _logger;
         private EffectModel _activeEffect;
 
-        public EffectManager(IEventAggregator events, KeyboardManager keyboardManager)
+        public EffectManager(IEventAggregator events, ILogger logger, KeyboardManager keyboardManager)
         {
-            Logger.Info("Intializing EffectManager");
+            _logger = logger;
+            _logger.Info("Intializing EffectManager");
+
             _events = events;
             _keyboardManager = keyboardManager;
 
             EffectModels = new List<EffectModel>();
-            Logger.Info("Intialized EffectManager");
+            _logger.Info("Intialized EffectManager");
         }
 
         /// <summary>
@@ -68,7 +69,7 @@ namespace Artemis.Managers
         /// <returns>Whether enabling was successful or not.</returns>
         public EffectModel GetLastEffect()
         {
-            Logger.Debug("Getting last effect: {0}", General.Default.LastEffect);
+            _logger.Debug("Getting last effect: {0}", General.Default.LastEffect);
             return General.Default.LastEffect == null
                 ? null
                 : EffectModels.FirstOrDefault(e => e.Name == General.Default.LastEffect);
@@ -103,7 +104,7 @@ namespace Artemis.Managers
                     wasNull = true;
                     ActiveEffect = effectModel;
                 }
-                
+
                 lock (ActiveEffect)
                 {
                     if (!wasNull)
@@ -126,7 +127,7 @@ namespace Artemis.Managers
                 loopManager.Start();
             }
 
-            Logger.Debug($"Changed active effect to: {effectModel.Name}");
+            _logger.Debug($"Changed active effect to: {effectModel.Name}");
         }
 
 
@@ -147,7 +148,7 @@ namespace Artemis.Managers
                 }
             }
 
-            Logger.Debug("Cleared active effect");
+            _logger.Debug("Cleared active effect");
         }
 
         /// <summary>
@@ -156,7 +157,7 @@ namespace Artemis.Managers
         /// <param name="activeEffect"></param>
         public void DisableGame(EffectModel activeEffect)
         {
-            Logger.Debug($"Disabling game: {activeEffect?.Name}");
+            _logger.Debug($"Disabling game: {activeEffect?.Name}");
             if (GetLastEffect() == null)
                 ClearEffect();
             else
diff --git a/Artemis/Artemis/Managers/KeyboardManager.cs b/Artemis/Artemis/Managers/KeyboardManager.cs
index aa61b270d..f09bfb685 100644
--- a/Artemis/Artemis/Managers/KeyboardManager.cs
+++ b/Artemis/Artemis/Managers/KeyboardManager.cs
@@ -6,7 +6,6 @@ using Artemis.KeyboardProviders;
 using Artemis.Settings;
 using Caliburn.Micro;
 using NLog;
-using LogManager = NLog.LogManager;
 
 namespace Artemis.Managers
 {
@@ -15,18 +14,19 @@ namespace Artemis.Managers
     /// </summary>
     public class KeyboardManager
     {
-        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private readonly IEventAggregator _events;
+        private readonly ILogger _logger;
         private KeyboardProvider _activeKeyboard;
 
-        public KeyboardManager(IEventAggregator events)
+        public KeyboardManager(IEventAggregator events, ILogger logger)
         {
-            Logger.Info("Intializing KeyboardManager");
+            _logger = logger;
+            _logger.Info("Intializing KeyboardManager");
 
             _events = events;
             KeyboardProviders = ProviderHelper.GetKeyboardProviders();
 
-            Logger.Info("Intialized KeyboardManager");
+            _logger.Info("Intialized KeyboardManager");
         }
 
         public List<KeyboardProvider> KeyboardProviders { get; set; }
@@ -47,7 +47,7 @@ namespace Artemis.Managers
         /// </summary>
         public void EnableLastKeyboard()
         {
-            Logger.Debug($"Enabling last keyboard: {General.Default.LastKeyboard}");
+            _logger.Debug($"Enabling last keyboard: {General.Default.LastKeyboard}");
             if (string.IsNullOrEmpty(General.Default.LastKeyboard))
                 return;
 
@@ -76,7 +76,7 @@ namespace Artemis.Managers
 
             lock (ActiveKeyboard)
             {
-                Logger.Debug($"Enabling keyboard: {keyboardProvider.Name}");
+                _logger.Debug($"Enabling keyboard: {keyboardProvider.Name}");
 
                 if (!wasNull)
                     ReleaseActiveKeyboard();
@@ -112,7 +112,7 @@ namespace Artemis.Managers
                 ActiveKeyboard = null;
             }
 
-            Logger.Debug($"Released keyboard: {ActiveKeyboard?.Name}");
+            _logger.Debug($"Released keyboard: {ActiveKeyboard?.Name}");
         }
     }
 }
\ No newline at end of file
diff --git a/Artemis/Artemis/Managers/LoopManager.cs b/Artemis/Artemis/Managers/LoopManager.cs
index 0dd826b73..5e4e1e504 100644
--- a/Artemis/Artemis/Managers/LoopManager.cs
+++ b/Artemis/Artemis/Managers/LoopManager.cs
@@ -14,12 +14,13 @@ namespace Artemis.Managers
         private readonly EffectManager _effectManager;
         private readonly IEventAggregator _events;
         private readonly KeyboardManager _keyboardManager;
+        private readonly ILogger _logger;
         private readonly Timer _loopTimer;
 
         public LoopManager(ILogger logger, IEventAggregator events, EffectManager effectManager,
             KeyboardManager keyboardManager)
         {
-            Logger = logger;
+            _logger = logger;
             _events = events;
             _effectManager = effectManager;
             _keyboardManager = keyboardManager;
@@ -29,8 +30,6 @@ namespace Artemis.Managers
             _loopTimer.Start();
         }
 
-        public ILogger Logger { get; }
-
         /// <summary>
         ///     Gets whether the loop is running
         /// </summary>
@@ -44,17 +43,18 @@ namespace Artemis.Managers
 
         public void Start()
         {
-            Logger.Debug("Starting LoopManager");
+            _logger.Debug("Starting LoopManager");
 
             if (_keyboardManager.ActiveKeyboard == null)
                 _keyboardManager.EnableLastKeyboard();
 
+            // TODO: Deadlock maybe? I don't know what Resharper is on about
             if (_effectManager.ActiveEffect == null)
             {
                 var lastEffect = _effectManager.GetLastEffect();
                 if (lastEffect == null)
                     return;
-                
+
                 _effectManager.ChangeEffect(lastEffect);
             }
 
@@ -63,7 +63,7 @@ namespace Artemis.Managers
 
         public void Stop()
         {
-            Logger.Debug("Stopping LoopManager");
+            _logger.Debug("Stopping LoopManager");
             Running = false;
 
             _keyboardManager.ReleaseActiveKeyboard();
@@ -77,9 +77,9 @@ namespace Artemis.Managers
             // Stop if no active keyboard/efffect
             if (_keyboardManager.ActiveKeyboard == null || _effectManager.ActiveEffect == null)
             {
-                Logger.Debug("No active keyboard/effect, stopping. " +
-                             $"Keyboard={_keyboardManager.ActiveKeyboard?.Name}, " +
-                             $"effect={_effectManager.ActiveEffect?.Name}");
+                _logger.Debug("No active keyboard/effect, stopping. " +
+                              $"Keyboard={_keyboardManager.ActiveKeyboard?.Name}, " +
+                              $"effect={_effectManager.ActiveEffect?.Name}");
                 Stop();
                 return;
             }
diff --git a/Artemis/Artemis/Managers/MainManager.cs b/Artemis/Artemis/Managers/MainManager.cs
index 7ab5fa55a..345063e8f 100644
--- a/Artemis/Artemis/Managers/MainManager.cs
+++ b/Artemis/Artemis/Managers/MainManager.cs
@@ -24,16 +24,17 @@ namespace Artemis.Managers
         public delegate void PauseCallbackHandler();
 
         private readonly IEventAggregator _events;
+        private readonly ILogger _logger;
 
         public MainManager(IEventAggregator events, ILogger logger, LoopManager loopManager,
             KeyboardManager keyboardManager, EffectManager effectManager)
         {
-            Logger = logger;
+            _logger = logger;
             LoopManager = loopManager;
             KeyboardManager = keyboardManager;
             EffectManager = effectManager;
 
-            Logger.Info("Intializing MainManager");
+            _logger.Info("Intializing MainManager");
 
             _events = events;
 
@@ -58,13 +59,12 @@ namespace Artemis.Managers
             PipeServer = new PipeServer();
             PipeServer.Start("artemis");
 
-            Logger.Info("Intialized MainManager");
+            _logger.Info("Intialized MainManager");
         }
 
         [Inject]
         public Lazy<ShellViewModel> ShellViewModel { get; set; }
 
-        public ILogger Logger { get; }
         public LoopManager LoopManager { get; }
         public KeyboardManager KeyboardManager { get; set; }
         public EffectManager EffectManager { get; set; }
@@ -80,7 +80,7 @@ namespace Artemis.Managers
 
         public void Dispose()
         {
-            Logger.Debug("Shutting down MainManager");
+            _logger.Debug("Shutting down MainManager");
             LoopManager.Stop();
             ProcessWorker.CancelAsync();
             ProcessWorker.CancelAsync();
@@ -93,7 +93,7 @@ namespace Artemis.Managers
         /// </summary>
         public void EnableProgram()
         {
-            Logger.Debug("Enabling program");
+            _logger.Debug("Enabling program");
             ProgramEnabled = true;
             LoopManager.Start();
             _events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled));
@@ -104,7 +104,7 @@ namespace Artemis.Managers
         /// </summary>
         public void DisableProgram()
         {
-            Logger.Debug("Disabling program");
+            _logger.Debug("Disabling program");
             LoopManager.Stop();
             ProgramEnabled = false;
             _events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled));
@@ -150,7 +150,7 @@ namespace Artemis.Managers
             if (e.Error == null)
                 return;
 
-            Logger.Error(e.Error, "Exception in the BackgroundWorker");
+            _logger.Error(e.Error, "Exception in the BackgroundWorker");
             throw e.Error;
         }
     }
diff --git a/Artemis/Artemis/NLog.config b/Artemis/Artemis/NLog.config
index a5fc24d5d..8e6815325 100644
--- a/Artemis/Artemis/NLog.config
+++ b/Artemis/Artemis/NLog.config
@@ -5,38 +5,13 @@
       autoReload="true"
       throwExceptions="false"
       internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
-
-
-  <!-- optional, add some variabeles
-  https://github.com/nlog/NLog/wiki/Configuration-file#variables
-  -->
-  <variable name="myvar" value="myvalue"/>
-
-  <!-- 
-  See https://github.com/nlog/nlog/wiki/Configuration-file 
-  for information on customizing logging rules and outputs.
-   -->
   <targets>
-
-    <!-- 
-    add your targets here 
-    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
-    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-    -->
-
-    <!--
-    Write events to a file with the date in the filename. 
-    <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
-            layout="${longdate} ${uppercase:${level}} ${message}" />
-    -->
+    <target name="file" xsi:type="File" maxArchiveFiles="7" fileName="${specialfolder:folder=MyDocuments}/Artemis/logs/${shortdate}.txt"/>
+    <target name="debugger" xsi:type="Debugger" layout="${logger:shortName=True} - ${uppercase:${level}}: ${message}"/>
   </targets>
 
   <rules>
-    <!-- add your logging rules here -->
-
-    <!--
-    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
-    <logger name="*" minlevel="Debug" writeTo="f" />
-    -->
+    <logger name="*" minlevel="Debug" writeTo="file" />
+    <logger name="*" minlevel="Debug" writeTo="debugger" />
   </rules>
 </nlog>
\ No newline at end of file
diff --git a/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs b/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs
index 3b28bdef4..1eb0cc2ff 100644
--- a/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs
+++ b/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs
@@ -34,6 +34,7 @@ namespace Artemis.ViewModels.Abstract
 
         [Inject]
         public ProfilePreviewModel ProfilePreviewModel { get; set; }
+
         public IEventAggregator Events { get; set; }
         public IProfileEditorViewModelFactory PFactory { get; set; }