diff --git a/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.Designer.cs b/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.Designer.cs
index 7e20bebb..6c32c6a8 100644
--- a/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.Designer.cs
+++ b/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.Designer.cs
@@ -32,6 +32,8 @@ private void InitializeComponent()
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(KeppyDriverConfiguratorMain));
             this.TabsForTheControls = new System.Windows.Forms.TabControl();
             this.List1 = new System.Windows.Forms.TabPage();
+            this.DisableSF1 = new System.Windows.Forms.Button();
+            this.EnableSF1 = new System.Windows.Forms.Button();
             this.List1Override = new System.Windows.Forms.Label();
             this.IELPan1 = new System.Windows.Forms.Panel();
             this.EL1 = new System.Windows.Forms.Button();
@@ -43,6 +45,8 @@ private void InitializeComponent()
             this.AddSF1 = new System.Windows.Forms.Button();
             this.Lis1 = new System.Windows.Forms.ListBox();
             this.List2 = new System.Windows.Forms.TabPage();
+            this.DisableSF2 = new System.Windows.Forms.Button();
+            this.EnableSF2 = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
             this.EL2 = new System.Windows.Forms.Button();
             this.IEL2 = new System.Windows.Forms.Button();
@@ -54,6 +58,8 @@ private void InitializeComponent()
             this.AddSF2 = new System.Windows.Forms.Button();
             this.Lis2 = new System.Windows.Forms.ListBox();
             this.List3 = new System.Windows.Forms.TabPage();
+            this.DisableSF3 = new System.Windows.Forms.Button();
+            this.EnableSF3 = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
             this.EL3 = new System.Windows.Forms.Button();
             this.IEL3 = new System.Windows.Forms.Button();
@@ -65,6 +71,8 @@ private void InitializeComponent()
             this.AddSF3 = new System.Windows.Forms.Button();
             this.Lis3 = new System.Windows.Forms.ListBox();
             this.List4 = new System.Windows.Forms.TabPage();
+            this.DisableSF4 = new System.Windows.Forms.Button();
+            this.EnableSF4 = new System.Windows.Forms.Button();
             this.panel3 = new System.Windows.Forms.Panel();
             this.EL4 = new System.Windows.Forms.Button();
             this.IEL4 = new System.Windows.Forms.Button();
@@ -76,6 +84,8 @@ private void InitializeComponent()
             this.AddSF4 = new System.Windows.Forms.Button();
             this.Lis4 = new System.Windows.Forms.ListBox();
             this.List5 = new System.Windows.Forms.TabPage();
+            this.DisableSF5 = new System.Windows.Forms.Button();
+            this.EnableSF5 = new System.Windows.Forms.Button();
             this.panel4 = new System.Windows.Forms.Panel();
             this.EL5 = new System.Windows.Forms.Button();
             this.IEL5 = new System.Windows.Forms.Button();
@@ -87,6 +97,8 @@ private void InitializeComponent()
             this.AddSF5 = new System.Windows.Forms.Button();
             this.Lis5 = new System.Windows.Forms.ListBox();
             this.List6 = new System.Windows.Forms.TabPage();
+            this.DisableSF6 = new System.Windows.Forms.Button();
+            this.EnableSF6 = new System.Windows.Forms.Button();
             this.panel5 = new System.Windows.Forms.Panel();
             this.EL6 = new System.Windows.Forms.Button();
             this.IEL6 = new System.Windows.Forms.Button();
@@ -98,6 +110,8 @@ private void InitializeComponent()
             this.AddSF6 = new System.Windows.Forms.Button();
             this.Lis6 = new System.Windows.Forms.ListBox();
             this.List7 = new System.Windows.Forms.TabPage();
+            this.DisableSF7 = new System.Windows.Forms.Button();
+            this.EnableSF7 = new System.Windows.Forms.Button();
             this.panel6 = new System.Windows.Forms.Panel();
             this.EL7 = new System.Windows.Forms.Button();
             this.IEL7 = new System.Windows.Forms.Button();
@@ -109,6 +123,8 @@ private void InitializeComponent()
             this.AddSF7 = new System.Windows.Forms.Button();
             this.Lis7 = new System.Windows.Forms.ListBox();
             this.List8 = new System.Windows.Forms.TabPage();
