Upstream

Optimizer/Forms/MainForm.cs

@@ -246,10 +246,8 @@ namespace Optimizer
             leftTaskbarSw.ToggleClicked += new EventHandler(LeftTaskbarSw_Click);
             snapAssistSw.ToggleClicked += new EventHandler(SnapAssistSw_Click);
             widgetsSw.ToggleClicked += new EventHandler(WidgetsSw_Click);
-            smallerTaskbarSw.ToggleClicked += new EventHandler(SmallerTaskbarSw_Click);
             chatSw.ToggleClicked += new EventHandler(chatSw_Click);
             stickersSw.ToggleClicked += new EventHandler(StickersSw_ToggleClicked);
-            classicRibbonSw.ToggleClicked += new EventHandler(ClassicRibbonSw_Click);
             classicContextSw.ToggleClicked += new EventHandler(ClassicContextSw_Click);
             ffTelemetrySw.ToggleClicked += new EventHandler(FfTelemetrySw_ToggleClicked);
             chromeTelemetrySw.ToggleClicked += new EventHandler(ChromeTelemetrySw_ToggleClicked);
@@ -278,11 +276,11 @@ namespace Optimizer
         {
             if (winSearchSw.ToggleChecked)
             {
-                Optimize.DisableSearch();
+                OptimizeHelper.DisableSearch();
             }
             else
             {
-                Optimize.EnableSearch();
+                OptimizeHelper.EnableSearch();
             }
             Options.CurrentOptions.DisableSearch = winSearchSw.ToggleChecked;
         }
