diff --git a/Artemis/Artemis/Managers/MainManager.cs b/Artemis/Artemis/Managers/MainManager.cs
index 79e394518..8446f1eb3 100644
--- a/Artemis/Artemis/Managers/MainManager.cs
+++ b/Artemis/Artemis/Managers/MainManager.cs
@@ -120,8 +120,15 @@ namespace Artemis.Managers
 
         private void FinishStop(object sender, RunWorkerCompletedEventArgs e)
         {
+            UpdateWorker.RunWorkerCompleted -= FinishStop;
             KeyboardManager.ReleaseActiveKeyboard();
             Running = false;
+
+            if (e.Error != null || !_restarting)
+                return;
+
+            Start();
+            _restarting = false;
         }
 
         public void Pause()
@@ -161,23 +168,9 @@ namespace Artemis.Managers
             }
 
             _restarting = true;
-
-            UpdateWorker.RunWorkerCompleted += FinishRestart;
             Stop();
         }
 
-        public void FinishRestart(object sender, RunWorkerCompletedEventArgs e)
-        {
-            UpdateWorker.RunWorkerCompleted -= FinishRestart;
-
-            if (e.Error != null)
-                return;
-
-            Start();
-
-            _restarting = false;
-        }
-
         /// <summary>
         ///     Loads the last active effect and starts the program
         /// </summary>
diff --git a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs
index dc3456ed9..c6577f2b9 100644
--- a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs
+++ b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs
@@ -34,13 +34,13 @@ namespace Artemis.Modules.Effects.Debug
 
             KeyboardRectangle = new KeyboardRectangle(MainManager.KeyboardManager.ActiveKeyboard, 0, 0, new List<Color>
             {
-                Color.Red,
-                Color.OrangeRed,
-                Color.Yellow,
+                //Color.Red,
+                //Color.OrangeRed,
+                //Color.Yellow,
                 Color.Green,
                 Color.Blue,
-                Color.Purple,
-                Color.DeepPink
+                //Color.Purple,
+                //Color.DeepPink
             }, LinearGradientMode.Horizontal);
 
             Initialized = true;