+            this.DisableSF8 = new System.Windows.Forms.Button();
+            this.EnableSF8 = new System.Windows.Forms.Button();
             this.panel7 = new System.Windows.Forms.Panel();
             this.EL8 = new System.Windows.Forms.Button();
             this.IEL8 = new System.Windows.Forms.Button();
@@ -199,22 +215,9 @@ private void InitializeComponent()
             this.ExternalListImport = new System.Windows.Forms.OpenFileDialog();
             this.ExportList = new System.Windows.Forms.SaveFileDialog();
             this.VolumeHotkeysCheck = new System.Windows.Forms.Timer(this.components);
-            this.EnableSF1 = new System.Windows.Forms.Button();
-            this.DisableSF1 = new System.Windows.Forms.Button();
-            this.DisableSF2 = new System.Windows.Forms.Button();
-            this.EnableSF2 = new System.Windows.Forms.Button();
-            this.DisableSF3 = new System.Windows.Forms.Button();
-            this.EnableSF3 = new System.Windows.Forms.Button();
-            this.DisableSF4 = new System.Windows.Forms.Button();
-            this.EnableSF4 = new System.Windows.Forms.Button();
-            this.DisableSF5 = new System.Windows.Forms.Button();
-            this.EnableSF5 = new System.Windows.Forms.Button();
-            this.DisableSF6 = new System.Windows.Forms.Button();
-            this.EnableSF6 = new System.Windows.Forms.Button();
-            this.DisableSF7 = new System.Windows.Forms.Button();
-            this.EnableSF7 = new System.Windows.Forms.Button();
-            this.DisableSF8 = new System.Windows.Forms.Button();
-            this.EnableSF8 = new System.Windows.Forms.Button();
+            this.watchdogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.watchdogEnabledToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.watchdogDisabledToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.TabsForTheControls.SuspendLayout();
             this.List1.SuspendLayout();
             this.IELPan1.SuspendLayout();
@@ -284,6 +287,26 @@ private void InitializeComponent()
             this.List1.Text = "List 1";
             this.List1.UseVisualStyleBackColor = true;
             // 
+            // DisableSF1
+            // 
+            this.DisableSF1.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF1.Name = "DisableSF1";
+            this.DisableSF1.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF1.TabIndex = 11;
+            this.DisableSF1.Text = "Disable SF";
+            this.DisableSF1.UseVisualStyleBackColor = true;
+            this.DisableSF1.Click += new System.EventHandler(this.DisableSF1_Click);
+            // 
+            // EnableSF1
+            // 
+            this.EnableSF1.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF1.Name = "EnableSF1";
+            this.EnableSF1.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF1.TabIndex = 10;
+            this.EnableSF1.Text = "Enable SF";
+            this.EnableSF1.UseVisualStyleBackColor = true;
+            this.EnableSF1.Click += new System.EventHandler(this.EnableSF1_Click);
+            // 
             // List1Override
             // 
             this.List1Override.AutoSize = true;
@@ -410,6 +433,26 @@ private void InitializeComponent()
             this.List2.Text = "List 2";
             this.List2.UseVisualStyleBackColor = true;
             // 
+            // DisableSF2
+            // 
+            this.DisableSF2.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF2.Name = "DisableSF2";
+            this.DisableSF2.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF2.TabIndex = 20;
+            this.DisableSF2.Text = "Disable SF";
+            this.DisableSF2.UseVisualStyleBackColor = true;
+            this.DisableSF2.Click += new System.EventHandler(this.DisableSF2_Click);
+            // 
+            // EnableSF2
+            // 
+            this.EnableSF2.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF2.Name = "EnableSF2";
+            this.EnableSF2.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF2.TabIndex = 19;
+            this.EnableSF2.Text = "Enable SF";
+            this.EnableSF2.UseVisualStyleBackColor = true;
+            this.EnableSF2.Click += new System.EventHandler(this.EnableSF2_Click);
+            // 
             // panel1
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -535,6 +578,26 @@ private void InitializeComponent()
             this.List3.Text = "List 3";
             this.List3.UseVisualStyleBackColor = true;
             // 