@@ -291,11 +289,11 @@ namespace Optimizer
         {
             if (vbsSw.ToggleChecked)
             {
-                Optimize.DisableVirtualizationBasedSecurity();
+                OptimizeHelper.DisableVirtualizationBasedSecurity();
             }
             else
             {
-                Optimize.EnableVirtualizationBasedSecurity();
+                OptimizeHelper.EnableVirtualizationBasedSecurity();
             }
             Options.CurrentOptions.DisableVBS = vbsSw.ToggleChecked;
             ShowRestartNeeded();
@@ -305,11 +303,11 @@ namespace Optimizer
         {
             if (nvidiaTelemetrySw.ToggleChecked)
             {
-                Optimize.DisableNvidiaTelemetry();
+                OptimizeHelper.DisableNvidiaTelemetry();
             }
             else
             {
-                Optimize.EnableNvidiaTelemetry();
+                OptimizeHelper.EnableNvidiaTelemetry();
             }
             Options.CurrentOptions.DisableNVIDIATelemetry = nvidiaTelemetrySw.ToggleChecked;
             ShowRestartNeeded();
@@ -319,11 +317,11 @@ namespace Optimizer
         {
             if (ntfsStampSw.ToggleChecked)
             {
-                Optimize.DisableNTFSTimeStamp();
+                OptimizeHelper.DisableNTFSTimeStamp();
             }
             else
             {
-                Optimize.EnableNTFSTimeStamp();
+                OptimizeHelper.EnableNTFSTimeStamp();
             }
             Options.CurrentOptions.DisableNTFSTimeStamp = ntfsStampSw.ToggleChecked;
             ShowRestartNeeded();
@@ -333,11 +331,11 @@ namespace Optimizer
         {
             if (smb2Sw.ToggleChecked)
             {
-                Optimize.DisableSMB("2");
+                OptimizeHelper.DisableSMB("2");
             }
             else
             {
-                Optimize.EnableSMB("2");
+                OptimizeHelper.EnableSMB("2");
             }
             Options.CurrentOptions.DisableSMB2 = smb2Sw.ToggleChecked;
             ShowRestartNeeded();
@@ -347,11 +345,11 @@ namespace Optimizer
         {
             if (smb1Sw.ToggleChecked)
             {
-                Optimize.DisableSMB("1");
+                OptimizeHelper.DisableSMB("1");
             }
             else
             {
-                Optimize.EnableSMB("1");
+                OptimizeHelper.EnableSMB("1");
             }
             Options.CurrentOptions.DisableSMB1 = smb1Sw.ToggleChecked;
             ShowRestartNeeded();
@@ -375,11 +373,11 @@ namespace Optimizer
         {
             if (stickersSw.ToggleChecked)
             {
-                Optimize.DisableStickers();
+                OptimizeHelper.DisableStickers();
             }
             else
             {
-                Optimize.EnableStickers();
+                OptimizeHelper.EnableStickers();
             }
             Options.CurrentOptions.DisableStickers = stickersSw.ToggleChecked;
         }
@@ -388,11 +386,11 @@ namespace Optimizer
         {
             if (tpmSw.ToggleChecked)
             {
-                Optimize.DisableTPMCheck();
+                OptimizeHelper.DisableTPMCheck();
             }
             else
             {
-                Optimize.EnableTPMCheck();
+                OptimizeHelper.EnableTPMCheck();
             }
             Options.CurrentOptions.DisableTPMCheck = tpmSw.ToggleChecked;
         }
@@ -401,11 +399,11 @@ namespace Optimizer
         {
             if (compactModeSw.ToggleChecked)
             {
-                Optimize.EnableFilesCompactMode();
+                OptimizeHelper.EnableFilesCompactMode();
             }
             else
             {
-                Optimize.DisableFilesCompactMode();
+                OptimizeHelper.DisableFilesCompactMode();
             }
             Options.CurrentOptions.CompactMode = compactModeSw.ToggleChecked;
             ShowRestartNeeded();
@@ -415,11 +413,11 @@ namespace Optimizer
         {
             if (gameModeSw.ToggleChecked)
             {
-                Optimize.EnableGamingMode();
+                OptimizeHelper.EnableGamingMode();
             }
             else
             {
-                Optimize.DisableGamingMode();
+                OptimizeHelper.DisableGamingMode();
             }
             Options.CurrentOptions.EnableGamingMode = gameModeSw.ToggleChecked;
             ShowRestartNeeded();
@@ -429,11 +427,11 @@ namespace Optimizer
         {
             if (vsSw.ToggleChecked)
             {
-                Optimize.DisableVisualStudioTelemetry();
+                OptimizeHelper.DisableVisualStudioTelemetry();
             }
             else
             {
-                Optimize.EnableVisualStudioTelemetry();
+                OptimizeHelper.EnableVisualStudioTelemetry();
             }
             Options.CurrentOptions.DisableVisualStudioTelemetry = vsSw.ToggleChecked;
         }
@@ -442,11 +440,11 @@ namespace Optimizer
         {
             if (chromeTelemetrySw.ToggleChecked)
             {
-                Optimize.DisableChromeTelemetry();
+                OptimizeHelper.DisableChromeTelemetry();
             }
             else
             {
-                Optimize.EnableChromeTelemetry();
+                OptimizeHelper.EnableChromeTelemetry();
             }
             Options.CurrentOptions.DisableChromeTelemetry = chromeTelemetrySw.ToggleChecked;
         }
@@ -455,11 +453,11 @@ namespace Optimizer
         {
             if (ffTelemetrySw.ToggleChecked)
             {
-                Optimize.DisableFirefoxTelemetry();
+                OptimizeHelper.DisableFirefoxTelemetry();
             }
             else
             {
-                Optimize.EnableFirefoxTelemetry();
+                OptimizeHelper.EnableFirefoxTelemetry();
             }
             Options.CurrentOptions.DisableFirefoxTemeletry = ffTelemetrySw.ToggleChecked;
         }
@@ -468,65 +466,38 @@ namespace Optimizer
         {
             if (classicContextSw.ToggleChecked)
             {
-                Optimize.DisableShowMoreOptions();
+                OptimizeHelper.DisableShowMoreOptions();
             }
             else
             {
-                Optimize.EnableShowMoreOptions();
+                OptimizeHelper.EnableShowMoreOptions();
             }
             Options.CurrentOptions.ClassicMenu = classicContextSw.ToggleChecked;
             ShowRestartNeeded();
         }
 
-        private void ClassicRibbonSw_Click(object sender, EventArgs e)
-        {
-            if (classicRibbonSw.ToggleChecked)
-            {
-                Optimize.EnableFileExplorerClassicRibbon();
-            }
-            else
-            {
-                Optimize.DisableFileExplorerClassicRibbon();
-            }
-            Options.CurrentOptions.ClassicRibbon = classicContextSw.ToggleChecked;
-            ShowRestartNeeded();
-        }
-
         private void chatSw_Click(object sender, EventArgs e)
         {
             if (chatSw.ToggleChecked)
             {
-                Optimize.DisableChat();
+                OptimizeHelper.DisableChat();
             }
             else
             {
-                Optimize.EnableChat();
+                OptimizeHelper.EnableChat();
             }
             Options.CurrentOptions.DisableChat = chatSw.ToggleChecked;
         }
 
-        private void SmallerTaskbarSw_Click(object sender, EventArgs e)
-        {
-            if (smallerTaskbarSw.ToggleChecked)
-            {
-                Optimize.SmallerTaskbar();
-            }
-            else
-            {
-                Optimize.DefaultTaskbarSize();
-            }
-            Options.CurrentOptions.TaskbarSmaller = smallerTaskbarSw.ToggleChecked;
-        }
-
         private void WidgetsSw_Click(object sender, EventArgs e)
         {
             if (widgetsSw.ToggleChecked)
             {
-                Optimize.DisableWidgets();
+                OptimizeHelper.DisableWidgets();
             }
             else
             {
-                Optimize.EnableWidgets();
+                OptimizeHelper.EnableWidgets();
             }
             Options.CurrentOptions.DisableWidgets = widgetsSw.ToggleChecked;
         }
@@ -535,11 +506,11 @@ namespace Optimizer
         {
             if (snapAssistSw.ToggleChecked)
             {
-                Optimize.DisableSnapAssist();
+                OptimizeHelper.DisableSnapAssist();
             }
             else
             {
-                Optimize.EnableSnapAssist();
+                OptimizeHelper.EnableSnapAssist();
             }
             Options.CurrentOptions.DisableSnapAssist = snapAssistSw.ToggleChecked;
             ShowRestartNeeded();
@@ -549,11 +520,11 @@ namespace Optimizer
         {
             if (leftTaskbarSw.ToggleChecked)
             {
-                Optimize.AlignTaskbarToLeft();
+                OptimizeHelper.AlignTaskbarToLeft();
             }
             else
             {
-                Optimize.AlignTaskbarToCenter();
+                OptimizeHelper.AlignTaskbarToCenter();
             }
             Options.CurrentOptions.TaskbarToLeft = leftTaskbarSw.ToggleChecked;
         }
@@ -602,8 +573,6 @@ namespace Optimizer
             widgetsSw.Label.Tag = Options.TranslationList["widgetsTip"].ToString();
             chatSw.Label.Tag = Options.TranslationList["chatTip"].ToString();
             stickersSw.Label.Tag = Options.TranslationList["stickersTip"].ToString();
-            smallerTaskbarSw.Label.Tag = Options.TranslationList["smallerTaskbarTip"].ToString();
-            classicRibbonSw.Label.Tag = Options.TranslationList["classicRibbonTip"].ToString();
             classicContextSw.Label.Tag = Options.TranslationList["classicContextTip"].ToString();
             picUpdate.Tag = Options.TranslationList["linkUpdate"].ToString() + "!";
             picLab.Tag = Options.TranslationList["lblLab"].ToString();
@@ -626,11 +595,11 @@ namespace Optimizer
         {
             if (castSw.ToggleChecked)
             {
-                Optimize.RemoveCastToDevice();
+                OptimizeHelper.RemoveCastToDevice();
             }
             else
             {
-                Optimize.AddCastToDevice();
+                OptimizeHelper.AddCastToDevice();
             }
             Options.CurrentOptions.RemoveCastToDevice = castSw.ToggleChecked;
         }
@@ -639,11 +608,11 @@ namespace Optimizer
         {
             if (longPathsSw.ToggleChecked)
             {
-                Optimize.EnableLongPaths();
+                OptimizeHelper.EnableLongPaths();
             }
             else
             {
-                Optimize.DisableLongPaths();
+                OptimizeHelper.DisableLongPaths();
             }
             Options.CurrentOptions.EnableLongPaths = longPathsSw.ToggleChecked;
         }
@@ -652,11 +621,11 @@ namespace Optimizer
         {
             if (stickySw.ToggleChecked)
             {
-                Optimize.DisableStickyKeys();
+                OptimizeHelper.DisableStickyKeys();
             }
             else
             {
-                Optimize.EnableStickyKeys();
+                OptimizeHelper.EnableStickyKeys();
             }
             Options.CurrentOptions.DisableStickyKeys = stickySw.ToggleChecked;
         }
@@ -665,11 +634,11 @@ namespace Optimizer
         {
             if (ccSw.ToggleChecked)
             {
-                Optimize.DisableCloudClipboard();
+                OptimizeHelper.DisableCloudClipboard();
             }
             else
             {
-                Optimize.EnableCloudClipboard();
+                OptimizeHelper.EnableCloudClipboard();
             }
             Options.CurrentOptions.DisableCloudClipboard = ccSw.ToggleChecked;
         }
@@ -678,11 +647,11 @@ namespace Optimizer
         {
             if (smartScreenSw.ToggleChecked)
             {
-                Optimize.DisableSmartScreen();
+                OptimizeHelper.DisableSmartScreen();
             }
             else
             {
-                Optimize.EnableSmartScreen();
+                OptimizeHelper.EnableSmartScreen();
             }
             Options.CurrentOptions.DisableSmartScreen = smartScreenSw.ToggleChecked;
         }
@@ -691,11 +660,11 @@ namespace Optimizer
         {
             if (storeUpdatesSw.ToggleChecked)
             {
-                Optimize.DisableStoreUpdates();
+                OptimizeHelper.DisableStoreUpdates();
             }
             else
             {
-                Optimize.EnableStoreUpdates();
+                OptimizeHelper.EnableStoreUpdates();
             }
             Options.CurrentOptions.DisableStoreUpdates = storeUpdatesSw.ToggleChecked;
         }
@@ -704,11 +673,11 @@ namespace Optimizer
         {
             if (insiderSw.ToggleChecked)
             {
-                Optimize.DisableInsiderService();
+                OptimizeHelper.DisableInsiderService();
             }
             else
             {
-                Optimize.EnableInsiderService();
+                OptimizeHelper.EnableInsiderService();
             }
             Options.CurrentOptions.DisableInsiderService = insiderSw.ToggleChecked;
         }
@@ -717,11 +686,11 @@ namespace Optimizer
         {
             if (faxSw.ToggleChecked)
             {
-                Optimize.DisableFaxService();
+                OptimizeHelper.DisableFaxService();
             }
             else
             {
-                Optimize.EnableFaxService();
+                OptimizeHelper.EnableFaxService();
             }
             Options.CurrentOptions.DisableFaxService = faxSw.ToggleChecked;
         }
@@ -959,6 +928,16 @@ namespace Optimizer
                 launcherMenu.Items.RemoveByKey("trayPinger");
             }
 
+            // ADVANCED
+            if (Program.UNSAFE_MODE)
+            {
+                // load config
+            }
+            else
+            {
+                tabCollection.TabPages.Remove(advancedTab);
+            }
+
             Program._MainForm = this;
 
             if (string.IsNullOrEmpty(Options.CurrentOptions.AppsFolder))
@@ -2195,8 +2174,6 @@ namespace Optimizer
             widgetsSw.ToggleChecked = Options.CurrentOptions.DisableWidgets;
             chatSw.ToggleChecked = Options.CurrentOptions.DisableChat;
             stickersSw.ToggleChecked = Options.CurrentOptions.DisableStickers;
-            smallerTaskbarSw.ToggleChecked = Options.CurrentOptions.TaskbarSmaller;
-            classicRibbonSw.ToggleChecked = Options.CurrentOptions.ClassicRibbon;
             classicContextSw.ToggleChecked = Options.CurrentOptions.ClassicMenu;
             tpmSw.ToggleChecked = Options.CurrentOptions.DisableTPMCheck;
             compactModeSw.ToggleChecked = Options.CurrentOptions.CompactMode;
@@ -3041,11 +3018,11 @@ namespace Optimizer
         {
             if (performanceSw.ToggleChecked)
             {
-                Optimize.EnablePerformanceTweaks();
+                OptimizeHelper.EnablePerformanceTweaks();
             }
             else
             {
-                Optimize.DisablePerformanceTweaks();
+                OptimizeHelper.DisablePerformanceTweaks();
             }
             Options.CurrentOptions.EnablePerformanceTweaks = performanceSw.ToggleChecked;
             ShowRestartNeeded();
@@ -3055,11 +3032,11 @@ namespace Optimizer
         {
             if (networkSw.ToggleChecked)
             {
-                Optimize.DisableNetworkThrottling();
+                OptimizeHelper.DisableNetworkThrottling();
             }
             else
             {
-                Optimize.EnableNetworkThrottling();
+                OptimizeHelper.EnableNetworkThrottling();
             }
             Options.CurrentOptions.DisableNetworkThrottling = networkSw.ToggleChecked;
         }
@@ -3068,11 +3045,11 @@ namespace Optimizer
         {
             if (defenderSw.ToggleChecked)
             {
-                Optimize.DisableDefender();
+                OptimizeHelper.DisableDefender();
             }
             else
             {
-                Optimize.EnableDefender();
+                OptimizeHelper.EnableDefender();
             }
             Options.CurrentOptions.DisableWindowsDefender = defenderSw.ToggleChecked;
         }
@@ -3089,13 +3066,13 @@ namespace Optimizer
                 }
 
                 _skipSystemRestore = false;
-                Optimize.DisableSystemRestore();
+                OptimizeHelper.DisableSystemRestore();
             }
             else
             {
                 if (_skipSystemRestore) return;
 
-                Optimize.EnableSystemRestore();
+                OptimizeHelper.EnableSystemRestore();
             }
             if (!_skipSystemRestore) Options.CurrentOptions.DisableSystemRestore = systemRestoreSw.ToggleChecked;
         }
@@ -3104,11 +3081,11 @@ namespace Optimizer
         {
             if (printSw.ToggleChecked)
             {
-                Optimize.DisablePrintService();
+                OptimizeHelper.DisablePrintService();
             }
             else
             {
-                Optimize.EnablePrintService();
+                OptimizeHelper.EnablePrintService();
             }
             Options.CurrentOptions.DisablePrintService = printSw.ToggleChecked;
         }
@@ -3117,11 +3094,11 @@ namespace Optimizer
         {
             if (mediaSharingSw.ToggleChecked)
             {
-                Optimize.DisableMediaPlayerSharing();
+                OptimizeHelper.DisableMediaPlayerSharing();
             }
             else
             {
-                Optimize.EnableMediaPlayerSharing();
+                OptimizeHelper.EnableMediaPlayerSharing();
             }
             Options.CurrentOptions.DisableMediaPlayerSharing = mediaSharingSw.ToggleChecked;
         }
@@ -3130,11 +3107,11 @@ namespace Optimizer
         {
             if (reportingSw.ToggleChecked)
             {
-                Optimize.DisableErrorReporting();
+                OptimizeHelper.DisableErrorReporting();
             }
             else
             {
-                Optimize.EnableErrorReporting();
+                OptimizeHelper.EnableErrorReporting();
             }
             Options.CurrentOptions.DisableErrorReporting = reportingSw.ToggleChecked;
         }
@@ -3143,11 +3120,11 @@ namespace Optimizer
         {
             if (homegroupSw.ToggleChecked)
             {
-                Optimize.DisableHomeGroup();
+                OptimizeHelper.DisableHomeGroup();
             }
             else
             {
-                Optimize.EnableHomeGroup();
+                OptimizeHelper.EnableHomeGroup();
             }
             Options.CurrentOptions.DisableHomeGroup = homegroupSw.ToggleChecked;
         }
@@ -3156,11 +3133,11 @@ namespace Optimizer
         {
             if (superfetchSw.ToggleChecked)
             {
-                Optimize.DisableSuperfetch();
+                OptimizeHelper.DisableSuperfetch();
             }
             else
             {
-                Optimize.EnableSuperfetch();
+                OptimizeHelper.EnableSuperfetch();
             }
             Options.CurrentOptions.DisableSuperfetch = superfetchSw.ToggleChecked;
         }
@@ -3169,11 +3146,11 @@ namespace Optimizer
         {
             if (telemetryTasksSw.ToggleChecked)
             {
-                Optimize.DisableTelemetryTasks();
+                OptimizeHelper.DisableTelemetryTasks();
             }
             else
             {
-                Optimize.EnableTelemetryTasks();
+                OptimizeHelper.EnableTelemetryTasks();
             }
             Options.CurrentOptions.DisableTelemetryTasks = telemetryTasksSw.ToggleChecked;
         }
@@ -3182,11 +3159,11 @@ namespace Optimizer
         {
             if (officeTelemetrySw.ToggleChecked)
             {
-                Optimize.DisableOffice2016Telemetry();
+                OptimizeHelper.DisableOffice2016Telemetry();
             }
             else
             {
-                Optimize.EnableOffice2016Telemetry();
+                OptimizeHelper.EnableOffice2016Telemetry();
             }
             Options.CurrentOptions.DisableOffice2016Telemetry = officeTelemetrySw.ToggleChecked;
         }
@@ -3195,11 +3172,11 @@ namespace Optimizer
         {
             if (oldMixerSw.ToggleChecked)
             {
-                Optimize.EnableLegacyVolumeSlider();
+                OptimizeHelper.EnableLegacyVolumeSlider();
             }
             else
             {
-                Optimize.DisableLegacyVolumeSlider();
+                OptimizeHelper.DisableLegacyVolumeSlider();
             }
             Options.CurrentOptions.EnableLegacyVolumeSlider = oldMixerSw.ToggleChecked;
         }
@@ -3208,11 +3185,11 @@ namespace Optimizer
         {
             if (oldExplorerSw.ToggleChecked)
             {
-                Optimize.DisableQuickAccessHistory();
+                OptimizeHelper.DisableQuickAccessHistory();
             }
             else
             {
-                Optimize.EnableQuickAccessHistory();
+                OptimizeHelper.EnableQuickAccessHistory();
             }
             Options.CurrentOptions.DisableQuickAccessHistory = oldExplorerSw.ToggleChecked;
             ShowRestartNeeded();
@@ -3222,11 +3199,11 @@ namespace Optimizer
         {
             if (adsSw.ToggleChecked)
             {
-                Optimize.DisableStartMenuAds();
+                OptimizeHelper.DisableStartMenuAds();
             }
             else
             {
-                Optimize.EnableStartMenuAds();
+                OptimizeHelper.EnableStartMenuAds();
             }
             Options.CurrentOptions.DisableStartMenuAds = adsSw.ToggleChecked;
         }
@@ -3244,14 +3221,14 @@ namespace Optimizer
 
                 _skipOneDrive = false;
 
-                Task t = new Task(() => Optimize.UninstallOneDrive());
+                Task t = new Task(() => OptimizeHelper.UninstallOneDrive());
                 t.Start();
             }
             else
             {
                 if (_skipOneDrive) return;
 
-                Task t = new Task(() => Optimize.InstallOneDrive());
+                Task t = new Task(() => OptimizeHelper.InstallOneDrive());
                 t.Start();
             }
 
@@ -3262,11 +3239,11 @@ namespace Optimizer
         {
             if (peopleSw.ToggleChecked)
             {
-                Optimize.DisableMyPeople();
+                OptimizeHelper.DisableMyPeople();
             }
             else
             {
-                Optimize.EnableMyPeople();
+                OptimizeHelper.EnableMyPeople();
             }
             Options.CurrentOptions.DisableMyPeople = peopleSw.ToggleChecked;
         }
@@ -3275,11 +3252,11 @@ namespace Optimizer
         {
             if (autoUpdatesSw.ToggleChecked)
             {
-                Optimize.DisableAutomaticUpdates();
+                OptimizeHelper.DisableAutomaticUpdates();
             }
             else
             {
-                Optimize.EnableAutomaticUpdates();
+                OptimizeHelper.EnableAutomaticUpdates();
             }
             Options.CurrentOptions.DisableAutomaticUpdates = autoUpdatesSw.ToggleChecked;
         }
@@ -3288,11 +3265,11 @@ namespace Optimizer
         {
             if (driversSw.ToggleChecked)
             {
-                Optimize.ExcludeDrivers();
+                OptimizeHelper.ExcludeDrivers();
             }
             else
             {
-                Optimize.IncludeDrivers();
+                OptimizeHelper.IncludeDrivers();
             }
             Options.CurrentOptions.ExcludeDrivers = driversSw.ToggleChecked;
         }
@@ -3301,11 +3278,11 @@ namespace Optimizer
         {
             if (telemetryServicesSw.ToggleChecked)
             {
-                Optimize.DisableTelemetryServices();
+                OptimizeHelper.DisableTelemetryServices();
             }
             else
             {
-                Optimize.EnableTelemetryServices();
+                OptimizeHelper.EnableTelemetryServices();
             }
             Options.CurrentOptions.DisableTelemetryServices = telemetryServicesSw.ToggleChecked;
             ShowRestartNeeded();
@@ -3315,12 +3292,12 @@ namespace Optimizer
         {
             if (privacySw.ToggleChecked)
             {
-                Task t = new Task(() => Optimize.EnhancePrivacy());
+                Task t = new Task(() => OptimizeHelper.EnhancePrivacy());
                 t.Start();
             }
             else
             {
-                Task t = new Task(() => Optimize.CompromisePrivacy());
+                Task t = new Task(() => OptimizeHelper.CompromisePrivacy());
                 t.Start();
             }
             Options.CurrentOptions.DisablePrivacyOptions = privacySw.ToggleChecked;
@@ -3331,11 +3308,11 @@ namespace Optimizer
         {
             if (cortanaSw.ToggleChecked)
             {
-                Optimize.DisableCortana();
+                OptimizeHelper.DisableCortana();
             }
             else
             {
-                Optimize.EnableCortana();
+                OptimizeHelper.EnableCortana();
             }
             Options.CurrentOptions.DisableCortana = cortanaSw.ToggleChecked;
         }
@@ -3344,11 +3321,11 @@ namespace Optimizer
         {
             if (sensorSw.ToggleChecked)
             {
-                Optimize.DisableSensorServices();
+                OptimizeHelper.DisableSensorServices();
             }
             else
             {
-                Optimize.EnableSensorServices();
+                OptimizeHelper.EnableSensorServices();
             }
             Options.CurrentOptions.DisableSensorServices = sensorSw.ToggleChecked;
             ShowRestartNeeded();
@@ -3358,11 +3335,11 @@ namespace Optimizer
         {
             if (inkSw.ToggleChecked)
             {
-                Optimize.DisableWindowsInk();
+                OptimizeHelper.DisableWindowsInk();
             }
             else
             {
-                Optimize.EnableWindowsInk();
+                OptimizeHelper.EnableWindowsInk();
             }
             Options.CurrentOptions.DisableWindowsInk = inkSw.ToggleChecked;
         }
@@ -3371,11 +3348,11 @@ namespace Optimizer
         {
             if (spellSw.ToggleChecked)
             {
-                Optimize.DisableSpellingAndTypingFeatures();
+                OptimizeHelper.DisableSpellingAndTypingFeatures();
             }
             else
             {
-                Optimize.EnableSpellingAndTypingFeatures();
+                OptimizeHelper.EnableSpellingAndTypingFeatures();
             }
             Options.CurrentOptions.DisableSpellingTyping = spellSw.ToggleChecked;
         }
@@ -3384,11 +3361,11 @@ namespace Optimizer
         {
             if (xboxSw.ToggleChecked)
             {
-                Optimize.DisableXboxLive();
+                OptimizeHelper.DisableXboxLive();
             }
             else
             {
-                Optimize.EnableXboxLive();
+                OptimizeHelper.EnableXboxLive();
             }
             Options.CurrentOptions.DisableXboxLive = xboxSw.ToggleChecked;
             ShowRestartNeeded();
@@ -3398,11 +3375,11 @@ namespace Optimizer
         {
             if (gameBarSw.ToggleChecked)
             {
-                Optimize.DisableGameBar();
+                OptimizeHelper.DisableGameBar();
             }
             else
             {
-                Optimize.EnableGameBar();
+                OptimizeHelper.EnableGameBar();
             }
             Options.CurrentOptions.DisableGameBar = gameBarSw.ToggleChecked;
             ShowRestartNeeded();
@@ -3412,11 +3389,11 @@ namespace Optimizer
         {
             if (disableOneDriveSw.ToggleChecked)
             {
-                Optimize.DisableOneDrive();
+                OptimizeHelper.DisableOneDrive();
             }
             else
             {
-                Optimize.EnableOneDrive();
+                OptimizeHelper.EnableOneDrive();
             }
             Options.CurrentOptions.DisableOneDrive = disableOneDriveSw.ToggleChecked;
         }
@@ -3425,11 +3402,11 @@ namespace Optimizer
         {
             if (compatSw.ToggleChecked)
             {
-                Optimize.DisableCompatibilityAssistant();
+                OptimizeHelper.DisableCompatibilityAssistant();
             }
             else
             {
-                Optimize.EnableCompatibilityAssistant();
+                OptimizeHelper.EnableCompatibilityAssistant();
             }
             Options.CurrentOptions.DisableCompatibilityAssistant = compatSw.ToggleChecked;
         }

Optimizer/Forms/MainForm.resx

@@ -722,7 +722,7 @@ any application only by typing your desired keyword.</value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC0
-        GgAAAk1TRnQBSQFMAgEBCQEAAbgBDQG4AQ0BIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        GgAAAk1TRnQBSQFMAgEBCQEAAdABDQHQAQ0BIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABYAMAAQEBAAEgBgABwP8A/wD/AP8A/wD/AP8A/wAeAANHAYB0//8AiQADRwGAdP//AIkAAyoBQANH
         AYADRwGAA0cBgANHAYADRwGAA0cBgANHAYADRwGAA0cBgANHAYADRwGAA0cBgANHAYADRwGAA0cBgANH
         AYADRwGAA0cBgANHAYADRwGAA0cBgANHAYADRwGAA0cBgANHAYADRwGAA0cBgANHAYADRwGA/wD/AP8A
@@ -870,7 +870,7 @@ any application only by typing your desired keyword.</value>
     <value>1097, 12</value>
   </metadata>
   <metadata name="launcherMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>160, 46</value>
+    <value>56, 65</value>
   </metadata>
   <data name="trayStartup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1615,7 +1615,7 @@ any application only by typing your desired keyword.</value>
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>94</value>
+    <value>90</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Optimizer/Optimize.cs → Optimizer/OptimizeHelper.cs

@@ -1,11 +1,12 @@
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
+using System.Drawing;
 using System.IO;
 
 namespace Optimizer
 {
-    public static class Optimize
+    public static class OptimizeHelper
     {
         readonly static string DiagnosisAutoLoggerFolder = Path.Combine(CleanHelper.ProgramData, @"Microsoft\Diagnosis\ETLLogs\AutoLogger");
 
@@ -1629,15 +1630,16 @@ namespace Optimizer
             Registry.SetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarMn", "1", RegistryValueKind.DWord);
         }
 
-        internal static void SmallerTaskbar()
-        {
-            Registry.SetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarSi", "0", RegistryValueKind.DWord);
-        }
+        // DEPRECATED
+        //internal static void SmallerTaskbar()
+        //{
+        //    Registry.SetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarSi", "0", RegistryValueKind.DWord);
+        //}
 
-        internal static void DefaultTaskbarSize()
-        {
-            Registry.SetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarSi", "1", RegistryValueKind.DWord);
-        }
+        //internal static void DefaultTaskbarSize()
+        //{
+        //    Registry.SetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarSi", "1", RegistryValueKind.DWord);
+        //}
 
         internal static void DisableShowMoreOptions()
         {
@@ -1670,16 +1672,17 @@ namespace Optimizer
             Registry.LocalMachine.OpenSubKey(@"SYSTEM\Setup\LabConfig", true).DeleteValue("BypassCPUCheck", false);
         }
 
-        internal static void EnableFileExplorerClassicRibbon()
-        {
-            Registry.SetValue(@"HKEY_CURRENT_USER\Software\Classes\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}\InprocServer32", "", "");
-        }
+        // DEPRECATED
+        //internal static void EnableFileExplorerClassicRibbon()
+        //{
+        //    Registry.SetValue(@"HKEY_CURRENT_USER\Software\Classes\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}\InprocServer32", "", "");
+        //}
 
-        internal static void DisableFileExplorerClassicRibbon()
-        {
-            Registry.CurrentUser.DeleteSubKeyTree(@"Software\Classes\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}", false);
-            Utilities.TryDeleteRegistryValue(true, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages", "UndockingDisable");
-        }
+        //internal static void DisableFileExplorerClassicRibbon()
+        //{
+        //    Registry.CurrentUser.DeleteSubKeyTree(@"Software\Classes\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}", false);
+        //    Utilities.TryDeleteRegistryValue(true, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages", "UndockingDisable");
+        //}
 
         internal static void EnableFilesCompactMode()
         {
@@ -1701,6 +1704,31 @@ namespace Optimizer
             Registry.SetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PolicyManager\current\device\Stickers", "EnableStickers", 1, RegistryValueKind.DWord);
         }
 
+        /* Microsoft Edge-related tweaks */
+        internal static void DisableEdgeDiscoverBar()
+        {
+            Registry.SetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft", "HubsSidebarEnabled", 0, RegistryValueKind.DWord);
+            Registry.SetValue(@"HKEY_CURRENT_USER\SOFTWARE\Policies\Microsoft", "HubsSidebarEnabled", 0, RegistryValueKind.DWord);
+        }
+
+        internal static void EnableEdgeDiscoverBar()
+        {
+            Utilities.TryDeleteRegistryValue(true, @"SOFTWARE\Policies\Microsoft", "HubsSidebarEnabled");
+            Utilities.TryDeleteRegistryValue(false, @"SOFTWARE\Policies\Microsoft", "HubsSidebarEnabled");
+        }
+
+        internal static void DisableEdgeTelemetry()
+        {
+
+        }
+
+        internal static void EnableEdgeTelemetry()
+        {
+
+        }
+
+        /* Apps-specific tweaks */
+
         // VISUAL STUDIO TELEMETRY
         internal static void DisableVisualStudioTelemetry()
         {
@@ -1709,7 +1737,7 @@ namespace Optimizer
             Registry.SetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\VisualStudio\Feedback", "DisableEmailInput", 1);
             Registry.SetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\VisualStudio\Feedback", "DisableScreenshotCapture", 1);
             Registry.SetValue(@"HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\VisualStudio\SQM", "OptIn", 0);
-
+            
             if (Environment.Is64BitOperatingSystem)
             {
                 Registry.SetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VSCommon\14.0\SQM", "OptIn", 0);

Optimizer/Optimizer.csproj

@@ -202,7 +202,7 @@
     </Compile>
     <Compile Include="NetworkAdapter.cs" />
     <Compile Include="NetworkMonitor.cs" />
-    <Compile Include="Optimize.cs" />
+    <Compile Include="OptimizeHelper.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="PingerHelper.cs" />
     <Compile Include="Program.cs" />

Optimizer/Options.cs

@@ -50,6 +50,10 @@ namespace Optimizer
         public bool DisableChromeTelemetry { get; set; }
         public bool DisableNVIDIATelemetry { get; set; }
 
+        // edge
+        public bool DisableEdgeDiscoverBar { get; set; }
+        public bool DisableEdgeTelemetry { get; set; }
+
         // windows 8
         public bool DisableOneDrive { get; set; }
 
@@ -80,8 +84,6 @@ namespace Optimizer
         public bool DisableSnapAssist { get; set; }
         public bool DisableWidgets { get; set; }
         public bool DisableChat { get; set; }
-        public bool TaskbarSmaller { get; set; }
-        public bool ClassicRibbon { get; set; }
         public bool ClassicMenu { get; set; }
         public bool DisableTPMCheck { get; set; }
         public bool CompactMode { get; set; }
@@ -267,14 +269,15 @@ namespace Optimizer
                     CurrentOptions.DisableChromeTelemetry = false;
                     CurrentOptions.DisableNVIDIATelemetry = false;
 
+                    CurrentOptions.DisableEdgeDiscoverBar = false;
+                    CurrentOptions.DisableEdgeTelemetry = false;
+
                     CurrentOptions.DisableOneDrive = false;
 
                     CurrentOptions.TaskbarToLeft = false;
                     CurrentOptions.DisableSnapAssist = false;
                     CurrentOptions.DisableWidgets = false;
                     CurrentOptions.DisableChat = false;
-                    CurrentOptions.TaskbarSmaller = false;
-                    CurrentOptions.ClassicRibbon = false;
                     CurrentOptions.ClassicMenu = false;
                     CurrentOptions.DisableTPMCheck = false;
                     CurrentOptions.CompactMode = false;

Optimizer/Program.cs

@@ -13,8 +13,8 @@ namespace Optimizer
         /* VERSION PROPERTIES */
         /* DO NOT LEAVE THEM EMPTY */
 
-        internal readonly static float Major = 14;
-        internal readonly static float Minor = 9;
+        internal readonly static float Major = 15;
+        internal readonly static float Minor = 0;
 
         internal readonly static bool EXPERIMENTAL_BUILD = false;
         internal static int DPI_PREFERENCE;
@@ -388,7 +388,7 @@ namespace Optimizer
             LoadSettings();
             StartSplashForm();
 
-            _MainForm = new MainForm(_SplashForm, codes[0], codes[1], codes[2], codes[3], codes[4], codes[5], codes[6], codes[7]);
+            _MainForm = new MainForm(_SplashForm, codes[0], codes[3], codes[2], codes[1], codes[4], codes[5], codes[6], codes[7]);
             _MainForm.Load += MainForm_Load;
             Application.Run(_MainForm);
         }

Optimizer/Resources/i18n/EN.json

@@ -42,6 +42,7 @@
 	"cleanerTab": "Cleaner",
 	"pingerTab": "Pinger",
 	"registryFixerTab": "Registry",
+	"advancedTab": "Advanced",
 	"integratorTab": "Integrator",
 	"CleanPreviewForm": "Clean Preview",
 	"optionsTab": "Options",
@@ -289,6 +290,7 @@
 	"trayHosts": "HOSTS Editor",
 	"trayAD": "Apps Downloader",
 	"trayOptions": "Options",
+	"trayAdvanced": "Advanced",
 	"trayRegistry": "Registry Repair",
 	"trayRestartExplorer": "Restart Explorer",
 	"trayExit": "Exit",

Optimizer/SilentConfig.cs

@@ -61,8 +61,6 @@ namespace Optimizer
         public bool? DisableSnapAssist { get; set; }
         public bool? DisableWidgets { get; set; }
         public bool? DisableChat { get; set; }
-        public bool? TaskbarSmaller { get; set; }
-        public bool? ClassicRibbon { get; set; }
         public bool? ClassicMenu { get; set; }
         public bool? DisableTPMCheck { get; set; }
         public bool? CompactMode { get; set; }

Optimizer/SilentOps.cs

@@ -30,11 +30,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.EnablePerformanceTweaks.Value)
                 {
-                    Optimize.EnablePerformanceTweaks();
+                    OptimizeHelper.EnablePerformanceTweaks();
                 }
                 else
                 {
-                    Optimize.DisablePerformanceTweaks();
+                    OptimizeHelper.DisablePerformanceTweaks();
                 }
             }
 
@@ -42,11 +42,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableNetworkThrottling.Value)
                 {
-                    Optimize.DisableNetworkThrottling();
+                    OptimizeHelper.DisableNetworkThrottling();
                 }
                 else
                 {
-                    Optimize.EnableNetworkThrottling();
+                    OptimizeHelper.EnableNetworkThrottling();
                 }
             }
 
@@ -54,11 +54,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableWindowsDefender.Value)
                 {
-                    Optimize.DisableDefender();
+                    OptimizeHelper.DisableDefender();
                 }
                 else
                 {
-                    Optimize.EnableDefender();
+                    OptimizeHelper.EnableDefender();
                 }
             }
 
@@ -66,11 +66,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSystemRestore.Value)
                 {
-                    Optimize.DisableSystemRestore();
+                    OptimizeHelper.DisableSystemRestore();
                 }
                 else
                 {
-                    Optimize.EnableSystemRestore();
+                    OptimizeHelper.EnableSystemRestore();
                 }
             }
 
@@ -78,11 +78,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisablePrintService.Value)
                 {
-                    Optimize.DisablePrintService();
+                    OptimizeHelper.DisablePrintService();
                 }
                 else
                 {
-                    Optimize.EnablePrintService();
+                    OptimizeHelper.EnablePrintService();
                 }
             }
 
@@ -90,11 +90,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableMediaPlayerSharing.Value)
                 {
-                    Optimize.DisableMediaPlayerSharing();
+                    OptimizeHelper.DisableMediaPlayerSharing();
                 }
                 else
                 {
-                    Optimize.EnableMediaPlayerSharing();
+                    OptimizeHelper.EnableMediaPlayerSharing();
                 }
             }
 
@@ -102,11 +102,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableErrorReporting.Value)
                 {
-                    Optimize.DisableErrorReporting();
+                    OptimizeHelper.DisableErrorReporting();
                 }
                 else
                 {
-                    Optimize.EnableErrorReporting();
+                    OptimizeHelper.EnableErrorReporting();
                 }
             }
 