+            // DisableSF3
+            // 
+            this.DisableSF3.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF3.Name = "DisableSF3";
+            this.DisableSF3.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF3.TabIndex = 27;
+            this.DisableSF3.Text = "Disable SF";
+            this.DisableSF3.UseVisualStyleBackColor = true;
+            this.DisableSF3.Click += new System.EventHandler(this.DisableSF3_Click);
+            // 
+            // EnableSF3
+            // 
+            this.EnableSF3.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF3.Name = "EnableSF3";
+            this.EnableSF3.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF3.TabIndex = 26;
+            this.EnableSF3.Text = "Enable SF";
+            this.EnableSF3.UseVisualStyleBackColor = true;
+            this.EnableSF3.Click += new System.EventHandler(this.EnableSF3_Click);
+            // 
             // panel2
             // 
             this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -660,6 +723,26 @@ private void InitializeComponent()
             this.List4.Text = "List 4";
             this.List4.UseVisualStyleBackColor = true;
             // 
+            // DisableSF4
+            // 
+            this.DisableSF4.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF4.Name = "DisableSF4";
+            this.DisableSF4.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF4.TabIndex = 34;
+            this.DisableSF4.Text = "Disable SF";
+            this.DisableSF4.UseVisualStyleBackColor = true;
+            this.DisableSF4.Click += new System.EventHandler(this.DisableSF4_Click);
+            // 
+            // EnableSF4
+            // 
+            this.EnableSF4.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF4.Name = "EnableSF4";
+            this.EnableSF4.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF4.TabIndex = 33;
+            this.EnableSF4.Text = "Enable SF";
+            this.EnableSF4.UseVisualStyleBackColor = true;
+            this.EnableSF4.Click += new System.EventHandler(this.EnableSF4_Click);
+            // 
             // panel3
             // 
             this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -785,6 +868,26 @@ private void InitializeComponent()
             this.List5.Text = "List 5";
             this.List5.UseVisualStyleBackColor = true;
             // 
+            // DisableSF5
+            // 
+            this.DisableSF5.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF5.Name = "DisableSF5";
+            this.DisableSF5.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF5.TabIndex = 43;
+            this.DisableSF5.Text = "Disable SF";
+            this.DisableSF5.UseVisualStyleBackColor = true;
+            this.DisableSF5.Click += new System.EventHandler(this.DisableSF5_Click);
+            // 
+            // EnableSF5
+            // 
+            this.EnableSF5.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF5.Name = "EnableSF5";
+            this.EnableSF5.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF5.TabIndex = 42;
+            this.EnableSF5.Text = "Enable SF";
+            this.EnableSF5.UseVisualStyleBackColor = true;
+            this.EnableSF5.Click += new System.EventHandler(this.EnableSF5_Click);
+            // 
             // panel4
             // 
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -910,6 +1013,26 @@ private void InitializeComponent()
             this.List6.Text = "List 6";
             this.List6.UseVisualStyleBackColor = true;
             // 
+            // DisableSF6
+            // 
+            this.DisableSF6.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF6.Name = "DisableSF6";
+            this.DisableSF6.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF6.TabIndex = 43;
+            this.DisableSF6.Text = "Disable SF";
+            this.DisableSF6.UseVisualStyleBackColor = true;
+            this.DisableSF6.Click += new System.EventHandler(this.DisableSF6_Click);
+            // 
+            // EnableSF6
+            // 
+            this.EnableSF6.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF6.Name = "EnableSF6";
+            this.EnableSF6.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF6.TabIndex = 42;
+            this.EnableSF6.Text = "Enable SF";
+            this.EnableSF6.UseVisualStyleBackColor = true;
+            this.EnableSF6.Click += new System.EventHandler(this.EnableSF6_Click);
+            // 
             // panel5
             // 
             this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -1035,6 +1158,26 @@ private void InitializeComponent()
             this.List7.Text = "List 7";
             this.List7.UseVisualStyleBackColor = true;
             // 
+            // DisableSF7
+            // 
+            this.DisableSF7.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF7.Name = "DisableSF7";
+            this.DisableSF7.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF7.TabIndex = 43;
+            this.DisableSF7.Text = "Disable SF";
+            this.DisableSF7.UseVisualStyleBackColor = true;
+            this.DisableSF7.Click += new System.EventHandler(this.DisableSF7_Click);
+            // 
+            // EnableSF7
+            // 
+            this.EnableSF7.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF7.Name = "EnableSF7";
+            this.EnableSF7.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF7.TabIndex = 42;
+            this.EnableSF7.Text = "Enable SF";
+            this.EnableSF7.UseVisualStyleBackColor = true;
+            this.EnableSF7.Click += new System.EventHandler(this.EnableSF7_Click);
+            // 
             // panel6
             // 
             this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -1160,6 +1303,26 @@ private void InitializeComponent()
             this.List8.Text = "List 8";
             this.List8.UseVisualStyleBackColor = true;
             // 