@@ -114,11 +114,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableHomeGroup.Value)
                 {
-                    Optimize.DisableHomeGroup();
+                    OptimizeHelper.DisableHomeGroup();
                 }
                 else
                 {
-                    Optimize.EnableHomeGroup();
+                    OptimizeHelper.EnableHomeGroup();
                 }
             }
 
@@ -126,11 +126,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSuperfetch.Value)
                 {
-                    Optimize.DisableSuperfetch();
+                    OptimizeHelper.DisableSuperfetch();
                 }
                 else
                 {
-                    Optimize.EnableSuperfetch();
+                    OptimizeHelper.EnableSuperfetch();
                 }
             }
 
@@ -138,11 +138,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableTelemetryTasks.Value)
                 {
-                    Optimize.DisableTelemetryTasks();
+                    OptimizeHelper.DisableTelemetryTasks();
                 }
                 else
                 {
-                    Optimize.EnableTelemetryTasks();
+                    OptimizeHelper.EnableTelemetryTasks();
                 }
             }
 
@@ -150,11 +150,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableOffice2016Telemetry.Value)
                 {
-                    Optimize.DisableOffice2016Telemetry();
+                    OptimizeHelper.DisableOffice2016Telemetry();
                 }
                 else
                 {
-                    Optimize.EnableOffice2016Telemetry();
+                    OptimizeHelper.EnableOffice2016Telemetry();
                 }
             }
 
@@ -162,11 +162,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableCompatibilityAssistant.Value)
                 {
-                    Optimize.DisableCompatibilityAssistant();
+                    OptimizeHelper.DisableCompatibilityAssistant();
                 }
                 else
                 {
-                    Optimize.EnableCompatibilityAssistant();
+                    OptimizeHelper.EnableCompatibilityAssistant();
                 }
             }
 
@@ -174,11 +174,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableFaxService.Value)
                 {
-                    Optimize.DisableFaxService();
+                    OptimizeHelper.DisableFaxService();
                 }
                 else
                 {
-                    Optimize.EnableFaxService();
+                    OptimizeHelper.EnableFaxService();
                 }
             }
 
@@ -186,11 +186,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSmartScreen.Value)
                 {
-                    Optimize.DisableSmartScreen();
+                    OptimizeHelper.DisableSmartScreen();
                 }
                 else
                 {
-                    Optimize.EnableSmartScreen();
+                    OptimizeHelper.EnableSmartScreen();
                 }
             }
 
@@ -198,11 +198,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableStickyKeys.Value)
                 {
-                    Optimize.DisableStickyKeys();
+                    OptimizeHelper.DisableStickyKeys();
                 }
                 else
                 {
-                    Optimize.EnableStickyKeys();
+                    OptimizeHelper.EnableStickyKeys();
                 }
             }
 