+            // DisableSF8
+            // 
+            this.DisableSF8.Location = new System.Drawing.Point(581, 257);
+            this.DisableSF8.Name = "DisableSF8";
+            this.DisableSF8.Size = new System.Drawing.Size(89, 23);
+            this.DisableSF8.TabIndex = 43;
+            this.DisableSF8.Text = "Disable SF";
+            this.DisableSF8.UseVisualStyleBackColor = true;
+            this.DisableSF8.Click += new System.EventHandler(this.DisableSF8_Click);
+            // 
+            // EnableSF8
+            // 
+            this.EnableSF8.Location = new System.Drawing.Point(581, 228);
+            this.EnableSF8.Name = "EnableSF8";
+            this.EnableSF8.Size = new System.Drawing.Size(89, 23);
+            this.EnableSF8.TabIndex = 42;
+            this.EnableSF8.Text = "Enable SF";
+            this.EnableSF8.UseVisualStyleBackColor = true;
+            this.EnableSF8.Click += new System.EventHandler(this.EnableSF8_Click);
+            // 
             // panel7
             // 
             this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -1910,7 +2073,8 @@ private void InitializeComponent()
             this.changeDirectoryOfTheOutputToWAVModeToolStripMenuItem,
             this.changeTheMaximumSamplesPerFrameToolStripMenuItem,
             this.changeDefaultSoundfontListToolStripMenuItem1,
-            this.hotkeysToolStripMenuItem});
+            this.hotkeysToolStripMenuItem,
+            this.watchdogToolStripMenuItem});
             this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
             this.settingsToolStripMenuItem.Size = new System.Drawing.Size(116, 20);
             this.settingsToolStripMenuItem.Text = "Advanced settings";
@@ -1959,14 +2123,14 @@ private void InitializeComponent()
             // hLSEnabledToolStripMenuItem
             // 
             this.hLSEnabledToolStripMenuItem.Name = "hLSEnabledToolStripMenuItem";
-            this.hLSEnabledToolStripMenuItem.Size = new System.Drawing.Size(119, 22);
+            this.hLSEnabledToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
             this.hLSEnabledToolStripMenuItem.Text = "Enabled";
             this.hLSEnabledToolStripMenuItem.Click += new System.EventHandler(this.hLSEnabledToolStripMenuItem_Click);
             // 
             // hLSDisabledToolStripMenuItem
             // 
             this.hLSDisabledToolStripMenuItem.Name = "hLSDisabledToolStripMenuItem";
-            this.hLSDisabledToolStripMenuItem.Size = new System.Drawing.Size(119, 22);
+            this.hLSDisabledToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
             this.hLSDisabledToolStripMenuItem.Text = "Disabled";
             this.hLSDisabledToolStripMenuItem.Click += new System.EventHandler(this.hLSDisabledToolStripMenuItem_Click);
             // 
@@ -2159,165 +2323,28 @@ private void InitializeComponent()
             this.VolumeHotkeysCheck.Interval = 1;
             this.VolumeHotkeysCheck.Tick += new System.EventHandler(this.VolumeHotkeysCheck_Tick);
             // 
-            // EnableSF1
-            // 
-            this.EnableSF1.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF1.Name = "EnableSF1";
-            this.EnableSF1.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF1.TabIndex = 10;
-            this.EnableSF1.Text = "Enable SF";
-            this.EnableSF1.UseVisualStyleBackColor = true;
-            this.EnableSF1.Click += new System.EventHandler(this.EnableSF1_Click);
+            // watchdogToolStripMenuItem
             // 
-            // DisableSF1
+            this.watchdogToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.watchdogEnabledToolStripMenuItem,
+            this.watchdogDisabledToolStripMenuItem});
+            this.watchdogToolStripMenuItem.Name = "watchdogToolStripMenuItem";
+            this.watchdogToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
+            this.watchdogToolStripMenuItem.Text = "Watchdog";
             // 