@@ -222,11 +222,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSMB1.Value)
                 {
-                    Optimize.DisableSMB("1");
+                    OptimizeHelper.DisableSMB("1");
                 }
                 else
                 {
-                    Optimize.EnableSMB("1");
+                    OptimizeHelper.EnableSMB("1");
                 }
             }
 
@@ -234,11 +234,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSMB2.Value)
                 {
-                    Optimize.DisableSMB("2");
+                    OptimizeHelper.DisableSMB("2");
                 }
                 else
                 {
-                    Optimize.EnableSMB("2");
+                    OptimizeHelper.EnableSMB("2");
                 }
             }
 
@@ -246,11 +246,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableNTFSTimeStamp.Value)
                 {
-                    Optimize.DisableNTFSTimeStamp();
+                    OptimizeHelper.DisableNTFSTimeStamp();
                 }
                 else
                 {
-                    Optimize.EnableNTFSTimeStamp();
+                    OptimizeHelper.EnableNTFSTimeStamp();
                 }
             }
 
@@ -258,11 +258,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSearch.Value)
                 {
-                    Optimize.DisableSearch();
+                    OptimizeHelper.DisableSearch();
                 }
                 else
                 {
-                    Optimize.EnableSearch();
+                    OptimizeHelper.EnableSearch();
                 }
             }
 
@@ -270,11 +270,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableChromeTelemetry.Value)
                 {
-                    Optimize.DisableChromeTelemetry();
+                    OptimizeHelper.DisableChromeTelemetry();
                 }
                 else
                 {
-                    Optimize.EnableChromeTelemetry();
+                    OptimizeHelper.EnableChromeTelemetry();
                 }
             }
 
@@ -282,11 +282,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableFirefoxTemeletry.Value)
                 {
-                    Optimize.DisableFirefoxTelemetry();
+                    OptimizeHelper.DisableFirefoxTelemetry();
                 }
                 else
                 {
-                    Optimize.EnableFirefoxTelemetry();
+                    OptimizeHelper.EnableFirefoxTelemetry();
                 }
             }
 
@@ -294,11 +294,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableVisualStudioTelemetry.Value)
                 {
-                    Optimize.DisableVisualStudioTelemetry();
+                    OptimizeHelper.DisableVisualStudioTelemetry();
                 }
                 else
                 {
-                    Optimize.EnableVisualStudioTelemetry();
+                    OptimizeHelper.EnableVisualStudioTelemetry();
                 }
             }
 
@@ -306,11 +306,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableNVIDIATelemetry.Value)
                 {
-                    Optimize.DisableNvidiaTelemetry();
+                    OptimizeHelper.DisableNvidiaTelemetry();
                 }
                 else
                 {
-                    Optimize.EnableNvidiaTelemetry();
+                    OptimizeHelper.EnableNvidiaTelemetry();
                 }
             }
         }