-            this.DisableSF1.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF1.Name = "DisableSF1";
-            this.DisableSF1.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF1.TabIndex = 11;
-            this.DisableSF1.Text = "Disable SF";
-            this.DisableSF1.UseVisualStyleBackColor = true;
-            this.DisableSF1.Click += new System.EventHandler(this.DisableSF1_Click);
+            // watchdogEnabledToolStripMenuItem
             // 
-            // DisableSF2
+            this.watchdogEnabledToolStripMenuItem.Name = "watchdogEnabledToolStripMenuItem";
+            this.watchdogEnabledToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.watchdogEnabledToolStripMenuItem.Text = "Enabled";
+            this.watchdogEnabledToolStripMenuItem.Click += new System.EventHandler(this.watchdogEnabledToolStripMenuItem_Click);
             // 
-            this.DisableSF2.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF2.Name = "DisableSF2";
-            this.DisableSF2.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF2.TabIndex = 20;
-            this.DisableSF2.Text = "Disable SF";
-            this.DisableSF2.UseVisualStyleBackColor = true;
-            this.DisableSF2.Click += new System.EventHandler(this.DisableSF2_Click);
+            // watchdogDisabledToolStripMenuItem
             // 
-            // EnableSF2
-            // 
-            this.EnableSF2.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF2.Name = "EnableSF2";
-            this.EnableSF2.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF2.TabIndex = 19;
-            this.EnableSF2.Text = "Enable SF";
-            this.EnableSF2.UseVisualStyleBackColor = true;
-            this.EnableSF2.Click += new System.EventHandler(this.EnableSF2_Click);
-            // 
-            // DisableSF3
-            // 
-            this.DisableSF3.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF3.Name = "DisableSF3";
-            this.DisableSF3.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF3.TabIndex = 27;
-            this.DisableSF3.Text = "Disable SF";
-            this.DisableSF3.UseVisualStyleBackColor = true;
-            this.DisableSF3.Click += new System.EventHandler(this.DisableSF3_Click);
-            // 
-            // EnableSF3
-            // 
-            this.EnableSF3.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF3.Name = "EnableSF3";
-            this.EnableSF3.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF3.TabIndex = 26;
-            this.EnableSF3.Text = "Enable SF";
-            this.EnableSF3.UseVisualStyleBackColor = true;
-            this.EnableSF3.Click += new System.EventHandler(this.EnableSF3_Click);
-            // 
-            // DisableSF4
-            // 
-            this.DisableSF4.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF4.Name = "DisableSF4";
-            this.DisableSF4.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF4.TabIndex = 34;
-            this.DisableSF4.Text = "Disable SF";
-            this.DisableSF4.UseVisualStyleBackColor = true;
-            this.DisableSF4.Click += new System.EventHandler(this.DisableSF4_Click);
-            // 
-            // EnableSF4
-            // 
-            this.EnableSF4.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF4.Name = "EnableSF4";
-            this.EnableSF4.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF4.TabIndex = 33;
-            this.EnableSF4.Text = "Enable SF";
-            this.EnableSF4.UseVisualStyleBackColor = true;
-            this.EnableSF4.Click += new System.EventHandler(this.EnableSF4_Click);
-            // 
-            // DisableSF5
-            // 
-            this.DisableSF5.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF5.Name = "DisableSF5";
-            this.DisableSF5.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF5.TabIndex = 43;
-            this.DisableSF5.Text = "Disable SF";
-            this.DisableSF5.UseVisualStyleBackColor = true;
-            this.DisableSF5.Click += new System.EventHandler(this.DisableSF5_Click);
-            // 
-            // EnableSF5
-            // 
-            this.EnableSF5.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF5.Name = "EnableSF5";
-            this.EnableSF5.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF5.TabIndex = 42;
-            this.EnableSF5.Text = "Enable SF";
-            this.EnableSF5.UseVisualStyleBackColor = true;
-            this.EnableSF5.Click += new System.EventHandler(this.EnableSF5_Click);
-            // 
-            // DisableSF6
-            // 
-            this.DisableSF6.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF6.Name = "DisableSF6";
-            this.DisableSF6.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF6.TabIndex = 43;
-            this.DisableSF6.Text = "Disable SF";
-            this.DisableSF6.UseVisualStyleBackColor = true;
-            this.DisableSF6.Click += new System.EventHandler(this.DisableSF6_Click);
-            // 
-            // EnableSF6
-            // 
-            this.EnableSF6.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF6.Name = "EnableSF6";
-            this.EnableSF6.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF6.TabIndex = 42;
-            this.EnableSF6.Text = "Enable SF";
-            this.EnableSF6.UseVisualStyleBackColor = true;
-            this.EnableSF6.Click += new System.EventHandler(this.EnableSF6_Click);
-            // 
-            // DisableSF7
-            // 
-            this.DisableSF7.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF7.Name = "DisableSF7";
-            this.DisableSF7.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF7.TabIndex = 43;
-            this.DisableSF7.Text = "Disable SF";
-            this.DisableSF7.UseVisualStyleBackColor = true;
-            this.DisableSF7.Click += new System.EventHandler(this.DisableSF7_Click);
-            // 
-            // EnableSF7
-            // 
-            this.EnableSF7.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF7.Name = "EnableSF7";
-            this.EnableSF7.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF7.TabIndex = 42;
-            this.EnableSF7.Text = "Enable SF";
-            this.EnableSF7.UseVisualStyleBackColor = true;
-            this.EnableSF7.Click += new System.EventHandler(this.EnableSF7_Click);
-            // 
-            // DisableSF8
-            // 
-            this.DisableSF8.Location = new System.Drawing.Point(581, 257);
-            this.DisableSF8.Name = "DisableSF8";
-            this.DisableSF8.Size = new System.Drawing.Size(89, 23);
-            this.DisableSF8.TabIndex = 43;
-            this.DisableSF8.Text = "Disable SF";
-            this.DisableSF8.UseVisualStyleBackColor = true;
-            this.DisableSF8.Click += new System.EventHandler(this.DisableSF8_Click);
-            // 
-            // EnableSF8
-            // 
-            this.EnableSF8.Location = new System.Drawing.Point(581, 228);
-            this.EnableSF8.Name = "EnableSF8";
-            this.EnableSF8.Size = new System.Drawing.Size(89, 23);
-            this.EnableSF8.TabIndex = 42;
-            this.EnableSF8.Text = "Enable SF";
-            this.EnableSF8.UseVisualStyleBackColor = true;
-            this.EnableSF8.Click += new System.EventHandler(this.EnableSF8_Click);
+            this.watchdogDisabledToolStripMenuItem.Name = "watchdogDisabledToolStripMenuItem";
+            this.watchdogDisabledToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.watchdogDisabledToolStripMenuItem.Text = "Disabled";
+            this.watchdogDisabledToolStripMenuItem.Click += new System.EventHandler(this.watchdogDisabledToolStripMenuItem_Click);
             // 
             // KeppyDriverConfiguratorMain
             // 