@@ -322,11 +322,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableOneDrive.Value)
                 {
-                    Optimize.DisableOneDrive();
+                    OptimizeHelper.DisableOneDrive();
                 }
                 else
                 {
-                    Optimize.EnableOneDrive();
+                    OptimizeHelper.EnableOneDrive();
                 }
             }
 
@@ -339,11 +339,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.EnableGamingMode.Value)
                 {
-                    Optimize.EnableGamingMode();
+                    OptimizeHelper.EnableGamingMode();
                 }
                 else
                 {
-                    Optimize.DisableGamingMode();
+                    OptimizeHelper.DisableGamingMode();
                 }
             }
 
@@ -351,11 +351,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.EnableLegacyVolumeSlider.Value)
                 {
-                    Optimize.EnableLegacyVolumeSlider();
+                    OptimizeHelper.EnableLegacyVolumeSlider();
                 }
                 else
                 {
-                    Optimize.DisableLegacyVolumeSlider();
+                    OptimizeHelper.DisableLegacyVolumeSlider();
                 }
             }
 
@@ -363,11 +363,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableQuickAccessHistory.Value)
                 {
-                    Optimize.DisableQuickAccessHistory();
+                    OptimizeHelper.DisableQuickAccessHistory();
                 }
                 else
                 {
-                    Optimize.EnableQuickAccessHistory();
+                    OptimizeHelper.EnableQuickAccessHistory();
                 }
             }
 
@@ -375,11 +375,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableStartMenuAds.Value)
                 {
-                    Optimize.DisableStartMenuAds();
+                    OptimizeHelper.DisableStartMenuAds();
                 }
                 else
                 {
-                    Optimize.EnableStartMenuAds();
+                    OptimizeHelper.EnableStartMenuAds();
                 }
             }
 
@@ -387,12 +387,12 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.UninstallOneDrive.Value)
                 {
-                    Task t = new Task(() => Optimize.UninstallOneDrive());
+                    Task t = new Task(() => OptimizeHelper.UninstallOneDrive());
                     t.Start();
                 }
                 else
                 {
-                    Task t = new Task(() => Optimize.InstallOneDrive());
+                    Task t = new Task(() => OptimizeHelper.InstallOneDrive());
                     t.Start();
                 }
             }
@@ -401,11 +401,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableMyPeople.Value)
                 {
-                    Optimize.DisableMyPeople();
+                    OptimizeHelper.DisableMyPeople();
                 }
                 else
                 {
-                    Optimize.EnableMyPeople();
+                    OptimizeHelper.EnableMyPeople();
                 }
             }
 
@@ -413,11 +413,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.EnableLongPaths.Value)
                 {
-                    Optimize.EnableLongPaths();
+                    OptimizeHelper.EnableLongPaths();
                 }
                 else
                 {
-                    Optimize.DisableLongPaths();
+                    OptimizeHelper.DisableLongPaths();
                 }
             }
 
@@ -425,11 +425,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableAutomaticUpdates.Value)
                 {
-                    Optimize.DisableAutomaticUpdates();
+                    OptimizeHelper.DisableAutomaticUpdates();
                 }
                 else
                 {
-                    Optimize.EnableAutomaticUpdates();
+                    OptimizeHelper.EnableAutomaticUpdates();
                 }
             }
 
@@ -437,11 +437,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.ExcludeDrivers.Value)
                 {
-                    Optimize.ExcludeDrivers();
+                    OptimizeHelper.ExcludeDrivers();
                 }
                 else
                 {
-                    Optimize.IncludeDrivers();
+                    OptimizeHelper.IncludeDrivers();
                 }
             }
 
@@ -449,11 +449,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableTelemetryServices.Value)
                 {
-                    Optimize.DisableTelemetryServices();
+                    OptimizeHelper.DisableTelemetryServices();
                 }
                 else
                 {
-                    Optimize.EnableTelemetryServices();
+                    OptimizeHelper.EnableTelemetryServices();
                 }
             }
 
@@ -461,11 +461,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisablePrivacyOptions.Value)
                 {
-                    Optimize.EnhancePrivacy();
+                    OptimizeHelper.EnhancePrivacy();
                 }
                 else
                 {
-                    Optimize.CompromisePrivacy();
+                    OptimizeHelper.CompromisePrivacy();
                 }
             }
 
@@ -473,11 +473,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableCortana.Value)
                 {
-                    Optimize.DisableCortana();
+                    OptimizeHelper.DisableCortana();
                 }
                 else
                 {
-                    Optimize.EnableCortana();
+                    OptimizeHelper.EnableCortana();
                 }
             }
 