@@ -2570,6 +2597,9 @@ private void InitializeComponent()
         private System.Windows.Forms.Button EnableSF7;
         private System.Windows.Forms.Button DisableSF8;
         private System.Windows.Forms.Button EnableSF8;
+        private System.Windows.Forms.ToolStripMenuItem watchdogToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem watchdogEnabledToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem watchdogDisabledToolStripMenuItem;
     }
 }
 
diff --git a/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.cs b/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.cs
index 2a7315c1..0eba92ae 100644
--- a/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.cs
+++ b/KeppyDriverConfigurator/KeppyDriverConfigurator/KeppyDriverConfiguratorMain.cs
@@ -740,6 +740,23 @@ private void KeppyDriverConfiguratorMain_Load(object sender, EventArgs e)
                     hLSEnabledToolStripMenuItem.Enabled = true;
                     hLSDisabledToolStripMenuItem.Enabled = false;
                 }
+                if (Convert.ToInt32(Settings.GetValue("watchdog")) == 1)
+                {
+                    soundfontListChangeConfirmationDialogToolStripMenuItem.Enabled = true;
+                    volumeHotkeysToolStripMenuItem.Enabled = true;
+                    watchdogEnabledToolStripMenuItem.Checked = true;
+                    watchdogDisabledToolStripMenuItem.Checked = false;
+                    watchdogEnabledToolStripMenuItem.Enabled = false;
+                    watchdogDisabledToolStripMenuItem.Enabled = true;
+                }
+                else
+                {
+                    soundfontListChangeConfirmationDialogToolStripMenuItem.Enabled = false;
+                    watchdogEnabledToolStripMenuItem.Checked = false;
+                    watchdogDisabledToolStripMenuItem.Checked = true;
+                    watchdogEnabledToolStripMenuItem.Enabled = true;
+                    watchdogDisabledToolStripMenuItem.Enabled = false;
+                }
                 Frequency.Text = Settings.GetValue("frequency").ToString();
                 TracksLimit.Value = Convert.ToInt32(Settings.GetValue("tracks"));
 
@@ -1653,6 +1670,29 @@ private void hLSDisabledToolStripMenuItem_Click(object sender, EventArgs e)
             hLSDisabledToolStripMenuItem.Enabled = false;
         }
 
+
+        private void watchdogEnabledToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            RegistryKey Settings = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Keppy's Driver\\Watchdog", true);
+            Settings.SetValue("watchdog", "1", RegistryValueKind.DWord);
+            Settings.Close();
+            watchdogEnabledToolStripMenuItem.Checked = true;
+            watchdogDisabledToolStripMenuItem.Checked = false;
+            watchdogEnabledToolStripMenuItem.Enabled = false;
+            watchdogDisabledToolStripMenuItem.Enabled = true;
+        }
+
+        private void watchdogDisabledToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            RegistryKey Settings = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Keppy's Driver\\Watchdog", true);
+            Settings.SetValue("watchdog", "0", RegistryValueKind.DWord);
+            Settings.Close();
+            watchdogEnabledToolStripMenuItem.Checked = false;
+            watchdogDisabledToolStripMenuItem.Checked = true;
+            watchdogEnabledToolStripMenuItem.Enabled = true;
+            watchdogDisabledToolStripMenuItem.Enabled = false;
+        }
+
         private void exitToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Application.Exit();
diff --git a/KeppyDriverWatchdog/KeppyDriverWatchdog/KeppyDriverWatchdog.csproj b/KeppyDriverWatchdog/KeppyDriverWatchdog/KeppyDriverWatchdog.csproj
index e226a031..8d1461b1 100644
--- a/KeppyDriverWatchdog/KeppyDriverWatchdog/KeppyDriverWatchdog.csproj
+++ b/KeppyDriverWatchdog/KeppyDriverWatchdog/KeppyDriverWatchdog.csproj
@@ -32,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\watchdog.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -75,6 +78,9 @@
   <ItemGroup>
     <None Include="Resources\gear.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\watchdog.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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/KeppyDriverWatchdog/KeppyDriverWatchdog/Program.cs b/KeppyDriverWatchdog/KeppyDriverWatchdog/Program.cs
index 7dd4eb1f..12d95a21 100644
--- a/KeppyDriverWatchdog/KeppyDriverWatchdog/Program.cs
+++ b/KeppyDriverWatchdog/KeppyDriverWatchdog/Program.cs
@@ -4,32 +4,44 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Threading;
+using Microsoft.Win32;
 
 namespace KeppyDriverWatchdog
 {
     static class Program
     {
+        static RegistryKey Watchdog = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Keppy's Driver\\Watchdog", true);
+
         [STAThread]
         static void Main()
         {
-            bool ok;
-            Mutex m = new Mutex(true, "KeppyDriverWatchdog", out ok);
-            if (!ok)
+            if (Convert.ToInt32(Watchdog.GetValue("watchdog")) == 1)
             {
-                return;
-            }
-            NotifyIcon ni;
-            ni = new NotifyIcon();
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
+                bool ok;
+                Mutex m = new Mutex(true, "KeppyDriverWatchdog", out ok);
+                if (!ok)
+                {
+                    return;
+                }
+                NotifyIcon ni;
+                ni = new NotifyIcon();
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+
+                using (ProcessIcon pi = new ProcessIcon())
+                {
+                    pi.Display();
+                    Application.Run();
+                }
 
-            using (ProcessIcon pi = new ProcessIcon())
+                GC.KeepAlive(m);
+            }
+            else
             {
-                pi.Display();
-                Application.Run();
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Exit();
             }
-
-            GC.KeepAlive(m);
         }
     }
 }
diff --git a/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/AssemblyInfo.cs b/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/AssemblyInfo.cs
index a1577696..cfc3fde9 100644
--- a/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/AssemblyInfo.cs
+++ b/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@
 // Le informazioni generali relative a un assembly sono controllate dal seguente 
 // set di attributi. Per modificare le informazioni associate a un assembly
 // occorre quindi modificare i valori di questi attributi.