@@ -485,11 +485,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSensorServices.Value)
                 {
-                    Optimize.DisableSensorServices();
+                    OptimizeHelper.DisableSensorServices();
                 }
                 else
                 {
-                    Optimize.EnableSensorServices();
+                    OptimizeHelper.EnableSensorServices();
                 }
             }
 
@@ -497,11 +497,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableWindowsInk.Value)
                 {
-                    Optimize.DisableWindowsInk();
+                    OptimizeHelper.DisableWindowsInk();
                 }
                 else
                 {
-                    Optimize.EnableWindowsInk();
+                    OptimizeHelper.EnableWindowsInk();
                 }
             }
 
@@ -509,11 +509,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSpellingTyping.Value)
                 {
-                    Optimize.DisableSpellingAndTypingFeatures();
+                    OptimizeHelper.DisableSpellingAndTypingFeatures();
                 }
                 else
                 {
-                    Optimize.EnableSpellingAndTypingFeatures();
+                    OptimizeHelper.EnableSpellingAndTypingFeatures();
                 }
             }
 
@@ -521,11 +521,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableXboxLive.Value)
                 {
-                    Optimize.DisableXboxLive();
+                    OptimizeHelper.DisableXboxLive();
                 }
                 else
                 {
-                    Optimize.EnableXboxLive();
+                    OptimizeHelper.EnableXboxLive();
                 }
             }
 
@@ -533,11 +533,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableGameBar.Value)
                 {
-                    Optimize.DisableGameBar();
+                    OptimizeHelper.DisableGameBar();
                 }
                 else
                 {
-                    Optimize.EnableGameBar();
+                    OptimizeHelper.EnableGameBar();
                 }
             }
 
@@ -545,11 +545,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableInsiderService.Value)
                 {
-                    Optimize.DisableInsiderService();
+                    OptimizeHelper.DisableInsiderService();
                 }
                 else
                 {
-                    Optimize.EnableInsiderService();
+                    OptimizeHelper.EnableInsiderService();
                 }
             }
 
@@ -557,11 +557,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableStoreUpdates.Value)
                 {
-                    Optimize.DisableStoreUpdates();
+                    OptimizeHelper.DisableStoreUpdates();
                 }
                 else
                 {
-                    Optimize.EnableStoreUpdates();
+                    OptimizeHelper.EnableStoreUpdates();
                 }
             }
 
@@ -569,11 +569,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableCloudClipboard.Value)
                 {
-                    Optimize.DisableCloudClipboard();
+                    OptimizeHelper.DisableCloudClipboard();
                 }
                 else
                 {
-                    Optimize.EnableCloudClipboard();
+                    OptimizeHelper.EnableCloudClipboard();
                 }
             }
 
@@ -581,11 +581,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.RemoveCastToDevice.Value)
                 {
-                    Optimize.RemoveCastToDevice();
+                    OptimizeHelper.RemoveCastToDevice();
                 }
                 else
                 {
-                    Optimize.AddCastToDevice();
+                    OptimizeHelper.AddCastToDevice();
                 }
             }
         }
@@ -597,11 +597,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.TaskbarToLeft.Value)
                 {
-                    Optimize.AlignTaskbarToLeft();
+                    OptimizeHelper.AlignTaskbarToLeft();
                 }
                 else
                 {
-                    Optimize.AlignTaskbarToCenter();
+                    OptimizeHelper.AlignTaskbarToCenter();
                 }
             }
 
@@ -609,11 +609,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableStickers.Value)
                 {
-                    Optimize.DisableStickers();
+                    OptimizeHelper.DisableStickers();
                 }
                 else
                 {
-                    Optimize.EnableStickers();
+                    OptimizeHelper.EnableStickers();
                 }
             }
 
@@ -621,11 +621,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.CompactMode.Value)
                 {
-                    Optimize.EnableFilesCompactMode();
+                    OptimizeHelper.EnableFilesCompactMode();
                 }
                 else
                 {
-                    Optimize.DisableFilesCompactMode();
+                    OptimizeHelper.DisableFilesCompactMode();
                 }
             }
 
@@ -633,11 +633,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableSnapAssist.Value)
                 {
-                    Optimize.DisableSnapAssist();
+                    OptimizeHelper.DisableSnapAssist();
                 }
                 else
                 {
-                    Optimize.EnableSnapAssist();
+                    OptimizeHelper.EnableSnapAssist();
                 }
             }
 
@@ -645,11 +645,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableWidgets.Value)
                 {
-                    Optimize.DisableWidgets();
+                    OptimizeHelper.DisableWidgets();
                 }
                 else
                 {
-                    Optimize.EnableWidgets();
+                    OptimizeHelper.EnableWidgets();
                 }
             }
 
@@ -657,23 +657,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableChat.Value)
                 {
-                    Optimize.DisableChat();
+                    OptimizeHelper.DisableChat();
                 }
                 else
                 {
-                    Optimize.EnableChat();
-                }
-            }
-
-            if (CurrentSilentConfig.TaskbarSmaller.HasValue)
-            {
-                if (CurrentSilentConfig.TaskbarSmaller.Value)
-                {
-                    Optimize.SmallerTaskbar();
-                }
-                else
-                {
-                    Optimize.DefaultTaskbarSize();
+                    OptimizeHelper.EnableChat();
                 }
             }
 
@@ -681,23 +669,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableVBS.Value)
                 {
-                    Optimize.DisableVirtualizationBasedSecurity();
-                }
-                else
-                {
-                    Optimize.EnableVirtualizationBasedSecurity();
-                }
-            }
-
-            if (CurrentSilentConfig.ClassicRibbon.HasValue)
-            {
-                if (CurrentSilentConfig.ClassicRibbon.Value)
-                {
-                    Optimize.EnableFileExplorerClassicRibbon();
+                    OptimizeHelper.DisableVirtualizationBasedSecurity();
                 }
                 else
                 {
-                    Optimize.DisableFileExplorerClassicRibbon();
+                    OptimizeHelper.EnableVirtualizationBasedSecurity();
                 }
             }
 
@@ -705,11 +681,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.ClassicMenu.Value)
                 {
-                    Optimize.DisableShowMoreOptions();
+                    OptimizeHelper.DisableShowMoreOptions();
                 }
                 else
                 {
-                    Optimize.EnableShowMoreOptions();
+                    OptimizeHelper.EnableShowMoreOptions();
                 }
             }
 
@@ -717,11 +693,11 @@ namespace Optimizer
             {
                 if (CurrentSilentConfig.DisableTPMCheck.Value)
                 {
-                    Optimize.DisableTPMCheck();
+                    OptimizeHelper.DisableTPMCheck();
                 }
                 else
                 {
-                    Optimize.EnableTPMCheck();
+                    OptimizeHelper.EnableTPMCheck();
                 }
             }
         }
@@ -861,14 +837,6 @@ namespace Optimizer
             {
                 Options.CurrentOptions.DisableChat = CurrentSilentConfig.DisableChat.Value;
             }
-            if (CurrentSilentConfig.TaskbarSmaller.HasValue)
-            {
-                Options.CurrentOptions.TaskbarSmaller = CurrentSilentConfig.TaskbarSmaller.Value;
-            }
-            if (CurrentSilentConfig.ClassicRibbon.HasValue)
-            {
-                Options.CurrentOptions.ClassicRibbon = CurrentSilentConfig.ClassicRibbon.Value;
-            }
             if (CurrentSilentConfig.ClassicMenu.HasValue)
             {
                 Options.CurrentOptions.ClassicMenu = CurrentSilentConfig.ClassicMenu.Value;