-[assembly: AssemblyTitle("KeppyDriverWatchdog")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("Keppy's Driver Watchdog")]
+[assembly: AssemblyDescription("Keppy's Driver New Configurator (C#)")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("KeppyDriverWatchdog")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCompany("Keppy Studios Ltd.")]
+[assembly: AssemblyProduct("Keppy's Driver")]
+[assembly: AssemblyCopyright("Copyright © Keppy Studios 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.Designer.cs b/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.Designer.cs
index 9ea851cb..117034f0 100644
--- a/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.Designer.cs
+++ b/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.Designer.cs
@@ -69,5 +69,15 @@ internal class Resources {
                 return ((System.Drawing.Icon)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona).
+        /// </summary>
+        internal static System.Drawing.Icon watchdog {
+            get {
+                object obj = ResourceManager.GetObject("watchdog", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }
diff --git a/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.resx b/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.resx
index e93961cb..33be62c0 100644
--- a/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.resx
+++ b/KeppyDriverWatchdog/KeppyDriverWatchdog/Properties/Resources.resx
@@ -121,4 +121,7 @@
   <data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="watchdog" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\watchdog.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/KeppyDriverWatchdog/KeppyDriverWatchdog/Resources/watchdog.ico b/KeppyDriverWatchdog/KeppyDriverWatchdog/Resources/watchdog.ico
new file mode 100644
index 00000000..3d2f5f6f
Binary files /dev/null and b/KeppyDriverWatchdog/KeppyDriverWatchdog/Resources/watchdog.ico differ
diff --git a/keppydrv.iss b/keppydrv.iss
index 822e6deb..25830f44 100644
--- a/keppydrv.iss
+++ b/keppydrv.iss
@@ -9,7 +9,7 @@ AppPublisherURL=http://keppystudios.com
 AppSupportPhone=+393511888475
 AppSupportURL=mailto:kaleidonkep99@outlook.com
 AppUpdatesURL=https://github.com/KaleidonKep99/Keppy-s-MIDI-Driver/releases
-AppVersion=3.3.1.6
+AppVersion=3.3.1.7
 ArchitecturesAllowed=x86 x64
 ArchitecturesInstallIn64BitMode=x64
 Compression=bzip
@@ -34,9 +34,9 @@ VersionInfoCompany=Keppy Studios
 VersionInfoCopyright=Copyright (c) 2011-2016 Brad Miller, Chris Moeller and Riccardo Loi. All rights reserved.
 VersionInfoDescription=User-mode MIDI driver for Windows XP SP3 (SP2 for x64) and newer
 VersionInfoProductName=Keppy's Driver
-VersionInfoProductTextVersion=3.3.1.6
+VersionInfoProductTextVersion=3.3.1.7
 VersionInfoTextVersion=User-mode MIDI driver for Windows XP SP3 (SP2 for x64) and newer
-VersionInfoVersion=3.3.1.6
+VersionInfoVersion=3.3.1.7
 UsePreviousSetupType=False
 FlatComponentsList=False
 AlwaysShowGroupOnReadyPage=True
@@ -130,6 +130,7 @@ Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; Valu
 Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "volume"; ValueData: "10000"; Flags: createvalueifdoesntexist uninsdeletekey
 Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "volumemon"; ValueData: "0"; Flags: createvalueifdoesntexist uninsdeletekey
 Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "volumehotkeys"; ValueData: "1"; Flags: createvalueifdoesntexist uninsdeletekey
+Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "watchdog"; ValueData: "1"; Flags: createvalueifdoesntexist uninsdeletekey
 Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "xaudiodisabled"; ValueData: "0"; Flags: createvalueifdoesntexist uninsdeletekey
 
 ;Channels volume
diff --git a/keppydrv/Resource.aps b/keppydrv/Resource.aps
index fda34751..2f0f73ac 100644
Binary files a/keppydrv/Resource.aps and b/keppydrv/Resource.aps differ
diff --git a/keppydrv/Resource.rc b/keppydrv/Resource.rc
index 3cca9cdf..4002494a 100644
Binary files a/keppydrv/Resource.rc and b/keppydrv/Resource.rc differ
diff --git a/midiicon.ico b/midiicon.ico
index 4d7debcf..80b28caa 100644
Binary files a/midiicon.ico and b/midiicon.ico differ