Tweak Options visuals (labels, spacing, colors) & fix off-by-pixel bug on high DPI

Closes #234 (hopefully)

Configuration/Arguments.cs

@@ -7,7 +7,6 @@ namespace TweetDuck.Configuration{
         public const string ArgDataFolder = "-datafolder";
         public const string ArgLogging = "-log";
         public const string ArgIgnoreGDPR = "-nogdpr";
-        public const string ArgNotificationScrollWA = "-nscrollwa";
 
         // internal args
         public const string ArgRestart = "-restart";

Configuration/ConfigManager.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using TweetDuck.Configuration.Instance;
+using TweetDuck.Core.Utils;
+using TweetDuck.Data;
+using TweetDuck.Data.Serialization;
+
+namespace TweetDuck.Configuration{
+    sealed class ConfigManager{
+        public UserConfig User { get; }
+        public SystemConfig System { get; }
+        
+        public event EventHandler ProgramRestartRequested;
+
+        private readonly FileConfigInstance<UserConfig> infoUser;
+        private readonly FileConfigInstance<SystemConfig> infoSystem;
+
+        private readonly IConfigInstance<BaseConfig>[] infoList;
+
+        public ConfigManager(){
+            User = new UserConfig(this);
+            System = new SystemConfig(this);
+            
+            infoList = new IConfigInstance<BaseConfig>[]{
+                infoUser = new FileConfigInstance<UserConfig>(Program.UserConfigFilePath, User, "program options"),
+                infoSystem = new FileConfigInstance<SystemConfig>(Program.SystemConfigFilePath, System, "system options")
+            };
+
+            // TODO refactor further
+
+            infoUser.Serializer.RegisterTypeConverter(typeof(WindowState), WindowState.Converter);
+
+            infoUser.Serializer.RegisterTypeConverter(typeof(Point), new SingleTypeConverter<Point>{
+                ConvertToString = value => $"{value.X} {value.Y}",
+                ConvertToObject = value => {
+                    int[] elements = StringUtils.ParseInts(value, ' ');
+                    return new Point(elements[0], elements[1]);
+                }
+            });
+            
+            infoUser.Serializer.RegisterTypeConverter(typeof(Size), new SingleTypeConverter<Size>{
+                ConvertToString = value => $"{value.Width} {value.Height}",
+                ConvertToObject = value => {
+                    int[] elements = StringUtils.ParseInts(value, ' ');
+                    return new Size(elements[0], elements[1]);
+                }
+            });
+        }
+
+        public void LoadAll(){
+            infoUser.Load();
+            infoSystem.Load();
+        }
+
+        public void SaveAll(){
+            infoUser.Save();
+            infoSystem.Save();
+        }
+
+        public void ReloadAll(){
+            infoUser.Reload();
+            infoSystem.Reload();
+        }
+
+        private void TriggerProgramRestartRequested(){
+            ProgramRestartRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private IConfigInstance<BaseConfig> GetInstanceInfo(BaseConfig instance){
+            Type instanceType = instance.GetType();
+            return Array.Find(infoList, info => info.Instance.GetType() == instanceType); // TODO handle null
+        }
+
+        public abstract class BaseConfig{
+            private readonly ConfigManager configManager;
+
+            protected BaseConfig(ConfigManager configManager){
+                this.configManager = configManager;
+            }
+
+            // Management
+
+            public void Save(){
+                configManager.GetInstanceInfo(this).Save();
+            }
+
+            public void Reload(){
+                configManager.GetInstanceInfo(this).Reload();
+            }
+
+            public void Reset(){
+                configManager.GetInstanceInfo(this).Reset();
+            }
+
+            // Construction methods
+
+            public T ConstructWithDefaults<T>() where T : BaseConfig{
+                return ConstructWithDefaults(configManager) as T;
+            }
+
+            protected abstract BaseConfig ConstructWithDefaults(ConfigManager configManager);
+
+            // Utility methods
+
+            protected void UpdatePropertyWithEvent<T>(ref T field, T value, EventHandler eventHandler){
+                if (!EqualityComparer<T>.Default.Equals(field, value)){
+                    field = value;
+                    eventHandler?.Invoke(this, EventArgs.Empty);
+                }
+            }
+
+            protected void UpdatePropertyWithRestartRequest<T>(ref T field, T value){
+                if (!EqualityComparer<T>.Default.Equals(field, value)){
+                    field = value;
+                    configManager.TriggerProgramRestartRequested();
+                }
+            }
+        }
+    }
+}

Configuration/Instance/FileConfigInstance.cs

@@ -0,0 +1,104 @@
+using System;
+using System.IO;
+using TweetDuck.Data.Serialization;
+
+namespace TweetDuck.Configuration.Instance{
+    sealed class FileConfigInstance<T> : IConfigInstance<T> where T : ConfigManager.BaseConfig{
+        private const string ErrorTitle = "Configuration Error";
+
+        public T Instance { get; }
+        public FileSerializer<T> Serializer { get; }
+
+        private readonly string filenameMain;
+        private readonly string filenameBackup;
+        private readonly string errorIdentifier;
+
+        public FileConfigInstance(string filename, T instance, string errorIdentifier){
+            this.filenameMain = filename;
+            this.filenameBackup = filename+".bak";
+            this.errorIdentifier = errorIdentifier;
+
+            this.Instance = instance;
+            this.Serializer = new FileSerializer<T>();
+        }
+
+        private void LoadInternal(bool backup){
+            Serializer.Read(backup ? filenameBackup : filenameMain, Instance);
+        }
+
+        public void Load(){
+            Exception firstException = null;
+            
+            for(int attempt = 0; attempt < 2; attempt++){
+                try{
+                    LoadInternal(attempt > 0);
+
+                    if (firstException != null){ // silently log exception that caused a backup restore
+                        Program.Reporter.Log(firstException.ToString());
+                    }
+
+                    return;
+                }catch(FileNotFoundException){
+                }catch(DirectoryNotFoundException){
+                    break;
+                }catch(Exception e){
+                    if (firstException == null){
+                        firstException = e;
+                    }
+                }
+            }
+            
+            if (firstException is FormatException){
+                Program.Reporter.HandleException(ErrorTitle, "The configuration file for "+errorIdentifier+" is outdated or corrupted. If you continue, your "+errorIdentifier+" will be reset.", true, firstException);
+            }
+            else if (firstException is SerializationSoftException sse){
+                Program.Reporter.HandleException(ErrorTitle, $"{sse.Errors.Count} error{(sse.Errors.Count == 1 ? " was" : "s were")} encountered while loading the configuration file for "+errorIdentifier+". If you continue, some of your "+errorIdentifier+" will be reset.", true, firstException);
+            }
+            else if (firstException != null){
+                Program.Reporter.HandleException(ErrorTitle, "Could not open the configuration file for "+errorIdentifier+". If you continue, your "+errorIdentifier+" will be reset.", true, firstException);
+            }
+        }
+
+        public void Save(){
+            try{
+                if (File.Exists(filenameMain)){
+                    File.Delete(filenameBackup);
+                    File.Move(filenameMain, filenameBackup);
+                }
+
+                Serializer.Write(filenameMain, Instance);
+            }catch(SerializationSoftException e){
+                Program.Reporter.HandleException(ErrorTitle, $"{e.Errors.Count} error{(e.Errors.Count == 1 ? " was" : "s were")} encountered while saving the configuration file for "+errorIdentifier+".", true, e);
+            }catch(Exception e){
+                Program.Reporter.HandleException(ErrorTitle, "Could not save the configuration file for "+errorIdentifier+".", true, e);
+            }
+        }
+
+        public void Reload(){
+            try{
+                LoadInternal(false);
+            }catch(FileNotFoundException){
+                try{
+                    Serializer.Write(filenameMain, Instance.ConstructWithDefaults<T>());
+                    LoadInternal(false);
+                }catch(Exception e){
+                    Program.Reporter.HandleException(ErrorTitle, "Could not regenerate the configuration file for "+errorIdentifier+".", true, e);
+                }
+            }catch(Exception e){
+                Program.Reporter.HandleException(ErrorTitle, "Could not reload the configuration file for "+errorIdentifier+".", true, e);
+            }
+        }
+
+        public void Reset(){
+            try{
+                File.Delete(filenameMain);
+                File.Delete(filenameBackup);
+            }catch(Exception e){
+                Program.Reporter.HandleException(ErrorTitle, "Could not delete configuration files to reset "+errorIdentifier+".", true, e);
+                return;
+            }
+            
+            Reload();
+        }
+    }
+}

Configuration/Instance/IConfigInstance.cs

@@ -0,0 +1,9 @@
+namespace TweetDuck.Configuration.Instance{
+    interface IConfigInstance<out T>{
+        T Instance { get; }
+
+        void Save();
+        void Reload();
+        void Reset();
+    }
+}

Configuration/SystemConfig.cs

@@ -1,17 +1,9 @@
-using System;
+namespace TweetDuck.Configuration{
-using System.IO;
+    sealed class SystemConfig : ConfigManager.BaseConfig{
-using TweetDuck.Data.Serialization;
-
-namespace TweetDuck.Configuration{
-    sealed class SystemConfig{
-        private static readonly FileSerializer<SystemConfig> Serializer = new FileSerializer<SystemConfig>();
-
-        public static readonly bool IsHardwareAccelerationSupported = File.Exists(Path.Combine(Program.ProgramPath, "libEGL.dll")) &&
-                                                                      File.Exists(Path.Combine(Program.ProgramPath, "libGLESv2.dll"));
 
         // CONFIGURATION DATA
         
-        private bool _hardwareAcceleration = true;
+        public bool _hardwareAcceleration = true;
         
         public bool ClearCacheAutomatically { get; set; } = true;
         public int ClearCacheThreshold      { get; set; } = 250;
@@ -19,36 +11,16 @@ namespace TweetDuck.Configuration{
         // SPECIAL PROPERTIES
         
         public bool HardwareAcceleration{
-            get => _hardwareAcceleration && IsHardwareAccelerationSupported;
+            get => _hardwareAcceleration;
-            set => _hardwareAcceleration = value;
+            set => UpdatePropertyWithRestartRequest(ref _hardwareAcceleration, value);
         }
         
         // END OF CONFIG
 
-        private readonly string file;
+        public SystemConfig(ConfigManager configManager) : base(configManager){}
 
-        private SystemConfig(string file){
+        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
-            this.file = file;
+            return new SystemConfig(configManager);
-        }
-
-        public void Save(){
-            try{
-                Serializer.Write(file, this);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not save the system configuration file.", true, e);
-            }
-        }
-        
-        public static SystemConfig Load(string file){
-            SystemConfig config = new SystemConfig(file);
-            
-            try{
-                Serializer.ReadIfExists(file, config);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not open the system configuration file. If you continue, you will lose system specific configuration such as Hardware Acceleration.", true, e);
-            }
-
-            return config;
         }
     }
 }

Configuration/UserConfig.cs

@@ -1,37 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
-using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Configuration{
-    sealed class UserConfig{
+    sealed class UserConfig : ConfigManager.BaseConfig{
-        private static readonly FileSerializer<UserConfig> Serializer = new FileSerializer<UserConfig>();
-
-        static UserConfig(){
-            Serializer.RegisterTypeConverter(typeof(WindowState), WindowState.Converter);
-
-            Serializer.RegisterTypeConverter(typeof(Point), new SingleTypeConverter<Point>{
-                ConvertToString = value => $"{value.X} {value.Y}",
-                ConvertToObject = value => {
-                    int[] elements = StringUtils.ParseInts(value, ' ');
-                    return new Point(elements[0], elements[1]);
-                }
-            });
-            
-            Serializer.RegisterTypeConverter(typeof(Size), new SingleTypeConverter<Size>{
-                ConvertToString = value => $"{value.Width} {value.Height}",
-                ConvertToObject = value => {
-                    int[] elements = StringUtils.ParseInts(value, ' ');
-                    return new Size(elements[0], elements[1]);
-                }
-            });
-        }
         
         // CONFIGURATION DATA
 
@@ -47,18 +23,21 @@ namespace TweetDuck.Configuration{
         public bool BestImageQuality          { get; set; } = true;
         public bool EnableAnimatedImages      { get; set; } = true;
 
-        public bool IgnoreTrackingUrlWarning { get; set; } = false;
+        public bool _enableSmoothScrolling = true;
-        public bool EnableSmoothScrolling    { get; set; } = true;
+        public bool _enableTouchAdjustment = false;
+        public string _customCefArgs       = null;
+
         public string BrowserPath            { get; set; } = null;
+        public bool IgnoreTrackingUrlWarning { get; set; } = false;
         public string SearchEngineUrl        { get; set; } = null;
         private int _zoomLevel                             = 100;
-        private bool _muteNotifications;
 
         public int VideoPlayerVolume { get; set; } = 50;
         
-        public bool EnableSpellCheck     { get; set; } = false;
+        public bool EnableSpellCheck { get; set; } = false;
-        public string SpellCheckLanguage { get; set; } = "en-US";
+        private string _spellCheckLanguage         = "en-US";
-        public string TranslationTarget  { get; set; } = "en";
+
+        public string TranslationTarget { get; set; } = "en";
         
         private TrayIcon.Behavior _trayBehavior       = TrayIcon.Behavior.Disabled;
         public bool EnableTrayHighlight { get; set; } = true;
@@ -72,9 +51,9 @@ namespace TweetDuck.Configuration{
         public bool NotificationNonIntrusiveMode { get; set; } = true;
         public int NotificationIdlePauseSeconds  { get; set; } = 0;
 
-        public bool DisplayNotificationTimer     { get; set; } = true;
+        public bool DisplayNotificationTimer   { get; set; } = true;
-        public bool NotificationTimerCountDown   { get; set; } = false;
+        public bool NotificationTimerCountDown { get; set; } = false;
-        public int NotificationDurationValue     { get; set; } = 25;
+        public int NotificationDurationValue   { get; set; } = 25;
 
         public TweetNotification.Position NotificationPosition { get; set; } = TweetNotification.Position.TopRight;
         public Point CustomNotificationPosition                { get; set; } = ControlExtensions.InvisibleLocation;
@@ -88,7 +67,8 @@ namespace TweetDuck.Configuration{
         private string _notificationSoundPath;
         private int _notificationSoundVolume = 100;
 
-        public string CustomCefArgs         { get; set; } = null;
+        private bool _muteNotifications;
+
         public string CustomBrowserCSS      { get; set; } = null;
         public string CustomNotificationCSS { get; set; } = null;
         
@@ -125,6 +105,26 @@ namespace TweetDuck.Configuration{
             set => UpdatePropertyWithEvent(ref _trayBehavior, value, TrayBehaviorChanged);
         }
         
+        public bool EnableSmoothScrolling{
+            get => _enableSmoothScrolling;
+            set => UpdatePropertyWithRestartRequest(ref _enableSmoothScrolling, value);
+        }
+
+        public bool EnableTouchAdjustment{
+            get => _enableTouchAdjustment;
+            set => UpdatePropertyWithRestartRequest(ref _enableTouchAdjustment, value);
+        }
+
+        public string CustomCefArgs{
+            get => _customCefArgs;
+            set => UpdatePropertyWithRestartRequest(ref _customCefArgs, value);
+        }
+
+        public string SpellCheckLanguage{
+            get => _spellCheckLanguage;
+            set => UpdatePropertyWithRestartRequest(ref _spellCheckLanguage, value);
+        }
+
         // EVENTS
         
         public event EventHandler MuteToggled;
@@ -134,105 +134,10 @@ namespace TweetDuck.Configuration{
 
         // END OF CONFIG
         
-        private readonly string file;
+        public UserConfig(ConfigManager configManager) : base(configManager){}
 
-        private UserConfig(string file){
+        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
-            this.file = file;
+            return new UserConfig(configManager);
-        }
-
-        private void UpdatePropertyWithEvent<T>(ref T field, T value, EventHandler eventHandler){
-            if (!EqualityComparer<T>.Default.Equals(field, value)){
-                field = value;
-                eventHandler?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        public void Save(){
-            try{
-                if (File.Exists(file)){
-                    string backupFile = GetBackupFile(file);
-                    File.Delete(backupFile);
-                    File.Move(file, backupFile);
-                }
-
-                Serializer.Write(file, this);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not save the configuration file.", true, e);
-            }
-        }
-
-        public void Reload(){
-            try{
-                LoadInternal(false);
-            }catch(FileNotFoundException){
-                try{
-                    Serializer.Write(file, new UserConfig(file));
-                    LoadInternal(false);
-                }catch(Exception e){
-                    Program.Reporter.HandleException("Configuration Error", "Could not regenerate configuration file.", true, e);
-                }
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not reload configuration file.", true, e);
-            }
-        }
-
-        public void Reset(){
-            try{
-                File.Delete(file);
-                File.Delete(GetBackupFile(file));
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not delete configuration files to reset the options.", true, e);
-                return;
-            }
-            
-            Reload();
-        }
-
-        private void LoadInternal(bool backup){
-            Serializer.Read(backup ? GetBackupFile(file) : file, this);
-
-            if (NotificationScrollSpeed == 10){ // incorrect initial value
-                NotificationScrollSpeed = 100;
-                Save();
-            }
-        }
-        
-        public static UserConfig Load(string file){
-            Exception firstException = null;
-
-            for(int attempt = 0; attempt < 2; attempt++){
-                try{
-                    UserConfig config = new UserConfig(file);
-                    config.LoadInternal(attempt > 0);
-                    return config;
-                }catch(FileNotFoundException){
-                }catch(DirectoryNotFoundException){
-                    break;
-                }catch(Exception e){
-                    if (attempt == 0){
-                        firstException = e;
-                        Program.Reporter.Log(e.ToString());
-                    }
-                    else if (firstException is FormatException){
-                        Program.Reporter.HandleException("Configuration Error", "The configuration file is outdated or corrupted. If you continue, your program options will be reset.", true, e);
-                        return new UserConfig(file);
-                    }
-                    else if (firstException != null){
-                        Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, your program options will be reset.", true, e);
-                        return new UserConfig(file);
-                    }
-                }
-            }
-
-            if (firstException != null){
-                Program.Reporter.HandleException("Configuration Error", "Could not open the configuration file.", true, firstException);
-            }
-
-            return new UserConfig(file);
-        }
-
-        public static string GetBackupFile(string file){
-            return file+".bak";
         }
     }
 }

Core/Bridge/TweetDeckBridge.cs

@@ -51,6 +51,10 @@ namespace TweetDuck.Core.Bridge{
                 form.InvokeAsyncSafe(form.OpenContextMenu);
             }
 
+            public void OpenProfileImport(){
+                form.InvokeAsyncSafe(form.OpenProfileImport);
+            }
+            
             public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
                 form.InvokeAsyncSafe(() => {
                     form.OnIntroductionClosed(showGuide, allowDataCollection);

Core/Bridge/UpdateBridge.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Windows.Forms;
+using TweetDuck.Core.Controls;
+using TweetDuck.Updates;
+
+namespace TweetDuck.Core.Bridge{
+    class UpdateBridge{
+        private readonly UpdateHandler updates;
+        private readonly Control sync;
+
+        private UpdateInfo nextUpdate = null;
+
+        public event EventHandler<UpdateInfo> UpdateAccepted;
+        public event EventHandler<UpdateInfo> UpdateDelayed;
+        public event EventHandler<UpdateInfo> UpdateDismissed;
+
+        public UpdateBridge(UpdateHandler updates, Control sync){
+            this.sync = sync;
+
+            this.updates = updates;
+            this.updates.CheckFinished += updates_CheckFinished;
+        }
+
+        internal void Cleanup(){
+            updates.CheckFinished -= updates_CheckFinished;
+            nextUpdate?.DeleteInstaller();
+        }
+
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+            UpdateInfo foundUpdate = e.Result.HasValue ? e.Result.Value : null;
+
+            if (nextUpdate != null && !nextUpdate.Equals(foundUpdate)){
+                nextUpdate.DeleteInstaller();
+            }
+
+            nextUpdate = foundUpdate;
+        }
+
+        private void HandleInteractionEvent(EventHandler<UpdateInfo> eventHandler){
+            UpdateInfo tmpInfo = nextUpdate;
+
+            if (tmpInfo != null){
+                sync.InvokeAsyncSafe(() => eventHandler?.Invoke(this, tmpInfo));
+            }
+        }
+
+        // Bridge methods
+
+        public void TriggerUpdateCheck(){
+            updates.Check(false);
+        }
+
+        public void OnUpdateAccepted(){
+            HandleInteractionEvent(UpdateAccepted);
+        }
+
+        public void OnUpdateDelayed(){
+            HandleInteractionEvent(UpdateDelayed);
+        }
+
+        public void OnUpdateDismissed(){
+            HandleInteractionEvent(UpdateDismissed);
+
+            nextUpdate?.DeleteInstaller();
+            nextUpdate = null;
+        }
+    }
+}

Core/FormBrowser.cs

@@ -5,17 +5,18 @@ using TweetDuck.Configuration;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
+using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Notification.Screenshot;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Updates;
-using TweetDuck.Updates.Events;
 
 namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
@@ -48,6 +49,7 @@ namespace TweetDuck.Core{
         private readonly UpdateHandler updates;
         private readonly FormNotificationTweet notification;
         private readonly ContextMenu contextMenu;
+        private readonly UpdateBridge updateBridge;
 
         private bool isLoaded;
         private FormWindowState prevState;
@@ -69,10 +71,18 @@ namespace TweetDuck.Core{
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
             
-            this.browser = new TweetDeckBrowser(this, new TweetDeckBridge.Browser(this, notification));
+            this.updates = new UpdateHandler(Program.InstallerPath);
+            this.updates.CheckFinished += updates_CheckFinished;
+
+            this.updateBridge = new UpdateBridge(updates, this);
+            this.updateBridge.UpdateAccepted += updateBridge_UpdateAccepted;
+            this.updateBridge.UpdateDelayed += updateBridge_UpdateDelayed;
+            this.updateBridge.UpdateDismissed += updateBridge_UpdateDismissed;
+
+            this.browser = new TweetDeckBrowser(this, new TweetDeckBridge.Browser(this, notification), updateBridge);
             this.contextMenu = ContextMenuBrowser.CreateMenu(this);
 
-            this.plugins.Register(browser, PluginEnvironment.Browser, true);
+            this.plugins.Register(browser, PluginEnvironment.Browser, this, true);
 
             Controls.Add(new MenuStrip{ Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
 
@@ -95,12 +105,11 @@ namespace TweetDuck.Core{
             this.trayIcon.ClickClose += trayIcon_ClickClose;
             Config.TrayBehaviorChanged += Config_TrayBehaviorChanged;
 
-            UpdateTrayIcon();
+            UpdateTray();
 
-            this.updates = new UpdateHandler(browser, Program.InstallerPath);
+            if (Config.MuteNotifications){
-            this.updates.CheckFinished += updates_CheckFinished;
+                UpdateFormIcon();
-            this.updates.UpdateAccepted += updates_UpdateAccepted;
+            }
-            this.updates.UpdateDismissed += updates_UpdateDismissed;
 
             if (Config.AllowDataCollection){
                 analytics = new AnalyticsManager(this, plugins, Program.AnalyticsFilePath);
@@ -127,7 +136,11 @@ namespace TweetDuck.Core{
             isLoaded = true;
         }
 
-        private void UpdateTrayIcon(){
+        private void UpdateFormIcon(){ // TODO fix to show icon in taskbar too
+            Icon = Config.MuteNotifications ? Properties.Resources.icon_muted : Properties.Resources.icon;
+        }
+
+        private void UpdateTray(){
             trayIcon.Visible = Config.TrayBehavior.ShouldDisplayIcon();
         }
 
@@ -197,23 +210,24 @@ namespace TweetDuck.Core{
 
         private void FormBrowser_FormClosed(object sender, FormClosedEventArgs e){
             if (isLoaded && UpdateInstallerPath == null){
-                updates.CleanupDownload();
+                updateBridge.Cleanup();
             }
         }
 
         private void Config_MuteToggled(object sender, EventArgs e){
+            UpdateFormIcon();
             AnalyticsFile.NotificationMutes.Trigger();
         }
 
         private void Config_TrayBehaviorChanged(object sender, EventArgs e){
-            UpdateTrayIcon();
+            UpdateTray();
         }
 
         private void trayIcon_ClickRestore(object sender, EventArgs e){
             Show();
             RestoreWindow();
             Activate();
-            UpdateTrayIcon();
+            UpdateTray();
         }
 
         private void trayIcon_ClickClose(object sender, EventArgs e){
@@ -241,7 +255,7 @@ namespace TweetDuck.Core{
                 string tag = update.VersionTag;
 
                 if (tag != Program.VersionTag && tag != Config.DismissedUpdate){
-                    updates.PrepareUpdate(update);
+                    update.BeginSilentDownload();
                     browser.ShowUpdateNotification(tag, update.ReleaseNotes);
                 }
                 else{
@@ -257,38 +271,61 @@ namespace TweetDuck.Core{
             ignoreUpdateCheckError = true;
         }
 
-        private void updates_UpdateAccepted(object sender, UpdateEventArgs e){
+        private void updateBridge_UpdateAccepted(object sender, UpdateInfo update){
-            this.InvokeAsyncSafe(() => {
+            FormManager.CloseAllDialogs();
-                FormManager.CloseAllDialogs();
 
-                if (!string.IsNullOrEmpty(Config.DismissedUpdate)){
+            if (!string.IsNullOrEmpty(Config.DismissedUpdate)){
-                    Config.DismissedUpdate = null;
+                Config.DismissedUpdate = null;
-                    Config.Save();
+                Config.Save();
+            }
+
+            void OnFinished(){
+                UpdateDownloadStatus status = update.DownloadStatus;
+
+                if (status == UpdateDownloadStatus.Done){
+                    UpdateInstallerPath = update.InstallerPath;
+                    ForceClose();
                 }
+                else if (status != UpdateDownloadStatus.Canceled && FormMessage.Error("Update Has Failed", "Could not automatically download the update: "+(update.DownloadError?.Message ?? "unknown error")+"\n\nWould you like to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
+                    BrowserUtils.OpenExternalBrowser(Program.Website);
+                    ForceClose();
+                }
+                else{
+                    Show();
+                }
+            }
             
-                updates.BeginUpdateDownload(this, e.UpdateInfo, update => {
+            if (update.DownloadStatus.IsFinished(true)){
-                    UpdateDownloadStatus status = update.DownloadStatus;
+                OnFinished();
+            }
+            else{
+                FormUpdateDownload downloadForm = new FormUpdateDownload(update);
 
-                    if (status == UpdateDownloadStatus.Done){
+                downloadForm.VisibleChanged += (sender2, args2) => {
-                        UpdateInstallerPath = update.InstallerPath;
+                    downloadForm.MoveToCenter(this);
-                        ForceClose();
+                    Hide();
+                };
+
+                downloadForm.FormClosed += (sender2, args2) => {
+                    if (downloadForm.DialogResult != DialogResult.OK){
+                        update.CancelDownload();
                     }
-                    else if (status != UpdateDownloadStatus.Canceled && FormMessage.Error("Update Has Failed", "Could not automatically download the update: "+(update.DownloadError?.Message ?? "unknown error")+"\n\nWould you like to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
+
-                        BrowserUtils.OpenExternalBrowser(Program.Website);
+                    downloadForm.Dispose();
-                        ForceClose();
+                    OnFinished();
-                    }
+                };
-                    else{
+
-                        Show();
+                downloadForm.Show();
-                    }
+            }
-                });
-            });
         }
 
-        private void updates_UpdateDismissed(object sender, UpdateEventArgs e){
+        private void updateBridge_UpdateDelayed(object sender, UpdateInfo update){
-            this.InvokeAsyncSafe(() => {
+            // stops the timer
-                Config.DismissedUpdate = e.UpdateInfo.VersionTag;
+        }
-                Config.Save();
+
-            });
+        private void updateBridge_UpdateDismissed(object sender, UpdateInfo update){
+            Config.DismissedUpdate = update.VersionTag;
+            Config.Save();
         }
 
         protected override void WndProc(ref Message m){
@@ -360,6 +397,10 @@ namespace TweetDuck.Core{
             AnalyticsFile.UsedROT13.Trigger();
         }
 
+        public void OpenDevTools(){
+            browser.OpenDevTools();
+        }
+
         // callback handlers
         
         public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
@@ -393,7 +434,7 @@ namespace TweetDuck.Core{
                 FormSettings form = new FormSettings(this, plugins, updates, analytics, startTab);
                 
                 form.FormClosed += (sender, args) => {
-                    if (!prevEnableUpdateCheck && Config.EnableUpdateCheck && !UpdateHandler.TemporarilyForceUpdateChecking){
+                    if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){
                         Config.DismissedUpdate = null;
                         Config.Save();
                         
@@ -447,6 +488,18 @@ namespace TweetDuck.Core{
             }
         }
 
+        public void OpenProfileImport(){
+            FormManager.TryFind<FormSettings>()?.Close();
+
+            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins, true)){
+                if (dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){
+                    BrowserProcessHandler.UpdatePrefs();
+                    FormManager.TryFind<FormPlugins>()?.Close();
+                    plugins.Reload(); // also reloads the browser
+                }
+            }
+        }
+
         public void OnTweetNotification(){ // may be called multiple times, once for each type of notification
             if (Config.EnableTrayHighlight && !ContainsFocus){
                 trayIcon.HasNotifications = true;

Core/FormManager.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Windows.Forms;
-using TweetDuck.Core.Other;
 
 namespace TweetDuck.Core{
     static class FormManager{
@@ -18,12 +17,14 @@ namespace TweetDuck.Core{
             else return false;
         }
 
+        public static bool HasAnyDialogs => Application.OpenForms.OfType<IAppDialog>().Any();
+        
         public static void CloseAllDialogs(){
-            foreach(Form form in Application.OpenForms.Cast<Form>().Reverse()){
+            foreach(IAppDialog dialog in Application.OpenForms.OfType<IAppDialog>().Reverse()){
-                if (form is FormSettings || form is FormPlugins || form is FormAbout || form is FormGuide){
+                ((Form)dialog).Close();
-                    form.Close();
-                }
             }
         }
+
+        public interface IAppDialog{}
     }
 }

Core/Handling/ContextMenuBase.cs

@@ -15,8 +15,6 @@ using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
-        public static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
-
         private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality;
         
         private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
@@ -238,7 +236,10 @@ namespace TweetDuck.Core.Handling{
         }
         
         protected static void AddDebugMenuItems(IMenuModel model){
-            model.AddItem(MenuOpenDevTools, "Open dev tools");
+            if (BrowserUtils.HasDevTools){
+                AddSeparator(model);
+                model.AddItem(MenuOpenDevTools, "Open dev tools");
+            }
         }
 
         protected static void RemoveSeparatorIfLast(IMenuModel model){

Core/Handling/ContextMenuBrowser.cs

@@ -84,10 +84,7 @@ namespace TweetDuck.Core.Handling{
                 globalMenu.AddItem(MenuPlugins, TitlePlugins);
                 globalMenu.AddItem(MenuAbout, TitleAboutProgram);
                 
-                if (HasDevTools){
+                AddDebugMenuItems(globalMenu);
-                    globalMenu.AddSeparator();
-                    AddDebugMenuItems(globalMenu);
-                }
             }
 
             RemoveSeparatorIfLast(model);

Core/Handling/ContextMenuGuide.cs

@@ -8,11 +8,7 @@ namespace TweetDuck.Core.Handling{
         public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
             model.Clear();
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
-
+            AddDebugMenuItems(model);
-            if (HasDevTools){
-                AddSeparator(model);
-                AddDebugMenuItems(model);
-            }
         }
     }
 }

Core/Handling/ContextMenuNotification.cs

@@ -47,11 +47,7 @@ namespace TweetDuck.Core.Handling{
                 }
             }
             
-            if (HasDevTools){
+            AddDebugMenuItems(model);
-                AddSeparator(model);
-                AddDebugMenuItems(model);
-            }
-
             RemoveSeparatorIfLast(model);
 
             form.InvokeAsyncSafe(() => {

Core/Handling/Filters/ResponseFilterBase.cs

@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using System.Text;
+using CefSharp;
+
+namespace TweetDuck.Core.Handling.Filters{
+    abstract class ResponseFilterBase : IResponseFilter{
+        private enum State{
+            Reading, Writing, Done
+        }
+
+        private readonly Encoding encoding;
+        private byte[] responseData;
+
+        private State state;
+        private int offset;
+
+        protected ResponseFilterBase(int totalBytes, Encoding encoding){
+            this.responseData = new byte[totalBytes];
+            this.encoding = encoding;
+            this.state = State.Reading;
+        }
+        
+        FilterStatus IResponseFilter.Filter(Stream dataIn, out long dataInRead, Stream dataOut, out long dataOutWritten){
+            int responseLength = responseData.Length;
+
+            if (state == State.Reading){
+                int bytesToRead = Math.Min(responseLength-offset, (int)Math.Min(dataIn?.Length ?? 0, int.MaxValue));
+                
+                dataIn?.Read(responseData, offset, bytesToRead);
+                offset += bytesToRead;
+                
+                dataInRead = bytesToRead;
+                dataOutWritten = 0;
+                
+                if (offset >= responseLength){
+                    responseData = encoding.GetBytes(ProcessResponse(encoding.GetString(responseData)));
+                    state = State.Writing;
+                    offset = 0;
+                }
+
+                return FilterStatus.NeedMoreData;
+            }
+            else if (state == State.Writing){
+                int bytesToWrite = Math.Min(responseLength-offset, (int)Math.Min(dataOut.Length, int.MaxValue));
+
+                if (bytesToWrite > 0){
+                    dataOut.Write(responseData, offset, bytesToWrite);
+                    offset += bytesToWrite;
+                }
+
+                dataOutWritten = bytesToWrite;
+                dataInRead = 0;
+
+                if (offset < responseLength){
+                    return FilterStatus.NeedMoreData;
+                }
+                else{
+                    state = State.Done;
+                    return FilterStatus.Done;
+                }
+            }
+            else{
+                throw new InvalidOperationException("This resource filter cannot be reused.");
+            }
+        }
+        
+        public abstract bool InitFilter();
+        protected abstract string ProcessResponse(string text);
+        public abstract void Dispose();
+    }
+}

Core/Handling/Filters/ResponseFilterVendor.cs

@@ -0,0 +1,20 @@
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace TweetDuck.Core.Handling.Filters{
+    sealed class ResponseFilterVendor : ResponseFilterBase{
+        private static readonly Regex RegexRestoreJQuery = new Regex(@"(\w+)\.fn=\1\.prototype", RegexOptions.Compiled);
+
+        public ResponseFilterVendor(int totalBytes) : base(totalBytes, Encoding.UTF8){}
+
+        public override bool InitFilter(){
+            return true;
+        }
+        
+        protected override string ProcessResponse(string text){
+            return RegexRestoreJQuery.Replace(text, "window.$$=$1;$&", 1);
+        }
+
+        public override void Dispose(){}
+    }
+}

Core/Handling/General/FileDialogHandler.cs

@@ -7,16 +7,14 @@ using CefSharp;
 
 namespace TweetDuck.Core.Handling.General{
     sealed class FileDialogHandler : IDialogHandler{
-        public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
+        public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
-            CefFileDialogMode dialogType = mode & CefFileDialogMode.TypeMask;
+            if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple){
-
-            if (dialogType == CefFileDialogMode.Open || dialogType == CefFileDialogMode.OpenMultiple){
                 string allFilters = string.Join(";", acceptFilters.Select(filter => "*"+filter));
 
                 using(OpenFileDialog dialog = new OpenFileDialog{
                     AutoUpgradeEnabled = true,
                     DereferenceLinks = true,
-                    Multiselect = dialogType == CefFileDialogMode.OpenMultiple,
+                    Multiselect = mode == CefFileDialogMode.OpenMultiple,
                     Title = "Open Files",
                     Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
                 }){

Core/Handling/RequestHandlerBase.cs

@@ -2,6 +2,7 @@
 using CefSharp;
 using CefSharp.Handler;
 using TweetDuck.Core.Handling.General;
+using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     class RequestHandlerBase : DefaultRequestHandler{
@@ -16,7 +17,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
-            if (ContextMenuBase.HasDevTools){
+            if (BrowserUtils.HasDevTools){
                 NameValueCollection headers = request.Headers;
                 headers.Remove("x-devtools-emulate-network-conditions-client-id");
                 request.Headers = headers;

Core/Handling/RequestHandlerBrowser.cs

@@ -1,11 +1,18 @@
-using System.Text.RegularExpressions;
+// Uncomment to force TweetDeck to load a predefined version of the vendor/bundle scripts
+// #define FREEZE_TWEETDECK_SCRIPTS
+
+using System.Collections.Specialized;
 using CefSharp;
+using TweetDuck.Core.Handling.Filters;
 using TweetDuck.Core.Utils;
 
+#if FREEZE_TWEETDECK_SCRIPTS
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+#endif
+
 namespace TweetDuck.Core.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
-        private static readonly Regex TmpResourceRedirect = new Regex(@"dist\/(.*?)\.(.*?)\.js$", RegexOptions.Compiled);
-
         public string BlockNextUserNavUrl { get; set; }
 
         public RequestHandlerBrowser() : base(true){}
@@ -29,37 +36,61 @@ namespace TweetDuck.Core.Handling{
             return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
         }
 
+        #if FREEZE_TWEETDECK_SCRIPTS
+        private static readonly Regex TweetDeckScriptUrl = new Regex(@"/dist/(.*?)\.(.*?)\.js$", RegexOptions.Compiled);
+        
+        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(2){
+            { "vendor", "942c0a20e8" },
+            { "bundle", "1bd75b5854" }
+        };
+        #endif
+
         public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Image && request.Url.Contains("backgrounds/spinner_blue")){
+            if (request.ResourceType == ResourceType.Image && request.Url.Contains("/backgrounds/spinner_blue")){
                 request.Url = TwitterUtils.LoadingSpinner.Url;
                 return true;
             }
-            else if (request.ResourceType == ResourceType.Script){ // TODO delaying the apocalypse
+            #if FREEZE_TWEETDECK_SCRIPTS
-                Match match = TmpResourceRedirect.Match(request.Url);
+            else if (request.ResourceType == ResourceType.Script){
+                Match match = TweetDeckScriptUrl.Match(request.Url);
 
-                if (match.Success){
+                if (match.Success && TweetDeckHashes.TryGetValue(match.Groups[1].Value, out string hash)){
-                    string scriptType = match.Groups[1].Value;
+                    if (match.Groups[2].Value == hash){
-                    string scriptHash = match.Groups[2].Value;
+                        System.Diagnostics.Debug.WriteLine($"accepting {request.Url}");
-
+                    }
-                    const string HashBundle = "1bd75b5854";
+                    else{
-                    const string HashVendor = "942c0a20e8";
+                        System.Diagnostics.Debug.WriteLine($"rewriting {request.Url} to {hash}");
-
+                        request.Url = TweetDeckScriptUrl.Replace(request.Url, "/dist/$1."+hash+".js");
-                    if (scriptType == "bundle" && scriptHash != HashBundle){
-                        request.Url = TmpResourceRedirect.Replace(request.Url, "dist/$1."+HashBundle+".js");
-                        System.Diagnostics.Debug.WriteLine("rewriting "+scriptType+" to "+request.Url);
                         return true;
                     }
-                    else if (scriptType == "vendor" && scriptHash != HashVendor){
-                        request.Url = TmpResourceRedirect.Replace(request.Url, "dist/$1."+HashVendor+".js");
-                        System.Diagnostics.Debug.WriteLine("rewriting "+scriptType+" to "+request.Url);
-                        return true;
-                    }
-
-                    System.Diagnostics.Debug.WriteLine("accepting "+scriptType+" as "+request.Url);
                 }
             }
+            #endif
 
             return base.OnResourceResponse(browserControl, browser, frame, request, response);
         }
+
+        public override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if (request.ResourceType == ResourceType.Script && request.Url.Contains("/dist/vendor")){
+                NameValueCollection headers = response.ResponseHeaders;
+
+                if (int.TryParse(headers["x-ton-expected-size"], out int totalBytes)){
+                    return new ResponseFilterVendor(totalBytes);
+                }
+                #if DEBUG
+                else{
+                    System.Diagnostics.Debug.WriteLine($"Missing uncompressed size header in {request.Url}");
+
+                    foreach(string key in headers){
+                        System.Diagnostics.Debug.WriteLine($" {key}: {headers[key]}");
+                    }
+
+                    System.Diagnostics.Debugger.Break();
+                }
+                #endif
+            }
+
+            return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
+        }
     }
 }

Core/Management/ProfileManager.cs

@@ -22,8 +22,6 @@ namespace TweetDuck.Core.Management{
             All = UserConfig|SystemConfig|Session|PluginData
         }
         
-        public bool IsRestarting { get; private set; }
-
         private readonly string file;
         private readonly PluginManager plugins;
 
@@ -125,7 +123,6 @@ namespace TweetDuck.Core.Management{
                             case "system":
                                 if (items.HasFlag(Items.SystemConfig)){
                                     entry.WriteToFile(Program.SystemConfigFilePath);
-                                    IsRestarting = true;
                                 }
 
                                 break;
@@ -153,7 +150,6 @@ namespace TweetDuck.Core.Management{
                             case "cookies":
                                 if (items.HasFlag(Items.Session)){
                                     entry.WriteToFile(Path.Combine(Program.StoragePath, TempCookiesPath));
-                                    IsRestarting = true;
                                 }
 
                                 break;
@@ -167,7 +163,7 @@ namespace TweetDuck.Core.Management{
 
                 return true;
             }catch(Exception e){
-                Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing TweetDuck profile.", true, e);
+                Program.Reporter.HandleException("Profile Import", "An exception happened while importing TweetDuck profile.", true, e);
                 return false;
             }
         }
@@ -216,10 +212,4 @@ namespace TweetDuck.Core.Management{
             }
         }
     }
-
-    static class ProfileManagerExtensions{
-        public static bool NeedsRestart(this ProfileManager.Items items){
-            return items.HasFlag(ProfileManager.Items.SystemConfig) || items.HasFlag(ProfileManager.Items.Session);
-        }
-    }
 }

Core/Notification/Example/FormNotificationExample.cs

@@ -30,7 +30,7 @@ namespace TweetDuck.Core.Notification.Example{
         public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
             browser.LoadingStateChanged += browser_LoadingStateChanged;
 
-            string exampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true)?.Replace("{avatar}", TweetNotification.AppLogo.Url) ?? string.Empty;
+            string exampleTweetHTML = ScriptLoader.LoadResourceSilent("pages/example.html")?.Replace("{avatar}", TweetNotification.AppLogo.Url) ?? string.Empty;
 
             #if DEBUG
             exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");

Core/Notification/FormNotificationBase.cs

@@ -185,7 +185,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         protected virtual string GetTweetHTML(TweetNotification tweet){
-            return tweet.GenerateHtml(IsCursorOverBrowser ? "td-notification td-hover" : "td-notification");
+            return tweet.GenerateHtml(IsCursorOverBrowser ? "td-notification td-hover" : "td-notification", this);
         }
 
         protected virtual void LoadTweet(TweetNotification tweet){

Core/Notification/FormNotificationMain.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Configuration;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
@@ -15,11 +14,6 @@ using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification{
     abstract partial class FormNotificationMain : FormNotificationBase, ITweetDeckBrowser{
-        private const string NotificationScriptFile = "notification.js";
-
-        private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
-        private static readonly string NotificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
-        
         private readonly PluginManager plugins;
         private readonly int timerBarHeight;
 
@@ -88,7 +82,7 @@ namespace TweetDuck.Core.Notification{
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
-            plugins.Register(this, PluginEnvironment.Notification);
+            plugins.Register(this, PluginEnvironment.Notification, this);
 
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
@@ -106,7 +100,7 @@ namespace TweetDuck.Core.Notification{
             browser.FrameLoadEnd += (sender, args) => {
                 IFrame frame = args.Frame;
 
-                if (frame.IsMain && NotificationJS != null && browser.Address != "about:blank"){
+                if (frame.IsMain && browser.Address != "about:blank"){
                     callback(frame);
                 }
             };
@@ -137,14 +131,7 @@ namespace TweetDuck.Core.Notification{
                 int eventType = wParam.ToInt32();
 
                 if (eventType == NativeMethods.WM_MOUSEWHEEL && IsCursorOverBrowser){
-                    if (Arguments.HasFlag(Arguments.ArgNotificationScrollWA)){
+                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Program.UserConfig.NotificationScrollSpeed*0.01), CefEventFlags.None);
-                        int delta = BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Program.UserConfig.NotificationScrollSpeed*0.01);
-                        browser.ExecuteScriptAsync("window.scrollBy", 0, -Math.Round(delta/0.72));
-                    }
-                    else{
-                        browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Program.UserConfig.NotificationScrollSpeed*0.01), CefEventFlags.None);
-                    }
-
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONDOWN && DesktopBounds.Contains(Cursor.Position)){
@@ -194,9 +181,9 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && NotificationJS != null && browser.Address != "about:blank"){
+            if (e.Frame.IsMain && browser.Address != "about:blank"){
                 e.Frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
-                ScriptLoader.ExecuteScript(e.Frame, NotificationJS, NotificationScriptIdentifier);
+                ScriptLoader.ExecuteScript(e.Frame, ScriptLoader.LoadResource("notification.js", this), "root:notification");
             }
         }
 

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -20,6 +20,8 @@ namespace TweetDuck.Core.Notification.Screenshot{
         public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager, string html, int width) : base(owner, false){
             this.plugins = pluginManager;
 
+            int realWidth = BrowserUtils.Scale(width, DpiScale);
+
             browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, callback));
 
             browser.LoadingStateChanged += (sender, args) => {
@@ -27,7 +29,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
                     return;
                 }
 
-                string script = ScriptLoader.LoadResource("screenshot.js", true);
+                string script = ScriptLoader.LoadResourceSilent("screenshot.js");
                         
                 if (script == null){
                     this.InvokeAsyncSafe(callback);
@@ -35,16 +37,16 @@ namespace TweetDuck.Core.Notification.Screenshot{
                 }
                 
                 using(IFrame frame = args.Browser.MainFrame){
-                    ScriptLoader.ExecuteScript(frame, script.Replace("{width}", BrowserUtils.Scale(width, DpiScale).ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
+                    ScriptLoader.ExecuteScript(frame, script.Replace("{width}", realWidth.ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
                 }
             };
             
-            SetNotificationSize(width, 1024);
+            SetNotificationSize(realWidth, 1024);
             LoadTweet(new TweetNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
         }
 
         protected override string GetTweetHTML(TweetNotification tweet){
-            string html = tweet.GenerateHtml("td-screenshot");
+            string html = tweet.GenerateHtml("td-screenshot", this);
 
             foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.InjectInto(html);

Core/Notification/TweetNotification.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using System.Windows.Forms;
 using CefSharp;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Data;
@@ -8,7 +9,6 @@ using TweetDuck.Resources;
 namespace TweetDuck.Core.Notification{
     sealed class TweetNotification{
         private const string DefaultHeadLayout = @"<html class=""scroll-v os-windows dark txt-size--14"" lang=""en-US"" id=""tduck"" data-td-font=""medium"" data-td-theme=""dark""><head><meta charset=""utf-8""><link href=""https://ton.twimg.com/tweetdeck-web/web/dist/bundle.4b1f87e09d.css"" rel=""stylesheet""><style type='text/css'>body { background: rgb(34, 36, 38) !important }</style>";
-        private static readonly string CustomCSS = ScriptLoader.LoadResource("styles/notification.css") ?? string.Empty;
         public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
 
         public static TweetNotification Example(string html, int characters){
@@ -53,11 +53,11 @@ namespace TweetDuck.Core.Notification{
             return 2000+Math.Max(1000, value*characters);
         }
 
-        public string GenerateHtml(string bodyClasses){
+        public string GenerateHtml(string bodyClasses, Control sync){
             StringBuilder build = new StringBuilder();
             build.Append("<!DOCTYPE html>");
             build.Append(TweetDeckBridge.NotificationHeadLayout ?? DefaultHeadLayout);
-            build.Append("<style type='text/css'>").Append(CustomCSS).Append("</style>");
+            build.Append("<style type='text/css'>").Append(ScriptLoader.LoadResource("styles/notification.css", sync) ?? string.Empty).Append("</style>");
 
             if (!string.IsNullOrEmpty(Program.UserConfig.CustomNotificationCSS)){
                 build.Append("<style type='text/css'>").Append(Program.UserConfig.CustomNotificationCSS).Append("</style>");

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -8,7 +8,6 @@ using TweetDuck.Configuration;
 using System.Linq;
 using System.Management;
 using System.Text.RegularExpressions;
-using TweetDuck.Core.Handling;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
@@ -22,7 +21,7 @@ namespace TweetDuck.Core.Other.Analytics{
             return new AnalyticsReport{
                 { "App Version"   , Program.VersionTag },
                 { "App Type"      , Program.IsPortable ? "portable" : "installed" },
-                { "App Dev Tools" , Bool(ContextMenuBase.HasDevTools) },
+                { "App Dev Tools" , Bool(BrowserUtils.HasDevTools) },
                 0,
                 { "System Name"        , SystemName },
                 { "System Edition"     , SystemEdition },

Core/Other/FormAbout.Designer.cs

@@ -50,7 +50,7 @@ namespace TweetDuck.Core.Other {
             this.labelDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelDescription.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDescription.Font = new System.Drawing.Font("Segoe UI", 9.75F);
             this.labelDescription.Location = new System.Drawing.Point(114, 12);
             this.labelDescription.Name = "labelDescription";
             this.labelDescription.Size = new System.Drawing.Size(232, 113);
@@ -59,7 +59,7 @@ namespace TweetDuck.Core.Other {
             // labelTips
             // 
             this.labelTips.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelTips.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTips.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular);
             this.labelTips.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelTips.Location = new System.Drawing.Point(117, 0);
             this.labelTips.Margin = new System.Windows.Forms.Padding(0);
@@ -74,7 +74,7 @@ namespace TweetDuck.Core.Other {
             // 
             this.labelWebsite.AutoSize = true;
             this.labelWebsite.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular);
             this.labelWebsite.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelWebsite.Location = new System.Drawing.Point(0, 0);
             this.labelWebsite.Margin = new System.Windows.Forms.Padding(0);
@@ -106,7 +106,7 @@ namespace TweetDuck.Core.Other {
             // labelIssues
             // 
             this.labelIssues.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelIssues.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelIssues.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular);
             this.labelIssues.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelIssues.Location = new System.Drawing.Point(216, 0);
             this.labelIssues.Margin = new System.Windows.Forms.Padding(0);

Core/Other/FormAbout.cs

@@ -5,7 +5,7 @@ using System.Windows.Forms;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Other{
-    sealed partial class FormAbout : Form{
+    sealed partial class FormAbout : Form, FormManager.IAppDialog{
         private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki";
         private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues";
 

Core/Other/FormGuide.cs

@@ -12,7 +12,7 @@ using TweetDuck.Data;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Other{
-    sealed partial class FormGuide : Form{
+    sealed partial class FormGuide : Form, FormManager.IAppDialog{
         private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
         private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
 

Core/Other/FormPlugins.Designer.cs

@@ -35,7 +35,7 @@
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnClose.Location = new System.Drawing.Point(642, 433);
             this.btnClose.Name = "btnClose";
             this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -49,7 +49,7 @@
             // 
             this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnReload.AutoSize = true;
-            this.btnReload.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnReload.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnReload.Location = new System.Drawing.Point(141, 433);
             this.btnReload.Name = "btnReload";
             this.btnReload.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -63,7 +63,7 @@
             // 
             this.btnOpenFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnOpenFolder.AutoSize = true;
-            this.btnOpenFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnOpenFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnOpenFolder.Location = new System.Drawing.Point(12, 433);
             this.btnOpenFolder.Name = "btnOpenFolder";
             this.btnOpenFolder.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);

Core/Other/FormPlugins.cs

@@ -7,7 +7,7 @@ using TweetDuck.Plugins;
 using TweetDuck.Plugins.Controls;
 
 namespace TweetDuck.Core.Other{
-    sealed partial class FormPlugins : Form{
+    sealed partial class FormPlugins : Form, FormManager.IAppDialog{
         private readonly PluginManager pluginManager;
         
         public FormPlugins(){

Core/Other/FormSettings.Designer.cs

@@ -33,8 +33,8 @@
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnClose.Location = new System.Drawing.Point(448, 525);
+            this.btnClose.Location = new System.Drawing.Point(747, 500);
             this.btnClose.Name = "btnClose";
             this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnClose.Size = new System.Drawing.Size(50, 25);
@@ -53,7 +53,7 @@
             this.panelContents.Location = new System.Drawing.Point(135, 12);
             this.panelContents.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.panelContents.Name = "panelContents";
-            this.panelContents.Size = new System.Drawing.Size(363, 507);
+            this.panelContents.Size = new System.Drawing.Size(662, 482);
             this.panelContents.TabIndex = 1;
             // 
             // panelButtons
@@ -64,15 +64,15 @@
             this.panelButtons.Location = new System.Drawing.Point(12, 12);
             this.panelButtons.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
             this.panelButtons.Name = "panelButtons";
-            this.panelButtons.Size = new System.Drawing.Size(124, 507);
+            this.panelButtons.Size = new System.Drawing.Size(124, 482);
             this.panelButtons.TabIndex = 0;
             // 
             // btnManageOptions
             // 
             this.btnManageOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnManageOptions.AutoSize = true;
-            this.btnManageOptions.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnManageOptions.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnManageOptions.Location = new System.Drawing.Point(12, 525);
+            this.btnManageOptions.Location = new System.Drawing.Point(12, 500);
             this.btnManageOptions.Name = "btnManageOptions";
             this.btnManageOptions.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnManageOptions.Size = new System.Drawing.Size(109, 25);
@@ -85,7 +85,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(510, 562);
+            this.ClientSize = new System.Drawing.Size(809, 537);
             this.Controls.Add(this.btnManageOptions);
             this.Controls.Add(this.panelContents);
             this.Controls.Add(this.panelButtons);

Core/Other/FormSettings.cs

@@ -13,17 +13,17 @@ using TweetDuck.Plugins;
 using TweetDuck.Updates;
 
 namespace TweetDuck.Core.Other{
-    sealed partial class FormSettings : Form{
+    sealed partial class FormSettings : Form, FormManager.IAppDialog{
+        public bool ShouldReloadBrowser { get; private set; }
+
         private readonly FormBrowser browser;
         private readonly PluginManager plugins;
 
         private readonly int buttonHeight;
 
-        private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(4);
+        private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(8);
         private SettingsTab currentTab;
 
-        public bool ShouldReloadBrowser { get; private set; }
-
         public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, AnalyticsManager analytics, Type startTab){
             InitializeComponent();
 
@@ -36,32 +36,48 @@ namespace TweetDuck.Core.Other{
             
             this.buttonHeight = BrowserUtils.Scale(39, this.GetDPIScale()) | 1;
 
+            PrepareLoad();
+
             AddButton("General", () => new TabSettingsGeneral(this.browser.ReloadColumns, updates));
-            AddButton("Locales", () => new TabSettingsLocales());
-            AddButton("System Tray", () => new TabSettingsTray());
             AddButton("Notifications", () => new TabSettingsNotifications(new FormNotificationExample(this.browser, this.plugins)));
             AddButton("Sounds", () => new TabSettingsSounds(this.browser.PlaySoundNotification));
             AddButton("Feedback", () => new TabSettingsFeedback(analytics, AnalyticsReportGenerator.ExternalInfo.From(this.browser), this.plugins));
-            AddButton("Advanced", () => new TabSettingsAdvanced(this.browser.ReinjectCustomCSS));
+            AddButton("Advanced", () => new TabSettingsAdvanced(this.browser.ReinjectCustomCSS, this.browser.OpenDevTools));
 
             SelectTab(tabs[startTab ?? typeof(TabSettingsGeneral)]);
         }
 
-        private void FormSettings_FormClosing(object sender, FormClosingEventArgs e){
+        private void PrepareLoad(){
+            Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
+        }
+
+        private void PrepareUnload(){ // TODO refactor this further later
             currentTab.Control.OnClosing();
             
+            Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
+            Program.Config.SaveAll();
+        }
+
+        private void Config_ProgramRestartRequested(object sender, EventArgs e){
+            if (FormMessage.Information("TweetDuck Options", "The application must restart for the option to take place. Do you want to restart now?", FormMessage.Yes, FormMessage.No)){
+                Program.Restart();
+            }
+        }
+
+        private void FormSettings_FormClosing(object sender, FormClosingEventArgs e){
+            PrepareUnload();
+
             foreach(SettingsTab tab in tabs.Values){
                 if (tab.IsInitialized){
                     tab.Control.Dispose();
                 }
             }
             
-            Program.UserConfig.Save();
             browser.ResumeNotification();
         }
 
         private void btnManageOptions_Click(object sender, EventArgs e){
-            currentTab.Control.OnClosing();
+            PrepareUnload();
 
             using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
                 FormClosing -= FormSettings_FormClosing;
@@ -70,14 +86,17 @@ namespace TweetDuck.Core.Other{
                     if (!dialog.IsRestarting){
                         browser.ResumeNotification();
 
-                        BrowserProcessHandler.UpdatePrefs();
+                        if (dialog.ShouldReloadBrowser){
-                        ShouldReloadBrowser = dialog.ShouldReloadBrowser;
+                            BrowserProcessHandler.UpdatePrefs();
+                            ShouldReloadBrowser = true;
+                        }
                     }
 
                     Close();
                 }
                 else{
                     FormClosing += FormSettings_FormClosing;
+                    PrepareLoad();
                 }
             }
         }
@@ -138,6 +157,10 @@ namespace TweetDuck.Core.Other{
                     }
                 }
 
+                if (tab.Control.Height < panelContents.Height-2){
+                    tab.Control.Height = panelContents.Height-2; // fixes off-by-pixel error on high DPI
+                }
+
                 tab.Control.OnReady();
             }
             

Core/Other/Settings/BaseTabSettings.cs

@@ -5,6 +5,7 @@ using TweetDuck.Configuration;
 namespace TweetDuck.Core.Other.Settings{
     class BaseTabSettings : UserControl{
         protected static UserConfig Config => Program.UserConfig;
+        protected static SystemConfig SysConfig => Program.SystemConfig;
 
         public IEnumerable<Control> InteractiveControls{
             get{
@@ -31,11 +32,5 @@ namespace TweetDuck.Core.Other.Settings{
 
         public virtual void OnReady(){}
         public virtual void OnClosing(){}
-
-        protected static void PromptRestart(){
-            if (FormMessage.Information("TweetDuck Options", "The application must restart for the option to take place. Do you want to restart now?", FormMessage.Yes, FormMessage.No)){
-                Program.Restart();
-            }
-        }
     }
 }

Core/Other/Settings/Dialogs/DialogSettingsAnalytics.Designer.cs

@@ -33,7 +33,7 @@
             this.textBoxReport.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxReport.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.textBoxReport.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular);
             this.textBoxReport.Location = new System.Drawing.Point(12, 45);
             this.textBoxReport.Multiline = true;
             this.textBoxReport.Name = "textBoxReport";
@@ -46,7 +46,7 @@
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnClose.Location = new System.Drawing.Point(397, 525);
             this.btnClose.Name = "btnClose";
             this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -59,7 +59,7 @@
             // labelInfo
             // 
             this.labelInfo.AutoSize = true;
-            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelInfo.Location = new System.Drawing.Point(12, 9);
             this.labelInfo.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelInfo.Name = "labelInfo";

Core/Other/Settings/Dialogs/DialogSettingsCSS.Designer.cs

@@ -27,33 +27,30 @@
             this.textBoxBrowserCSS = new System.Windows.Forms.TextBox();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnApply = new System.Windows.Forms.Button();
-            this.splitContainer = new System.Windows.Forms.SplitContainer();
-            this.labelBrowser = new System.Windows.Forms.Label();
-            this.labelNotification = new System.Windows.Forms.Label();
             this.textBoxNotificationCSS = new System.Windows.Forms.TextBox();
-            this.labelWarning = new System.Windows.Forms.Label();
+            this.btnOpenDevTools = new System.Windows.Forms.Button();
-            this.btnOpenWiki = new System.Windows.Forms.Button();
             this.timerTestBrowser = new System.Windows.Forms.Timer(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+            this.tabPanel = new System.Windows.Forms.TabControl();
-            this.splitContainer.Panel1.SuspendLayout();
+            this.tabPageBrowser = new System.Windows.Forms.TabPage();
-            this.splitContainer.Panel2.SuspendLayout();
+            this.tabPageNotification = new System.Windows.Forms.TabPage();
-            this.splitContainer.SuspendLayout();
+            this.tabPanel.SuspendLayout();
+            this.tabPageBrowser.SuspendLayout();
+            this.tabPageNotification.SuspendLayout();
             this.SuspendLayout();
             // 
             // textBoxBrowserCSS
             // 
-            this.textBoxBrowserCSS.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.textBoxBrowserCSS.Dock = System.Windows.Forms.DockStyle.Fill;
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.textBoxBrowserCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular);
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBoxBrowserCSS.Location = new System.Drawing.Point(3, 3);
-            this.textBoxBrowserCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxBrowserCSS.Location = new System.Drawing.Point(0, 16);
             this.textBoxBrowserCSS.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
             this.textBoxBrowserCSS.Multiline = true;
             this.textBoxBrowserCSS.Name = "textBoxBrowserCSS";
             this.textBoxBrowserCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxBrowserCSS.Size = new System.Drawing.Size(378, 251);
+            this.textBoxBrowserCSS.Size = new System.Drawing.Size(426, 332);
-            this.textBoxBrowserCSS.TabIndex = 1;
+            this.textBoxBrowserCSS.TabIndex = 0;
             this.textBoxBrowserCSS.WordWrap = false;
+            this.textBoxBrowserCSS.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBoxCSS_KeyDown);
             this.textBoxBrowserCSS.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxBrowserCSS_KeyUp);
             // 
             // btnCancel
@@ -61,7 +58,7 @@
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.AutoSize = true;
             this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnCancel.Location = new System.Drawing.Point(657, 285);
+            this.btnCancel.Location = new System.Drawing.Point(337, 384);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnCancel.Size = new System.Drawing.Size(57, 25);
@@ -75,7 +72,7 @@
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnApply.AutoSize = true;
             this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnApply.Location = new System.Drawing.Point(720, 285);
+            this.btnApply.Location = new System.Drawing.Point(400, 384);
             this.btnApply.Name = "btnApply";
             this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnApply.Size = new System.Drawing.Size(52, 25);
@@ -84,117 +81,94 @@
             this.btnApply.UseVisualStyleBackColor = true;
             this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
             // 
-            // splitContainer
-            // 
-            this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.splitContainer.Location = new System.Drawing.Point(12, 12);
-            this.splitContainer.Name = "splitContainer";
-            // 
-            // splitContainer.Panel1
-            // 
-            this.splitContainer.Panel1.Controls.Add(this.labelBrowser);
-            this.splitContainer.Panel1.Controls.Add(this.textBoxBrowserCSS);
-            this.splitContainer.Panel1MinSize = 64;
-            // 
-            // splitContainer.Panel2
-            // 
-            this.splitContainer.Panel2.Controls.Add(this.labelNotification);
-            this.splitContainer.Panel2.Controls.Add(this.textBoxNotificationCSS);
-            this.splitContainer.Panel2MinSize = 64;
-            this.splitContainer.Size = new System.Drawing.Size(760, 267);
-            this.splitContainer.SplitterDistance = 378;
-            this.splitContainer.SplitterWidth = 5;
-            this.splitContainer.TabIndex = 0;
-            // 
-            // labelBrowser
-            // 
-            this.labelBrowser.AutoSize = true;
-            this.labelBrowser.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelBrowser.Location = new System.Drawing.Point(-3, 0);
-            this.labelBrowser.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.labelBrowser.Name = "labelBrowser";
-            this.labelBrowser.Size = new System.Drawing.Size(49, 15);
-            this.labelBrowser.TabIndex = 0;
-            this.labelBrowser.Text = "Browser";
-            // 
-            // labelNotification
-            // 
-            this.labelNotification.AutoSize = true;
-            this.labelNotification.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelNotification.Location = new System.Drawing.Point(-3, 0);
-            this.labelNotification.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.labelNotification.Name = "labelNotification";
-            this.labelNotification.Size = new System.Drawing.Size(70, 15);
-            this.labelNotification.TabIndex = 0;
-            this.labelNotification.Text = "Notification";
-            // 
             // textBoxNotificationCSS
             // 
-            this.textBoxNotificationCSS.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.textBoxNotificationCSS.Dock = System.Windows.Forms.DockStyle.Fill;
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.textBoxNotificationCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular);
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBoxNotificationCSS.Location = new System.Drawing.Point(3, 3);
-            this.textBoxNotificationCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxNotificationCSS.Location = new System.Drawing.Point(0, 16);
             this.textBoxNotificationCSS.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
             this.textBoxNotificationCSS.Multiline = true;
             this.textBoxNotificationCSS.Name = "textBoxNotificationCSS";
             this.textBoxNotificationCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxNotificationCSS.Size = new System.Drawing.Size(372, 251);
+            this.textBoxNotificationCSS.Size = new System.Drawing.Size(426, 332);
-            this.textBoxNotificationCSS.TabIndex = 1;
+            this.textBoxNotificationCSS.TabIndex = 0;
             this.textBoxNotificationCSS.WordWrap = false;
+            this.textBoxNotificationCSS.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBoxCSS_KeyDown);
             // 
-            // labelWarning
+            // btnOpenDevTools
             // 
-            this.labelWarning.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnOpenDevTools.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.labelWarning.AutoSize = true;
+            this.btnOpenDevTools.AutoSize = true;
-            this.labelWarning.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnOpenDevTools.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelWarning.Location = new System.Drawing.Point(94, 290);
+            this.btnOpenDevTools.Location = new System.Drawing.Point(12, 384);
-            this.labelWarning.Name = "labelWarning";
+            this.btnOpenDevTools.Name = "btnOpenDevTools";
-            this.labelWarning.Size = new System.Drawing.Size(373, 15);
+            this.btnOpenDevTools.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.labelWarning.TabIndex = 3;
+            this.btnOpenDevTools.Size = new System.Drawing.Size(104, 25);
-            this.labelWarning.Text = "The code is not validated, please make sure there are no syntax errors.";
+            this.btnOpenDevTools.TabIndex = 3;
-            // 
+            this.btnOpenDevTools.Text = "Open Dev Tools";
-            // btnOpenWiki
+            this.btnOpenDevTools.UseVisualStyleBackColor = true;
-            // 
+            this.btnOpenDevTools.Click += new System.EventHandler(this.btnOpenDevTools_Click);
-            this.btnOpenWiki.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOpenWiki.AutoSize = true;
-            this.btnOpenWiki.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnOpenWiki.Location = new System.Drawing.Point(12, 285);
-            this.btnOpenWiki.Name = "btnOpenWiki";
-            this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnOpenWiki.Size = new System.Drawing.Size(76, 25);
-            this.btnOpenWiki.TabIndex = 4;
-            this.btnOpenWiki.Text = "Open Wiki";
-            this.btnOpenWiki.UseVisualStyleBackColor = true;
-            this.btnOpenWiki.Click += new System.EventHandler(this.btnOpenWiki_Click);
             // 
             // timerTestBrowser
             // 
-            this.timerTestBrowser.Interval = 500;
+            this.timerTestBrowser.Interval = 400;
             this.timerTestBrowser.Tick += new System.EventHandler(this.timerTestBrowser_Tick);
             // 
+            // tabPanel
+            // 
+            this.tabPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tabPanel.Controls.Add(this.tabPageBrowser);
+            this.tabPanel.Controls.Add(this.tabPageNotification);
+            this.tabPanel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
+            this.tabPanel.Location = new System.Drawing.Point(12, 12);
+            this.tabPanel.Name = "tabPanel";
+            this.tabPanel.SelectedIndex = 0;
+            this.tabPanel.Size = new System.Drawing.Size(440, 366);
+            this.tabPanel.TabIndex = 0;
+            this.tabPanel.SelectedIndexChanged += new System.EventHandler(this.tabPanel_SelectedIndexChanged);
+            // 
+            // tabPageBrowser
+            // 
+            this.tabPageBrowser.Controls.Add(this.textBoxBrowserCSS);
+            this.tabPageBrowser.Location = new System.Drawing.Point(4, 24);
+            this.tabPageBrowser.Name = "tabPageBrowser";
+            this.tabPageBrowser.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPageBrowser.Size = new System.Drawing.Size(432, 338);
+            this.tabPageBrowser.TabIndex = 0;
+            this.tabPageBrowser.Text = "Browser";
+            this.tabPageBrowser.UseVisualStyleBackColor = true;
+            // 
+            // tabPageNotification
+            // 
+            this.tabPageNotification.Controls.Add(this.textBoxNotificationCSS);
+            this.tabPageNotification.Location = new System.Drawing.Point(4, 24);
+            this.tabPageNotification.Name = "tabPageNotification";
+            this.tabPageNotification.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPageNotification.Size = new System.Drawing.Size(432, 338);
+            this.tabPageNotification.TabIndex = 1;
+            this.tabPageNotification.Text = "Notification";
+            this.tabPageNotification.UseVisualStyleBackColor = true;
+            // 
             // DialogSettingsCSS
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(784, 322);
+            this.ClientSize = new System.Drawing.Size(464, 421);
-            this.Controls.Add(this.btnOpenWiki);
+            this.Controls.Add(this.tabPanel);
-            this.Controls.Add(this.labelWarning);
+            this.Controls.Add(this.btnOpenDevTools);
-            this.Controls.Add(this.splitContainer);
             this.Controls.Add(this.btnApply);
             this.Controls.Add(this.btnCancel);
-            this.MinimumSize = new System.Drawing.Size(620, 160);
+            this.MinimumSize = new System.Drawing.Size(320, 240);
             this.Name = "DialogSettingsCSS";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.splitContainer.Panel1.ResumeLayout(false);
+            this.tabPanel.ResumeLayout(false);
-            this.splitContainer.Panel1.PerformLayout();
+            this.tabPageBrowser.ResumeLayout(false);
-            this.splitContainer.Panel2.ResumeLayout(false);
+            this.tabPageBrowser.PerformLayout();
-            this.splitContainer.Panel2.PerformLayout();
+            this.tabPageNotification.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+            this.tabPageNotification.PerformLayout();
-            this.splitContainer.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -205,12 +179,11 @@
         private System.Windows.Forms.TextBox textBoxBrowserCSS;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Button btnApply;
-        private System.Windows.Forms.SplitContainer splitContainer;
         private System.Windows.Forms.TextBox textBoxNotificationCSS;
-        private System.Windows.Forms.Label labelBrowser;
+        private System.Windows.Forms.Button btnOpenDevTools;
-        private System.Windows.Forms.Label labelNotification;
-        private System.Windows.Forms.Label labelWarning;
-        private System.Windows.Forms.Button btnOpenWiki;
         private System.Windows.Forms.Timer timerTestBrowser;
+        private System.Windows.Forms.TabControl tabPanel;
+        private System.Windows.Forms.TabPage tabPageBrowser;
+        private System.Windows.Forms.TabPage tabPageNotification;
     }
 }

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
@@ -9,19 +11,108 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         public string NotificationCSS => textBoxNotificationCSS.Text;
 
         private readonly Action<string> reinjectBrowserCSS;
+        private readonly Action openDevTools;
 
-        public DialogSettingsCSS(Action<string> reinjectBrowserCSS){ // TODO high dpi breaks scaling of things inside the panel...
+        public DialogSettingsCSS(Action<string> reinjectBrowserCSS, Action openDevTools){
             InitializeComponent();
             
             Text = Program.BrandName+" Options - CSS";
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
+            this.openDevTools = openDevTools;
             
             textBoxBrowserCSS.EnableMultilineShortcuts();
             textBoxBrowserCSS.Text = Program.UserConfig.CustomBrowserCSS ?? "";
 
             textBoxNotificationCSS.EnableMultilineShortcuts();
             textBoxNotificationCSS.Text = Program.UserConfig.CustomNotificationCSS ?? "";
+
+            if (!BrowserUtils.HasDevTools){
+                btnOpenDevTools.Enabled = false;
+            }
+
+            ActiveControl = textBoxBrowserCSS;
+            textBoxBrowserCSS.Select(textBoxBrowserCSS.TextLength, 0);
+        }
+
+        private void tabPanel_SelectedIndexChanged(object sender, EventArgs e){
+            TextBox tb = tabPanel.SelectedTab.Controls.OfType<TextBox>().FirstOrDefault();
+
+            if (tb != null){
+                tb.Focus();
+                tb.Select(tb.TextLength, 0);
+            }
+        }
+
+        private void textBoxCSS_KeyDown(object sender, KeyEventArgs e){
+            TextBox tb = (TextBox)sender;
+            string text = tb.Text;
+
+            if (e.KeyCode == Keys.Back && e.Modifiers == Keys.Control){
+                e.SuppressKeyPress = true;
+
+                int deleteTo = tb.SelectionStart;
+
+                if (deleteTo > 0){
+                    char initialChar = text[--deleteTo];
+                    bool shouldDeleteAlphanumeric = char.IsLetterOrDigit(initialChar);
+                
+                    while(--deleteTo >= 0){
+                        if ((shouldDeleteAlphanumeric && !char.IsLetterOrDigit(text[deleteTo])) ||
+                            (!shouldDeleteAlphanumeric && text[deleteTo] != initialChar)){
+                            break;
+                        }
+                    }
+                    
+                    if (!(deleteTo < text.Length-1 && text[deleteTo] == '\r' && text[deleteTo+1] == '\n')){
+                        ++deleteTo;
+                    }
+
+                    tb.Select(deleteTo, tb.SelectionLength+tb.SelectionStart-deleteTo);
+                    tb.SelectedText = string.Empty;
+                }
+            }
+            else if (e.KeyCode == Keys.Back && e.Modifiers == Keys.None){
+                int deleteTo = tb.SelectionStart;
+
+                if (deleteTo > 1 && text[deleteTo-1] == ' ' && text[deleteTo-2] == ' '){
+                    e.SuppressKeyPress = true;
+
+                    tb.Select(deleteTo-2, 2);
+                    tb.SelectedText = string.Empty;
+                }
+            }
+            else if (e.KeyCode == Keys.Enter && e.Modifiers == Keys.None && tb.SelectionLength == 0){
+                int insertAt = tb.SelectionStart, cursorOffset = 0;
+                string insertText;
+
+                if (insertAt == 0){
+                    return;
+                }
+                else if (text[insertAt-1] == '{'){
+                    insertText = Environment.NewLine+"  ";
+
+                    int nextBracket = insertAt < text.Length ? text.IndexOfAny(new char[]{ '{', '}' }, insertAt+1) : -1;
+
+                    if (nextBracket == -1 || text[nextBracket] == '{'){
+                        string insertExtra = Environment.NewLine+"}";
+                        insertText += insertExtra;
+                        cursorOffset -= insertExtra.Length;
+                    }
+                }
+                else{
+                    int lineStart = text.LastIndexOf('\n', tb.SelectionStart-1);
+
+                    Match match = Regex.Match(text.Substring(lineStart == -1 ? 0 : lineStart+1), "^([ \t]+)");
+                    insertText = match.Success ? Environment.NewLine+match.Groups[1].Value : null;
+                }
+
+                if (!string.IsNullOrEmpty(insertText)){
+                    e.SuppressKeyPress = true;
+                    tb.Text = text.Insert(insertAt, insertText);
+                    tb.SelectionStart = insertAt+cursorOffset+insertText.Length;
+                }
+            }
         }
 
         private void textBoxBrowserCSS_KeyUp(object sender, KeyEventArgs e){
@@ -34,8 +125,8 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             timerTestBrowser.Stop();
         }
 
-        private void btnOpenWiki_Click(object sender, EventArgs e){
+        private void btnOpenDevTools_Click(object sender, EventArgs e){
-            BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/wiki");
+            openDevTools();
         }
 
         private void btnApply_Click(object sender, EventArgs e){

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.Designer.cs

@@ -35,7 +35,7 @@
             this.textBoxArgs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxArgs.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.textBoxArgs.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular);
             this.textBoxArgs.Location = new System.Drawing.Point(12, 30);
             this.textBoxArgs.Multiline = true;
             this.textBoxArgs.Name = "textBoxArgs";
@@ -46,7 +46,7 @@
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.AutoSize = true;
-            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnCancel.Location = new System.Drawing.Point(377, 225);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -60,7 +60,7 @@
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnApply.AutoSize = true;
-            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnApply.Location = new System.Drawing.Point(440, 225);
             this.btnApply.Name = "btnApply";
             this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -74,7 +74,7 @@
             // 
             this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnHelp.AutoSize = true;
-            this.btnHelp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnHelp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnHelp.Location = new System.Drawing.Point(12, 225);
             this.btnHelp.Name = "btnHelp";
             this.btnHelp.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -87,7 +87,7 @@
             // labelWarning
             // 
             this.labelWarning.AutoSize = true;
-            this.labelWarning.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWarning.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelWarning.Location = new System.Drawing.Point(12, 9);
             this.labelWarning.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelWarning.Name = "labelWarning";

Core/Other/Settings/Dialogs/DialogSettingsManage.Designer.cs

@@ -44,7 +44,7 @@
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.AutoSize = true;
-            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnCancel.Location = new System.Drawing.Point(165, 92);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -59,7 +59,7 @@
             this.btnContinue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnContinue.AutoSize = true;
             this.btnContinue.Enabled = false;
-            this.btnContinue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnContinue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnContinue.Location = new System.Drawing.Point(114, 92);
             this.btnContinue.Name = "btnContinue";
             this.btnContinue.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -72,7 +72,7 @@
             // cbProgramConfig
             // 
             this.cbProgramConfig.AutoSize = true;
-            this.cbProgramConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbProgramConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.cbProgramConfig.Location = new System.Drawing.Point(3, 3);
             this.cbProgramConfig.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbProgramConfig.Name = "cbProgramConfig";
@@ -86,7 +86,7 @@
             // cbSession
             // 
             this.cbSession.AutoSize = true;
-            this.cbSession.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbSession.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.cbSession.Location = new System.Drawing.Point(3, 51);
             this.cbSession.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbSession.Name = "cbSession";
@@ -100,7 +100,7 @@
             // cbPluginData
             // 
             this.cbPluginData.AutoSize = true;
-            this.cbPluginData.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbPluginData.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.cbPluginData.Location = new System.Drawing.Point(3, 75);
             this.cbPluginData.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbPluginData.Name = "cbPluginData";
@@ -114,7 +114,7 @@
             // cbSystemConfig
             // 
             this.cbSystemConfig.AutoSize = true;
-            this.cbSystemConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbSystemConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.cbSystemConfig.Location = new System.Drawing.Point(3, 27);
             this.cbSystemConfig.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbSystemConfig.Name = "cbSystemConfig";
@@ -158,7 +158,7 @@
             // radioImport
             // 
             this.radioImport.AutoSize = true;
-            this.radioImport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioImport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.radioImport.Location = new System.Drawing.Point(3, 3);
             this.radioImport.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioImport.Name = "radioImport";
@@ -172,7 +172,7 @@
             // radioExport
             // 
             this.radioExport.AutoSize = true;
-            this.radioExport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioExport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.radioExport.Location = new System.Drawing.Point(3, 27);
             this.radioExport.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioExport.Name = "radioExport";
@@ -186,7 +186,7 @@
             // radioReset
             // 
             this.radioReset.AutoSize = true;
-            this.radioReset.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioReset.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.radioReset.Location = new System.Drawing.Point(3, 51);
             this.radioReset.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioReset.Name = "radioReset";

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Management;
+using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
@@ -23,6 +24,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             }
         }
 
+        private bool SelectedItemsForceRestart{
+            get => _selectedItems.HasFlag(ProfileManager.Items.Session);
+        }
+        
         public bool IsRestarting { get; private set; }
         public bool ShouldReloadBrowser { get; private set; }
         
@@ -31,10 +36,11 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
         private State currentState;
         private ProfileManager importManager;
+        private bool requestedRestartFromConfig;
 
         private ProfileManager.Items _selectedItems = ProfileManager.Items.None;
 
-        public DialogSettingsManage(PluginManager plugins){
+        public DialogSettingsManage(PluginManager plugins, bool openImportImmediately = false){
             InitializeComponent();
 
             this.plugins = plugins;
@@ -44,6 +50,11 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             this.checkBoxMap[cbSystemConfig] = ProfileManager.Items.SystemConfig;
             this.checkBoxMap[cbSession] = ProfileManager.Items.Session;
             this.checkBoxMap[cbPluginData] = ProfileManager.Items.PluginData;
+
+            if (openImportImmediately){
+                radioImport.Checked = true;
+                btnContinue_Click(null, EventArgs.Empty);
+            }
         }
 
         private void radioDecision_CheckedChanged(object sender, EventArgs e){
@@ -111,37 +122,38 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
                 case State.Reset:
                     if (FormMessage.Warning("Reset TweetDuck Options", "This will reset the selected items. Are you sure you want to proceed?", FormMessage.Yes, FormMessage.No)){
+                        Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
+
                         if (SelectedItems.HasFlag(ProfileManager.Items.UserConfig)){
                             Program.UserConfig.Reset();
                         }
 
                         if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
-                            try{
+                            Program.SystemConfig.Reset();
-                                File.Delete(Program.SystemConfigFilePath);
-                            }catch(Exception ex){
-                                Program.Reporter.HandleException("System Config Reset Error", "Could not delete system config.", true, ex);
-                            }
                         }
 
+                        Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
+
                         if (SelectedItems.HasFlag(ProfileManager.Items.PluginData)){
                             try{
                                 File.Delete(Program.PluginConfigFilePath);
                                 Directory.Delete(Program.PluginDataPath, true);
                             }catch(Exception ex){
-                                Program.Reporter.HandleException("Plugin Data Reset Error", "Could not delete plugin data.", true, ex);
+                                Program.Reporter.HandleException("Profile Reset", "Could not delete plugin data.", true, ex);
                             }
                         }
 
-                        if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
+                        if (SelectedItemsForceRestart){
-                            RestartProgram(Arguments.ArgDeleteCookies);
+                            RestartProgram(SelectedItems.HasFlag(ProfileManager.Items.Session) ? new string[]{ Arguments.ArgDeleteCookies } : StringUtils.EmptyArray);
                         }
-                        else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
+                        else if (requestedRestartFromConfig){
-                            RestartProgram();
+                            if (FormMessage.Information("Profile Reset", "The application must restart for some of the restored options to take place. Do you want to restart now?", FormMessage.Yes, FormMessage.No)){
-                        }
+                                RestartProgram();
-                        else{
+                            }
-                            ShouldReloadBrowser = true;
                         }
 
+                        ShouldReloadBrowser = true;
+
                         DialogResult = DialogResult.OK;
                         Close();
                     }
@@ -150,21 +162,22 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
                 case State.Import:
                     if (importManager.Import(SelectedItems)){
-                        Program.UserConfig.Reload();
+                        Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
+                        Program.Config.ReloadAll();
+                        Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
                         
-                        if (importManager.IsRestarting){
+                        if (SelectedItemsForceRestart){
-                            if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
+                            RestartProgram(SelectedItems.HasFlag(ProfileManager.Items.Session) ? new string[]{ Arguments.ArgImportCookies } : StringUtils.EmptyArray);
-                                RestartProgram(Arguments.ArgImportCookies);
+                        }
-                            }
+                        else if (requestedRestartFromConfig){
-                            else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
+                            if (FormMessage.Information("Profile Import", "The application must restart for some of the imported options to take place. Do you want to restart now?", FormMessage.Yes, FormMessage.No)){
                                 RestartProgram();
                             }
                         }
-                        else{
-                            ShouldReloadBrowser = true;
-                        }
                     }
                     
+                    ShouldReloadBrowser = true;
+
                     DialogResult = DialogResult.OK;
                     Close();
                     break;
@@ -186,9 +199,6 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         file = dialog.FileName;
                     }
                     
-                    Program.UserConfig.Save();
-                    Program.SystemConfig.Save();
-                    
                     new ProfileManager(file, plugins).Export(SelectedItems);
 
                     DialogResult = DialogResult.OK;
@@ -202,15 +212,19 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             Close();
         }
 
+        private void Config_ProgramRestartRequested(object sender, EventArgs e){
+            requestedRestartFromConfig = true;
+        }
+
         private void SetFlag(ProfileManager.Items flag, bool enable){
             _selectedItems = enable ? _selectedItems | flag : _selectedItems & ~flag;
             btnContinue.Enabled = _selectedItems != ProfileManager.Items.None;
             
             if (currentState == State.Import){
-                btnContinue.Text = _selectedItems.NeedsRestart() ? "Import && Restart" : "Import Profile";
+                btnContinue.Text = SelectedItemsForceRestart ? "Import && Restart" : "Import Profile";
             }
             else if (currentState == State.Reset){
-                btnContinue.Text = _selectedItems.NeedsRestart() ? "Restore && Restart" : "Restore Defaults";
+                btnContinue.Text = SelectedItemsForceRestart ? "Restore && Restart" : "Restore Defaults";
             }
         }
 

Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs

@@ -40,7 +40,7 @@
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.AutoSize = true;
-            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnCancel.Location = new System.Drawing.Point(215, 146);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -54,7 +54,7 @@
             // 
             this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnRestart.AutoSize = true;
-            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnRestart.Location = new System.Drawing.Point(152, 146);
             this.btnRestart.Name = "btnRestart";
             this.btnRestart.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -67,7 +67,7 @@
             // cbLogging
             // 
             this.cbLogging.AutoSize = true;
-            this.cbLogging.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbLogging.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.cbLogging.Location = new System.Drawing.Point(3, 3);
             this.cbLogging.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbLogging.Name = "cbLogging";
@@ -79,7 +79,7 @@
             // 
             // tbDataFolder
             // 
-            this.tbDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.tbDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.tbDataFolder.Location = new System.Drawing.Point(3, 54);
             this.tbDataFolder.Name = "tbDataFolder";
             this.tbDataFolder.Size = new System.Drawing.Size(260, 23);
@@ -92,7 +92,7 @@
             this.tbShortcutTarget.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tbShortcutTarget.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.tbShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.tbShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.tbShortcutTarget.Location = new System.Drawing.Point(3, 110);
             this.tbShortcutTarget.Name = "tbShortcutTarget";
             this.tbShortcutTarget.ReadOnly = true;
@@ -103,7 +103,7 @@
             // labelDataFolder
             // 
             this.labelDataFolder.AutoSize = true;
-            this.labelDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelDataFolder.Location = new System.Drawing.Point(3, 36);
             this.labelDataFolder.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDataFolder.Name = "labelDataFolder";
@@ -114,7 +114,7 @@
             // labelShortcutTarget
             // 
             this.labelShortcutTarget.AutoSize = true;
-            this.labelShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelShortcutTarget.Location = new System.Drawing.Point(3, 92);
             this.labelShortcutTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelShortcutTarget.Name = "labelShortcutTarget";

Core/Other/Settings/Dialogs/DialogSettingsSearchEngine.Designer.cs

@@ -34,7 +34,7 @@
             this.textBoxUrl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxUrl.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.textBoxUrl.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.textBoxUrl.Location = new System.Drawing.Point(12, 30);
             this.textBoxUrl.Name = "textBoxUrl";
             this.textBoxUrl.Size = new System.Drawing.Size(310, 23);
@@ -44,7 +44,7 @@
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.AutoSize = true;
-            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnCancel.Location = new System.Drawing.Point(207, 59);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -58,7 +58,7 @@
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnApply.AutoSize = true;
-            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnApply.Location = new System.Drawing.Point(270, 59);
             this.btnApply.Name = "btnApply";
             this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -71,7 +71,7 @@
             // labelInfo
             // 
             this.labelInfo.AutoSize = true;
-            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelInfo.Location = new System.Drawing.Point(12, 9);
             this.labelInfo.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelInfo.Name = "labelInfo";

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -25,7 +25,6 @@
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.btnClearCache = new System.Windows.Forms.Button();
-            this.checkHardwareAcceleration = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.btnEditCefArgs = new System.Windows.Forms.Button();
             this.btnEditCSS = new System.Windows.Forms.Button();
@@ -37,9 +36,8 @@
             this.checkClearCacheAuto = new System.Windows.Forms.CheckBox();
             this.labelApp = new System.Windows.Forms.Label();
             this.panelAppButtons = new System.Windows.Forms.Panel();
-            this.labelPerformance = new System.Windows.Forms.Label();
-            this.panelClearCacheAuto = new System.Windows.Forms.Panel();
             this.labelCache = new System.Windows.Forms.Label();
+            this.panelClearCacheAuto = new System.Windows.Forms.Panel();
             this.panelConfiguration = new System.Windows.Forms.Panel();
             this.labelConfiguration = new System.Windows.Forms.Label();
             this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
@@ -52,99 +50,87 @@
             // 
             // btnClearCache
             // 
-            this.btnClearCache.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClearCache.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnClearCache.Location = new System.Drawing.Point(5, 179);
+            this.btnClearCache.Location = new System.Drawing.Point(5, 135);
             this.btnClearCache.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnClearCache.Name = "btnClearCache";
-            this.btnClearCache.Size = new System.Drawing.Size(144, 25);
+            this.btnClearCache.Size = new System.Drawing.Size(143, 25);
-            this.btnClearCache.TabIndex = 5;
+            this.btnClearCache.TabIndex = 3;
             this.btnClearCache.Text = "Clear Cache (...)";
             this.btnClearCache.UseVisualStyleBackColor = true;
             // 
-            // checkHardwareAcceleration
-            // 
-            this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 128);
-            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
-            this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
-            this.checkHardwareAcceleration.Size = new System.Drawing.Size(146, 19);
-            this.checkHardwareAcceleration.TabIndex = 3;
-            this.checkHardwareAcceleration.Text = "Hardware Acceleration";
-            this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
-            // 
             // btnEditCefArgs
             // 
-            this.btnEditCefArgs.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnEditCefArgs.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnEditCefArgs.Location = new System.Drawing.Point(5, 3);
             this.btnEditCefArgs.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnEditCefArgs.Name = "btnEditCefArgs";
-            this.btnEditCefArgs.Size = new System.Drawing.Size(144, 25);
+            this.btnEditCefArgs.Size = new System.Drawing.Size(143, 25);
             this.btnEditCefArgs.TabIndex = 0;
             this.btnEditCefArgs.Text = "Edit CEF Arguments";
             this.btnEditCefArgs.UseVisualStyleBackColor = true;
             // 
             // btnEditCSS
             // 
-            this.btnEditCSS.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnEditCSS.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnEditCSS.Location = new System.Drawing.Point(155, 3);
+            this.btnEditCSS.Location = new System.Drawing.Point(154, 3);
             this.btnEditCSS.Name = "btnEditCSS";
-            this.btnEditCSS.Size = new System.Drawing.Size(144, 25);
+            this.btnEditCSS.Size = new System.Drawing.Size(143, 25);
             this.btnEditCSS.TabIndex = 1;
             this.btnEditCSS.Text = "Edit CSS";
             this.btnEditCSS.UseVisualStyleBackColor = true;
             // 
             // btnRestartArgs
             // 
-            this.btnRestartArgs.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnRestartArgs.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnRestartArgs.Location = new System.Drawing.Point(155, 32);
+            this.btnRestartArgs.Location = new System.Drawing.Point(154, 32);
             this.btnRestartArgs.Name = "btnRestartArgs";
-            this.btnRestartArgs.Size = new System.Drawing.Size(144, 25);
+            this.btnRestartArgs.Size = new System.Drawing.Size(143, 25);
             this.btnRestartArgs.TabIndex = 3;
             this.btnRestartArgs.Text = "Restart with Arguments";
             this.btnRestartArgs.UseVisualStyleBackColor = true;
             // 
             // btnRestart
             // 
-            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnRestart.Location = new System.Drawing.Point(155, 3);
+            this.btnRestart.Location = new System.Drawing.Point(154, 3);
             this.btnRestart.Name = "btnRestart";
-            this.btnRestart.Size = new System.Drawing.Size(144, 25);
+            this.btnRestart.Size = new System.Drawing.Size(143, 25);
             this.btnRestart.TabIndex = 2;
             this.btnRestart.Text = "Restart the Program";
             this.btnRestart.UseVisualStyleBackColor = true;
             // 
             // btnOpenAppFolder
             // 
-            this.btnOpenAppFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnOpenAppFolder.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnOpenAppFolder.Location = new System.Drawing.Point(5, 3);
             this.btnOpenAppFolder.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnOpenAppFolder.Name = "btnOpenAppFolder";
-            this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 25);
+            this.btnOpenAppFolder.Size = new System.Drawing.Size(143, 25);
             this.btnOpenAppFolder.TabIndex = 0;
             this.btnOpenAppFolder.Text = "Open Program Folder";
             this.btnOpenAppFolder.UseVisualStyleBackColor = true;
             // 
             // btnOpenDataFolder
             // 
-            this.btnOpenDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnOpenDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnOpenDataFolder.Location = new System.Drawing.Point(5, 32);
             this.btnOpenDataFolder.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnOpenDataFolder.Name = "btnOpenDataFolder";
-            this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 25);
+            this.btnOpenDataFolder.Size = new System.Drawing.Size(143, 25);
             this.btnOpenDataFolder.TabIndex = 1;
             this.btnOpenDataFolder.Text = "Open Data Folder";
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
             // 
             // numClearCacheThreshold
             // 
-            this.numClearCacheThreshold.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.numClearCacheThreshold.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.numClearCacheThreshold.Increment = new decimal(new int[] {
             50,
             0,
             0,
             0});
-            this.numClearCacheThreshold.Location = new System.Drawing.Point(246, 5);
+            this.numClearCacheThreshold.Location = new System.Drawing.Point(210, 5);
             this.numClearCacheThreshold.Maximum = new decimal(new int[] {
             1000,
             0,
@@ -156,7 +142,7 @@
             0,
             0});
             this.numClearCacheThreshold.Name = "numClearCacheThreshold";
-            this.numClearCacheThreshold.Size = new System.Drawing.Size(68, 23);
+            this.numClearCacheThreshold.Size = new System.Drawing.Size(89, 23);
             this.numClearCacheThreshold.TabIndex = 1;
             this.numClearCacheThreshold.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.numClearCacheThreshold.TextSuffix = " MB";
@@ -169,29 +155,28 @@
             // checkClearCacheAuto
             // 
             this.checkClearCacheAuto.AutoSize = true;
-            this.checkClearCacheAuto.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkClearCacheAuto.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkClearCacheAuto.Location = new System.Drawing.Point(6, 6);
             this.checkClearCacheAuto.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
             this.checkClearCacheAuto.Name = "checkClearCacheAuto";
-            this.checkClearCacheAuto.Size = new System.Drawing.Size(237, 19);
+            this.checkClearCacheAuto.Size = new System.Drawing.Size(201, 19);
             this.checkClearCacheAuto.TabIndex = 0;
-            this.checkClearCacheAuto.Text = "Clear Cache Automatically When Above";
+            this.checkClearCacheAuto.Text = "Clear Automatically When Above";
             this.checkClearCacheAuto.UseVisualStyleBackColor = true;
             // 
             // labelApp
             // 
             this.labelApp.AutoSize = true;
-            this.labelApp.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelApp.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
             this.labelApp.Location = new System.Drawing.Point(0, 0);
-            this.labelApp.Margin = new System.Windows.Forms.Padding(0);
+            this.labelApp.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelApp.Name = "labelApp";
-            this.labelApp.Size = new System.Drawing.Size(37, 20);
+            this.labelApp.Size = new System.Drawing.Size(97, 19);
             this.labelApp.TabIndex = 0;
-            this.labelApp.Text = "App";
+            this.labelApp.Text = "APPLICATION";
             // 
             // panelAppButtons
             // 
-            this.panelAppButtons.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelAppButtons.Controls.Add(this.btnOpenDataFolder);
             this.panelAppButtons.Controls.Add(this.btnOpenAppFolder);
             this.panelAppButtons.Controls.Add(this.btnRestart);
@@ -199,73 +184,57 @@
             this.panelAppButtons.Location = new System.Drawing.Point(0, 20);
             this.panelAppButtons.Margin = new System.Windows.Forms.Padding(0);
             this.panelAppButtons.Name = "panelAppButtons";
-            this.panelAppButtons.Size = new System.Drawing.Size(322, 62);
+            this.panelAppButtons.Size = new System.Drawing.Size(300, 62);
             this.panelAppButtons.TabIndex = 1;
             // 
-            // labelPerformance
-            // 
-            this.labelPerformance.AutoSize = true;
-            this.labelPerformance.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelPerformance.Location = new System.Drawing.Point(0, 102);
-            this.labelPerformance.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
-            this.labelPerformance.Name = "labelPerformance";
-            this.labelPerformance.Size = new System.Drawing.Size(93, 20);
-            this.labelPerformance.TabIndex = 2;
-            this.labelPerformance.Text = "Performance";
-            // 
-            // panelClearCacheAuto
-            // 
-            this.panelClearCacheAuto.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.panelClearCacheAuto.Controls.Add(this.checkClearCacheAuto);
-            this.panelClearCacheAuto.Controls.Add(this.numClearCacheThreshold);
-            this.panelClearCacheAuto.Location = new System.Drawing.Point(0, 207);
-            this.panelClearCacheAuto.Margin = new System.Windows.Forms.Padding(0);
-            this.panelClearCacheAuto.Name = "panelClearCacheAuto";
-            this.panelClearCacheAuto.Size = new System.Drawing.Size(322, 28);
-            this.panelClearCacheAuto.TabIndex = 6;
-            // 
             // labelCache
             // 
             this.labelCache.AutoSize = true;
-            this.labelCache.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelCache.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelCache.Location = new System.Drawing.Point(3, 161);
+            this.labelCache.Location = new System.Drawing.Point(0, 112);
-            this.labelCache.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelCache.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
             this.labelCache.Name = "labelCache";
-            this.labelCache.Size = new System.Drawing.Size(40, 15);
+            this.labelCache.Size = new System.Drawing.Size(123, 19);
-            this.labelCache.TabIndex = 4;
+            this.labelCache.TabIndex = 2;
-            this.labelCache.Text = "Cache";
+            this.labelCache.Text = "BROWSER CACHE";
+            // 
+            // panelClearCacheAuto
+            // 
+            this.panelClearCacheAuto.Controls.Add(this.checkClearCacheAuto);
+            this.panelClearCacheAuto.Controls.Add(this.numClearCacheThreshold);
+            this.panelClearCacheAuto.Location = new System.Drawing.Point(0, 163);
+            this.panelClearCacheAuto.Margin = new System.Windows.Forms.Padding(0);
+            this.panelClearCacheAuto.Name = "panelClearCacheAuto";
+            this.panelClearCacheAuto.Size = new System.Drawing.Size(300, 28);
+            this.panelClearCacheAuto.TabIndex = 4;
             // 
             // panelConfiguration
             // 
-            this.panelConfiguration.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelConfiguration.Controls.Add(this.btnEditCSS);
             this.panelConfiguration.Controls.Add(this.btnEditCefArgs);
-            this.panelConfiguration.Location = new System.Drawing.Point(0, 275);
+            this.panelConfiguration.Location = new System.Drawing.Point(0, 241);
             this.panelConfiguration.Margin = new System.Windows.Forms.Padding(0);
             this.panelConfiguration.Name = "panelConfiguration";
-            this.panelConfiguration.Size = new System.Drawing.Size(322, 31);
+            this.panelConfiguration.Size = new System.Drawing.Size(300, 31);
-            this.panelConfiguration.TabIndex = 8;
+            this.panelConfiguration.TabIndex = 6;
             // 
             // labelConfiguration
             // 
             this.labelConfiguration.AutoSize = true;
-            this.labelConfiguration.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelConfiguration.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelConfiguration.Location = new System.Drawing.Point(0, 255);
+            this.labelConfiguration.Location = new System.Drawing.Point(0, 221);
-            this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
+            this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
             this.labelConfiguration.Name = "labelConfiguration";
-            this.labelConfiguration.Size = new System.Drawing.Size(100, 20);
+            this.labelConfiguration.Size = new System.Drawing.Size(123, 19);
-            this.labelConfiguration.TabIndex = 7;
+            this.labelConfiguration.TabIndex = 5;
-            this.labelConfiguration.Text = "Configuration";
+            this.labelConfiguration.Text = "CONFIGURATION";
             // 
             // flowPanel
             // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Left)));
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.flowPanel.Controls.Add(this.labelApp);
             this.flowPanel.Controls.Add(this.panelAppButtons);
-            this.flowPanel.Controls.Add(this.labelPerformance);
-            this.flowPanel.Controls.Add(this.checkHardwareAcceleration);
             this.flowPanel.Controls.Add(this.labelCache);
             this.flowPanel.Controls.Add(this.btnClearCache);
             this.flowPanel.Controls.Add(this.panelClearCacheAuto);
@@ -274,7 +243,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 307);
+            this.flowPanel.Size = new System.Drawing.Size(300, 462);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -284,7 +253,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsAdvanced";
-            this.Size = new System.Drawing.Size(340, 325);
+            this.Size = new System.Drawing.Size(631, 480);
             ((System.ComponentModel.ISupportInitialize)(this.numClearCacheThreshold)).EndInit();
             this.panelAppButtons.ResumeLayout(false);
             this.panelClearCacheAuto.ResumeLayout(false);
@@ -299,7 +268,6 @@
         #endregion
 
         private System.Windows.Forms.Button btnClearCache;
-        private System.Windows.Forms.CheckBox checkHardwareAcceleration;
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Button btnEditCefArgs;
         private System.Windows.Forms.Button btnEditCSS;
@@ -309,11 +277,10 @@
         private System.Windows.Forms.Button btnOpenDataFolder;
         private System.Windows.Forms.Label labelApp;
         private System.Windows.Forms.Panel panelAppButtons;
-        private System.Windows.Forms.Label labelPerformance;
+        private System.Windows.Forms.Label labelCache;
         private System.Windows.Forms.Panel panelClearCacheAuto;
         private System.Windows.Forms.Panel panelConfiguration;
         private System.Windows.Forms.Label labelConfiguration;
-        private System.Windows.Forms.Label labelCache;
         private Controls.NumericUpDownEx numClearCacheThreshold;
         private System.Windows.Forms.CheckBox checkClearCacheAuto;
         private System.Windows.Forms.FlowLayoutPanel flowPanel;

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -10,36 +10,27 @@ using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsAdvanced : BaseTabSettings{
-        private static SystemConfig SysConfig => Program.SystemConfig;
-
         private readonly Action<string> reinjectBrowserCSS;
+        private readonly Action openDevTools;
 
-        public TabSettingsAdvanced(Action<string> reinjectBrowserCSS){
+        public TabSettingsAdvanced(Action<string> reinjectBrowserCSS, Action openDevTools){
             InitializeComponent();
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
+            this.openDevTools = openDevTools;
+
+            // application
             
             toolTip.SetToolTip(btnOpenAppFolder, "Opens the folder where the app is located.");
             toolTip.SetToolTip(btnOpenDataFolder, "Opens the folder where your profile data is located.");
             toolTip.SetToolTip(btnRestart, "Restarts the program using the same command\r\nline arguments that were used at launch.");
             toolTip.SetToolTip(btnRestartArgs, "Restarts the program with customizable\r\ncommand line arguments.");
 
-            toolTip.SetToolTip(checkHardwareAcceleration, "Uses graphics card to improve performance. Disable if you experience\r\nvisual glitches. This option will not be exported in a profile.");
+            // browser cache
 
             toolTip.SetToolTip(btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources.");
             toolTip.SetToolTip(checkClearCacheAuto, "Automatically clears cache when its size exceeds the set threshold. Note that cache can only be cleared when closing TweetDuck.");
 
-            toolTip.SetToolTip(btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
-            toolTip.SetToolTip(btnEditCSS, "Set custom CSS for browser and notification windows.");
-
-            if (SystemConfig.IsHardwareAccelerationSupported){
-                checkHardwareAcceleration.Checked = SysConfig.HardwareAcceleration;
-            }
-            else{
-                checkHardwareAcceleration.Enabled = false;
-                checkHardwareAcceleration.Checked = false;
-            }
-
             checkClearCacheAuto.Checked = SysConfig.ClearCacheAutomatically;
             numClearCacheThreshold.Enabled = checkClearCacheAuto.Checked;
             numClearCacheThreshold.SetValueSafe(SysConfig.ClearCacheThreshold);
@@ -48,6 +39,11 @@ namespace TweetDuck.Core.Other.Settings{
                 string text = task.Status == TaskStatus.RanToCompletion ? (int)Math.Ceiling(task.Result/(1024.0*1024.0))+" MB" : "unknown";
                 this.InvokeSafe(() => btnClearCache.Text = $"Clear Cache ({text})");
             });
+
+            // configuration
+
+            toolTip.SetToolTip(btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
+            toolTip.SetToolTip(btnEditCSS, "Set custom CSS for browser and notification windows.");
         }
 
         public override void OnReady(){
@@ -56,8 +52,6 @@ namespace TweetDuck.Core.Other.Settings{
             btnRestart.Click += btnRestart_Click;
             btnRestartArgs.Click += btnRestartArgs_Click;
 
-            checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
-
             btnClearCache.Click += btnClearCache_Click;
             checkClearCacheAuto.CheckedChanged += checkClearCacheAuto_CheckedChanged;
             
@@ -68,68 +62,9 @@ namespace TweetDuck.Core.Other.Settings{
         public override void OnClosing(){
             SysConfig.ClearCacheAutomatically = checkClearCacheAuto.Checked;
             SysConfig.ClearCacheThreshold = (int)numClearCacheThreshold.Value;
-            SysConfig.Save();
         }
 
-        private void btnClearCache_Click(object sender, EventArgs e){
+        #region Application
-            btnClearCache.Enabled = false;
-            BrowserCache.SetClearOnExit();
-            FormMessage.Information("Clear Cache", "Cache will be automatically cleared when TweetDuck exits.", FormMessage.OK);
-        }
-
-        private void checkClearCacheAuto_CheckedChanged(object sender, EventArgs e){
-            numClearCacheThreshold.Enabled = checkClearCacheAuto.Checked;
-        }
-
-        private void checkHardwareAcceleration_CheckedChanged(object sender, EventArgs e){
-            SysConfig.HardwareAcceleration = checkHardwareAcceleration.Checked;
-            PromptRestart(); // calls OnClosing
-        }
-
-        private void btnEditCefArgs_Click(object sender, EventArgs e){
-            DialogSettingsCefArgs form = new DialogSettingsCefArgs();
-
-            form.VisibleChanged += (sender2, args2) => {
-                form.MoveToCenter(ParentForm);
-            };
-
-            form.FormClosed += (sender2, args2) => {
-                RestoreParentForm();
-
-                if (form.DialogResult == DialogResult.OK){
-                    Config.CustomCefArgs = form.CefArgs;
-                    PromptRestart();
-                    form.Dispose();
-                }
-                else form.Dispose();
-            };
-            
-            form.Show(ParentForm);
-            NativeMethods.SetFormDisabled(ParentForm, true);
-        }
-
-        private void btnEditCSS_Click(object sender, EventArgs e){
-            DialogSettingsCSS form = new DialogSettingsCSS(reinjectBrowserCSS);
-
-            form.VisibleChanged += (sender2, args2) => {
-                form.MoveToCenter(ParentForm);
-            };
-
-            form.FormClosed += (sender2, args2) => {
-                RestoreParentForm();
-
-                if (form.DialogResult == DialogResult.OK){
-                    Config.CustomBrowserCSS = form.BrowserCSS;
-                    Config.CustomNotificationCSS = form.NotificationCSS;
-                }
-
-                reinjectBrowserCSS(Config.CustomBrowserCSS); // reinject on cancel too, because the CSS is updated while typing
-                form.Dispose();
-            };
-            
-            form.Show(ParentForm);
-            NativeMethods.SetFormDisabled(ParentForm, true);
-        }
         
         private void btnOpenAppFolder_Click(object sender, EventArgs e){
             using(Process.Start("explorer.exe", "\""+Program.ProgramPath+"\"")){}
@@ -151,10 +86,72 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
+        #endregion
+        #region Browser Cache
+
+        private void btnClearCache_Click(object sender, EventArgs e){
+            btnClearCache.Enabled = false;
+            BrowserCache.SetClearOnExit();
+            FormMessage.Information("Clear Cache", "Cache will be automatically cleared when TweetDuck exits.", FormMessage.OK);
+        }
+
+        private void checkClearCacheAuto_CheckedChanged(object sender, EventArgs e){
+            numClearCacheThreshold.Enabled = checkClearCacheAuto.Checked;
+        }
+
+        #endregion
+        #region Configuration
+
+        private void btnEditCefArgs_Click(object sender, EventArgs e){
+            DialogSettingsCefArgs form = new DialogSettingsCefArgs();
+
+            form.VisibleChanged += (sender2, args2) => {
+                form.MoveToCenter(ParentForm);
+            };
+
+            form.FormClosed += (sender2, args2) => {
+                RestoreParentForm();
+
+                if (form.DialogResult == DialogResult.OK){
+                    Config.CustomCefArgs = form.CefArgs;
+                }
+
+                form.Dispose();
+            };
+            
+            form.Show(ParentForm);
+            NativeMethods.SetFormDisabled(ParentForm, true);
+        }
+
+        private void btnEditCSS_Click(object sender, EventArgs e){
+            DialogSettingsCSS form = new DialogSettingsCSS(reinjectBrowserCSS, openDevTools);
+
+            form.VisibleChanged += (sender2, args2) => {
+                form.MoveToCenter(ParentForm);
+            };
+
+            form.FormClosed += (sender2, args2) => {
+                RestoreParentForm();
+
+                if (form.DialogResult == DialogResult.OK){
+                    Config.CustomBrowserCSS = form.BrowserCSS;
+                    Config.CustomNotificationCSS = form.NotificationCSS;
+                }
+
+                reinjectBrowserCSS(Config.CustomBrowserCSS); // reinject on cancel too, because the CSS is updated while typing
+                form.Dispose();
+            };
+            
+            form.Show(ParentForm);
+            NativeMethods.SetFormDisabled(ParentForm, true);
+        }
+
         private void RestoreParentForm(){
             if (ParentForm != null){ // when the parent is closed first, ParentForm is null in FormClosed event
                 NativeMethods.SetFormDisabled(ParentForm, false);
             }
         }
+
+        #endregion
     }
 }

Core/Other/Settings/TabSettingsFeedback.Designer.cs

@@ -40,19 +40,18 @@
             // 
             // panelDataCollection
             // 
-            this.panelDataCollection.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelDataCollection.Controls.Add(this.labelDataCollectionLink);
             this.panelDataCollection.Controls.Add(this.checkDataCollection);
             this.panelDataCollection.Location = new System.Drawing.Point(0, 78);
             this.panelDataCollection.Margin = new System.Windows.Forms.Padding(0);
             this.panelDataCollection.Name = "panelDataCollection";
-            this.panelDataCollection.Size = new System.Drawing.Size(322, 28);
+            this.panelDataCollection.Size = new System.Drawing.Size(300, 28);
             this.panelDataCollection.TabIndex = 3;
             // 
             // labelDataCollectionLink
             // 
             this.labelDataCollectionLink.AutoSize = true;
-            this.labelDataCollectionLink.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataCollectionLink.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.labelDataCollectionLink.LinkArea = new System.Windows.Forms.LinkArea(1, 10);
             this.labelDataCollectionLink.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;
             this.labelDataCollectionLink.Location = new System.Drawing.Point(153, 4);
@@ -68,7 +67,7 @@
             // checkDataCollection
             // 
             this.checkDataCollection.AutoSize = true;
-            this.checkDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkDataCollection.Location = new System.Drawing.Point(6, 6);
             this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
             this.checkDataCollection.Name = "checkDataCollection";
@@ -79,17 +78,17 @@
             // 
             // labelDataCollectionMessage
             // 
-            this.labelDataCollectionMessage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataCollectionMessage.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.labelDataCollectionMessage.Location = new System.Drawing.Point(6, 143);
             this.labelDataCollectionMessage.Margin = new System.Windows.Forms.Padding(6);
             this.labelDataCollectionMessage.Name = "labelDataCollectionMessage";
-            this.labelDataCollectionMessage.Size = new System.Drawing.Size(310, 67);
+            this.labelDataCollectionMessage.Size = new System.Drawing.Size(288, 67);
             this.labelDataCollectionMessage.TabIndex = 5;
             // 
             // btnViewReport
             // 
             this.btnViewReport.AutoSize = true;
-            this.btnViewReport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnViewReport.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnViewReport.Location = new System.Drawing.Point(5, 109);
             this.btnViewReport.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnViewReport.Name = "btnViewReport";
@@ -102,7 +101,7 @@
             // btnSendFeedback
             // 
             this.btnSendFeedback.AutoSize = true;
-            this.btnSendFeedback.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnSendFeedback.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnSendFeedback.Location = new System.Drawing.Point(5, 23);
             this.btnSendFeedback.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnSendFeedback.Name = "btnSendFeedback";
@@ -115,7 +114,7 @@
             // labelDataCollection
             // 
             this.labelDataCollection.AutoSize = true;
-            this.labelDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataCollection.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
             this.labelDataCollection.Location = new System.Drawing.Point(3, 63);
             this.labelDataCollection.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDataCollection.Name = "labelDataCollection";
@@ -126,13 +125,13 @@
             // labelFeedback
             // 
             this.labelFeedback.AutoSize = true;
-            this.labelFeedback.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelFeedback.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
             this.labelFeedback.Location = new System.Drawing.Point(0, 0);
-            this.labelFeedback.Margin = new System.Windows.Forms.Padding(0);
+            this.labelFeedback.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelFeedback.Name = "labelFeedback";
-            this.labelFeedback.Size = new System.Drawing.Size(72, 20);
+            this.labelFeedback.Size = new System.Drawing.Size(75, 19);
             this.labelFeedback.TabIndex = 0;
-            this.labelFeedback.Text = "Feedback";
+            this.labelFeedback.Text = "FEEDBACK";
             // 
             // flowPanel
             // 
@@ -148,7 +147,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 212);
+            this.flowPanel.Size = new System.Drawing.Size(300, 462);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -158,7 +157,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsFeedback";
-            this.Size = new System.Drawing.Size(340, 230);
+            this.Size = new System.Drawing.Size(631, 480);
             this.panelDataCollection.ResumeLayout(false);
             this.panelDataCollection.PerformLayout();
             this.flowPanel.ResumeLayout(false);

Core/Other/Settings/TabSettingsFeedback.cs

@@ -18,6 +18,8 @@ namespace TweetDuck.Core.Other.Settings{
             this.analyticsInfo = analyticsInfo;
             this.plugins = plugins;
 
+            // feedback
+
             checkDataCollection.Checked = Config.AllowDataCollection;
 
             if (analytics != null){
@@ -33,6 +35,8 @@ namespace TweetDuck.Core.Other.Settings{
             btnViewReport.Click += btnViewReport_Click;
         }
 
+        #region Feedback
+
         private void btnSendFeedback_Click(object sender, EventArgs e){
             BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/issues/new");
         }
@@ -50,5 +54,7 @@ namespace TweetDuck.Core.Other.Settings{
                 dialog.ShowDialog();
             }
         }
+
+        #endregion
     }
 }

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -38,23 +38,38 @@
             this.panelZoom = new System.Windows.Forms.Panel();
             this.checkAnimatedAvatars = new System.Windows.Forms.CheckBox();
             this.labelUpdates = new System.Windows.Forms.Label();
-            this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
+            this.flowPanelLeft = new System.Windows.Forms.FlowLayoutPanel();
             this.checkKeepLikeFollowDialogsOpen = new System.Windows.Forms.CheckBox();
+            this.labelTray = new System.Windows.Forms.Label();
+            this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
+            this.labelTrayIcon = new System.Windows.Forms.Label();
+            this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
             this.labelBrowserSettings = new System.Windows.Forms.Label();
             this.checkSmoothScrolling = new System.Windows.Forms.CheckBox();
+            this.checkTouchAdjustment = new System.Windows.Forms.CheckBox();
             this.labelBrowserPath = new System.Windows.Forms.Label();
             this.comboBoxBrowserPath = new System.Windows.Forms.ComboBox();
             this.labelSearchEngine = new System.Windows.Forms.Label();
             this.comboBoxSearchEngine = new System.Windows.Forms.ComboBox();
+            this.flowPanelRight = new System.Windows.Forms.FlowLayoutPanel();
+            this.checkHardwareAcceleration = new System.Windows.Forms.CheckBox();
+            this.labelLocales = new System.Windows.Forms.Label();
+            this.checkSpellCheck = new System.Windows.Forms.CheckBox();
+            this.labelSpellCheckLanguage = new System.Windows.Forms.Label();
+            this.comboBoxSpellCheckLanguage = new System.Windows.Forms.ComboBox();
+            this.labelTranslationTarget = new System.Windows.Forms.Label();
+            this.comboBoxTranslationTarget = new System.Windows.Forms.ComboBox();
+            this.panelSeparator = new System.Windows.Forms.Panel();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
             this.panelZoom.SuspendLayout();
-            this.flowPanel.SuspendLayout();
+            this.flowPanelLeft.SuspendLayout();
+            this.flowPanelRight.SuspendLayout();
             this.SuspendLayout();
             // 
             // checkExpandLinks
             // 
             this.checkExpandLinks.AutoSize = true;
-            this.checkExpandLinks.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkExpandLinks.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkExpandLinks.Location = new System.Drawing.Point(6, 26);
             this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkExpandLinks.Name = "checkExpandLinks";
@@ -66,32 +81,32 @@
             // checkUpdateNotifications
             // 
             this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkUpdateNotifications.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 427);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 393);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(182, 19);
-            this.checkUpdateNotifications.TabIndex = 15;
+            this.checkUpdateNotifications.TabIndex = 13;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
             // btnCheckUpdates
             // 
             this.btnCheckUpdates.AutoSize = true;
-            this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 451);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 417);
             this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
             this.btnCheckUpdates.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnCheckUpdates.Size = new System.Drawing.Size(128, 25);
-            this.btnCheckUpdates.TabIndex = 16;
+            this.btnCheckUpdates.TabIndex = 14;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
             // labelZoomValue
             // 
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelZoomValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelZoomValue.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.labelZoomValue.Location = new System.Drawing.Point(147, 4);
             this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelZoomValue.Name = "labelZoomValue";
@@ -103,7 +118,7 @@
             // checkBestImageQuality
             // 
             this.checkBestImageQuality.AutoSize = true;
-            this.checkBestImageQuality.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkBestImageQuality.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkBestImageQuality.Location = new System.Drawing.Point(6, 98);
             this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkBestImageQuality.Name = "checkBestImageQuality";
@@ -115,7 +130,7 @@
             // checkOpenSearchInFirstColumn
             // 
             this.checkOpenSearchInFirstColumn.AutoSize = true;
-            this.checkOpenSearchInFirstColumn.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkOpenSearchInFirstColumn.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 50);
             this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
@@ -142,12 +157,12 @@
             // labelZoom
             // 
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelZoom.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelZoom.Location = new System.Drawing.Point(3, 330);
+            this.labelZoom.Location = new System.Drawing.Point(3, 155);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(39, 15);
-            this.labelZoom.TabIndex = 12;
+            this.labelZoom.TabIndex = 6;
             this.labelZoom.Text = "Zoom";
             // 
             // zoomUpdateTimer
@@ -158,29 +173,28 @@
             // labelUI
             // 
             this.labelUI.AutoSize = true;
-            this.labelUI.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUI.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
             this.labelUI.Location = new System.Drawing.Point(0, 0);
-            this.labelUI.Margin = new System.Windows.Forms.Padding(0);
+            this.labelUI.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelUI.Name = "labelUI";
-            this.labelUI.Size = new System.Drawing.Size(100, 20);
+            this.labelUI.Size = new System.Drawing.Size(118, 19);
             this.labelUI.TabIndex = 0;
-            this.labelUI.Text = "User Interface";
+            this.labelUI.Text = "USER INTERFACE";
             // 
             // panelZoom
             // 
-            this.panelZoom.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelZoom.Controls.Add(this.trackBarZoom);
             this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 345);
+            this.panelZoom.Location = new System.Drawing.Point(0, 171);
-            this.panelZoom.Margin = new System.Windows.Forms.Padding(0);
+            this.panelZoom.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelZoom.Name = "panelZoom";
-            this.panelZoom.Size = new System.Drawing.Size(322, 36);
+            this.panelZoom.Size = new System.Drawing.Size(300, 35);
-            this.panelZoom.TabIndex = 13;
+            this.panelZoom.TabIndex = 7;
             // 
             // checkAnimatedAvatars
             // 
             this.checkAnimatedAvatars.AutoSize = true;
-            this.checkAnimatedAvatars.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkAnimatedAvatars.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 122);
             this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
@@ -192,47 +206,44 @@
             // labelUpdates
             // 
             this.labelUpdates.AutoSize = true;
-            this.labelUpdates.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUpdates.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelUpdates.Location = new System.Drawing.Point(0, 401);
+            this.labelUpdates.Location = new System.Drawing.Point(0, 367);
-            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
+            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
             this.labelUpdates.Name = "labelUpdates";
-            this.labelUpdates.Size = new System.Drawing.Size(64, 20);
+            this.labelUpdates.Size = new System.Drawing.Size(69, 19);
-            this.labelUpdates.TabIndex = 14;
+            this.labelUpdates.TabIndex = 12;
-            this.labelUpdates.Text = "Updates";
+            this.labelUpdates.Text = "UPDATES";
             // 
-            // flowPanel
+            // flowPanelLeft
             // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.flowPanelLeft.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Left)));
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.flowPanelLeft.Controls.Add(this.labelUI);
-            this.flowPanel.Controls.Add(this.labelUI);
+            this.flowPanelLeft.Controls.Add(this.checkExpandLinks);
-            this.flowPanel.Controls.Add(this.checkExpandLinks);
+            this.flowPanelLeft.Controls.Add(this.checkOpenSearchInFirstColumn);
-            this.flowPanel.Controls.Add(this.checkOpenSearchInFirstColumn);
+            this.flowPanelLeft.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
-            this.flowPanel.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
+            this.flowPanelLeft.Controls.Add(this.checkBestImageQuality);
-            this.flowPanel.Controls.Add(this.checkBestImageQuality);
+            this.flowPanelLeft.Controls.Add(this.checkAnimatedAvatars);
-            this.flowPanel.Controls.Add(this.checkAnimatedAvatars);
+            this.flowPanelLeft.Controls.Add(this.labelZoom);
-            this.flowPanel.Controls.Add(this.labelBrowserSettings);
+            this.flowPanelLeft.Controls.Add(this.panelZoom);
-            this.flowPanel.Controls.Add(this.checkSmoothScrolling);
+            this.flowPanelLeft.Controls.Add(this.labelTray);
-            this.flowPanel.Controls.Add(this.labelBrowserPath);
+            this.flowPanelLeft.Controls.Add(this.comboBoxTrayType);
-            this.flowPanel.Controls.Add(this.comboBoxBrowserPath);
+            this.flowPanelLeft.Controls.Add(this.labelTrayIcon);
-            this.flowPanel.Controls.Add(this.labelSearchEngine);
+            this.flowPanelLeft.Controls.Add(this.checkTrayHighlight);
-            this.flowPanel.Controls.Add(this.comboBoxSearchEngine);
+            this.flowPanelLeft.Controls.Add(this.labelUpdates);
-            this.flowPanel.Controls.Add(this.labelZoom);
+            this.flowPanelLeft.Controls.Add(this.checkUpdateNotifications);
-            this.flowPanel.Controls.Add(this.panelZoom);
+            this.flowPanelLeft.Controls.Add(this.btnCheckUpdates);
-            this.flowPanel.Controls.Add(this.labelUpdates);
+            this.flowPanelLeft.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowPanel.Controls.Add(this.checkUpdateNotifications);
+            this.flowPanelLeft.Location = new System.Drawing.Point(9, 9);
-            this.flowPanel.Controls.Add(this.btnCheckUpdates);
+            this.flowPanelLeft.Name = "flowPanelLeft";
-            this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flowPanelLeft.Size = new System.Drawing.Size(300, 462);
-            this.flowPanel.Location = new System.Drawing.Point(9, 9);
+            this.flowPanelLeft.TabIndex = 0;
-            this.flowPanel.Name = "flowPanel";
+            this.flowPanelLeft.WrapContents = false;
-            this.flowPanel.Size = new System.Drawing.Size(322, 486);
-            this.flowPanel.TabIndex = 0;
-            this.flowPanel.WrapContents = false;
             // 
             // checkKeepLikeFollowDialogsOpen
             // 
             this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
-            this.checkKeepLikeFollowDialogsOpen.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkKeepLikeFollowDialogsOpen.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 74);
             this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
@@ -241,84 +252,260 @@
             this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
             this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
             // 
+            // labelTray
+            // 
+            this.labelTray.AutoSize = true;
+            this.labelTray.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
+            this.labelTray.Location = new System.Drawing.Point(0, 236);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
+            this.labelTray.Name = "labelTray";
+            this.labelTray.Size = new System.Drawing.Size(99, 19);
+            this.labelTray.TabIndex = 8;
+            this.labelTray.Text = "SYSTEM TRAY";
+            // 
+            // comboBoxTrayType
+            // 
+            this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTrayType.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxTrayType.FormattingEnabled = true;
+            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 260);
+            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.comboBoxTrayType.Name = "comboBoxTrayType";
+            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 23);
+            this.comboBoxTrayType.TabIndex = 9;
+            // 
+            // labelTrayIcon
+            // 
+            this.labelTrayIcon.AutoSize = true;
+            this.labelTrayIcon.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 295);
+            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
+            this.labelTrayIcon.Name = "labelTrayIcon";
+            this.labelTrayIcon.Size = new System.Drawing.Size(56, 15);
+            this.labelTrayIcon.TabIndex = 10;
+            this.labelTrayIcon.Text = "Tray Icon";
+            // 
+            // checkTrayHighlight
+            // 
+            this.checkTrayHighlight.AutoSize = true;
+            this.checkTrayHighlight.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 316);
+            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
+            this.checkTrayHighlight.Name = "checkTrayHighlight";
+            this.checkTrayHighlight.Size = new System.Drawing.Size(114, 19);
+            this.checkTrayHighlight.TabIndex = 11;
+            this.checkTrayHighlight.Text = "Enable Highlight";
+            this.checkTrayHighlight.UseVisualStyleBackColor = true;
+            // 
             // labelBrowserSettings
             // 
             this.labelBrowserSettings.AutoSize = true;
-            this.labelBrowserSettings.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelBrowserSettings.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 163);
+            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 0);
-            this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
+            this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelBrowserSettings.Name = "labelBrowserSettings";
-            this.labelBrowserSettings.Size = new System.Drawing.Size(119, 20);
+            this.labelBrowserSettings.Size = new System.Drawing.Size(143, 19);
-            this.labelBrowserSettings.TabIndex = 6;
+            this.labelBrowserSettings.TabIndex = 0;
-            this.labelBrowserSettings.Text = "Browser Settings";
+            this.labelBrowserSettings.Text = "BROWSER SETTINGS";
             // 
             // checkSmoothScrolling
             // 
             this.checkSmoothScrolling.AutoSize = true;
-            this.checkSmoothScrolling.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkSmoothScrolling.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 189);
+            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 26);
             this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkSmoothScrolling.Name = "checkSmoothScrolling";
             this.checkSmoothScrolling.Size = new System.Drawing.Size(117, 19);
-            this.checkSmoothScrolling.TabIndex = 7;
+            this.checkSmoothScrolling.TabIndex = 1;
             this.checkSmoothScrolling.Text = "Smooth Scrolling";
             this.checkSmoothScrolling.UseVisualStyleBackColor = true;
             // 
+            // checkTouchAdjustment
+            // 
+            this.checkTouchAdjustment.AutoSize = true;
+            this.checkTouchAdjustment.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkTouchAdjustment.Location = new System.Drawing.Point(6, 50);
+            this.checkTouchAdjustment.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
+            this.checkTouchAdjustment.Name = "checkTouchAdjustment";
+            this.checkTouchAdjustment.Size = new System.Drawing.Size(163, 19);
+            this.checkTouchAdjustment.TabIndex = 2;
+            this.checkTouchAdjustment.Text = "Touch Screen Adjustment";
+            this.checkTouchAdjustment.UseVisualStyleBackColor = true;
+            // 
             // labelBrowserPath
             // 
             this.labelBrowserPath.AutoSize = true;
-            this.labelBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelBrowserPath.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelBrowserPath.Location = new System.Drawing.Point(3, 222);
+            this.labelBrowserPath.Location = new System.Drawing.Point(3, 107);
             this.labelBrowserPath.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelBrowserPath.Name = "labelBrowserPath";
-            this.labelBrowserPath.Size = new System.Drawing.Size(103, 15);
+            this.labelBrowserPath.Size = new System.Drawing.Size(104, 15);
-            this.labelBrowserPath.TabIndex = 8;
+            this.labelBrowserPath.TabIndex = 4;
             this.labelBrowserPath.Text = "Open Links With...";
             // 
             // comboBoxBrowserPath
             // 
             this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.comboBoxBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxBrowserPath.FormattingEnabled = true;
-            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 240);
+            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 126);
-            this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
+            this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxBrowserPath.Name = "comboBoxBrowserPath";
             this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 23);
-            this.comboBoxBrowserPath.TabIndex = 9;
+            this.comboBoxBrowserPath.TabIndex = 5;
             // 
             // labelSearchEngine
             // 
             this.labelSearchEngine.AutoSize = true;
-            this.labelSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSearchEngine.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelSearchEngine.Location = new System.Drawing.Point(3, 276);
+            this.labelSearchEngine.Location = new System.Drawing.Point(3, 164);
             this.labelSearchEngine.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelSearchEngine.Name = "labelSearchEngine";
-            this.labelSearchEngine.Size = new System.Drawing.Size(81, 15);
+            this.labelSearchEngine.Size = new System.Drawing.Size(82, 15);
-            this.labelSearchEngine.TabIndex = 10;
+            this.labelSearchEngine.TabIndex = 6;
             this.labelSearchEngine.Text = "Search Engine";
             // 
             // comboBoxSearchEngine
             // 
             this.comboBoxSearchEngine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.comboBoxSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxSearchEngine.FormattingEnabled = true;
-            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 294);
+            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 183);
-            this.comboBoxSearchEngine.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
+            this.comboBoxSearchEngine.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxSearchEngine.Name = "comboBoxSearchEngine";
             this.comboBoxSearchEngine.Size = new System.Drawing.Size(173, 23);
-            this.comboBoxSearchEngine.TabIndex = 11;
+            this.comboBoxSearchEngine.TabIndex = 7;
+            // 
+            // flowPanelRight
+            // 
+            this.flowPanelRight.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.flowPanelRight.Controls.Add(this.labelBrowserSettings);
+            this.flowPanelRight.Controls.Add(this.checkSmoothScrolling);
+            this.flowPanelRight.Controls.Add(this.checkTouchAdjustment);
+            this.flowPanelRight.Controls.Add(this.checkHardwareAcceleration);
+            this.flowPanelRight.Controls.Add(this.labelBrowserPath);
+            this.flowPanelRight.Controls.Add(this.comboBoxBrowserPath);
+            this.flowPanelRight.Controls.Add(this.labelSearchEngine);
+            this.flowPanelRight.Controls.Add(this.comboBoxSearchEngine);
+            this.flowPanelRight.Controls.Add(this.labelLocales);
+            this.flowPanelRight.Controls.Add(this.checkSpellCheck);
+            this.flowPanelRight.Controls.Add(this.labelSpellCheckLanguage);
+            this.flowPanelRight.Controls.Add(this.comboBoxSpellCheckLanguage);
+            this.flowPanelRight.Controls.Add(this.labelTranslationTarget);
+            this.flowPanelRight.Controls.Add(this.comboBoxTranslationTarget);
+            this.flowPanelRight.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flowPanelRight.Location = new System.Drawing.Point(322, 9);
+            this.flowPanelRight.Name = "flowPanelRight";
+            this.flowPanelRight.Size = new System.Drawing.Size(300, 462);
+            this.flowPanelRight.TabIndex = 1;
+            this.flowPanelRight.WrapContents = false;
+            // 
+            // checkHardwareAcceleration
+            // 
+            this.checkHardwareAcceleration.AutoSize = true;
+            this.checkHardwareAcceleration.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 74);
+            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
+            this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
+            this.checkHardwareAcceleration.Size = new System.Drawing.Size(146, 19);
+            this.checkHardwareAcceleration.TabIndex = 3;
+            this.checkHardwareAcceleration.Text = "Hardware Acceleration";
+            this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
+            // 
+            // labelLocales
+            // 
+            this.labelLocales.AutoSize = true;
+            this.labelLocales.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
+            this.labelLocales.Location = new System.Drawing.Point(0, 236);
+            this.labelLocales.Margin = new System.Windows.Forms.Padding(0, 27, 0, 1);
+            this.labelLocales.Name = "labelLocales";
+            this.labelLocales.Size = new System.Drawing.Size(67, 19);
+            this.labelLocales.TabIndex = 8;
+            this.labelLocales.Text = "LOCALES";
+            // 
+            // checkSpellCheck
+            // 
+            this.checkSpellCheck.AutoSize = true;
+            this.checkSpellCheck.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkSpellCheck.Location = new System.Drawing.Point(6, 262);
+            this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
+            this.checkSpellCheck.Name = "checkSpellCheck";
+            this.checkSpellCheck.Size = new System.Drawing.Size(125, 19);
+            this.checkSpellCheck.TabIndex = 9;
+            this.checkSpellCheck.Text = "Enable Spell Check";
+            this.checkSpellCheck.UseVisualStyleBackColor = true;
+            // 
+            // labelSpellCheckLanguage
+            // 
+            this.labelSpellCheckLanguage.AutoSize = true;
+            this.labelSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 295);
+            this.labelSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelSpellCheckLanguage.Name = "labelSpellCheckLanguage";
+            this.labelSpellCheckLanguage.Size = new System.Drawing.Size(123, 15);
+            this.labelSpellCheckLanguage.TabIndex = 10;
+            this.labelSpellCheckLanguage.Text = "Spell Check Language";
+            // 
+            // comboBoxSpellCheckLanguage
+            // 
+            this.comboBoxSpellCheckLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxSpellCheckLanguage.FormattingEnabled = true;
+            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 314);
+            this.comboBoxSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.comboBoxSpellCheckLanguage.Name = "comboBoxSpellCheckLanguage";
+            this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(290, 23);
+            this.comboBoxSpellCheckLanguage.TabIndex = 11;
+            // 
+            // labelTranslationTarget
+            // 
+            this.labelTranslationTarget.AutoSize = true;
+            this.labelTranslationTarget.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 352);
+            this.labelTranslationTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelTranslationTarget.Name = "labelTranslationTarget";
+            this.labelTranslationTarget.Size = new System.Drawing.Size(142, 15);
+            this.labelTranslationTarget.TabIndex = 12;
+            this.labelTranslationTarget.Text = "Bing Translator Language";
+            // 
+            // comboBoxTranslationTarget
+            // 
+            this.comboBoxTranslationTarget.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxTranslationTarget.FormattingEnabled = true;
+            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 371);
+            this.comboBoxTranslationTarget.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.comboBoxTranslationTarget.Name = "comboBoxTranslationTarget";
+            this.comboBoxTranslationTarget.Size = new System.Drawing.Size(290, 23);
+            this.comboBoxTranslationTarget.TabIndex = 13;
+            // 
+            // panelSeparator
+            // 
+            this.panelSeparator.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelSeparator.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
+            this.panelSeparator.Location = new System.Drawing.Point(312, 0);
+            this.panelSeparator.Margin = new System.Windows.Forms.Padding(0, 0, 6, 0);
+            this.panelSeparator.Name = "panelSeparator";
+            this.panelSeparator.Size = new System.Drawing.Size(1, 480);
+            this.panelSeparator.TabIndex = 2;
             // 
             // TabSettingsGeneral
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.flowPanel);
+            this.Controls.Add(this.panelSeparator);
+            this.Controls.Add(this.flowPanelRight);
+            this.Controls.Add(this.flowPanelLeft);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(340, 504);
+            this.Size = new System.Drawing.Size(631, 480);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.panelZoom.ResumeLayout(false);
-            this.flowPanel.ResumeLayout(false);
+            this.flowPanelLeft.ResumeLayout(false);
-            this.flowPanel.PerformLayout();
+            this.flowPanelLeft.PerformLayout();
+            this.flowPanelRight.ResumeLayout(false);
+            this.flowPanelRight.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -339,7 +526,7 @@
         private System.Windows.Forms.CheckBox checkBestImageQuality;
         private System.Windows.Forms.CheckBox checkOpenSearchInFirstColumn;
         private System.Windows.Forms.CheckBox checkAnimatedAvatars;
-        private System.Windows.Forms.FlowLayoutPanel flowPanel;
+        private System.Windows.Forms.FlowLayoutPanel flowPanelLeft;
         private System.Windows.Forms.CheckBox checkKeepLikeFollowDialogsOpen;
         private System.Windows.Forms.Label labelBrowserPath;
         private System.Windows.Forms.ComboBox comboBoxBrowserPath;
@@ -347,5 +534,19 @@
         private System.Windows.Forms.CheckBox checkSmoothScrolling;
         private System.Windows.Forms.Label labelSearchEngine;
         private System.Windows.Forms.ComboBox comboBoxSearchEngine;
+        private System.Windows.Forms.CheckBox checkTouchAdjustment;
+        private System.Windows.Forms.FlowLayoutPanel flowPanelRight;
+        private System.Windows.Forms.Panel panelSeparator;
+        private System.Windows.Forms.Label labelTray;
+        private System.Windows.Forms.ComboBox comboBoxTrayType;
+        private System.Windows.Forms.Label labelTrayIcon;
+        private System.Windows.Forms.CheckBox checkTrayHighlight;
+        private System.Windows.Forms.Label labelLocales;
+        private System.Windows.Forms.CheckBox checkSpellCheck;
+        private System.Windows.Forms.Label labelSpellCheckLanguage;
+        private System.Windows.Forms.ComboBox comboBoxSpellCheckLanguage;
+        private System.Windows.Forms.Label labelTranslationTarget;
+        private System.Windows.Forms.ComboBox comboBoxTranslationTarget;
+        private System.Windows.Forms.CheckBox checkHardwareAcceleration;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -7,7 +7,6 @@ using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
 using TweetDuck.Updates;
-using TweetDuck.Updates.Events;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsGeneral : BaseTabSettings{
@@ -29,29 +28,61 @@ namespace TweetDuck.Core.Other.Settings{
             
             this.updates = updates;
             this.updates.CheckFinished += updates_CheckFinished;
+
             Disposed += (sender, args) => this.updates.CheckFinished -= updates_CheckFinished;
             
+            // user interface
+
             toolTip.SetToolTip(checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
             toolTip.SetToolTip(checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
             toolTip.SetToolTip(checkKeepLikeFollowDialogsOpen, "Allows liking and following from multiple accounts at once,\r\ninstead of automatically closing the dialog after taking an action.");
             toolTip.SetToolTip(checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
             toolTip.SetToolTip(checkAnimatedAvatars, "Some old Twitter avatars could be uploaded as animated GIFs.");
-
-            toolTip.SetToolTip(checkSmoothScrolling, "Toggles smooth mouse wheel scrolling.");
-            toolTip.SetToolTip(comboBoxBrowserPath, "Sets the default browser for opening links.");
             toolTip.SetToolTip(labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
             toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
 
-            toolTip.SetToolTip(checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
-            toolTip.SetToolTip(btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
-
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
             checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
             checkKeepLikeFollowDialogsOpen.Checked = Config.KeepLikeFollowDialogsOpen;
             checkBestImageQuality.Checked = Config.BestImageQuality;
             checkAnimatedAvatars.Checked = Config.EnableAnimatedImages;
             
+            trackBarZoom.SetValueSafe(Config.ZoomLevel);
+            labelZoomValue.Text = trackBarZoom.Value+"%";
+
+            // system tray
+            
+            toolTip.SetToolTip(comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
+            toolTip.SetToolTip(checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with popup or audio notifications.\r\nThe icon resets when the main window is restored.");
+
+            comboBoxTrayType.Items.Add("Disabled");
+            comboBoxTrayType.Items.Add("Display Icon Only");
+            comboBoxTrayType.Items.Add("Minimize to Tray");
+            comboBoxTrayType.Items.Add("Close to Tray");
+            comboBoxTrayType.Items.Add("Combined");
+            comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count-1);
+
+            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
+            checkTrayHighlight.Checked = Config.EnableTrayHighlight;
+
+            // updates
+            
+            toolTip.SetToolTip(checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
+            toolTip.SetToolTip(btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
+            
+            checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
+
+            // browser settings
+            
+            toolTip.SetToolTip(checkSmoothScrolling, "Toggles smooth mouse wheel scrolling.");
+            toolTip.SetToolTip(checkTouchAdjustment, "Toggles Chromium touch screen adjustment.\r\nDisabled by default, because it is very imprecise with TweetDeck.");
+            toolTip.SetToolTip(checkHardwareAcceleration, "Uses graphics card to improve performance.\r\nDisable if you experience visual glitches, or to save a small amount of RAM.");
+            toolTip.SetToolTip(comboBoxBrowserPath, "Sets the default browser for opening links.");
+            toolTip.SetToolTip(comboBoxSearchEngine, "Sets the default website for opening searches.");
+            
             checkSmoothScrolling.Checked = Config.EnableSmoothScrolling;
+            checkTouchAdjustment.Checked = Config.EnableTouchAdjustment;
+            checkHardwareAcceleration.Checked = SysConfig.HardwareAcceleration;
 
             foreach(WindowsUtils.Browser browserInfo in WindowsUtils.FindInstalledBrowsers()){
                 comboBoxBrowserPath.Items.Add(browserInfo);
@@ -69,10 +100,29 @@ namespace TweetDuck.Core.Other.Settings{
             searchEngineIndexCustom = comboBoxSearchEngine.Items.Add("(custom url...)");
             UpdateSearchEngineSelection();
 
-            trackBarZoom.SetValueSafe(Config.ZoomLevel);
+            // locales
-            labelZoomValue.Text = trackBarZoom.Value+"%";
             
-            checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
+            toolTip.SetToolTip(checkSpellCheck, "Underlines words that are spelled incorrectly.");
+            toolTip.SetToolTip(comboBoxSpellCheckLanguage, "Language used for spell check.");
+            toolTip.SetToolTip(comboBoxTranslationTarget, "Language tweets are translated into.");
+            
+            checkSpellCheck.Checked = Config.EnableSpellCheck;
+
+            try{
+                foreach(LocaleUtils.Item item in LocaleUtils.SpellCheckLanguages){
+                    comboBoxSpellCheckLanguage.Items.Add(item);
+                }
+            }catch{
+                comboBoxSpellCheckLanguage.Items.Add(new LocaleUtils.Item("en-US"));
+            }
+
+            comboBoxSpellCheckLanguage.SelectedItem = new LocaleUtils.Item(Config.SpellCheckLanguage);
+
+            foreach(LocaleUtils.Item item in LocaleUtils.TweetDeckTranslationLocales){
+                comboBoxTranslationTarget.Items.Add(item);
+            }
+
+            comboBoxTranslationTarget.SelectedItem = new LocaleUtils.Item(Config.TranslationTarget);
         }
 
         public override void OnReady(){
@@ -81,20 +131,31 @@ namespace TweetDuck.Core.Other.Settings{
             checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
             checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
             checkAnimatedAvatars.CheckedChanged += checkAnimatedAvatars_CheckedChanged;
-
-            checkSmoothScrolling.CheckedChanged += checkSmoothScrolling_CheckedChanged;
-            comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
-            comboBoxSearchEngine.SelectedIndexChanged += comboBoxSearchEngine_SelectedIndexChanged;
             trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
 
+            comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
+            checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
+            
             checkUpdateNotifications.CheckedChanged += checkUpdateNotifications_CheckedChanged;
             btnCheckUpdates.Click += btnCheckUpdates_Click;
+
+            checkSmoothScrolling.CheckedChanged += checkSmoothScrolling_CheckedChanged;
+            checkTouchAdjustment.CheckedChanged += checkTouchAdjustment_CheckedChanged;
+            checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
+            comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
+            comboBoxSearchEngine.SelectedIndexChanged += comboBoxSearchEngine_SelectedIndexChanged;
+
+            checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
+            comboBoxSpellCheckLanguage.SelectedValueChanged += comboBoxSpellCheckLanguage_SelectedValueChanged;
+            comboBoxTranslationTarget.SelectedValueChanged += comboBoxTranslationTarget_SelectedValueChanged;
         }
 
         public override void OnClosing(){
             Config.ZoomLevel = trackBarZoom.Value;
         }
 
+        #region User Interface
+
         private void checkExpandLinks_CheckedChanged(object sender, EventArgs e){
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
@@ -116,9 +177,72 @@ namespace TweetDuck.Core.Other.Settings{
             BrowserProcessHandler.UpdatePrefs().ContinueWith(task => reloadColumns());
         }
 
+        private void trackBarZoom_ValueChanged(object sender, EventArgs e){
+            if (trackBarZoom.AlignValueToTick()){
+                zoomUpdateTimer.Stop();
+                zoomUpdateTimer.Start();
+                labelZoomValue.Text = trackBarZoom.Value+"%";
+            }
+        }
+
+        private void zoomUpdateTimer_Tick(object sender, EventArgs e){
+            Config.ZoomLevel = trackBarZoom.Value;
+            zoomUpdateTimer.Stop();
+        }
+
+        #endregion
+        #region System Tray
+        
+        private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
+            Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
+            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
+        }
+
+        private void checkTrayHighlight_CheckedChanged(object sender, EventArgs e){
+            Config.EnableTrayHighlight = checkTrayHighlight.Checked;
+        }
+
+        #endregion
+        #region Updates
+        
+        private void checkUpdateNotifications_CheckedChanged(object sender, EventArgs e){
+            Config.EnableUpdateCheck = checkUpdateNotifications.Checked;
+        }
+
+        private void btnCheckUpdates_Click(object sender, EventArgs e){
+            Config.DismissedUpdate = null;
+
+            btnCheckUpdates.Enabled = false;
+            updateCheckEventId = updates.Check(true);
+        }
+
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+            if (e.EventId == updateCheckEventId){
+                btnCheckUpdates.Enabled = true;
+
+                e.Result.Handle(update => {
+                    if (update.VersionTag == Program.VersionTag){
+                        FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
+                    }
+                }, ex => {
+                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
+                });
+            }
+        }
+
+        #endregion
+        #region Browser Settings
+        
         private void checkSmoothScrolling_CheckedChanged(object sender, EventArgs e){
             Config.EnableSmoothScrolling = checkSmoothScrolling.Checked;
-            PromptRestart();
+        }
+
+        private void checkTouchAdjustment_CheckedChanged(object sender, EventArgs e){
+            Config.EnableTouchAdjustment = checkTouchAdjustment.Checked;
+        }
+        
+        private void checkHardwareAcceleration_CheckedChanged(object sender, EventArgs e){
+            SysConfig.HardwareAcceleration = checkHardwareAcceleration.Checked;
         }
 
         private void UpdateBrowserPathSelection(){
@@ -193,49 +317,6 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
-        private void trackBarZoom_ValueChanged(object sender, EventArgs e){
-            if (trackBarZoom.AlignValueToTick()){
-                zoomUpdateTimer.Stop();
-                zoomUpdateTimer.Start();
-                labelZoomValue.Text = trackBarZoom.Value+"%";
-            }
-        }
-
-        private void checkUpdateNotifications_CheckedChanged(object sender, EventArgs e){
-            Config.EnableUpdateCheck = checkUpdateNotifications.Checked;
-        }
-
-        private void btnCheckUpdates_Click(object sender, EventArgs e){
-            Config.DismissedUpdate = null;
-
-            btnCheckUpdates.Enabled = false;
-            updateCheckEventId = updates.Check(true);
-
-            if (updateCheckEventId == UpdateHandler.CheckCodeNotOnTweetDeck){
-                FormMessage.Error("Update Check", "Updates can only be checked once TweetDeck is fully loaded.", FormMessage.OK);
-                btnCheckUpdates.Enabled = true;
-            }
-        }
-
-        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
-            if (e.EventId == updateCheckEventId){
-                btnCheckUpdates.Enabled = true;
-
-                e.Result.Handle(update => {
-                    if (update.VersionTag == Program.VersionTag){
-                        FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
-                    }
-                }, ex => {
-                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
-                });
-            }
-        }
-
-        private void zoomUpdateTimer_Tick(object sender, EventArgs e){
-            Config.ZoomLevel = trackBarZoom.Value;
-            zoomUpdateTimer.Stop();
-        }
-
         private sealed class SearchEngine{
             private string Name { get; }
             public string Url { get; }
@@ -249,5 +330,23 @@ namespace TweetDuck.Core.Other.Settings{
             public override bool Equals(object obj) => obj is SearchEngine other && Name == other.Name;
             public override string ToString() => Name;
         }
+
+        #endregion
+        #region Locales
+        
+        private void checkSpellCheck_CheckedChanged(object sender, EventArgs e){
+            Config.EnableSpellCheck = checkSpellCheck.Checked;
+            BrowserProcessHandler.UpdatePrefs();
+        }
+
+        private void comboBoxSpellCheckLanguage_SelectedValueChanged(object sender, EventArgs e){
+            Config.SpellCheckLanguage = (comboBoxSpellCheckLanguage.SelectedItem as LocaleUtils.Item)?.Code ?? "en-US";
+        }
+
+        private void comboBoxTranslationTarget_SelectedValueChanged(object sender, EventArgs e){
+            Config.TranslationTarget = (comboBoxTranslationTarget.SelectedItem as LocaleUtils.Item)?.Code ?? "en";
+        }
+
+        #endregion
     }
 }

Core/Other/Settings/TabSettingsLocales.Designer.cs

@@ -1,160 +0,0 @@
-namespace TweetDuck.Core.Other.Settings {
-    partial class TabSettingsLocales {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.checkSpellCheck = new System.Windows.Forms.CheckBox();
-            this.labelLocales = new System.Windows.Forms.Label();
-            this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
-            this.labelSpellCheckLanguage = new System.Windows.Forms.Label();
-            this.comboBoxSpellCheckLanguage = new System.Windows.Forms.ComboBox();
-            this.labelTranslations = new System.Windows.Forms.Label();
-            this.labelTranslationTarget = new System.Windows.Forms.Label();
-            this.comboBoxTranslationTarget = new System.Windows.Forms.ComboBox();
-            this.flowPanel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // checkSpellCheck
-            // 
-            this.checkSpellCheck.AutoSize = true;
-            this.checkSpellCheck.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkSpellCheck.Location = new System.Drawing.Point(6, 26);
-            this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
-            this.checkSpellCheck.Name = "checkSpellCheck";
-            this.checkSpellCheck.Size = new System.Drawing.Size(125, 19);
-            this.checkSpellCheck.TabIndex = 1;
-            this.checkSpellCheck.Text = "Enable Spell Check";
-            this.checkSpellCheck.UseVisualStyleBackColor = true;
-            // 
-            // labelLocales
-            // 
-            this.labelLocales.AutoSize = true;
-            this.labelLocales.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelLocales.Location = new System.Drawing.Point(0, 0);
-            this.labelLocales.Margin = new System.Windows.Forms.Padding(0);
-            this.labelLocales.Name = "labelLocales";
-            this.labelLocales.Size = new System.Drawing.Size(58, 20);
-            this.labelLocales.TabIndex = 0;
-            this.labelLocales.Text = "Locales";
-            // 
-            // flowPanel
-            // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flowPanel.Controls.Add(this.labelLocales);
-            this.flowPanel.Controls.Add(this.checkSpellCheck);
-            this.flowPanel.Controls.Add(this.labelSpellCheckLanguage);
-            this.flowPanel.Controls.Add(this.comboBoxSpellCheckLanguage);
-            this.flowPanel.Controls.Add(this.labelTranslations);
-            this.flowPanel.Controls.Add(this.labelTranslationTarget);
-            this.flowPanel.Controls.Add(this.comboBoxTranslationTarget);
-            this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowPanel.Location = new System.Drawing.Point(9, 9);
-            this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 201);
-            this.flowPanel.TabIndex = 0;
-            this.flowPanel.WrapContents = false;
-            // 
-            // labelSpellCheckLanguage
-            // 
-            this.labelSpellCheckLanguage.AutoSize = true;
-            this.labelSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 59);
-            this.labelSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
-            this.labelSpellCheckLanguage.Name = "labelSpellCheckLanguage";
-            this.labelSpellCheckLanguage.Size = new System.Drawing.Size(123, 15);
-            this.labelSpellCheckLanguage.TabIndex = 2;
-            this.labelSpellCheckLanguage.Text = "Spell Check Language";
-            // 
-            // comboBoxSpellCheckLanguage
-            // 
-            this.comboBoxSpellCheckLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.comboBoxSpellCheckLanguage.FormattingEnabled = true;
-            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 77);
-            this.comboBoxSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
-            this.comboBoxSpellCheckLanguage.Name = "comboBoxSpellCheckLanguage";
-            this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(311, 23);
-            this.comboBoxSpellCheckLanguage.TabIndex = 3;
-            // 
-            // labelTranslations
-            // 
-            this.labelTranslations.AutoSize = true;
-            this.labelTranslations.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTranslations.Location = new System.Drawing.Point(0, 123);
-            this.labelTranslations.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
-            this.labelTranslations.Name = "labelTranslations";
-            this.labelTranslations.Size = new System.Drawing.Size(109, 20);
-            this.labelTranslations.TabIndex = 4;
-            this.labelTranslations.Text = "Bing Translator";
-            // 
-            // labelTranslationTarget
-            // 
-            this.labelTranslationTarget.AutoSize = true;
-            this.labelTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 155);
-            this.labelTranslationTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
-            this.labelTranslationTarget.Name = "labelTranslationTarget";
-            this.labelTranslationTarget.Size = new System.Drawing.Size(96, 15);
-            this.labelTranslationTarget.TabIndex = 5;
-            this.labelTranslationTarget.Text = "Target Language";
-            // 
-            // comboBoxTranslationTarget
-            // 
-            this.comboBoxTranslationTarget.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.comboBoxTranslationTarget.FormattingEnabled = true;
-            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 173);
-            this.comboBoxTranslationTarget.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
-            this.comboBoxTranslationTarget.Name = "comboBoxTranslationTarget";
-            this.comboBoxTranslationTarget.Size = new System.Drawing.Size(311, 23);
-            this.comboBoxTranslationTarget.TabIndex = 6;
-            // 
-            // TabSettingsLocales
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.flowPanel);
-            this.Name = "TabSettingsLocales";
-            this.Size = new System.Drawing.Size(340, 219);
-            this.flowPanel.ResumeLayout(false);
-            this.flowPanel.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.CheckBox checkSpellCheck;
-        private System.Windows.Forms.Label labelLocales;
-        private System.Windows.Forms.FlowLayoutPanel flowPanel;
-        private System.Windows.Forms.ComboBox comboBoxTranslationTarget;
-        private System.Windows.Forms.Label labelTranslationTarget;
-        private System.Windows.Forms.ComboBox comboBoxSpellCheckLanguage;
-        private System.Windows.Forms.Label labelTranslations;
-        private System.Windows.Forms.Label labelSpellCheckLanguage;
-    }
-}

Core/Other/Settings/TabSettingsLocales.cs

@@ -1,53 +0,0 @@
-using System;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Utils;
-
-namespace TweetDuck.Core.Other.Settings{
-    sealed partial class TabSettingsLocales : BaseTabSettings{
-        public TabSettingsLocales(){
-            InitializeComponent();
-            
-            toolTip.SetToolTip(checkSpellCheck, "Underlines words that are spelled incorrectly.");
-            toolTip.SetToolTip(comboBoxSpellCheckLanguage, "Language used for spell check.");
-            toolTip.SetToolTip(comboBoxTranslationTarget, "Language tweets are translated into.");
-            
-            checkSpellCheck.Checked = Config.EnableSpellCheck;
-
-            try{
-                foreach(LocaleUtils.Item item in LocaleUtils.SpellCheckLanguages){
-                    comboBoxSpellCheckLanguage.Items.Add(item);
-                }
-            }catch{
-                comboBoxSpellCheckLanguage.Items.Add(new LocaleUtils.Item("en-US"));
-            }
-
-            comboBoxSpellCheckLanguage.SelectedItem = new LocaleUtils.Item(Config.SpellCheckLanguage);
-
-            foreach(LocaleUtils.Item item in LocaleUtils.TweetDeckTranslationLocales){
-                comboBoxTranslationTarget.Items.Add(item);
-            }
-
-            comboBoxTranslationTarget.SelectedItem = new LocaleUtils.Item(Config.TranslationTarget);
-        }
-
-        public override void OnReady(){
-            checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
-            comboBoxSpellCheckLanguage.SelectedValueChanged += comboBoxSpellCheckLanguage_SelectedValueChanged;
-            comboBoxTranslationTarget.SelectedValueChanged += comboBoxTranslationTarget_SelectedValueChanged;
-        }
-
-        private void checkSpellCheck_CheckedChanged(object sender, EventArgs e){
-            Config.EnableSpellCheck = checkSpellCheck.Checked;
-            BrowserProcessHandler.UpdatePrefs();
-        }
-
-        private void comboBoxSpellCheckLanguage_SelectedValueChanged(object sender, EventArgs e){
-            Config.SpellCheckLanguage = (comboBoxSpellCheckLanguage.SelectedItem as LocaleUtils.Item)?.Code ?? "en-US";
-            PromptRestart();
-        }
-
-        private void comboBoxTranslationTarget_SelectedValueChanged(object sender, EventArgs e){
-            Config.TranslationTarget = (comboBoxTranslationTarget.SelectedItem as LocaleUtils.Item)?.Code ?? "en";
-        }
-    }
-}

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -64,8 +64,10 @@
             this.labelSize = new System.Windows.Forms.Label();
             this.panelSize = new System.Windows.Forms.Panel();
             this.durationUpdateTimer = new System.Windows.Forms.Timer(this.components);
-            this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
+            this.flowPanelLeft = new System.Windows.Forms.FlowLayoutPanel();
             this.panelScrollSpeed = new System.Windows.Forms.Panel();
+            this.flowPanelRight = new System.Windows.Forms.FlowLayoutPanel();
+            this.panelSeparator = new System.Windows.Forms.Panel();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).BeginInit();
             this.tableLayoutDurationButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).BeginInit();
@@ -74,13 +76,14 @@
             this.panelLocation.SuspendLayout();
             this.panelTimer.SuspendLayout();
             this.panelSize.SuspendLayout();
-            this.flowPanel.SuspendLayout();
+            this.flowPanelLeft.SuspendLayout();
             this.panelScrollSpeed.SuspendLayout();
+            this.flowPanelRight.SuspendLayout();
             this.SuspendLayout();
             // 
             // labelEdgeDistanceValue
             // 
-            this.labelEdgeDistanceValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelEdgeDistanceValue.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.labelEdgeDistanceValue.Location = new System.Drawing.Point(145, 4);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
@@ -92,41 +95,41 @@
             // labelDisplay
             // 
             this.labelDisplay.AutoSize = true;
-            this.labelDisplay.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDisplay.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelDisplay.Location = new System.Drawing.Point(3, 465);
+            this.labelDisplay.Location = new System.Drawing.Point(3, 83);
             this.labelDisplay.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDisplay.Name = "labelDisplay";
-            this.labelDisplay.Size = new System.Drawing.Size(45, 15);
+            this.labelDisplay.Size = new System.Drawing.Size(46, 15);
-            this.labelDisplay.TabIndex = 15;
+            this.labelDisplay.TabIndex = 2;
             this.labelDisplay.Text = "Display";
             // 
             // comboBoxDisplay
             // 
             this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxDisplay.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.comboBoxDisplay.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 483);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 102);
-            this.comboBoxDisplay.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
+            this.comboBoxDisplay.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxDisplay.Name = "comboBoxDisplay";
             this.comboBoxDisplay.Size = new System.Drawing.Size(144, 23);
-            this.comboBoxDisplay.TabIndex = 16;
+            this.comboBoxDisplay.TabIndex = 3;
             // 
             // labelEdgeDistance
             // 
             this.labelEdgeDistance.AutoSize = true;
-            this.labelEdgeDistance.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelEdgeDistance.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 521);
+            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 140);
             this.labelEdgeDistance.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelEdgeDistance.Name = "labelEdgeDistance";
-            this.labelEdgeDistance.Size = new System.Drawing.Size(112, 15);
+            this.labelEdgeDistance.Size = new System.Drawing.Size(113, 15);
-            this.labelEdgeDistance.TabIndex = 17;
+            this.labelEdgeDistance.TabIndex = 4;
             this.labelEdgeDistance.Text = "Distance From Edge";
             // 
             // radioLocCustom
             // 
-            this.radioLocCustom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioLocCustom.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.radioLocCustom.Location = new System.Drawing.Point(205, 4);
+            this.radioLocCustom.Location = new System.Drawing.Point(218, 4);
-            this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.radioLocCustom.Margin = new System.Windows.Forms.Padding(10, 4, 3, 3);
             this.radioLocCustom.Name = "radioLocCustom";
             this.radioLocCustom.Size = new System.Drawing.Size(70, 43);
             this.radioLocCustom.TabIndex = 4;
@@ -136,11 +139,11 @@
             // 
             // radioLocBR
             // 
-            this.radioLocBR.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioLocBR.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.radioLocBR.Location = new System.Drawing.Point(105, 28);
+            this.radioLocBR.Location = new System.Drawing.Point(109, 28);
             this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocBR.Name = "radioLocBR";
-            this.radioLocBR.Size = new System.Drawing.Size(92, 19);
+            this.radioLocBR.Size = new System.Drawing.Size(96, 19);
             this.radioLocBR.TabIndex = 3;
             this.radioLocBR.TabStop = true;
             this.radioLocBR.Text = "Bottom Right";
@@ -148,11 +151,11 @@
             // 
             // radioLocBL
             // 
-            this.radioLocBL.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioLocBL.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.radioLocBL.Location = new System.Drawing.Point(5, 28);
             this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocBL.Name = "radioLocBL";
-            this.radioLocBL.Size = new System.Drawing.Size(92, 19);
+            this.radioLocBL.Size = new System.Drawing.Size(96, 19);
             this.radioLocBL.TabIndex = 2;
             this.radioLocBL.TabStop = true;
             this.radioLocBL.Text = "Bottom Left";
@@ -160,11 +163,11 @@
             // 
             // radioLocTR
             // 
-            this.radioLocTR.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioLocTR.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.radioLocTR.Location = new System.Drawing.Point(105, 4);
+            this.radioLocTR.Location = new System.Drawing.Point(109, 4);
             this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTR.Name = "radioLocTR";
-            this.radioLocTR.Size = new System.Drawing.Size(92, 19);
+            this.radioLocTR.Size = new System.Drawing.Size(96, 19);
             this.radioLocTR.TabIndex = 1;
             this.radioLocTR.TabStop = true;
             this.radioLocTR.Text = "Top Right";
@@ -172,11 +175,11 @@
             // 
             // radioLocTL
             // 
-            this.radioLocTL.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioLocTL.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.radioLocTL.Location = new System.Drawing.Point(5, 4);
             this.radioLocTL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTL.Name = "radioLocTL";
-            this.radioLocTL.Size = new System.Drawing.Size(92, 19);
+            this.radioLocTL.Size = new System.Drawing.Size(96, 19);
             this.radioLocTL.TabIndex = 0;
             this.radioLocTL.TabStop = true;
             this.radioLocTL.Text = "Top Left";
@@ -205,7 +208,7 @@
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationMedium, 0, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationLong, 1, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationShort, 0, 0);
-            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 332);
+            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 353);
             this.tableLayoutDurationButtons.Name = "tableLayoutDurationButtons";
             this.tableLayoutDurationButtons.RowCount = 1;
             this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
@@ -219,7 +222,7 @@
             this.btnDurationMedium.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationMedium.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationMedium.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDurationMedium.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnDurationMedium.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnDurationMedium.Location = new System.Drawing.Point(58, 1);
             this.btnDurationMedium.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationMedium.Name = "btnDurationMedium";
@@ -235,7 +238,7 @@
             this.btnDurationLong.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationLong.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationLong.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDurationLong.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnDurationLong.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnDurationLong.Location = new System.Drawing.Point(122, 1);
             this.btnDurationLong.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationLong.Name = "btnDurationLong";
@@ -251,7 +254,7 @@
             this.btnDurationShort.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationShort.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationShort.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDurationShort.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnDurationShort.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnDurationShort.Location = new System.Drawing.Point(1, 1);
             this.btnDurationShort.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationShort.Name = "btnDurationShort";
@@ -263,7 +266,7 @@
             // labelDurationValue
             // 
             this.labelDurationValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelDurationValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDurationValue.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.labelDurationValue.Location = new System.Drawing.Point(147, 4);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
@@ -287,7 +290,7 @@
             // checkSkipOnLinkClick
             // 
             this.checkSkipOnLinkClick.AutoSize = true;
-            this.checkSkipOnLinkClick.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkSkipOnLinkClick.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 74);
             this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkSkipOnLinkClick.Name = "checkSkipOnLinkClick";
@@ -299,7 +302,7 @@
             // checkColumnName
             // 
             this.checkColumnName.AutoSize = true;
-            this.checkColumnName.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkColumnName.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkColumnName.Location = new System.Drawing.Point(6, 26);
             this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkColumnName.Name = "checkColumnName";
@@ -311,21 +314,21 @@
             // labelIdlePause
             // 
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelIdlePause.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
             this.labelIdlePause.Location = new System.Drawing.Point(3, 131);
             this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelIdlePause.Name = "labelIdlePause";
-            this.labelIdlePause.Size = new System.Drawing.Size(94, 15);
+            this.labelIdlePause.Size = new System.Drawing.Size(95, 15);
             this.labelIdlePause.TabIndex = 5;
             this.labelIdlePause.Text = "Pause When Idle";
             // 
             // comboBoxIdlePause
             // 
             this.comboBoxIdlePause.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxIdlePause.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.comboBoxIdlePause.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 149);
+            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 150);
-            this.comboBoxIdlePause.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
+            this.comboBoxIdlePause.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxIdlePause.Name = "comboBoxIdlePause";
             this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 23);
             this.comboBoxIdlePause.TabIndex = 6;
@@ -333,7 +336,7 @@
             // checkNonIntrusive
             // 
             this.checkNonIntrusive.AutoSize = true;
-            this.checkNonIntrusive.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkNonIntrusive.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkNonIntrusive.Location = new System.Drawing.Point(6, 98);
             this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkNonIntrusive.Name = "checkNonIntrusive";
@@ -345,8 +348,8 @@
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
-            this.checkTimerCountDown.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkTimerCountDown.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 245);
+            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 266);
             this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkTimerCountDown.Name = "checkTimerCountDown";
             this.checkTimerCountDown.Size = new System.Drawing.Size(132, 19);
@@ -357,8 +360,8 @@
             // checkNotificationTimer
             // 
             this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkNotificationTimer.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 221);
+            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 242);
             this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkNotificationTimer.Name = "checkNotificationTimer";
             this.checkNotificationTimer.Size = new System.Drawing.Size(164, 19);
@@ -368,7 +371,7 @@
             // 
             // radioSizeAuto
             // 
-            this.radioSizeAuto.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioSizeAuto.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.radioSizeAuto.Location = new System.Drawing.Point(5, 4);
             this.radioSizeAuto.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioSizeAuto.Name = "radioSizeAuto";
@@ -380,7 +383,7 @@
             // 
             // radioSizeCustom
             // 
-            this.radioSizeCustom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioSizeCustom.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.radioSizeCustom.Location = new System.Drawing.Point(105, 4);
             this.radioSizeCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioSizeCustom.Name = "radioSizeCustom";
@@ -393,29 +396,28 @@
             // labelGeneral
             // 
             this.labelGeneral.AutoSize = true;
-            this.labelGeneral.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelGeneral.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
             this.labelGeneral.Location = new System.Drawing.Point(0, 0);
-            this.labelGeneral.Margin = new System.Windows.Forms.Padding(0);
+            this.labelGeneral.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelGeneral.Name = "labelGeneral";
-            this.labelGeneral.Size = new System.Drawing.Size(60, 20);
+            this.labelGeneral.Size = new System.Drawing.Size(69, 19);
             this.labelGeneral.TabIndex = 0;
-            this.labelGeneral.Text = "General";
+            this.labelGeneral.Text = "GENERAL";
             // 
             // panelEdgeDistance
             // 
-            this.panelEdgeDistance.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelEdgeDistance.Controls.Add(this.trackBarEdgeDistance);
             this.panelEdgeDistance.Controls.Add(this.labelEdgeDistanceValue);
-            this.panelEdgeDistance.Location = new System.Drawing.Point(0, 536);
+            this.panelEdgeDistance.Location = new System.Drawing.Point(0, 156);
-            this.panelEdgeDistance.Margin = new System.Windows.Forms.Padding(0);
+            this.panelEdgeDistance.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelEdgeDistance.Name = "panelEdgeDistance";
-            this.panelEdgeDistance.Size = new System.Drawing.Size(322, 36);
+            this.panelEdgeDistance.Size = new System.Drawing.Size(300, 35);
-            this.panelEdgeDistance.TabIndex = 18;
+            this.panelEdgeDistance.TabIndex = 5;
             // 
             // checkMediaPreviews
             // 
             this.checkMediaPreviews.AutoSize = true;
-            this.checkMediaPreviews.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkMediaPreviews.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.checkMediaPreviews.Location = new System.Drawing.Point(6, 50);
             this.checkMediaPreviews.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkMediaPreviews.Name = "checkMediaPreviews";
@@ -426,7 +428,7 @@
             // 
             // labelScrollSpeedValue
             // 
-            this.labelScrollSpeedValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelScrollSpeedValue.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.labelScrollSpeedValue.Location = new System.Drawing.Point(145, 4);
             this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
@@ -452,153 +454,171 @@
             // labelScrollSpeed
             // 
             this.labelScrollSpeed.AutoSize = true;
-            this.labelScrollSpeed.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelScrollSpeed.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 651);
+            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 275);
             this.labelScrollSpeed.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelScrollSpeed.Name = "labelScrollSpeed";
-            this.labelScrollSpeed.Size = new System.Drawing.Size(71, 15);
+            this.labelScrollSpeed.Size = new System.Drawing.Size(73, 15);
-            this.labelScrollSpeed.TabIndex = 21;
+            this.labelScrollSpeed.TabIndex = 8;
             this.labelScrollSpeed.Text = "Scroll Speed";
             // 
             // labelLocation
             // 
             this.labelLocation.AutoSize = true;
-            this.labelLocation.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelLocation.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelLocation.Location = new System.Drawing.Point(0, 382);
+            this.labelLocation.Location = new System.Drawing.Point(0, 0);
-            this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
+            this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelLocation.Name = "labelLocation";
-            this.labelLocation.Size = new System.Drawing.Size(66, 20);
+            this.labelLocation.Size = new System.Drawing.Size(79, 19);
-            this.labelLocation.TabIndex = 13;
+            this.labelLocation.TabIndex = 0;
-            this.labelLocation.Text = "Location";
+            this.labelLocation.Text = "LOCATION";
             // 
             // panelLocation
             // 
-            this.panelLocation.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelLocation.Controls.Add(this.radioLocTL);
             this.panelLocation.Controls.Add(this.radioLocTR);
             this.panelLocation.Controls.Add(this.radioLocBL);
             this.panelLocation.Controls.Add(this.radioLocCustom);
             this.panelLocation.Controls.Add(this.radioLocBR);
-            this.panelLocation.Location = new System.Drawing.Point(0, 402);
+            this.panelLocation.Location = new System.Drawing.Point(0, 20);
             this.panelLocation.Margin = new System.Windows.Forms.Padding(0);
             this.panelLocation.Name = "panelLocation";
-            this.panelLocation.Size = new System.Drawing.Size(322, 51);
+            this.panelLocation.Size = new System.Drawing.Size(300, 51);
-            this.panelLocation.TabIndex = 14;
+            this.panelLocation.TabIndex = 1;
             // 
             // panelTimer
             // 
-            this.panelTimer.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelTimer.Controls.Add(this.labelDurationValue);
             this.panelTimer.Controls.Add(this.trackBarDuration);
-            this.panelTimer.Location = new System.Drawing.Point(0, 293);
+            this.panelTimer.Location = new System.Drawing.Point(0, 315);
-            this.panelTimer.Margin = new System.Windows.Forms.Padding(0);
+            this.panelTimer.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelTimer.Name = "panelTimer";
-            this.panelTimer.Size = new System.Drawing.Size(322, 36);
+            this.panelTimer.Size = new System.Drawing.Size(300, 35);
             this.panelTimer.TabIndex = 11;
             // 
             // labelDuration
             // 
             this.labelDuration.AutoSize = true;
-            this.labelDuration.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDuration.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelDuration.Location = new System.Drawing.Point(3, 278);
+            this.labelDuration.Location = new System.Drawing.Point(3, 299);
             this.labelDuration.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDuration.Name = "labelDuration";
-            this.labelDuration.Size = new System.Drawing.Size(53, 15);
+            this.labelDuration.Size = new System.Drawing.Size(54, 15);
             this.labelDuration.TabIndex = 10;
             this.labelDuration.Text = "Duration";
             // 
             // labelTimer
             // 
             this.labelTimer.AutoSize = true;
-            this.labelTimer.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTimer.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelTimer.Location = new System.Drawing.Point(0, 195);
+            this.labelTimer.Location = new System.Drawing.Point(0, 216);
-            this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
+            this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 40, 0, 1);
             this.labelTimer.Name = "labelTimer";
-            this.labelTimer.Size = new System.Drawing.Size(47, 20);
+            this.labelTimer.Size = new System.Drawing.Size(50, 19);
             this.labelTimer.TabIndex = 7;
-            this.labelTimer.Text = "Timer";
+            this.labelTimer.Text = "TIMER";
             // 
             // labelSize
             // 
             this.labelSize.AutoSize = true;
-            this.labelSize.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSize.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelSize.Location = new System.Drawing.Point(0, 592);
+            this.labelSize.Location = new System.Drawing.Point(0, 216);
-            this.labelSize.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
+            this.labelSize.Margin = new System.Windows.Forms.Padding(0, 25, 0, 1);
             this.labelSize.Name = "labelSize";
-            this.labelSize.Size = new System.Drawing.Size(36, 20);
+            this.labelSize.Size = new System.Drawing.Size(36, 19);
-            this.labelSize.TabIndex = 19;
+            this.labelSize.TabIndex = 6;
-            this.labelSize.Text = "Size";
+            this.labelSize.Text = "SIZE";
             // 
             // panelSize
             // 
-            this.panelSize.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.panelSize.Controls.Add(this.radioSizeCustom);
             this.panelSize.Controls.Add(this.radioSizeAuto);
-            this.panelSize.Location = new System.Drawing.Point(0, 612);
+            this.panelSize.Location = new System.Drawing.Point(0, 236);
             this.panelSize.Margin = new System.Windows.Forms.Padding(0);
             this.panelSize.Name = "panelSize";
-            this.panelSize.Size = new System.Drawing.Size(322, 27);
+            this.panelSize.Size = new System.Drawing.Size(300, 27);
-            this.panelSize.TabIndex = 20;
+            this.panelSize.TabIndex = 7;
             // 
             // durationUpdateTimer
             // 
             this.durationUpdateTimer.Interval = 200;
             this.durationUpdateTimer.Tick += new System.EventHandler(this.durationUpdateTimer_Tick);
             // 
-            // flowPanel
+            // flowPanelLeft
             // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.flowPanelLeft.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Left)));
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.flowPanelLeft.Controls.Add(this.labelGeneral);
-            this.flowPanel.Controls.Add(this.labelGeneral);
+            this.flowPanelLeft.Controls.Add(this.checkColumnName);
-            this.flowPanel.Controls.Add(this.checkColumnName);
+            this.flowPanelLeft.Controls.Add(this.checkMediaPreviews);
-            this.flowPanel.Controls.Add(this.checkMediaPreviews);
+            this.flowPanelLeft.Controls.Add(this.checkSkipOnLinkClick);
-            this.flowPanel.Controls.Add(this.checkSkipOnLinkClick);
+            this.flowPanelLeft.Controls.Add(this.checkNonIntrusive);
-            this.flowPanel.Controls.Add(this.checkNonIntrusive);
+            this.flowPanelLeft.Controls.Add(this.labelIdlePause);
-            this.flowPanel.Controls.Add(this.labelIdlePause);
+            this.flowPanelLeft.Controls.Add(this.comboBoxIdlePause);
-            this.flowPanel.Controls.Add(this.comboBoxIdlePause);
+            this.flowPanelLeft.Controls.Add(this.labelTimer);
-            this.flowPanel.Controls.Add(this.labelTimer);
+            this.flowPanelLeft.Controls.Add(this.checkNotificationTimer);
-            this.flowPanel.Controls.Add(this.checkNotificationTimer);
+            this.flowPanelLeft.Controls.Add(this.checkTimerCountDown);
-            this.flowPanel.Controls.Add(this.checkTimerCountDown);
+            this.flowPanelLeft.Controls.Add(this.labelDuration);
-            this.flowPanel.Controls.Add(this.labelDuration);
+            this.flowPanelLeft.Controls.Add(this.panelTimer);
-            this.flowPanel.Controls.Add(this.panelTimer);
+            this.flowPanelLeft.Controls.Add(this.tableLayoutDurationButtons);
-            this.flowPanel.Controls.Add(this.tableLayoutDurationButtons);
+            this.flowPanelLeft.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowPanel.Controls.Add(this.labelLocation);
+            this.flowPanelLeft.Location = new System.Drawing.Point(9, 9);
-            this.flowPanel.Controls.Add(this.panelLocation);
+            this.flowPanelLeft.Name = "flowPanelLeft";
-            this.flowPanel.Controls.Add(this.labelDisplay);
+            this.flowPanelLeft.Size = new System.Drawing.Size(300, 461);
-            this.flowPanel.Controls.Add(this.comboBoxDisplay);
+            this.flowPanelLeft.TabIndex = 0;
-            this.flowPanel.Controls.Add(this.labelEdgeDistance);
+            this.flowPanelLeft.WrapContents = false;
-            this.flowPanel.Controls.Add(this.panelEdgeDistance);
-            this.flowPanel.Controls.Add(this.labelSize);
-            this.flowPanel.Controls.Add(this.panelSize);
-            this.flowPanel.Controls.Add(this.labelScrollSpeed);
-            this.flowPanel.Controls.Add(this.panelScrollSpeed);
-            this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowPanel.Location = new System.Drawing.Point(9, 9);
-            this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 698);
-            this.flowPanel.TabIndex = 0;
-            this.flowPanel.WrapContents = false;
             // 
             // panelScrollSpeed
             // 
-            this.panelScrollSpeed.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelScrollSpeed.Controls.Add(this.trackBarScrollSpeed);
             this.panelScrollSpeed.Controls.Add(this.labelScrollSpeedValue);
-            this.panelScrollSpeed.Location = new System.Drawing.Point(0, 666);
+            this.panelScrollSpeed.Location = new System.Drawing.Point(0, 291);
-            this.panelScrollSpeed.Margin = new System.Windows.Forms.Padding(0);
+            this.panelScrollSpeed.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelScrollSpeed.Name = "panelScrollSpeed";
-            this.panelScrollSpeed.Size = new System.Drawing.Size(322, 36);
+            this.panelScrollSpeed.Size = new System.Drawing.Size(300, 35);
-            this.panelScrollSpeed.TabIndex = 22;
+            this.panelScrollSpeed.TabIndex = 9;
+            // 
+            // flowPanelRight
+            // 
+            this.flowPanelRight.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.flowPanelRight.Controls.Add(this.labelLocation);
+            this.flowPanelRight.Controls.Add(this.panelLocation);
+            this.flowPanelRight.Controls.Add(this.labelDisplay);
+            this.flowPanelRight.Controls.Add(this.comboBoxDisplay);
+            this.flowPanelRight.Controls.Add(this.labelEdgeDistance);
+            this.flowPanelRight.Controls.Add(this.panelEdgeDistance);
+            this.flowPanelRight.Controls.Add(this.labelSize);
+            this.flowPanelRight.Controls.Add(this.panelSize);
+            this.flowPanelRight.Controls.Add(this.labelScrollSpeed);
+            this.flowPanelRight.Controls.Add(this.panelScrollSpeed);
+            this.flowPanelRight.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flowPanelRight.Location = new System.Drawing.Point(322, 9);
+            this.flowPanelRight.Name = "flowPanelRight";
+            this.flowPanelRight.Size = new System.Drawing.Size(300, 461);
+            this.flowPanelRight.TabIndex = 1;
+            this.flowPanelRight.WrapContents = false;
+            // 
+            // panelSeparator
+            // 
+            this.panelSeparator.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelSeparator.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
+            this.panelSeparator.Location = new System.Drawing.Point(312, 0);
+            this.panelSeparator.Margin = new System.Windows.Forms.Padding(0, 0, 6, 0);
+            this.panelSeparator.Name = "panelSeparator";
+            this.panelSeparator.Size = new System.Drawing.Size(1, 480);
+            this.panelSeparator.TabIndex = 2;
             // 
             // TabSettingsNotifications
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.flowPanel);
+            this.Controls.Add(this.flowPanelRight);
+            this.Controls.Add(this.flowPanelLeft);
+            this.Controls.Add(this.panelSeparator);
             this.Name = "TabSettingsNotifications";
-            this.Size = new System.Drawing.Size(340, 717);
+            this.Size = new System.Drawing.Size(631, 480);
             this.ParentChanged += new System.EventHandler(this.TabSettingsNotifications_ParentChanged);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
             this.tableLayoutDurationButtons.ResumeLayout(false);
@@ -608,9 +628,11 @@
             this.panelLocation.ResumeLayout(false);
             this.panelTimer.ResumeLayout(false);
             this.panelSize.ResumeLayout(false);
-            this.flowPanel.ResumeLayout(false);
+            this.flowPanelLeft.ResumeLayout(false);
-            this.flowPanel.PerformLayout();
+            this.flowPanelLeft.PerformLayout();
             this.panelScrollSpeed.ResumeLayout(false);
+            this.flowPanelRight.ResumeLayout(false);
+            this.flowPanelRight.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -656,7 +678,9 @@
         private System.Windows.Forms.RadioButton radioSizeCustom;
         private System.Windows.Forms.RadioButton radioSizeAuto;
         private System.Windows.Forms.CheckBox checkMediaPreviews;
-        private System.Windows.Forms.FlowLayoutPanel flowPanel;
+        private System.Windows.Forms.FlowLayoutPanel flowPanelLeft;
         private System.Windows.Forms.Panel panelScrollSpeed;
+        private System.Windows.Forms.FlowLayoutPanel flowPanelRight;
+        private System.Windows.Forms.Panel panelSeparator;
     }
 }

Core/Other/Settings/TabSettingsNotifications.cs

@@ -26,22 +26,16 @@ namespace TweetDuck.Core.Other.Settings{
             this.notification.Activated += notification_Activated;
             this.notification.Show();
             
+            Disposed += (sender, args) => this.notification.Dispose();
+            
+            // general
+
             toolTip.SetToolTip(checkColumnName, "Shows column name each notification originated\r\nfrom in the notification window title.");
             toolTip.SetToolTip(checkMediaPreviews, "Shows image and video thumbnails in the notification window.");
             toolTip.SetToolTip(checkSkipOnLinkClick, "Skips current notification when a link\r\ninside the notification is clicked.");
             toolTip.SetToolTip(checkNonIntrusive, "When not idle and the cursor is within the notification window area,\r\nit will be delayed until the cursor moves away to prevent accidental clicks.");
-
             toolTip.SetToolTip(comboBoxIdlePause, "Pauses new notifications after going idle for a set amount of time.");
             
-            toolTip.SetToolTip(checkTimerCountDown, "The notification timer counts down instead of up.");
-            toolTip.SetToolTip(labelDurationValue, "Milliseconds per character.");
-            toolTip.SetToolTip(trackBarDuration, toolTip.GetToolTip(labelDurationValue));
-
-            toolTip.SetToolTip(radioLocCustom, "Drag the example notification window to the desired location.");
-            
-            toolTip.SetToolTip(radioSizeAuto, "Notification size is based on the font size and browser zoom level.");
-            toolTip.SetToolTip(radioSizeCustom, "Resize the example notification window to the desired size.");
-            
             checkColumnName.Checked = Config.DisplayNotificationColumn;
             checkMediaPreviews.Checked = Config.NotificationMediaPreviews;
             checkSkipOnLinkClick.Checked = Config.NotificationSkipOnLinkClick;
@@ -54,6 +48,12 @@ namespace TweetDuck.Core.Other.Settings{
             comboBoxIdlePause.Items.Add("5 minutes");
             comboBoxIdlePause.SelectedIndex = Math.Max(0, Array.FindIndex(IdlePauseSeconds, val => val == Config.NotificationIdlePauseSeconds));
 
+            // timer
+
+            toolTip.SetToolTip(checkTimerCountDown, "The notification timer counts down instead of up.");
+            toolTip.SetToolTip(labelDurationValue, "Milliseconds per character.");
+            toolTip.SetToolTip(trackBarDuration, toolTip.GetToolTip(labelDurationValue));
+            
             checkNotificationTimer.Checked = Config.DisplayNotificationTimer;
             checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
             checkTimerCountDown.Checked = Config.NotificationTimerCountDown;
@@ -61,6 +61,10 @@ namespace TweetDuck.Core.Other.Settings{
             trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
             labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
 
+            // location
+
+            toolTip.SetToolTip(radioLocCustom, "Drag the example notification window to the desired location.");
+            
             switch(Config.NotificationPosition){
                 case TweetNotification.Position.TopLeft: radioLocTL.Checked = true; break;
                 case TweetNotification.Position.TopRight: radioLocTR.Checked = true; break;
@@ -81,6 +85,11 @@ namespace TweetDuck.Core.Other.Settings{
             trackBarEdgeDistance.SetValueSafe(Config.NotificationEdgeDistance);
             labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
 
+            // size
+
+            toolTip.SetToolTip(radioSizeAuto, "Notification size is based on the font size and browser zoom level.");
+            toolTip.SetToolTip(radioSizeCustom, "Resize the example notification window to the desired size.");
+
             switch(Config.NotificationSize){
                 case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
                 case TweetNotification.Size.Custom: radioSizeCustom.Checked = true; break;
@@ -88,8 +97,6 @@ namespace TweetDuck.Core.Other.Settings{
 
             trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
             labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
-            
-            Disposed += (sender, args) => this.notification.Dispose();
         }
 
         public override void OnReady(){
@@ -97,12 +104,10 @@ namespace TweetDuck.Core.Other.Settings{
             checkMediaPreviews.CheckedChanged += checkMediaPreviews_CheckedChanged;
             checkSkipOnLinkClick.CheckedChanged += checkSkipOnLinkClick_CheckedChanged;
             checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
-
             comboBoxIdlePause.SelectedValueChanged += comboBoxIdlePause_SelectedValueChanged;
 
             checkNotificationTimer.CheckedChanged += checkNotificationTimer_CheckedChanged;
             checkTimerCountDown.CheckedChanged += checkTimerCountDown_CheckedChanged;
-
             trackBarDuration.ValueChanged += trackBarDuration_ValueChanged;
             btnDurationShort.Click += btnDurationShort_Click;
             btnDurationMedium.Click += btnDurationMedium_Click;
@@ -113,13 +118,11 @@ namespace TweetDuck.Core.Other.Settings{
             radioLocBL.CheckedChanged += radioLoc_CheckedChanged;
             radioLocBR.CheckedChanged += radioLoc_CheckedChanged;
             radioLocCustom.Click += radioLocCustom_Click;
-
             comboBoxDisplay.SelectedValueChanged += comboBoxDisplay_SelectedValueChanged;
             trackBarEdgeDistance.ValueChanged += trackBarEdgeDistance_ValueChanged;
 
             radioSizeAuto.CheckedChanged += radioSize_CheckedChanged;
             radioSizeCustom.Click += radioSizeCustom_Click;
-
             trackBarScrollSpeed.ValueChanged += trackBarScrollSpeed_ValueChanged;
         }
 
@@ -150,6 +153,71 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
+        #region General
+
+        private void checkColumnName_CheckedChanged(object sender, EventArgs e){
+            Config.DisplayNotificationColumn = checkColumnName.Checked;
+            notification.ShowExampleNotification(false);
+        }
+
+        private void checkMediaPreviews_CheckedChanged(object sender, EventArgs e){
+            Config.NotificationMediaPreviews = checkMediaPreviews.Checked;
+        }
+
+        private void checkSkipOnLinkClick_CheckedChanged(object sender, EventArgs e){
+            Config.NotificationSkipOnLinkClick = checkSkipOnLinkClick.Checked;
+        }
+
+        private void checkNonIntrusive_CheckedChanged(object sender, EventArgs e){
+            Config.NotificationNonIntrusiveMode = checkNonIntrusive.Checked;
+        }
+
+        private void comboBoxIdlePause_SelectedValueChanged(object sender, EventArgs e){
+            Config.NotificationIdlePauseSeconds = IdlePauseSeconds[comboBoxIdlePause.SelectedIndex];
+        }
+
+        #endregion
+        #region Timer
+
+        private void checkNotificationTimer_CheckedChanged(object sender, EventArgs e){
+            Config.DisplayNotificationTimer = checkNotificationTimer.Checked;
+            checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
+            notification.ShowExampleNotification(true);
+        }
+
+        private void checkTimerCountDown_CheckedChanged(object sender, EventArgs e){
+            Config.NotificationTimerCountDown = checkTimerCountDown.Checked;
+            notification.ShowExampleNotification(true);
+        }
+
+        private void trackBarDuration_ValueChanged(object sender, EventArgs e){
+            durationUpdateTimer.Stop();
+            durationUpdateTimer.Start();
+
+            Config.NotificationDurationValue = trackBarDuration.Value;
+            labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
+        }
+
+        private void btnDurationShort_Click(object sender, EventArgs e){
+            trackBarDuration.Value = 15;
+        }
+
+        private void btnDurationMedium_Click(object sender, EventArgs e){
+            trackBarDuration.Value = 25;
+        }
+
+        private void btnDurationLong_Click(object sender, EventArgs e){
+            trackBarDuration.Value = 35;
+        }
+
+        private void durationUpdateTimer_Tick(object sender, EventArgs e){
+            notification.ShowExampleNotification(true);
+            durationUpdateTimer.Stop();
+        }
+
+        #endregion
+        #region Location
+
         private void radioLoc_CheckedChanged(object sender, EventArgs e){
             if (radioLocTL.Checked)Config.NotificationPosition = TweetNotification.Position.TopLeft;
             else if (radioLocTR.Checked)Config.NotificationPosition = TweetNotification.Position.TopRight;
@@ -181,6 +249,20 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
+        private void comboBoxDisplay_SelectedValueChanged(object sender, EventArgs e){
+            Config.NotificationDisplay = comboBoxDisplay.SelectedIndex;
+            notification.ShowExampleNotification(false);
+        }
+
+        private void trackBarEdgeDistance_ValueChanged(object sender, EventArgs e){
+            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
+            Config.NotificationEdgeDistance = trackBarEdgeDistance.Value;
+            notification.ShowExampleNotification(false);
+        }
+
+        #endregion
+        #region Size
+
         private void radioSize_CheckedChanged(object sender, EventArgs e){
             if (radioSizeAuto.Checked){
                 Config.NotificationSize = TweetNotification.Size.Auto;
@@ -198,58 +280,6 @@ namespace TweetDuck.Core.Other.Settings{
             notification.ShowExampleNotification(false);
         }
 
-        private void trackBarDuration_ValueChanged(object sender, EventArgs e){
-            durationUpdateTimer.Stop();
-            durationUpdateTimer.Start();
-
-            Config.NotificationDurationValue = trackBarDuration.Value;
-            labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
-        }
-
-        private void btnDurationShort_Click(object sender, EventArgs e){
-            trackBarDuration.Value = 15;
-        }
-
-        private void btnDurationMedium_Click(object sender, EventArgs e){
-            trackBarDuration.Value = 25;
-        }
-
-        private void btnDurationLong_Click(object sender, EventArgs e){
-            trackBarDuration.Value = 35;
-        }
-
-        private void checkColumnName_CheckedChanged(object sender, EventArgs e){
-            Config.DisplayNotificationColumn = checkColumnName.Checked;
-            notification.ShowExampleNotification(false);
-        }
-
-        private void checkNotificationTimer_CheckedChanged(object sender, EventArgs e){
-            Config.DisplayNotificationTimer = checkNotificationTimer.Checked;
-            checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
-            notification.ShowExampleNotification(true);
-        }
-
-        private void checkTimerCountDown_CheckedChanged(object sender, EventArgs e){
-            Config.NotificationTimerCountDown = checkTimerCountDown.Checked;
-            notification.ShowExampleNotification(true);
-        }
-
-        private void checkMediaPreviews_CheckedChanged(object sender, EventArgs e){
-            Config.NotificationMediaPreviews = checkMediaPreviews.Checked;
-        }
-
-        private void checkSkipOnLinkClick_CheckedChanged(object sender, EventArgs e){
-            Config.NotificationSkipOnLinkClick = checkSkipOnLinkClick.Checked;
-        }
-
-        private void checkNonIntrusive_CheckedChanged(object sender, EventArgs e){
-            Config.NotificationNonIntrusiveMode = checkNonIntrusive.Checked;
-        }
-
-        private void comboBoxIdlePause_SelectedValueChanged(object sender, EventArgs e){
-            Config.NotificationIdlePauseSeconds = IdlePauseSeconds[comboBoxIdlePause.SelectedIndex];
-        }
-
         private void trackBarScrollSpeed_ValueChanged(object sender, EventArgs e){
             if (trackBarScrollSpeed.AlignValueToTick()){
                 labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
@@ -257,20 +287,6 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
-        private void comboBoxDisplay_SelectedValueChanged(object sender, EventArgs e){
+        #endregion
-            Config.NotificationDisplay = comboBoxDisplay.SelectedIndex;
-            notification.ShowExampleNotification(false);
-        }
-
-        private void trackBarEdgeDistance_ValueChanged(object sender, EventArgs e){
-            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
-            Config.NotificationEdgeDistance = trackBarEdgeDistance.Value;
-            notification.ShowExampleNotification(false);
-        }
-
-        private void durationUpdateTimer_Tick(object sender, EventArgs e){
-            notification.ShowExampleNotification(true);
-            durationUpdateTimer.Stop();
-        }
     }
 }

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -47,7 +47,7 @@
             // 
             this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbCustomSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.tbCustomSound.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
             this.tbCustomSound.Name = "tbCustomSound";
             this.tbCustomSound.Size = new System.Drawing.Size(316, 23);
@@ -56,7 +56,7 @@
             // labelVolumeValue
             // 
             this.labelVolumeValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelVolumeValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelVolumeValue.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.labelVolumeValue.Location = new System.Drawing.Point(147, 4);
             this.labelVolumeValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelVolumeValue.Name = "labelVolumeValue";
@@ -69,7 +69,7 @@
             // 
             this.btnPlaySound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnPlaySound.AutoSize = true;
-            this.btnPlaySound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnPlaySound.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnPlaySound.Location = new System.Drawing.Point(202, 32);
             this.btnPlaySound.Name = "btnPlaySound";
             this.btnPlaySound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -81,7 +81,7 @@
             // btnResetSound
             // 
             this.btnResetSound.AutoSize = true;
-            this.btnResetSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnResetSound.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnResetSound.Location = new System.Drawing.Point(3, 32);
             this.btnResetSound.Name = "btnResetSound";
             this.btnResetSound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -94,7 +94,7 @@
             // 
             this.btnBrowseSound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnBrowseSound.AutoSize = true;
-            this.btnBrowseSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnBrowseSound.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.btnBrowseSound.Location = new System.Drawing.Point(251, 32);
             this.btnBrowseSound.Name = "btnBrowseSound";
             this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -106,17 +106,16 @@
             // labelSoundNotification
             // 
             this.labelSoundNotification.AutoSize = true;
-            this.labelSoundNotification.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSoundNotification.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
             this.labelSoundNotification.Location = new System.Drawing.Point(0, 0);
-            this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0);
+            this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelSoundNotification.Name = "labelSoundNotification";
-            this.labelSoundNotification.Size = new System.Drawing.Size(188, 20);
+            this.labelSoundNotification.Size = new System.Drawing.Size(160, 19);
             this.labelSoundNotification.TabIndex = 0;
-            this.labelSoundNotification.Text = "Custom Sound Notification";
+            this.labelSoundNotification.Text = "SOUND NOTIFICATION";
             // 
             // panelSoundNotification
             // 
-            this.panelSoundNotification.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelSoundNotification.Controls.Add(this.btnPlaySound);
             this.panelSoundNotification.Controls.Add(this.tbCustomSound);
             this.panelSoundNotification.Controls.Add(this.btnResetSound);
@@ -130,11 +129,11 @@
             // labelVolume
             // 
             this.labelVolume.AutoSize = true;
-            this.labelVolume.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelVolume.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
             this.labelVolume.Location = new System.Drawing.Point(3, 91);
             this.labelVolume.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelVolume.Name = "labelVolume";
-            this.labelVolume.Size = new System.Drawing.Size(48, 15);
+            this.labelVolume.Size = new System.Drawing.Size(49, 15);
             this.labelVolume.TabIndex = 2;
             this.labelVolume.Text = "Volume";
             // 
@@ -153,9 +152,8 @@
             // 
             // flowPanel
             // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Left)));
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.flowPanel.Controls.Add(this.labelSoundNotification);
             this.flowPanel.Controls.Add(this.panelSoundNotification);
             this.flowPanel.Controls.Add(this.labelVolume);
@@ -163,7 +161,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 142);
+            this.flowPanel.Size = new System.Drawing.Size(322, 462);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -171,8 +169,8 @@
             // 
             this.panelVolume.Controls.Add(this.trackBarVolume);
             this.panelVolume.Controls.Add(this.labelVolumeValue);
-            this.panelVolume.Location = new System.Drawing.Point(0, 106);
+            this.panelVolume.Location = new System.Drawing.Point(0, 107);
-            this.panelVolume.Margin = new System.Windows.Forms.Padding(0);
+            this.panelVolume.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelVolume.Name = "panelVolume";
             this.panelVolume.Size = new System.Drawing.Size(322, 36);
             this.panelVolume.TabIndex = 3;
@@ -188,7 +186,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsSounds";
-            this.Size = new System.Drawing.Size(340, 160);
+            this.Size = new System.Drawing.Size(631, 480);
             this.panelSoundNotification.ResumeLayout(false);
             this.panelSoundNotification.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).EndInit();

Core/Other/Settings/TabSettingsSounds.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
+using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsSounds : BaseTabSettings{
@@ -14,6 +15,8 @@ namespace TweetDuck.Core.Other.Settings{
 
             this.playSoundNotification = playSoundNotification;
             
+            // sound notification
+
             toolTip.SetToolTip(tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
             
             trackBarVolume.SetValueSafe(Config.NotificationSoundVolume);
@@ -21,6 +24,7 @@ namespace TweetDuck.Core.Other.Settings{
 
             tbCustomSound.Text = Config.NotificationSoundPath;
             tbCustomSound_TextChanged(tbCustomSound, EventArgs.Empty);
+            NativeMethods.SendMessage(tbCustomSound.Handle, NativeMethods.EM_SETCUEBANNER, 0, "(default TweetDeck sound)");
         }
 
         public override void OnReady(){
@@ -35,6 +39,8 @@ namespace TweetDuck.Core.Other.Settings{
             Config.NotificationSoundVolume = trackBarVolume.Value;
         }
 
+        #region Sound Notification
+
         private bool RefreshCanPlay(){
             bool isEmpty = string.IsNullOrEmpty(tbCustomSound.Text);
             bool canPlay = isEmpty || File.Exists(tbCustomSound.Text);
@@ -84,5 +90,7 @@ namespace TweetDuck.Core.Other.Settings{
             Config.NotificationSoundVolume = trackBarVolume.Value;
             volumeUpdateTimer.Stop();
         }
+
+        #endregion
     }
 }

Core/Other/Settings/TabSettingsTray.Designer.cs

@@ -1,118 +0,0 @@
-namespace TweetDuck.Core.Other.Settings {
-    partial class TabSettingsTray {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
-            this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
-            this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
-            this.labelTrayIcon = new System.Windows.Forms.Label();
-            this.labelTray = new System.Windows.Forms.Label();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
-            this.flowPanel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // checkTrayHighlight
-            // 
-            this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 81);
-            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
-            this.checkTrayHighlight.Name = "checkTrayHighlight";
-            this.checkTrayHighlight.Size = new System.Drawing.Size(114, 19);
-            this.checkTrayHighlight.TabIndex = 3;
-            this.checkTrayHighlight.Text = "Enable Highlight";
-            this.checkTrayHighlight.UseVisualStyleBackColor = true;
-            // 
-            // comboBoxTrayType
-            // 
-            this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxTrayType.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.comboBoxTrayType.FormattingEnabled = true;
-            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 25);
-            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 5, 3, 3);
-            this.comboBoxTrayType.Name = "comboBoxTrayType";
-            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 23);
-            this.comboBoxTrayType.TabIndex = 1;
-            // 
-            // labelTrayIcon
-            // 
-            this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTrayIcon.Location = new System.Drawing.Point(3, 60);
-            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
-            this.labelTrayIcon.Name = "labelTrayIcon";
-            this.labelTrayIcon.Size = new System.Drawing.Size(56, 15);
-            this.labelTrayIcon.TabIndex = 2;
-            this.labelTrayIcon.Text = "Tray Icon";
-            // 
-            // labelTray
-            // 
-            this.labelTray.AutoSize = true;
-            this.labelTray.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTray.Location = new System.Drawing.Point(0, 0);
-            this.labelTray.Margin = new System.Windows.Forms.Padding(0);
-            this.labelTray.Name = "labelTray";
-            this.labelTray.Size = new System.Drawing.Size(88, 20);
-            this.labelTray.TabIndex = 0;
-            this.labelTray.Text = "System Tray";
-            // 
-            // flowPanel
-            // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flowPanel.Controls.Add(this.labelTray);
-            this.flowPanel.Controls.Add(this.comboBoxTrayType);
-            this.flowPanel.Controls.Add(this.labelTrayIcon);
-            this.flowPanel.Controls.Add(this.checkTrayHighlight);
-            this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowPanel.Location = new System.Drawing.Point(9, 9);
-            this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 102);
-            this.flowPanel.TabIndex = 0;
-            this.flowPanel.WrapContents = false;
-            // 
-            // TabSettingsTray
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.flowPanel);
-            this.Name = "TabSettingsTray";
-            this.Size = new System.Drawing.Size(340, 120);
-            this.flowPanel.ResumeLayout(false);
-            this.flowPanel.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private System.Windows.Forms.CheckBox checkTrayHighlight;
-        private System.Windows.Forms.ComboBox comboBoxTrayType;
-        private System.Windows.Forms.Label labelTrayIcon;
-        private System.Windows.Forms.Label labelTray;
-        private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.FlowLayoutPanel flowPanel;
-    }
-}

Core/Other/Settings/TabSettingsTray.cs

@@ -1,36 +0,0 @@
-using System;
-
-namespace TweetDuck.Core.Other.Settings{
-    sealed partial class TabSettingsTray : BaseTabSettings{
-        public TabSettingsTray(){
-            InitializeComponent();
-            
-            toolTip.SetToolTip(comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
-            toolTip.SetToolTip(checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with popup or audio notifications.\r\nThe icon resets when the main window is restored.");
-            
-            comboBoxTrayType.Items.Add("Disabled");
-            comboBoxTrayType.Items.Add("Display Icon Only");
-            comboBoxTrayType.Items.Add("Minimize to Tray");
-            comboBoxTrayType.Items.Add("Close to Tray");
-            comboBoxTrayType.Items.Add("Combined");
-            comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count-1);
-
-            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
-            checkTrayHighlight.Checked = Config.EnableTrayHighlight;
-        }
-
-        public override void OnReady(){
-            comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
-            checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
-        }
-
-        private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
-            Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
-            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
-        }
-
-        private void checkTrayHighlight_CheckedChanged(object sender, EventArgs e){
-            Config.EnableTrayHighlight = checkTrayHighlight.Checked;
-        }
-    }
-}

Core/Other/TrayIcon.cs

@@ -1,6 +1,8 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
+using TweetDuck.Configuration;
+using Res = TweetDuck.Properties.Resources;
 
 namespace TweetDuck.Core.Other{
     sealed partial class TrayIcon : Component{
@@ -8,6 +10,8 @@ namespace TweetDuck.Core.Other{
             Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined
         }
 
+        private static UserConfig Config => Program.UserConfig;
+
         public event EventHandler ClickRestore;
         public event EventHandler ClickClose;
 
@@ -17,12 +21,9 @@ namespace TweetDuck.Core.Other{
             }
 
             set{
-                if (value){
-                    notifyIcon.Icon = Properties.Resources.icon_tray;
-                }
-                
                 notifyIcon.Visible = value;
                 hasNotifications = false;
+                UpdateIcon();
             }
         }
 
@@ -32,9 +33,9 @@ namespace TweetDuck.Core.Other{
             }
 
             set{
-                if (hasNotifications != value && Visible){
+                if (hasNotifications != value){
-                    notifyIcon.Icon = value ? Properties.Resources.icon_tray_new : Properties.Resources.icon_tray;
                     hasNotifications = value;
+                    UpdateIcon();
                 }
             }
         }
@@ -53,14 +54,26 @@ namespace TweetDuck.Core.Other{
                 
             this.notifyIcon.ContextMenu = contextMenu;
             this.notifyIcon.Text = Program.BrandName;
+
+            Config.MuteToggled += Config_MuteToggled;
         }
 
         public TrayIcon(IContainer container) : this(){
             container.Add(this);
         }
 
+        private void UpdateIcon(){
+            if (Visible){
+                notifyIcon.Icon = hasNotifications ? Res.icon_tray_new : Config.MuteNotifications ? Res.icon_tray_muted : Res.icon_tray;
+            }
+        }
+
         // event handlers
 
+        private void Config_MuteToggled(object sender, EventArgs e){
+            UpdateIcon();
+        }
+
         private void trayIcon_MouseClick(object sender, MouseEventArgs e){
             if (e.Button == MouseButtons.Left){
                 menuItemRestore_Click(sender, e);
@@ -68,7 +81,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private void contextMenu_Popup(object sender, EventArgs e){
-            contextMenu.MenuItems[1].Checked = Program.UserConfig.MuteNotifications;
+            contextMenu.MenuItems[1].Checked = Config.MuteNotifications;
         }
 
         private void menuItemRestore_Click(object sender, EventArgs e){
@@ -76,8 +89,8 @@ namespace TweetDuck.Core.Other{
         }
 
         private void menuItemMuteNotifications_Click(object sender, EventArgs e){
-            Program.UserConfig.MuteNotifications = !contextMenu.MenuItems[1].Checked;
+            Config.MuteNotifications = !contextMenu.MenuItems[1].Checked;
-            Program.UserConfig.Save();
+            Config.Save();
         }
 
         private void menuItemClose_Click(object sender, EventArgs e){

Core/TweetDeckBrowser.cs

@@ -39,7 +39,7 @@ namespace TweetDuck.Core{
 
         private string prevSoundNotificationPath = null;
 
-        public TweetDeckBrowser(FormBrowser owner, TweetDeckBridge bridge){
+        public TweetDeckBrowser(FormBrowser owner, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
             RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
             
             this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
@@ -57,7 +57,8 @@ namespace TweetDuck.Core{
             this.browser.FrameLoadEnd += browser_FrameLoadEnd;
             this.browser.LoadError += browser_LoadError;
 
-            this.browser.RegisterAsyncJsObject("$TD", bridge);
+            this.browser.RegisterAsyncJsObject("$TD", tdBridge);
+            this.browser.RegisterAsyncJsObject("$TDU", updateBridge);
             
             this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
             this.browser.Dock = DockStyle.None;
@@ -145,25 +146,28 @@ namespace TweetDuck.Core{
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             IFrame frame = e.Frame;
 
-            if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
+            if (frame.IsMain){
-                UpdateProperties();
+                if (TwitterUtils.IsTweetDeckWebsite(frame)){
-                TweetDeckBridge.RestoreSessionData(frame);
+                    UpdateProperties();
-                ScriptLoader.ExecuteFile(frame, "code.js", browser);
+                    TweetDeckBridge.RestoreSessionData(frame);
+                    ScriptLoader.ExecuteFile(frame, "code.js", browser);
+
+                    InjectBrowserCSS();
+                    ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
+                    UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
+
+                    TweetDeckBridge.ResetStaticProperties();
+
+                    if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)){
+                        ScriptLoader.ExecuteScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
+                    }
+
+                    if (Program.UserConfig.FirstRun){
+                        ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
+                    }
+                }
+
                 ScriptLoader.ExecuteFile(frame, "update.js", browser);
-
-                InjectBrowserCSS();
-                ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
-                UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
-
-                TweetDeckBridge.ResetStaticProperties();
-
-                if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)){
-                    ScriptLoader.ExecuteScript(frame, @"TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
-                }
-
-                if (Program.UserConfig.FirstRun){
-                    ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
-                }
             }
         }
 
@@ -173,7 +177,7 @@ namespace TweetDuck.Core{
             }
 
             if (!e.FailedUrl.StartsWith("http://td/", StringComparison.Ordinal)){
-                string errorPage = ScriptLoader.LoadResource("pages/error.html", true);
+                string errorPage = ScriptLoader.LoadResourceSilent("pages/error.html");
 
                 if (errorPage != null){
                     browser.LoadHtml(errorPage.Replace("{err}", BrowserUtils.GetErrorName(e.ErrorCode)), "http://td/error");
@@ -222,7 +226,7 @@ namespace TweetDuck.Core{
         }
 
         public void InjectBrowserCSS(){
-            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css", false, browser)?.TrimEnd() ?? string.Empty);
+            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css", browser)?.TrimEnd() ?? string.Empty);
         }
 
         public void ReinjectCustomCSS(string css){
@@ -260,5 +264,9 @@ namespace TweetDuck.Core{
         public void ShowUpdateNotification(string versionTag, string releaseNotes){
             browser.ExecuteScriptAsync("TDUF_displayNotification", versionTag, Convert.ToBase64String(Encoding.GetEncoding("iso-8859-1").GetBytes(releaseNotes)));
         }
+
+        public void OpenDevTools(){
+            browser.ShowDevTools();
+        }
     }
 }

Core/Utils/BrowserUtils.cs

@@ -14,16 +14,32 @@ namespace TweetDuck.Core.Utils{
         public static string UserAgentVanilla => Program.BrandName+" "+Application.ProductVersion;
         public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/"+Cef.ChromiumVersion+" Safari/537.36";
 
+        public static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
+        
         public static void SetupCefArgs(IDictionary<string, string> args){
             if (!Program.SystemConfig.HardwareAcceleration){
                 args["disable-gpu"] = "1";
                 args["disable-gpu-vsync"] = "1";
             }
 
-            if (!Program.UserConfig.EnableSmoothScrolling){
+            if (Program.UserConfig.EnableSmoothScrolling){
+                args["disable-threaded-scrolling"] = "1";
+
+                if (args.TryGetValue("disable-features", out string disabledFeatures)){
+                    args["disable-features"] = "TouchpadAndWheelScrollLatching,"+disabledFeatures;
+                }
+                else{
+                    args["disable-features"] = "TouchpadAndWheelScrollLatching";
+                }
+            }
+            else{
                 args["disable-smooth-scrolling"] = "1";
             }
 
+            if (!Program.UserConfig.EnableTouchAdjustment){
+                args["disable-touch-adjustment"] = "1";
+            }
+            
             args["disable-pdf-extension"] = "1";
             args["disable-plugins-discovery"] = "1";
             args["enable-system-flash"] = "0";

Core/Utils/NativeMethods.cs

@@ -17,6 +17,7 @@ namespace TweetDuck.Core.Utils{
         public const int GWL_STYLE = -16;
 
         public const int SB_HORZ = 0;
+        public const int EM_SETCUEBANNER = 0x1501;
 
         public const int WM_MOUSE_LL = 14;
         public const int WM_MOUSEWHEEL = 0x020A;
@@ -52,6 +53,9 @@ namespace TweetDuck.Core.Utils{
         [DllImport("user32.dll", EntryPoint = "SetWindowPos")]
         private static extern bool SetWindowPos(int hWnd, int hWndOrder, int x, int y, int width, int height, uint flags);
 
+        [DllImport("user32.dll")]
+        public static extern bool SendMessage(IntPtr hWnd, int msg, int wParam, [MarshalAs(UnmanagedType.LPWStr)] string lParam);
+
         [DllImport("user32.dll")]
         public static extern bool PostMessage(IntPtr hWnd, uint msg, UIntPtr wParam, IntPtr lParam);
 

Core/Utils/TwitterUtils.cs

@@ -76,22 +76,14 @@ namespace TweetDuck.Core.Utils{
             string firstImageLink = GetMediaLink(urls[0], quality);
             int qualityIndex = firstImageLink.IndexOf(':', firstImageLink.LastIndexOf('/'));
 
-            string file = GetImageFileName(firstImageLink);
+            string filename = GetImageFileName(firstImageLink);
-            string ext = Path.GetExtension(file); // includes dot
+            string ext = Path.GetExtension(filename); // includes dot
-
-            string[] fileNameParts = qualityIndex == -1 ? new string[]{
-                Path.ChangeExtension(file, null)
-            } : new string[]{
-                username,
-                Path.ChangeExtension(file, null),
-                firstImageLink.Substring(qualityIndex+1)
-            };
             
             using(SaveFileDialog dialog = new SaveFileDialog{
                 AutoUpgradeEnabled = true,
                 OverwritePrompt = urls.Length == 1,
                 Title = "Save Image",
-                FileName = $"{string.Join(" ", fileNameParts.Where(part => !string.IsNullOrEmpty(part)))}{ext}",
+                FileName = qualityIndex == -1 ? filename : $"{username} {Path.ChangeExtension(filename, null)} {firstImageLink.Substring(qualityIndex+1)}".Trim()+ext,
                 Filter = (urls.Length == 1 ? "Image" : "Images")+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
@@ -122,12 +114,12 @@ namespace TweetDuck.Core.Utils{
                 AutoUpgradeEnabled = true,
                 OverwritePrompt = true,
                 Title = "Save Video",
-                FileName = string.IsNullOrEmpty(username) ? filename : $"{username} {filename}",
+                FileName = string.IsNullOrEmpty(username) ? filename : $"{username} {filename}".TrimStart(),
                 Filter = "Video"+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
                     BrowserUtils.DownloadFileAsync(url, dialog.FileName, null, ex => {
-                        FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                        FormMessage.Error("Video Download", "An error occurred while downloading the video: "+ex.Message, FormMessage.OK);
                     });
                 }
             }

Data/Serialization/FileSerializer.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.Serialization;
 using System.Text;
 using TweetDuck.Core.Utils;
 
@@ -65,6 +64,8 @@ namespace TweetDuck.Data.Serialization{
         }
 
         public void Write(string file, T obj){
+            LinkedList<string> errors = new LinkedList<string>();
+
             WindowsUtils.CreateDirectoryForFile(file);
 
             using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
@@ -78,15 +79,21 @@ namespace TweetDuck.Data.Serialization{
 
                     if (serializer.TryWriteType(type, value, out string converted)){
                         if (converted != null){
-                            writer.Write($"{prop.Key} {EscapeLine(converted)}");
+                            writer.Write(prop.Key);
+                            writer.Write(' ');
+                            writer.Write(EscapeLine(converted));
                             writer.Write(NewLineReal);
                         }
                     }
                     else{
-                        throw new SerializationException($"Invalid serialization type, conversion failed for: {type}");
+                        errors.AddLast($"Missing converter for type: {type}");
                     }
                 }
             }
+
+            if (errors.First != null){
+                throw new SerializationSoftException(errors.ToArray());
+            }
         }
 
         public void Read(string file, T obj){
@@ -103,6 +110,7 @@ namespace TweetDuck.Data.Serialization{
                 throw new FormatException("Input appears to be a binary file.");
             }
             
+            LinkedList<string> errors = new LinkedList<string>();
             int currentPos = 0;
                 
             do{
@@ -125,7 +133,8 @@ namespace TweetDuck.Data.Serialization{
                 int space = line.IndexOf(' ');
 
                 if (space == -1){
-                    throw new SerializationException($"Invalid file format, missing separator: {line}");
+                    errors.AddLast($"Missing separator on line: {line}");
+                    continue;
                 }
 
                 string property = line.Substring(0, space);
@@ -140,10 +149,14 @@ namespace TweetDuck.Data.Serialization{
                         info.SetValue(obj, converted);
                     }
                     else{
-                        throw new SerializationException($"Invalid file format, cannot convert value: {value} (property: {property})");
+                        errors.AddLast($"Failed reading property {property} with value: {value}");
                     }
                 }
             }while(currentPos != -1);
+
+            if (errors.First != null){
+                throw new SerializationSoftException(errors.ToArray());
+            }
         }
 
         public void ReadIfExists(string file, T obj){

Data/Serialization/SerializationSoftException.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace TweetDuck.Data.Serialization{
+    sealed class SerializationSoftException : Exception{
+        public IList<string> Errors { get; }
+
+        public SerializationSoftException(IList<string> errors) : base(string.Join(Environment.NewLine, errors)){
+            this.Errors = errors;
+        }
+    }
+}

Plugins/Controls/PluginControl.Designer.cs

@@ -43,7 +43,7 @@
             // btnToggleState
             // 
             this.btnToggleState.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnToggleState.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnToggleState.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnToggleState.Location = new System.Drawing.Point(451, 59);
             this.btnToggleState.Name = "btnToggleState";
             this.btnToggleState.Size = new System.Drawing.Size(70, 23);
@@ -56,7 +56,7 @@
             // 
             this.labelName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelName.AutoSize = true;
-            this.labelName.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelName.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold);
             this.labelName.Location = new System.Drawing.Point(0, 0);
             this.labelName.Margin = new System.Windows.Forms.Padding(0);
             this.labelName.Name = "labelName";
@@ -72,7 +72,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelDescription.AutoScroll = true;
             this.panelDescription.Controls.Add(this.labelDescription);
-            this.panelDescription.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.panelDescription.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.panelDescription.Location = new System.Drawing.Point(28, 33);
             this.panelDescription.Name = "panelDescription";
             this.panelDescription.Size = new System.Drawing.Size(410, 47);
@@ -96,7 +96,7 @@
             // 
             this.labelAuthor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelAuthor.AutoSize = true;
-            this.labelAuthor.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelAuthor.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelAuthor.Location = new System.Drawing.Point(53, 5);
             this.labelAuthor.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelAuthor.Name = "labelAuthor";
@@ -125,7 +125,7 @@
             this.labelWebsite.AutoEllipsis = true;
             this.labelWebsite.AutoSize = true;
             this.labelWebsite.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Underline);
             this.labelWebsite.ForeColor = System.Drawing.Color.Blue;
             this.labelWebsite.Location = new System.Drawing.Point(100, 5);
             this.labelWebsite.Margin = new System.Windows.Forms.Padding(3, 0, 0, 1);
@@ -140,7 +140,7 @@
             // 
             this.labelVersion.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelVersion.Location = new System.Drawing.Point(88, 6);
             this.labelVersion.Margin = new System.Windows.Forms.Padding(0, 0, 1, 0);
             this.labelVersion.Name = "labelVersion";
@@ -154,7 +154,7 @@
             // btnConfigure
             // 
             this.btnConfigure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnConfigure.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnConfigure.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.btnConfigure.Location = new System.Drawing.Point(451, 30);
             this.btnConfigure.Name = "btnConfigure";
             this.btnConfigure.Size = new System.Drawing.Size(70, 23);
@@ -168,7 +168,7 @@
             this.labelType.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.labelType.BackColor = System.Drawing.Color.DarkGray;
-            this.labelType.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelType.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Bold);
             this.labelType.LineHeight = 0;
             this.labelType.Location = new System.Drawing.Point(0, 0);
             this.labelType.Name = "labelType";

Plugins/Enums/PluginEnvironment.cs

@@ -24,15 +24,6 @@ namespace TweetDuck.Plugins.Enums{
             return environment == PluginEnvironment.Browser;
         }
 
-        public static string GetScriptIdentifier(this PluginEnvironment environment){
-            switch(environment){
-                case PluginEnvironment.None: return "root:plugins";
-                case PluginEnvironment.Browser: return "root:plugins.browser";
-                case PluginEnvironment.Notification: return "root:plugins.notification";
-                default: return null;
-            }
-        }
-
         public static string GetPluginScriptFile(this PluginEnvironment environment){
             switch(environment){
                 case PluginEnvironment.Browser: return "browser.js";

Plugins/PluginManager.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Windows.Forms;
 using TweetDuck.Core.Other.Interfaces;
 using TweetDuck.Data;
 using TweetDuck.Plugins.Enums;
@@ -12,15 +13,7 @@ using TweetDuck.Resources;
 
 namespace TweetDuck.Plugins{
     sealed class PluginManager{
-        private static IReadOnlyDictionary<PluginEnvironment, string> LoadSetupScripts(){
+        private static readonly IReadOnlyDictionary<PluginEnvironment, string> PluginSetupScriptNames = PluginEnvironmentExtensions.Map(null, "plugins.browser.js", "plugins.notification.js");
-            return PluginEnvironmentExtensions.Map(
-                ScriptLoader.LoadResource("plugins.js"),
-                ScriptLoader.LoadResource("plugins.browser.js"),
-                ScriptLoader.LoadResource("plugins.notification.js")
-            );
-        }
-
-        private static readonly IReadOnlyDictionary<PluginEnvironment, string> PluginSetupScripts = LoadSetupScripts();
 
         public string PathOfficialPlugins => Path.Combine(rootPath, "official");
         public string PathCustomPlugins => Path.Combine(rootPath, "user");
@@ -54,8 +47,8 @@ namespace TweetDuck.Plugins{
             Config.PluginChangedState += Config_PluginChangedState;
         }
 
-        public void Register(ITweetDeckBrowser browser, PluginEnvironment environment, bool asMainBrowser = false){
+        public void Register(ITweetDeckBrowser browser, PluginEnvironment environment, Control sync, bool asMainBrowser = false){
-            browser.OnFrameLoaded(frame => ExecutePlugins(frame, environment));
+            browser.OnFrameLoaded(frame => ExecutePlugins(frame, environment, sync));
             browser.RegisterBridge("$TDP", bridge);
 
             if (asMainBrowser){
@@ -152,14 +145,11 @@ namespace TweetDuck.Plugins{
             Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
         }
 
-        private void ExecutePlugins(IFrame frame, PluginEnvironment environment){
+        private void ExecutePlugins(IFrame frame, PluginEnvironment environment, Control sync){
-            if (!HasAnyPlugin(environment)){
+            if (!HasAnyPlugin(environment) || !ScriptLoader.ExecuteFile(frame, PluginSetupScriptNames[environment], sync)){
                 return;
             }
             
-            ScriptLoader.ExecuteScript(frame, PluginSetupScripts[environment], environment.GetScriptIdentifier());
-            ScriptLoader.ExecuteScript(frame, PluginSetupScripts[PluginEnvironment.None], PluginEnvironment.None.GetScriptIdentifier());
-            
             bool includeDisabled = environment.IncludesDisabledPlugins();
 
             if (includeDisabled){

Program.cs

@@ -19,7 +19,7 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.14.4.1";
+        public const string VersionTag = "1.15.1";
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
@@ -46,10 +46,13 @@ namespace TweetDuck{
         private static readonly LockManager LockManager = new LockManager(Path.Combine(StoragePath, ".lock"));
         private static bool HasCleanedUp;
         
-        public static UserConfig UserConfig { get; private set; }
-        public static SystemConfig SystemConfig { get; private set; }
-        public static Reporter Reporter { get; }
         public static CultureInfo Culture { get; }
+        public static Reporter Reporter { get; }
+        public static ConfigManager Config { get; }
+
+        // TODO
+        public static UserConfig UserConfig => Config.User;
+        public static SystemConfig SystemConfig => Config.System;
 
         static Program(){
             Culture = CultureInfo.CurrentCulture;
@@ -62,6 +65,8 @@ namespace TweetDuck{
 
             Reporter = new Reporter(ErrorLogFilePath);
             Reporter.SetupUnhandledExceptionHandler("TweetDuck Has Failed :(");
+
+            Config = new ConfigManager();
         }
 
         [STAThread]
@@ -113,8 +118,7 @@ namespace TweetDuck{
                 }
             }
             
-            UserConfig = UserConfig.Load(UserConfigFilePath);
+            Config.LoadAll();
-            SystemConfig = SystemConfig.Load(SystemConfigFilePath);
 
             if (Arguments.HasFlag(Arguments.ArgImportCookies)){
                 ProfileManager.ImportCookies();
@@ -213,7 +217,7 @@ namespace TweetDuck{
         private static void ExitCleanup(){
             if (HasCleanedUp)return;
 
-            UserConfig.Save();
+            Config.SaveAll();
 
             Cef.Shutdown();
             BrowserCache.Exit();

Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using System.Resources;
 using System.Runtime.InteropServices;
@@ -42,6 +42,6 @@ using TweetDuck;
 [assembly: CLSCompliant(true)]
 
 #if DEBUG
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("TweetTest.System")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("TweetTest.Unit")]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTests")]
 #endif

Properties/Resources.Designer.cs

@@ -80,6 +80,16 @@ namespace TweetDuck.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon icon_muted {
+            get {
+                object obj = ResourceManager.GetObject("icon_muted", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
@@ -90,6 +100,16 @@ namespace TweetDuck.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon icon_tray_muted {
+            get {
+                object obj = ResourceManager.GetObject("icon_tray_muted", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>

Properties/Resources.resx

@@ -119,18 +119,24 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="avatar" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\avatar.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Images\avatar.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icon_muted" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Images\icon-muted.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_tray" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon-tray.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\icon-tray.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icon_tray_muted" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Images\icon-tray-muted.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_tray_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon-tray-new.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\icon-tray-new.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="spinner" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\spinner.apng;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Images\spinner.apng;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>

README.md

@@ -15,7 +15,7 @@ The program was built using Visual Studio 2017. Before opening the solution, ple
 
 After opening the solution, right-click the solution and select **Restore NuGet Packages**, or manually run this command in the **Package Manager Console**:
 ```
-PM> Install-Package CefSharp.WinForms -Version 66.0.0-CI2629 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
+PM> Install-Package CefSharp.WinForms -Version 67.0.0-CI2662 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
 ```
 
 Note that some pre-release builds of CefSharp are not available on NuGet. To correctly restore packages in that case, open **Package Manager Settings**, and add `https://www.myget.org/F/cefsharp/api/v3/index.json` to the list of package sources.
@@ -44,6 +44,11 @@ If you decide to publicly release a custom version, please make it clear that it
 - Some files are checked for invalid characters:
   - `Resources/Plugins/emoji-keyboard/emoji-ordering.txt` line endings must be LF (line feed); any CR (carriage return) in the file will cause a failed build, and you will need to ensure correct line endings in your text editor
 
+#### Error: The "EmbedAllSources" parameter is not supported by the "Csc" task
+1. Open `C:\Program Files (x86)\Visual Studio\2017\<edition>\MSBuild\15.0\Bin\Microsoft.CSharp.CurrentVersion.targets` in a text editor
+2. Remove line that says `EmbedAllSources="$(EmbedAllSources)"`
+3. Hope the next Visual Studio update fixes it...
+
 ### Installers
 
 TweetDuck uses **Inno Setup** for installers and updates. First, download and install [InnoSetup QuickStart Pack](http://www.jrsoftware.org/isdl.php) (non-unicode; editor and encryption support not required) and the [Inno Download Plugin](https://code.google.com/archive/p/inno-download-plugin).

Reporter.cs

@@ -47,7 +47,8 @@ namespace TweetDuck{
         public void HandleException(string caption, string message, bool canIgnore, Exception e){
             bool loggedSuccessfully = Log(e.ToString());
             
-            FormMessage form = new FormMessage(caption, message+"\nError: "+e.Message, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
+            string exceptionText = e is ExpandedLogException ? e.Message+"\n\nDetails with potentially sensitive information are in the Error Log." : e.Message;
+            FormMessage form = new FormMessage(caption, message+"\nError: "+exceptionText, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
             
             Button btnExit = form.AddButton(FormMessage.Exit);
             Button btnIgnore = form.AddButton(FormMessage.Ignore, DialogResult.Ignore, ControlType.Cancel);
@@ -95,5 +96,15 @@ namespace TweetDuck{
                 Environment.FailFast(message, new Exception(message));
             }
         }
+
+        public sealed class ExpandedLogException : Exception{
+            private readonly string details;
+
+            public ExpandedLogException(Exception source, string details) : base(source.Message, source){
+                this.details = details;
+            }
+
+            public override string ToString() => base.ToString()+"\r\n"+details;
+        }
     }
 }

Resources/..code-workspace

@@ -0,0 +1,20 @@
+{
+	"folders": [
+		{
+			"name": "Installers",
+			"path": "..\\bld"
+		},
+		{
+			"name": "Resources",
+			"path": "."
+		}
+	],
+	"settings": {
+		"editor.tabSize": 2,
+		"javascript.validate.enable": false,
+		"files.autoGuessEncoding": false,
+		"files.insertFinalNewline": true,
+		"files.trimFinalNewlines": true,
+		"files.encoding": "utf8",
+	}
+}

Resources/Plugins/.debug/browser.js

@@ -2,6 +2,7 @@ enabled(){
   this.isDebugging = false;
   
   this.onKeyDown = (e) => {
+    
     // ==========================
     // F4 key - toggle debug mode
     // ==========================
@@ -11,8 +12,6 @@ enabled(){
       $(".nav-user-info").first().css("background-color", this.isDebugging ? "#5A6B75" : "#292F33");
     }
     
-    // Debug mode handling
-    
     else if (this.isDebugging){
       e.preventDefault();
       
@@ -22,15 +21,16 @@ enabled(){
       // ===================================
       
       if (e.keyCode === 78 || e.keyCode === 83){
-        var col = TD.controller.columnManager.getAllOrdered()[0];
+        let col = TD.controller.columnManager.getAllOrdered()[0];
+        let model = col.model;
         
-        var prevPopup = col.model.getHasNotification();
+        let prevPopup = model.getHasNotification();
-        var prevSound = col.model.getHasSound();
+        let prevSound = model.getHasSound();
         
-        col.model.setHasNotification(e.keyCode === 78);
+        model.setHasNotification(e.keyCode === 78);
-        col.model.setHasSound(e.keyCode === 83);
+        model.setHasSound(e.keyCode === 83);
         
-        $.publish("/notifications/new",[{
+        $.publish("/notifications/new", [{
           column: col,
           items: [
             col.updateArray[Math.floor(Math.random()*col.updateArray.length)]
@@ -38,8 +38,8 @@ enabled(){
         }]);
         
         setTimeout(function(){
-          col.model.setHasNotification(prevPopup);
+          model.setHasNotification(prevPopup);
-          col.model.setHasSound(prevSound);
+          model.setHasSound(prevSound);
         }, 1);
       }
       

Resources/Plugins/clear-columns/browser.js

@@ -1,29 +1,22 @@
-constructor(){
-  super({
-    requiresPageReload: true
-  });
-}
-
 enabled(){
-  // prepare variables and functions
+  const clearColumn = (columnName) => {
-  var clearColumn = (columnName) => {
     TD.controller.columnManager.get(columnName).clear();
     TD.controller.stats.columnActionClick("clear");
   };
   
-  var resetColumn = (columnName) => {
+  const resetColumn = (columnName) => {
     let col = TD.controller.columnManager.get(columnName);
     col.model.setClearedTimestamp(0);
     col.reloadTweets();
   };
   
-  var forEachColumn = (func) => {
+  const forEachColumn = (func) => {
     Object.keys(TD.controller.columnManager.getAll()).forEach(func);
   };
   
-  var wasShiftPressed = false;
+  let wasShiftPressed = false;
   
-  var updateShiftState = (pressed) => {
+  const updateShiftState = (pressed) => {
     if (pressed != wasShiftPressed){
       wasShiftPressed = pressed;
       
@@ -38,10 +31,17 @@ enabled(){
     }
   };
   
-  // prepare event handlers
+  // event handlers
-  this.eventClickSingle = function(e){
+  
-    var name = $(this).closest(".js-column").attr("data-column");
+  this.eventClickOneCapture = function(e){
-    e.shiftKey ? resetColumn(name) : clearColumn(name);
+    if (e.target.getAttribute("data-action") === "td-clearcolumns-dosingle"){
+      let name = $(e.target).closest(".js-column").attr("data-column");
+      e.shiftKey ? resetColumn(name) : clearColumn(name);
+      
+      e.preventDefault();
+      e.stopPropagation();
+      e.stopImmediatePropagation();
+    }
   };
   
   this.eventClickAll = function(e){
@@ -58,10 +58,10 @@ enabled(){
         forEachColumn(e.shiftKey ? resetColumn : clearColumn);
       }
       else{
-        var focusedColumn = $(".js-column.is-focused");
+        let focusedColumn = $(".js-column.is-focused");
         
         if (focusedColumn.length){
-          var name = focusedColumn.attr("data-column");
+          let name = focusedColumn.attr("data-column");
           e.shiftKey ? resetColumn(name) : clearColumn(name);
         }
       }
@@ -74,59 +74,86 @@ enabled(){
     }
   };
   
-  // setup clear all button
+  this.eventKeyboardShortcuts = function(e){
+    $(".keyboard-shortcut-list").first().append(`
+<dd class="keyboard-shortcut-definition" style="white-space:nowrap">
+  <span class="text-like-keyboard-key">1</span> … <span class="text-like-keyboard-key">9</span> + <span class="text-like-keyboard-key">Del</span> Clear column 1－9
+</dd>
+<dd class="keyboard-shortcut-definition">
+  <span class="text-like-keyboard-key">Alt</span> + <span class="text-like-keyboard-key">Del</span> Clear all columns
+</dd>`);
+  };
+  
+  // update UI
+  
   this.btnClearAllHTML = `
 <a class="clear-columns-btn-all-parent js-header-action link-clean cf app-nav-link padding-h--10" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
   <div class="obj-left margin-l--2"><i class="icon icon-medium icon-clear-timeline"></i></div>
   <div class="clear-columns-btn-all nbfc padding-ts hide-condensed txt-size--16 app-nav-link-text">Clear columns</div>
 </a>`;
   
-  // add column buttons and keyboard shortcut info to UI
+  this.btnClearOneHTML = `
-  window.TDPF_injectMustache("column/column_header.mustache", "prepend", "<a data-testid=\"optionsToggle\"", `
 <a class="js-action-header-button column-header-link" href="#" data-action="td-clearcolumns-dosingle">
-  <i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>
+  <i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"  data-action="td-clearcolumns-dosingle"></i>
-</a>`);
+</a>`;
   
-  window.TDPF_injectMustache("keyboard_shortcut_list.mustache", "prepend", "</dl> <dl", `
+  this.prevNavMenuMustache = TD.mustaches["menus/column_nav_menu.mustache"];
-<dd class="keyboard-shortcut-definition" style="white-space:nowrap">
+  window.TDPF_injectMustache("menus/column_nav_menu.mustache", "replace", "{{_i}}Add column{{/i}}</div> </a> </div>", `{{_i}}Add column{{/i}}</div></a>${this.btnClearAllHTML}</div>`);
-  <span class="text-like-keyboard-key">1</span> … <span class="text-like-keyboard-key">9</span> + <span class="text-like-keyboard-key">Del</span> Clear column 1－9
-</dd><dd class="keyboard-shortcut-definition">
-  <span class="text-like-keyboard-key">Alt</span> + <span class="text-like-keyboard-key">Del</span> Clear all columns
-</dd>`);
   
-  window.TDPF_injectMustache("menus/column_nav_menu.mustache", "replace", "{{_i}}Add column{{/i}}</div> </a> </div>", `{{_i}}Add column{{/i}}</div></a>${this.btnClearAllHTML}</div>`)
+  this.prevColumnHeaderMustache = TD.mustaches["column/column_header.mustache"];
+  window.TDPF_injectMustache("column/column_header.mustache", "prepend", "<a data-testid=\"optionsToggle\"", this.btnClearOneHTML);
   
-  // load custom style
+  if (TD.ready){
-  var css = window.TDPF_createCustomStyle(this);
+    $(".js-header-add-column").after(this.btnClearAllHTML);
-  css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
+    $("a[data-testid='optionsToggle']", ".js-column-header").before(this.btnClearOneHTML);
-  css.insert(".column-header-links { min-width: 51px !important; }");
+  }
-  css.insert("[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
+  
-  css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
+  // styles
-  css.insert(".column-navigator-overflow { bottom: 224px !important; }");
+  
-  css.insert("[data-action='td-clearcolumns-dosingle'] { padding: 3px 0 !important; }");
+  this.css = window.TDPF_createCustomStyle(this);
-  css.insert("[data-action='clear'].btn-options-tray { display: none !important; }");
+  this.css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
-  css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
+  this.css.insert(".column-header-links { min-width: 51px !important; }");
-  css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
+  this.css.insert("[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
+  this.css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
+  this.css.insert(".column-navigator-overflow { bottom: 224px !important; }");
+  this.css.insert("[data-action='td-clearcolumns-dosingle'] { padding: 3px 0 !important; }");
+  this.css.insert("[data-action='clear'].btn-options-tray { display: none !important; }");
+  this.css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
+  this.css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
 }
 
 ready(){
-  // setup events
+  document.addEventListener("click", this.eventClickOneCapture, true);
-  $(document).on("click", "[data-action='td-clearcolumns-dosingle']", this.eventClickSingle);
   $(document).on("click", "[data-action='td-clearcolumns-doall']", this.eventClickAll);
   $(document).on("keydown", this.eventKeyDown);
   $(document).on("keyup", this.eventKeyUp);
+  $(document).on("uiShowKeyboardShortcutList", this.eventKeyboardShortcuts);
   
-  // setup clear all button for nav overflow
   $(".js-app-add-column").first().after(this.btnClearAllHTML);
   
-  // setup tooltip handling
+  // fix tooltip
-  var tooltipEvents = $._data($(".js-header-action")[0]).events;
+  
+  let tooltipEvents = $._data($(".js-header-action")[0], "events");
   
   if (tooltipEvents.mouseover && tooltipEvents.mouseover.length && tooltipEvents.mouseout && tooltipEvents.mouseout.length){
-    $(".clear-columns-btn-all-parent").on("mouseover", tooltipEvents.mouseover[0].handler).on("mouseout", tooltipEvents.mouseout[0].handler);
+    $(".clear-columns-btn-all-parent").on({
+      mouseover: tooltipEvents.mouseover[0].handler,
+      mouseout: tooltipEvents.mouseout[0].handler
+    });
   }
 }
 
 disabled(){
-  // not needed, plugin reloads the page when enabled or disabled
+  this.css.remove();
+  
+  document.removeEventListener("click", this.eventClickOneCapture);
+  $(document).off("click", "[data-action='td-clearcolumns-doall']", this.eventClickAll);
+  $(document).off("keydown", this.eventKeyDown);
+  $(document).off("keyup", this.eventKeyUp);
+  $(document).off("uiShowKeyboardShortcutList", this.eventKeyboardShortcuts);
+  
+  TD.mustaches["menus/column_nav_menu.mustache"] = this.prevNavMenuMustache;
+  TD.mustaches["column/column_header.mustache"] = this.prevColumnHeaderMustache;
+  
+  $("[data-action^='td-clearcolumns-']").remove();
 }

Resources/Plugins/edit-design/browser.js

@@ -21,7 +21,7 @@ enabled(){
     avatarRadius: 2
   };
   
-  var prepareDefaultConfig = () => {
+  const prepareDefaultConfig = () => {
     this.defaultConfig._theme = TD.settings.getTheme();
     
     switch(TD.settings.getColumnWidth()){
@@ -39,7 +39,7 @@ enabled(){
   
   this.firstTimeLoad = null;
   
-  var me = this;
+  const me = this;
   
   // modal dialog loading
   $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
@@ -72,7 +72,7 @@ enabled(){
     }
   };
   
-  var loadConfigObject = obj => {
+  const loadConfigObject = obj => {
     this.tmpConfig = obj || {};
     this.firstTimeLoad = obj === null;
     
@@ -139,7 +139,7 @@ enabled(){
   };
   
   // modal dialog setup
-  var updateKey = function(key, value){
+  const updateKey = function(key, value){
     me.config[key] = value;
     
     setTimeout(function(){
@@ -541,7 +541,7 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 #tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
 #tduck .search-input-control .icon { font-size: 20px !important; top: -4px !important }
 
-.js-column-header .column-type-icon { margin-top: -1px !important }
+.js-column-header .column-type-icon { margin-top: 0 !important }
 .inline-reply .pull-left .Button--link { margin-top: 3px !important }
 
 .tweet-action-item .icon-favorite-toggle { font-size: 16px !important; }
@@ -643,7 +643,7 @@ ready(){
   $(".js-app").append('<div id="td-design-plugin-modal" class="js-modal settings-modal ovl scroll-v scroll-styled-v"></div>');
   
   // global settings override
-  var me = this;
+  const me = this;
   
   this.prevFuncSettingsGetInfo = TD.components.GlobalSettings.prototype.getInfo;
   this.prevFuncSettingsSwitchTab = TD.components.GlobalSettings.prototype.switchTab;

Resources/Plugins/edit-design/theme.black.css

@@ -13,7 +13,6 @@ html.dark .color-twitter-blue{color:#1DA1F2}
 html.dark .color-twitter-red{color:#E0245E}
 html.dark .color-twitter-deep-red{color:#A01744}
 html.dark .color-twitter-green{color:#17BF63}
-html.dark .color-twitter-deep-green{color:#008951}
 html.dark .color-twitter-deep-black{color:#14171A}
 html.dark .color-twitter-dark-black{color:#292F33}
 html.dark .color-twitter-dark-gray{color:#8899A6}
@@ -22,7 +21,6 @@ html.dark .color-twitter-yellow{color:#FFAD1F}
 html.dark .bg-color-twitter-white{background-color:#fff}
 html.dark .bg-color-twitter-blue{background-color:#1DA1F2}
 html.dark .bg-color-twitter-medium-blue{background-color:#1DA1F2}
-html.dark .bg-color-twitter-faded-yellow{background-color:#FFE8B6}
 html.dark .bg-color-twitter-deep-black{background-color:#292F33}
 html.dark .bg-color-twitter-lightest-gray{background-color:#F5F8FA}
 html.dark .link-hover-override:hover .link-hover-target{color:#8bd}
@@ -113,9 +111,6 @@ html.dark .btn-on-blue[disabled],html.dark .btn-on-blue[disabled]:hover,html.dar
 html.dark .btn-options-tray{color:#e1e8ed}
 html.dark .btn-options-tray:hover,html.dark .btn-options-tray:focus{color:#8bd}
 html.dark .btn-options-tray[disabled],html.dark .btn-options-tray[disabled]:hover,html.dark .btn-options-tray[disabled]:active,html.dark .btn-options-tray.is-disabled,html.dark .btn-options-tray.is-disabled:hover,html.dark .btn-options-tray.is-disabled:focus,html.dark .btn-options-tray.is-disabled:active{color:#8bd}
-html.dark .btn-bg-positive{background-color:rgba(102,117,127,0.5)}
-html.dark .btn-bg-positive:hover,html.dark .btn-bg-positive:focus{background-color:rgba(102,117,127,0.5)}
-html.dark .btn-bg-positive[disabled],html.dark .btn-bg-positive[disabled]:hover,html.dark .btn-bg-positive[disabled]:active,html.dark .btn-bg-positive.is-disabled,html.dark .btn-bg-positive.is-disabled:hover,html.dark .btn-bg-positive.is-disabled:focus,html.dark .btn-bg-positive.is-disabled:active{background-color:rgba(102,117,127,0.5)}
 html.dark .follow-btn .icon,html.dark .follow-btn .Icon{color:#1DA1F2}
 html.dark .account-profile-header{background-color:#1DA1F2}
 html.dark .account-settings-bt{border-top:1px solid #e1e8ed}
@@ -190,8 +185,6 @@ html.dark .is-touch-search .list-item:hover,html.dark .is-touch-search .list-ite
 html.dark .is-touch-search .list-item:hover .list-icon,html.dark .is-touch-search .list-item:active .list-icon,html.dark .is-touch-search .list-item.is-selected .list-icon{color:#fff}
 html.dark .avatar-border--2{border:2px solid #fff;background-color:#fff}
 html.dark .account-link{color:#e1e8ed}
-.on-blue html.dark .account-link{color:#fff}
-.compose .quoted-tweet html.dark .account-link{color:#66757f}
 html.dark .media-badge{border:1px solid #292F33;color:#999}
 html.dark .media-badge:hover{background-color:#14171A}
 html.dark .media-size-large-height::after,html.dark .media-item.media-size-large::after{background-image:linear-gradient(rgba(17,17,17,0.25),rgba(17,17,17,0))}
@@ -219,7 +212,7 @@ html.dark .is-minimalist .tweet-img{background:#292F33}
 html.dark .is-selected-tweet{background:#292F33}
 html.dark .in-tweet-divider:before{background:#292F33}
 html.dark .tweet-translation-original-text{color:#8899a6}
-html.dark .quoted-tweet{border:1px solid #E1E8ED;color:#66757f;border-color:#292F33;color:#999}
+html.dark .quoted-tweet{border-color:#292F33;color:#999}
 html.dark .scheduled-tweet{border:1px solid #292F33;color:#8899A6}
 html.dark .stream-item .icon-edit,html.dark .stream-item .icon-trash{color:#657786}
 html.dark .stream-item .icon-edit:hover,html.dark .stream-item .icon-trash:hover{color:#8899A6}
@@ -398,7 +391,7 @@ html.dark .mdl-column-rhs{border-left:1px solid #ccd6dd;background:#fff}
 html.dark .s-minimal .mdl-header{border-bottom:1px solid #e1e8ed}
 html.dark .lst-launcher .top-row{border-bottom:1px solid #e1e8ed}
 html.dark .lst-launcher .is-disabled a,html.dark .lst-launcher .is-disabled a:hover,html.dark .lst-launcher .is-disabled a:focus,html.dark .lst-launcher .is-disabled a:active{background:#fff}
-html.dark .lst-launcher a:hover,html.dark .lst-launcher a:focus,html.dark .lst-launcher a:active{background:#f2f9ff;border:1px solid #bbddf5}
+html.dark .lst-launcher a:hover,html.dark .lst-launcher a:focus,html.dark .lst-launcher a:active{background:#f2f9ff}
 html.dark .lst-profile a,html.dark .lst-profile a:hover,html.dark .lst-profile a:focus,html.dark .lst-profile a:active{color:#657786}
 html.dark .mdl-col-settings{background-color:#fff;border-left:1px solid #E1E8ED}
 html.dark .mdl-links{color:#8899a6}
@@ -435,7 +428,7 @@ html.dark .list-account .username{color:#8899a6}
 html.dark .list-listmember .username{color:#8899a6}
 html.dark .list-listmember .bio{color:#657786}
 html.dark .divider-bar{background-color:#ddd}
-html.dark select{background-image:url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='18' height='8' viewBox='0 0 18 8'><path fill='#aaa' d='M9.82875,0.840168025 C9.59875,0.608328018 9.22625,0.608328018 8.99625,0.840168025 L5.00125,4.86964815 L1.00375,0.840168025 C0.77375,0.608328018 0.40125,0.608328018 0.17125,0.840168025 C-0.05875,1.07200803 -0.05625,1.44748804 0.17125,1.67932805 L4.58375,6.12712819 C4.69875,6.24304819 4.84875,6.30100819 5.00125,6.30100819 C5.15125,6.30100819 5.30125,6.24304819 5.41625,6.12712819 L9.82875,1.67932805 C10.05875,1.44748804 10.05875,1.07200803 9.82875,0.840168025'></path></svg>");background-color:#fff}
+html.dark select{background-color:#fff}
 html.dark input,html.dark textarea,html.dark select{color:#111;border:1px solid #e1e8ed}
 html.dark input:disabled{background-color:#eaeaea;border-color:#e1e8ed}
 html.dark select:disabled{background-color:#f5f8fa}
@@ -613,46 +606,45 @@ html.dark .Dropdown-divider{background-color:#ccd6dd}
 html.dark .Dropdown-menuItem .Dropdown-menuItemContent,html.dark .Dropdown-menuGroupLabel{color:#14171a}
 html.dark .Dropdown-menuItem .Dropdown-menuItemContent .Icon--check{color:#1da1f2}
 html.dark .Dropdown-menuItem.is-focus{background-color:#1da1f2}
-html.dark .Dropdown-menuItem.is-focus .User .Icon--verified::before{color:#1da1f2}
 html.dark .Dropdown-menuGroupLabel{color:#657786}
 html.dark .ButtonGroup>.Button.is-selected,html.dark .ButtonGroup>.Button.is-selected:visited{background-color:#1da1f2;border:1px solid #1da1f2}
-html.dark .ButtonGroup>.Button.is-selected:focus,html.dark .ButtonGroup>.Button.is-selected.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #71c9f8;background:#1da1f2;border-color:#1da1f2}
+html.dark .ButtonGroup>.Button.is-selected:focus,html.dark .ButtonGroup>.Button.is-selected.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #71c9f8;background:#1da1f2;border-color:#1da1f2}
 html.dark .ButtonGroup>.Button.is-selected:hover,html.dark .ButtonGroup>.Button.is-selected.is-hover{background-color:#1da1f2;border-color:#1da1f2}
-html.dark .ButtonGroup>.Button.is-selected:active,html.dark .ButtonGroup>.Button.is-selected.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #1da1f2;background-color:#1da1f2;border-color:#1da1f2}
+html.dark .ButtonGroup>.Button.is-selected:active,html.dark .ButtonGroup>.Button.is-selected.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #1da1f2;background-color:#1da1f2;border-color:#1da1f2}
 html.dark .ButtonGroup>.Button.is-selected[disabled],html.dark .ButtonGroup>.Button.is-selected.is-disabled,html.dark fieldset[disabled] .ButtonGroup>.Button.is-selected{background-color:#1da1f2;border-color:#1da1f2}
 html.dark .ButtonGroup--tertiary>.Button.is-selected,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected,html.dark .ButtonGroup--tertiary>.Button.is-selected:visited,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected:visited{background-color:#657786;border:1px solid #657786}
-html.dark .ButtonGroup--tertiary>.Button.is-selected:focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected:focus,html.dark .ButtonGroup--tertiary>.Button.is-selected.is-focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #ccd6dd;background:#657786;border-color:#657786}
+html.dark .ButtonGroup--tertiary>.Button.is-selected:focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected:focus,html.dark .ButtonGroup--tertiary>.Button.is-selected.is-focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #ccd6dd;background:#657786;border-color:#657786}
 html.dark .ButtonGroup--tertiary>.Button.is-selected:hover,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected:hover,html.dark .ButtonGroup--tertiary>.Button.is-selected.is-hover,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected.is-hover{background-color:#657786;border-color:#657786}
-html.dark .ButtonGroup--tertiary>.Button.is-selected:active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected:active,html.dark .ButtonGroup--tertiary>.Button.is-selected.is-active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #aab8c2;background-color:#657786;border-color:#657786}
+html.dark .ButtonGroup--tertiary>.Button.is-selected:active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected:active,html.dark .ButtonGroup--tertiary>.Button.is-selected.is-active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #aab8c2;background-color:#657786;border-color:#657786}
 html.dark .ButtonGroup--tertiary>.Button.is-selected[disabled],html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected[disabled],html.dark .ButtonGroup--tertiary>.Button.is-selected.is-disabled,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected.is-disabled,html.dark fieldset[disabled] .ButtonGroup--tertiary>.Button.is-selected,html.dark fieldset[disabled] .ButtonGroup--tertiary>.ButtonGroup>.Button.is-selected{background-color:#657786;border-color:#657786}
 html.dark .Button,html.dark .Button:visited,html.dark .Button.is-visited{border:1px solid #1da1f2;color:#1da1f2}
-html.dark .Button:focus,html.dark .Button.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #71c9f8;border-color:#1da1f2;color:#1da1f2}
+html.dark .Button:focus,html.dark .Button.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #71c9f8;border-color:#1da1f2;color:#1da1f2}
 html.dark .Button:hover,html.dark .Button.is-hover{background-color:#eaf5fd;color:#1da1f2}
-html.dark .Button:active,html.dark .Button.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #1da1f2;background:#eaf5fd;border-color:#1da1f2;color:#1da1f2}
+html.dark .Button:active,html.dark .Button.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #1da1f2;background:#eaf5fd;border-color:#1da1f2;color:#1da1f2}
 html.dark .Button.Button--primary,html.dark .Button.Button--primary:visited,html.dark .ButtonGroup--primary>.Button,html.dark .ButtonGroup--primary>.Button:visited,html.dark .ButtonGroup--primary>.ButtonGroup>.Button,html.dark .ButtonGroup--primary>.ButtonGroup>.Button:visited{background-color:#1da1f2;border:1px solid #1da1f2}
-html.dark .Button.Button--primary:focus,html.dark .Button.Button--primary.is-focus,html.dark .ButtonGroup--primary>.Button:focus,html.dark .ButtonGroup--primary>.Button.is-focus,html.dark .ButtonGroup--primary>.ButtonGroup>.Button:focus,html.dark .ButtonGroup--primary>.ButtonGroup>.Button.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #71c9f8;background:#1da1f2;border-color:#1da1f2}
+html.dark .Button.Button--primary:focus,html.dark .Button.Button--primary.is-focus,html.dark .ButtonGroup--primary>.Button:focus,html.dark .ButtonGroup--primary>.Button.is-focus,html.dark .ButtonGroup--primary>.ButtonGroup>.Button:focus,html.dark .ButtonGroup--primary>.ButtonGroup>.Button.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #71c9f8;background:#1da1f2;border-color:#1da1f2}
 html.dark .Button.Button--primary:hover,html.dark .Button.Button--primary.is-hover,html.dark .ButtonGroup--primary>.Button:hover,html.dark .ButtonGroup--primary>.Button.is-hover,html.dark .ButtonGroup--primary>.ButtonGroup>.Button:hover,html.dark .ButtonGroup--primary>.ButtonGroup>.Button.is-hover{background-color:#005fd1;border-color:#005fd1}
-html.dark .Button.Button--primary:active,html.dark .Button.Button--primary.is-active,html.dark .ButtonGroup--primary>.Button:active,html.dark .ButtonGroup--primary>.Button.is-active,html.dark .ButtonGroup--primary>.ButtonGroup>.Button:active,html.dark .ButtonGroup--primary>.ButtonGroup>.Button.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #1da1f2;background-color:#005fd1;border-color:#005fd1}
+html.dark .Button.Button--primary:active,html.dark .Button.Button--primary.is-active,html.dark .ButtonGroup--primary>.Button:active,html.dark .ButtonGroup--primary>.Button.is-active,html.dark .ButtonGroup--primary>.ButtonGroup>.Button:active,html.dark .ButtonGroup--primary>.ButtonGroup>.Button.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #1da1f2;background-color:#005fd1;border-color:#005fd1}
 html.dark .Button.Button--primary[disabled],html.dark .Button.Button--primary.is-disabled,html.dark fieldset[disabled] .Button.Button--primary,html.dark .ButtonGroup--primary>.Button[disabled],html.dark .ButtonGroup--primary>.Button.is-disabled,html.dark fieldset[disabled] .ButtonGroup--primary>.Button,html.dark .ButtonGroup--primary>.ButtonGroup>.Button[disabled],html.dark .ButtonGroup--primary>.ButtonGroup>.Button.is-disabled,html.dark fieldset[disabled] .ButtonGroup--primary>.ButtonGroup>.Button{background-color:#1da1f2;border-color:#1da1f2}
 html.dark .Button.Button--tertiary,html.dark .Button.Button--tertiary:visited,html.dark .ButtonGroup--tertiary>.Button,html.dark .ButtonGroup--tertiary>.Button:visited,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button:visited{border:1px solid #657786;color:#657786}
-html.dark .Button.Button--tertiary:focus,html.dark .Button.Button--tertiary.is-focus,html.dark .ButtonGroup--tertiary>.Button:focus,html.dark .ButtonGroup--tertiary>.Button.is-focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button:focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #ccd6dd;border-color:#657786;color:#657786}
+html.dark .Button.Button--tertiary:focus,html.dark .Button.Button--tertiary.is-focus,html.dark .ButtonGroup--tertiary>.Button:focus,html.dark .ButtonGroup--tertiary>.Button.is-focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button:focus,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #ccd6dd;border-color:#657786;color:#657786}
 html.dark .Button.Button--tertiary:hover,html.dark .Button.Button--tertiary.is-hover,html.dark .ButtonGroup--tertiary>.Button:hover,html.dark .ButtonGroup--tertiary>.Button.is-hover,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button:hover,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-hover{background-color:#f5f8fa;border-color:#657786;color:#657786}
-html.dark .Button.Button--tertiary:active,html.dark .Button.Button--tertiary.is-active,html.dark .ButtonGroup--tertiary>.Button:active,html.dark .ButtonGroup--tertiary>.Button.is-active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button:active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #657786;background-color:#f5f8fa;border-color:#657786;color:#657786}
+html.dark .Button.Button--tertiary:active,html.dark .Button.Button--tertiary.is-active,html.dark .ButtonGroup--tertiary>.Button:active,html.dark .ButtonGroup--tertiary>.Button.is-active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button:active,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #657786;background-color:#f5f8fa;border-color:#657786;color:#657786}
 html.dark .Button.Button--tertiary[disabled],html.dark .Button.Button--tertiary.is-disabled,html.dark fieldset[disabled] .Button.Button--tertiary,html.dark .ButtonGroup--tertiary>.Button[disabled],html.dark .ButtonGroup--tertiary>.Button.is-disabled,html.dark fieldset[disabled] .ButtonGroup--tertiary>.Button,html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button[disabled],html.dark .ButtonGroup--tertiary>.ButtonGroup>.Button.is-disabled,html.dark fieldset[disabled] .ButtonGroup--tertiary>.ButtonGroup>.Button{border-color:#657786}
 html.dark .Button.Button--success,html.dark .Button.Button--success:visited{background-color:#17bf63;border:1px solid #17bf63}
-html.dark .Button.Button--success:focus,html.dark .Button.Button--success.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #68e090;background:#17bf63;border-color:#17bf63}
+html.dark .Button.Button--success:focus,html.dark .Button.Button--success.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #68e090;background:#17bf63;border-color:#17bf63}
 html.dark .Button.Button--success:hover,html.dark .Button.Button--success.is-hover{background-color:#008951;border-color:#008951}
-html.dark .Button.Button--success:active,html.dark .Button.Button--success.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #17bf63;background-color:#008951;border-color:#008951}
+html.dark .Button.Button--success:active,html.dark .Button.Button--success.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #17bf63;background-color:#008951;border-color:#008951}
 html.dark .Button.Button--success[disabled],html.dark .Button.Button--success.is-disabled,html.dark fieldset[disabled] .Button.Button--success{background-color:#17bf63;border-color:#17bf63}
 html.dark .Button.Button--warning,html.dark .Button.Button--warning:visited{background-color:#ffad1f;border:1px solid #ffad1f}
-html.dark .Button.Button--warning:focus,html.dark .Button.Button--warning.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #ffd03f;background:#ffad1f;border-color:#ffad1f}
+html.dark .Button.Button--warning:focus,html.dark .Button.Button--warning.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #ffd03f;background:#ffad1f;border-color:#ffad1f}
 html.dark .Button.Button--warning:hover,html.dark .Button.Button--warning.is-hover{background-color:#f98e00;border-color:#f98e00}
-html.dark .Button.Button--warning:active,html.dark .Button.Button--warning.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #ffad1f;background-color:#f98e00;border-color:#f98e00}
+html.dark .Button.Button--warning:active,html.dark .Button.Button--warning.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #ffad1f;background-color:#f98e00;border-color:#f98e00}
 html.dark .Button.Button--warning[disabled],html.dark .Button.Button--warning.is-disabled,html.dark fieldset[disabled] .Button.Button--warning{background-color:#ffad1f;border-color:#ffad1f}
 html.dark .Button.Button--danger,html.dark .Button.Button--danger:visited{background-color:#e0245e;border:1px solid #e0245e}
-html.dark .Button.Button--danger:focus,html.dark .Button.Button--danger.is-focus{box-shadow:0 0 0 2px white,0 0 0 4px #f6809a;background:#e0245e;border-color:#e0245e}
+html.dark .Button.Button--danger:focus,html.dark .Button.Button--danger.is-focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #f6809a;background:#e0245e;border-color:#e0245e}
 html.dark .Button.Button--danger:hover,html.dark .Button.Button--danger.is-hover{background-color:#a01744;border-color:#a01744}
-html.dark .Button.Button--danger:active,html.dark .Button.Button--danger.is-active{box-shadow:0 0 0 2px white,0 0 0 4px #e0245e;background-color:#a01744;border-color:#a01744}
+html.dark .Button.Button--danger:active,html.dark .Button.Button--danger.is-active{box-shadow:0 0 0 2px #fff,0 0 0 4px #e0245e;background-color:#a01744;border-color:#a01744}
 html.dark .Button.Button--danger[disabled],html.dark .Button.Button--danger.is-disabled,html.dark fieldset[disabled] .Button.Button--danger{background-color:#e0245e;border-color:#e0245e}
 html.dark .Button.Button--link{color:#1b95e0}
 html.dark .Button.Button--dangerLink{color:#e0245e}
@@ -730,8 +722,8 @@ html.dark .DateRange[dir='rtl'] .DateRange-pickersRow:first-child .DateRange-pic
 html.dark .PillGroup .Pill.is-selected{background:#005fd1}
 html.dark .PillGroup .Pill>a,html.dark .PillGroup .Pill>button{color:#1b95e0}
 html.dark .PillGroup .Pill>a:hover,html.dark .PillGroup .Pill>button:hover{background:#eaf5fd}
-html.dark .PillGroup .Pill>a:focus,html.dark .PillGroup .Pill>button:focus{box-shadow:0 0 0 2px white,0 0 0 4px #71c9f8}
+html.dark .PillGroup .Pill>a:focus,html.dark .PillGroup .Pill>button:focus{box-shadow:0 0 0 2px #fff,0 0 0 4px #71c9f8}
-html.dark .PillGroup .Pill>a:active,html.dark .PillGroup .Pill>button:active{box-shadow:0 0 0 2px white,0 0 0 4px #1da1f2}
+html.dark .PillGroup .Pill>a:active,html.dark .PillGroup .Pill>button:active{box-shadow:0 0 0 2px #fff,0 0 0 4px #1da1f2}
 html.dark .PillGroup .Pill.is-selected>a,html.dark .PillGroup .Pill.is-selected>button{color:#FFF}
 html.dark .FormInput,html.dark .FormTextarea{border:1px solid #ccd6dd;color:#14171a}
 html.dark .FormInput-characterCount{color:#ccd6dd}
@@ -751,51 +743,51 @@ html.dark .FormInputWrapper-startAdornment,html.dark .FormInputWrapper-endAdornm
 html.dark .FormField.is-invalid .FormField-validationMessage{color:#e0245e}
 html.dark .FormField.is-valid .FormField-validationMessage{color:#008951}
 html.dark .FormField-description{color:#657786}
-html.dark .Token-checkbox input[type="checkbox"]:focus+.Icon{box-shadow:0 0 0 5px white,0 0 0 7px #71c9f8}
+html.dark .Token-checkbox input[type="checkbox"]:focus+.Icon{box-shadow:0 0 0 5px #fff,0 0 0 7px #71c9f8}
-html.dark .Token--small .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--small>.Token .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--small>.TokenGroup>.Token .Token-trigger input[type="checkbox"]:focus+.Icon{box-shadow:0 0 0 3px white,0 0 0 5px #71c9f8}
+html.dark .Token--small .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--small>.Token .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--small>.TokenGroup>.Token .Token-trigger input[type="checkbox"]:focus+.Icon{box-shadow:0 0 0 3px #fff,0 0 0 5px #71c9f8}
-html.dark .Token--xsmall .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--xsmall>.Token .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--xsmall>.TokenGroup>.Token .Token-trigger input[type="checkbox"]:focus+.Icon{box-shadow:0 0 0 0 white,0 0 0 2px #71c9f8}
+html.dark .Token--xsmall .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--xsmall>.Token .Token-trigger input[type="checkbox"]:focus+.Icon,html.dark .TokenGroup--xsmall>.TokenGroup>.Token .Token-trigger input[type="checkbox"]:focus+.Icon{box-shadow:0 0 0 0 #fff,0 0 0 2px #71c9f8}
 html.dark .Token,html.dark .Token--blue{border-color:#1da1f2;color:#1da1f2}
 html.dark .Token .Token-adornment,html.dark .Token--blue .Token-adornment{background-color:#1da1f2}
 html.dark .Token:hover,html.dark .Token--blue:hover{background-color:#97e3ff;color:#005fd1}
 html.dark .Token.is-selected,html.dark .Token--blue.is-selected{background-color:#1da1f2}
 html.dark .Token.is-selected .Token-adornment,html.dark .Token--blue.is-selected .Token-adornment{color:#1da1f2}
 html.dark .Token.is-selected:hover,html.dark .Token--blue.is-selected:hover{background-color:#005fd1;border-color:#005fd1}
-html.dark .Token:focus,html.dark .Token--blue:focus,html.dark .Token.is-focused,html.dark .Token--blue.is-focused{box-shadow:0 0 0 1px white,0 0 0 3px #71c9f8}
+html.dark .Token:focus,html.dark .Token--blue:focus,html.dark .Token.is-focused,html.dark .Token--blue.is-focused{box-shadow:0 0 0 1px #fff,0 0 0 3px #71c9f8}
 html.dark .Token--green{border-color:#17bf63;color:#17bf63}
 html.dark .Token--green .Token-adornment{background-color:#17bf63}
 html.dark .Token--green:hover{background-color:#a5f2aa;color:#008951}
 html.dark .Token--green.is-selected{background-color:#17bf63}
 html.dark .Token--green.is-selected .Token-adornment{color:#17bf63}
 html.dark .Token--green.is-selected:hover{background-color:#008951;border-color:#008951}
-html.dark .Token--green:focus,html.dark .Token--green.is-focused{box-shadow:0 0 0 1px white,0 0 0 3px #68e090}
+html.dark .Token--green:focus,html.dark .Token--green.is-focused{box-shadow:0 0 0 1px #fff,0 0 0 3px #68e090}
 html.dark .Token--red{border-color:#e0245e;color:#e0245e}
 html.dark .Token--red .Token-adornment{background-color:#e0245e}
 html.dark .Token--red:hover{background-color:#ffb8c2;color:#a01744}
 html.dark .Token--red.is-selected{background-color:#e0245e}
 html.dark .Token--red.is-selected .Token-adornment{color:#e0245e}
 html.dark .Token--red.is-selected:hover{background-color:#a01744;border-color:#a01744}
-html.dark .Token--red:focus,html.dark .Token--red.is-focused{box-shadow:0 0 0 1px white,0 0 0 3px #f6809a}
+html.dark .Token--red:focus,html.dark .Token--red.is-focused{box-shadow:0 0 0 1px #fff,0 0 0 3px #f6809a}
 html.dark .Token--purple{border-color:#794bc4;color:#794bc4}
 html.dark .Token--purple .Token-adornment{background-color:#794bc4}
 html.dark .Token--purple:hover{background-color:#c7b4fa;color:#4f0299}
 html.dark .Token--purple.is-selected{background-color:#794bc4}
 html.dark .Token--purple.is-selected .Token-adornment{color:#794bc4}
 html.dark .Token--purple.is-selected:hover{background-color:#4f0299;border-color:#4f0299}
-html.dark .Token--purple:focus,html.dark .Token--purple.is-focused{box-shadow:0 0 0 1px white,0 0 0 3px #a37ced}
+html.dark .Token--purple:focus,html.dark .Token--purple.is-focused{box-shadow:0 0 0 1px #fff,0 0 0 3px #a37ced}
 html.dark .Token--yellow{border-color:#ffad1f;color:#ffad1f}
 html.dark .Token--yellow .Token-adornment{background-color:#ffad1f}
 html.dark .Token--yellow:hover{background-color:#ffe76e;color:#f98e00}
 html.dark .Token--yellow.is-selected{background-color:#ffad1f}
 html.dark .Token--yellow.is-selected .Token-adornment{color:#ffad1f}
 html.dark .Token--yellow.is-selected:hover{background-color:#f98e00;border-color:#f98e00}
-html.dark .Token--yellow:focus,html.dark .Token--yellow.is-focused{box-shadow:0 0 0 1px white,0 0 0 3px #ffd03f}
+html.dark .Token--yellow:focus,html.dark .Token--yellow.is-focused{box-shadow:0 0 0 1px #fff,0 0 0 3px #ffd03f}
 html.dark .Token--gray{border-color:#657786;color:#657786}
 html.dark .Token--gray .Token-adornment{background-color:#657786}
 html.dark .Token--gray:hover{background-color:#e6ecf0;color:#657786}
 html.dark .Token--gray.is-selected{background-color:#657786}
 html.dark .Token--gray.is-selected .Token-adornment{color:#657786}
 html.dark .Token--gray.is-selected:hover{background-color:#aab8c2;border-color:#aab8c2}
-html.dark .Token--gray:focus,html.dark .Token--gray.is-focused{box-shadow:0 0 0 1px white,0 0 0 3px #aab8c2}
+html.dark .Token--gray:focus,html.dark .Token--gray.is-focused{box-shadow:0 0 0 1px #fff,0 0 0 3px #aab8c2}
 html.dark .FormTokenInput-input::-webkit-input-placeholder{color:#aab8c2}
 html.dark .DataPoint .DataPoint-label{color:#657786}
 html.dark .DataPoint .DataPoint-info{color:#14171a}
@@ -805,7 +797,7 @@ html.dark .DataPoint--withBottomBorder{border-bottom:1px solid #ccd6dd}
 html.dark .FormTokenInput.FormTextarea::-webkit-input-placeholder{color:#8899A6}
 html.dark .FormTokenInput.FormTextarea::placeholder{color:#8899A6}
 html.dark .DatePicker.date-unselected .is-rangeStart,html.dark .DatePicker.date-unselected .is-rangeEnd{color:#14171a}
-html.dark .DatePicker.date-unselected .is-rangeStart:hover,html.dark .DatePicker.date-unselected .is-rangeEnd:hover{background-color:#005091;color:#ffffff}
+html.dark .DatePicker.date-unselected .is-rangeStart:hover,html.dark .DatePicker.date-unselected .is-rangeEnd:hover{background-color:#005091;color:#fff}
 html.dark .NotificationList .Notification-body{color:#14171A}
 html.dark .DrawerModal{color:#14171A}
 /* fixes */

Resources/Plugins/emoji-keyboard/browser.js

@@ -26,7 +26,7 @@ enabled(){
   this.emojiData3 = []; // no skin tones, appended
   this.emojiNames = [];
   
-  var me = this;
+  const me = this;
   
   // styles
   
@@ -51,12 +51,12 @@ enabled(){
   
   // layout
   
-  var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--6 padding-h--8 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
+  let buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--6 padding-h--8 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
   window.TDPF_injectMustache("compose/docked_compose.mustache", "append", '<div class="cf margin-t--12 margin-b--30">', buttonHTML);
   
-  var maybeDockedComposePanel = $(".js-docked-compose");
+  let maybeDockedComposePanel = $(".js-docked-compose");
   
   if (maybeDockedComposePanel.length){
     maybeDockedComposePanel.find(".cf.margin-t--12.margin-b--30").first().append(buttonHTML);
@@ -67,10 +67,10 @@ enabled(){
   this.currentKeyboard = null;
   this.currentSpanner = null;
   
-  var wasSearchFocused = false;
+  let wasSearchFocused = false;
-  var lastEmojiKeyword, lastEmojiPosition, lastEmojiLength;
+  let lastEmojiKeyword, lastEmojiPosition, lastEmojiLength;
   
-  var hideKeyboard = (refocus) => {
+  const hideKeyboard = (refocus) => {
     $(this.currentKeyboard).remove();
     this.currentKeyboard = null;
     
@@ -94,7 +94,7 @@ enabled(){
     lastEmojiKeyword = null;
   };
   
-  var generateEmojiHTML = skinTone => {
+  const generateEmojiHTML = skinTone => {
     let index = 0;
     let html = [ "<p style='font-size:13px;color:#444;margin:4px;text-align:center'>Please, note that some emoji may not show up correctly in the text box above, but they will display in the tweet.</p>" ];
     
@@ -113,7 +113,7 @@ enabled(){
     return html.join("");
   };
   
-  var updateFilters = () => {
+  const updateFilters = () => {
     let keywords = this.currentKeywords;
     let container = $(this.currentKeyboard.children[1]);
     
@@ -135,7 +135,7 @@ enabled(){
     }
   };
   
-  var selectSkinTone = skinTone => {
+  const selectSkinTone = skinTone => {
     let selectedEle = this.currentKeyboard.children[2].querySelector("[data-tone='"+this.selectedSkinTone+"']");
     selectedEle && selectedEle.classList.remove("sel");
     
@@ -146,12 +146,12 @@ enabled(){
   };
   
   this.generateKeyboard = (left, top) => {
-    var outer = document.createElement("div");
+    let outer = document.createElement("div");
     outer.classList.add("emoji-keyboard");
     outer.style.left = left+"px";
     outer.style.top = top+"px";
     
-    var keyboard = document.createElement("div");
+    let keyboard = document.createElement("div");
     keyboard.classList.add("emoji-keyboard-list");
     
     keyboard.addEventListener("click", function(e){
@@ -164,11 +164,11 @@ enabled(){
       e.stopPropagation();
     });
     
-    var search = document.createElement("div");
+    let search = document.createElement("div");
     search.innerHTML = "<input type='text' placeholder='Search...'>";
     search.classList.add("emoji-keyboard-search");
     
-    var skintones = document.createElement("div");
+    let skintones = document.createElement("div");
     skintones.innerHTML = me.skinToneData.map(entry => "<div data-tone='"+entry[0]+"' style='background-color:"+entry[1]+"'></div>").join("");
     skintones.classList.add("emoji-keyboard-skintones");
     
@@ -189,7 +189,7 @@ enabled(){
       e.stopPropagation();
     });
     
-    var searchInput = search.children[0];
+    let searchInput = search.children[0];
     searchInput.focus();
     
     wasSearchFocused = false;
@@ -232,12 +232,12 @@ enabled(){
     this.composePanelScroller.trigger("scroll");
   };
   
-  var getKeyboardTop = () => {
+  const getKeyboardTop = () => {
     let button = $(".emoji-keyboard-popup-btn");
     return button.offset().top+button.outerHeight()+me.composePanelScroller.scrollTop()+8;
   };
   
-  var insertEmoji = (src, alt) => {
+  const insertEmoji = (src, alt) => {
     let input = this.composeInput;
     
     let val = input.val();
@@ -418,7 +418,7 @@ ready(){
   
   // HTML generation
   
-  var convUnicode = function(codePt){
+  const convUnicode = function(codePt){
     if (codePt > 0xFFFF){
       codePt -= 0x10000;
       return String.fromCharCode(0xD800+(codePt>>10), 0xDC00+(codePt&0x3FF));

Resources/Plugins/reply-account/browser.js

@@ -1,5 +1,5 @@
 enabled(){
-  var configuration = { defaultAccount: "#preferred" };
+  let configuration = { defaultAccount: "#preferred" };
   
   window.TDPF_loadConfigurationFile(this, "configuration.js", "configuration.default.js", obj => configuration = obj);
   
@@ -8,7 +8,7 @@ enabled(){
   this.uiComposeTweetEvent = (e, data) => {
     return if !(data.type === "reply" || (data.type === "tweet" && "quotedTweet" in data)) || data.popFromInline || !("element" in data);
     
-    var query;
+    let query;
     
     if (configuration.useAdvancedSelector){
       if (configuration.customSelector){
@@ -88,7 +88,7 @@ enabled(){
       return;
     }
     
-    var identifier = null;
+    let identifier = null;
     
     switch(query){
       case "#preferred":
@@ -106,7 +106,7 @@ enabled(){
       
       default:
         if (query[0] === '@'){
-          var obj = TD.storage.accountController.getAccountFromUsername(query.substring(1));
+          let obj = TD.storage.accountController.getAccountFromUsername(query.substring(1));
           
           if (obj.length === 0){
             $TD.alert("warning", "Plugin reply-account has invalid configuration: requested account not found: "+query);
@@ -126,7 +126,7 @@ enabled(){
   };
   
   this.onSelectedAccountChanged = () => {
-    var selected = $(".js-account-item.is-selected", ".js-account-list");
+    let selected = $(".js-account-item.is-selected", ".js-account-list");
     this.lastSelectedAccount = selected.length === 1 ? selected.attr("data-account-key") : null;
   };
 }

Resources/Plugins/templates/browser.js

@@ -32,62 +32,32 @@ enabled(){
     });
   };
   
+  // setup
+  
+  this.htmlModal = null;
+  
+  $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
+    this.htmlModal = contents;
+  }).catch(err => {
+    $TD.alert("error", "Problem loading data for the template plugin: "+err.message);
+  });
+  
   // button
   
-  var buttonHTML = '<button class="manage-templates-btn needsclick btn btn-on-blue full-width txt-left margin-b--12 padding-v--6 padding-h--12"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
+  let buttonHTML = '<button class="manage-templates-btn needsclick btn btn-on-blue full-width txt-left margin-b--12 padding-v--6 padding-h--12"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
   window.TDPF_injectMustache("compose/docked_compose.mustache", "prepend", '<div class="js-tweet-type-button">', buttonHTML);
   
-  var dockedComposePanel = $(".js-docked-compose");
+  let dockedComposePanel = $(".js-docked-compose");
   
   if (dockedComposePanel.length){
     dockedComposePanel.find(".js-tweet-type-button").first().before(buttonHTML);
   }
   
-  // css
-  
-  this.css = window.TDPF_createCustomStyle(this);
-  this.css.insert(".manage-templates-btn.active { color: #fff; box-shadow: 0 0 2px 3px #50a5e6; outline: 0; }");
-  
-  this.css.insert("#templates-modal-wrap { width: 100%; height: 100%; padding: 49px; position: absolute; z-index: 999; box-sizing: border-box; background-color: rgba(0, 0, 0, 0.5); }");
-  this.css.insert("#templates-modal { width: 100%; height: 100%; min-width: 500px; background-color: #fff; display: flex; }");
-  this.css.insert("#templates-modal > div { display: flex; flex-direction: column; }");
-  
-  this.css.insert(".templates-modal-bottom { flex: 0 0 auto; padding: 16px; }");
-  this.css.insert("#template-list .templates-modal-bottom { display: flex; justify-content: space-between; }");
-  this.css.insert("#template-editor .templates-modal-bottom { text-align: right; }");
-  
-  this.css.insert("#template-list { height: 100%; flex: 1 1 auto; }");
-  this.css.insert("#template-list ul { list-style-type: none; font-size: 24px; color: #222; flex: 1 1 auto; padding: 12px; overflow-y: auto; }");
-  this.css.insert("#template-list li { display: block; width: 100%; padding: 4px 8px; box-sizing: border-box; }");
-  this.css.insert("#template-list li[data-template] { cursor: pointer; }");
-  this.css.insert("#template-list li[data-template]:hover { background-color: #d8d8d8; }");
-  this.css.insert("#template-list li span { white-space: nowrap; }");
-  this.css.insert("#template-list li .icon { opacity: 0.6; margin-left: 4px; padding: 3px; }");
-  this.css.insert("#template-list li .icon:hover { opacity: 1; }");
-  this.css.insert("#template-list li .template-actions { float: right; }");
-  
-  this.css.insert("#template-editor { height: 100%; flex: 0 0 auto; width: 25vw; min-width: 225px; max-width: 400px; background-color: #485865; }");
-  this.css.insert(".template-editor-form { flex: 1 1 auto; padding: 12px 16px; font-size: 14px; overflow-y: auto; }");
-  this.css.insert(".template-editor-form .compose-text-title { margin: 24px 0 9px; }");
-  this.css.insert(".template-editor-form .compose-text-title:first-child { margin-top: 0; }");
-  this.css.insert(".template-editor-form input, .template-editor-form textarea { color: #111; background-color: #fff; border: none; border-radius: 0; }");
-  this.css.insert(".template-editor-form input:focus, .template-editor-form textarea:focus { box-shadow: inset 0 1px 3px rgba(17, 17, 17, 0.1), 0 0 8px rgba(80, 165, 230, 0.6); }");
-  this.css.insert(".template-editor-form textarea { height: 146px; font-size: 14px; padding: 10px; resize: none; }");
-  this.css.insert(".template-editor-form .template-editor-tips-button { cursor: pointer; }");
-  this.css.insert(".template-editor-form .template-editor-tips-button .icon { font-size: 12px; vertical-align: -5%; margin-left: 4px; }");
-  this.css.insert(".template-editor-form .template-editor-tips { display: none; }");
-  this.css.insert(".template-editor-form .template-editor-tips p { margin: 10px 0; }");
-  this.css.insert(".template-editor-form .template-editor-tips p:first-child { margin-top: 0; }");
-  this.css.insert(".template-editor-form .template-editor-tips li:nth-child(2n+1) { margin-top: 5px; padding-left: 6px; font-family: monospace; }");
-  this.css.insert(".template-editor-form .template-editor-tips li:nth-child(2n) { margin-top: 1px; padding-left: 14px; opacity: 0.66; }");
-  
-  this.css.insert(".invisible { display: none !important; }");
-  
   // template implementation
   
-  var readTemplateTokens = (contents, tokenData) => {
+  const readTemplateTokens = (contents, tokenData) => {
     let startIndex = -1;
     let endIndex = -1;
     
@@ -155,7 +125,7 @@ enabled(){
     return [ contents, data ];
   };
   
-  var doAjaxRequest = (index, url, evaluator) => {
+  const doAjaxRequest = (index, url, evaluator) => {
     return new Promise((resolve, reject) => {
       if (!url){
         resolve([ index, "{ajax}" ]);
@@ -175,7 +145,7 @@ enabled(){
     });
   };
   
-  var useTemplate = (contents, append) => {
+  const useTemplate = (contents, append) => {
     let ele = $(".js-compose-text");
     return if ele.length === 0;
     
@@ -257,68 +227,19 @@ enabled(){
   
   this.editingTemplate = null;
   
-  var showTemplateModal = () => {
+  const showTemplateModal = () => {
-    $(".manage-templates-btn").addClass("active");
+    $(".js-app-content").prepend(this.htmlModal);
     
-    let html = `
+    /* TODO possibly implement this later
-<div id="templates-modal-wrap" class="scroll-v scroll-styled-v">
-  <div id="templates-modal">
-    <div id="template-list">
-      <ul></ul>
     
-      <div class="templates-modal-bottom">
+    <li>{paste}</li>
-        <button data-action="close" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Close</span></button>
+    <li>Paste text or an image from clipboard</li>
-        <button data-action="new-template" class="Button--primary"><i class="icon icon-plus icon-small padding-rs"></i><span class="label">New Template</span></button>
+    <li>{paste#text}</li>
-      </div>
+    <li>Paste only if clipboard has text</li>
-    </div>
+    <li>{paste#image}</li>
+    <li>Paste only if clipboard has an image</li>
     
-    <div id="template-editor" class="invisible">
+    */
-      <div class="template-editor-form">
-        <div class="compose-text-title">Template Name</div>
-        <input name="template-name" type="text">
-        
-        <div class="compose-text-title">Contents</div>
-        <textarea name="template-contents" class="compose-text scroll-v scroll-styled-v scroll-styled-h scroll-alt"></textarea>
-
-        <div class="compose-text-title template-editor-tips-button">Advanced <i class="icon icon-arrow-d"></i></div>
-        <div class="template-editor-tips">
-          <p>You can use the following tokens. All tokens except for <span style="font-family: monospace">{ajax}</span> can only be used once.</p>
-          <ul>
-            <li>{cursor}</li>
-            <li>Location where the cursor is placed</li>
-            <li>{cursor#&lt;selectionlength&gt;}</li>
-            <li>Places cursor and selects a set amount of characters</li>
-            <li>{ajax#&lt;url&gt;}</li>
-            <li>Replaced with the result of a cross-origin ajax request</li>
-            <li>{ajax#&lt;eval&gt;#&lt;url&gt;}</li>
-            <li>Allows parsing the ajax request using <span style="font-family: monospace">$</span> as the placeholder for the result<br>Example: <span style="font-family: monospace">$.substring(0,5)</span></li>
-          </ul>
-          <p>To use special characters in the tweet text, escape them with a backslash:
-            <br><span style="font-family: monospace">&nbsp; \\{&nbsp; \\}&nbsp; \\#&nbsp; \\\\</span>
-          </p>
-        </div>
-      </div>
-      
-      <div class="templates-modal-bottom">
-        <button data-action="editor-cancel" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Cancel</span></button>
-        <button data-action="editor-confirm" class="Button--primary" style="margin-left:4px"><i class="icon icon-check icon-small padding-rs"></i><span class="label">Confirm</span></button>
-      </div>
-    </div>
-  </div>
-</div>`;
-    
-/* TODO possibly implement this later
-
-<li>{paste}</li>
-<li>Paste text or an image from clipboard</li>
-<li>{paste#text}</li>
-<li>Paste only if clipboard has text</li>
-<li>{paste#image}</li>
-<li>Paste only if clipboard has an image</li>
-
-*/
-    
-    $(".js-app-content").prepend(html);
     
     let ele = $("#templates-modal-wrap").first();
     
@@ -407,12 +328,11 @@ enabled(){
     onTemplatesUpdated(false);
   };
   
-  var hideTemplateModal = function(){
+  const hideTemplateModal = () => {
     $("#templates-modal-wrap").remove();
-    $(".manage-templates-btn").removeClass("active");
   };
   
-  var toggleEditor = function(){
+  const toggleEditor = () => {
     let editor = $("#template-editor");
     $("[name]", editor).val("");
     
@@ -421,7 +341,7 @@ enabled(){
     }
   };
   
-  var onTemplatesUpdated = (save) => {
+  const onTemplatesUpdated = (save) => {
     let eles = [];
     
     for(let identifier of Object.keys(this.config.templates)){
@@ -468,8 +388,6 @@ ready(){
 }
 
 disabled(){
-  this.css.remove();
-  
   $(".manage-templates-btn").remove();
   $("#templates-modal-wrap").remove();
   

Resources/Plugins/templates/modal.html

@@ -0,0 +1,227 @@
+<div id="templates-modal-wrap" class="scroll-v scroll-styled-v">
+  <div id="templates-modal">
+    <div id="template-list">
+      <ul></ul>
+      
+      <div class="templates-modal-bottom">
+        <button data-action="close" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Close</span></button>
+        <button data-action="new-template" class="Button--primary"><i class="icon icon-plus icon-small padding-rs"></i><span class="label">New Template</span></button>
+      </div>
+    </div>
+    
+    <div id="template-editor" class="invisible">
+      <div class="template-editor-form">
+        <div class="compose-text-title">Template Name</div>
+        <input name="template-name" type="text">
+        
+        <div class="compose-text-title">Contents</div>
+        <textarea name="template-contents" class="compose-text scroll-v scroll-styled-v scroll-styled-h scroll-alt"></textarea>
+        
+        <div class="compose-text-title template-editor-tips-button">Advanced <i class="icon icon-arrow-d"></i></div>
+        <div class="template-editor-tips">
+          <p>You can use the following tokens. All tokens except for <span style="font-family: monospace">{ajax}</span> can only be used once.</p>
+          <ul>
+            <li>{cursor}</li>
+            <li>Location where the cursor is placed</li>
+            <li>{cursor#&lt;selectionlength&gt;}</li>
+            <li>Places cursor and selects a set amount of characters</li>
+            <li>{ajax#&lt;url&gt;}</li>
+            <li>Replaced with the result of a cross-origin ajax request</li>
+            <li>{ajax#&lt;eval&gt;#&lt;url&gt;}</li>
+            <li>Allows parsing the ajax request using <span style="font-family: monospace">$</span> as the placeholder for the result<br>Example: <span style="font-family: monospace">$.substring(0,5)</span></li>
+          </ul>
+          <p>To use special characters in the tweet text, escape them with a backslash:
+            <br><span style="font-family: monospace">&nbsp; \{&nbsp; \}&nbsp; \#&nbsp; \\</span>
+          </p>
+        </div>
+      </div>
+      
+      <div class="templates-modal-bottom">
+        <button data-action="editor-cancel" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Cancel</span></button>
+        <button data-action="editor-confirm" class="Button--primary" style="margin-left:4px"><i class="icon icon-check icon-small padding-rs"></i><span class="label">Confirm</span></button>
+      </div>
+    </div>
+  </div>
+  
+  <style type="text/css">
+    
+    /* General */
+    
+    #templates-modal-wrap {
+      width: 100%;
+      height: 100%;
+      padding: 49px;
+      position: absolute;
+      z-index: 999;
+      box-sizing: border-box;
+      background-color: rgba(0, 0, 0, 0.5);
+    }
+    
+    #templates-modal {
+      width: 100%;
+      height: 100%;
+      min-width: 500px;
+      background-color: #fff;
+      display: flex;
+    }
+    
+    #templates-modal > div {
+      display: flex;
+      flex-direction: column;
+    }
+    
+    .templates-modal-bottom {
+      flex: 0 0 auto;
+      padding: 16px;
+    }
+    
+    #template-list .templates-modal-bottom {
+      display: flex;
+      justify-content: space-between;
+    }
+    
+    #template-editor .templates-modal-bottom {
+      text-align: right;
+    }
+    
+    .manage-templates-btn {
+      /* modifies the Manage Templates button while open */
+      color: #fff;
+      box-shadow: 0 0 2px 3px #50a5e6;
+      outline: 0;
+    }
+    
+    /* Template list */
+    
+    #template-list {
+      height: 100%;
+      flex: 1 1 auto;
+    }
+    
+    #template-list ul {
+      list-style-type: none;
+      font-size: 24px;
+      color: #222;
+      flex: 1 1 auto;
+      padding: 12px;
+      overflow-y: auto;
+    }
+    
+    #template-list li {
+      display: block;
+      width: 100%;
+      padding: 4px 8px;
+      box-sizing: border-box;
+    }
+    
+    #template-list li[data-template] {
+      cursor: pointer;
+    }
+    
+    #template-list li[data-template]:hover {
+      background-color: #d8d8d8;
+    }
+    
+    #template-list li span {
+      white-space: nowrap;
+    }
+    
+    #template-list li .icon {
+      opacity: 0.6;
+      margin-left: 4px;
+      padding: 3px;
+    }
+    
+    #template-list li .icon:hover {
+      opacity: 1;
+    }
+    
+    #template-list li .template-actions {
+      float: right;
+    }
+    
+    /* Template editor */
+    
+    #template-editor {
+      height: 100%;
+      flex: 0 0 auto;
+      width: 25vw;
+      min-width: 225px;
+      max-width: 400px;
+      background-color: #485865;
+    }
+    
+    #template-editor.invisible {
+      display: none;
+    }
+    
+    .template-editor-form {
+      flex: 1 1 auto;
+      padding: 12px 16px;
+      font-size: 14px;
+      overflow-y: auto;
+    }
+    
+    .template-editor-form .compose-text-title {
+      margin: 24px 0 9px;
+    }
+    
+    .template-editor-form .compose-text-title:first-child {
+      margin-top: 0;
+    }
+    
+    .template-editor-form input, .template-editor-form textarea {
+      color: #111;
+      background-color: #fff;
+      border: none;
+      border-radius: 0;
+    }
+    
+    .template-editor-form input:focus, .template-editor-form textarea:focus {
+      box-shadow: inset 0 1px 3px rgba(17, 17, 17, 0.1), 0 0 8px rgba(80, 165, 230, 0.6);
+    }
+    
+    .template-editor-form textarea {
+      height: 146px;
+      font-size: 14px;
+      padding: 10px;
+      resize: none;
+    }
+    
+    /* Template tips */
+    
+    .template-editor-form .template-editor-tips-button {
+      cursor: pointer;
+    }
+    
+    .template-editor-form .template-editor-tips-button .icon {
+      font-size: 12px;
+      vertical-align: -5%;
+      margin-left: 4px;
+    }
+    
+    .template-editor-form .template-editor-tips {
+      display: none;
+    }
+    
+    .template-editor-form .template-editor-tips p {
+      margin: 10px 0;
+    }
+    
+    .template-editor-form .template-editor-tips p:first-child {
+      margin-top: 0;
+    }
+    
+    .template-editor-form .template-editor-tips li:nth-child(2n+1) {
+      margin-top: 5px;
+      padding-left: 6px;
+      font-family: monospace;
+    }
+    
+    .template-editor-form .template-editor-tips li:nth-child(2n) {
+      margin-top: 1px;
+      padding-left: 14px;
+      opacity: 0.66;
+    }
+  </style>
+</div>

Resources/Plugins/timeline-polls/browser.js

@@ -38,7 +38,7 @@ enabled(){
   
   // hooks
   
-  var funcs = {
+  const funcs = {
     TwitterStatus: TD.services.TwitterStatus.prototype.render,
     TwitterActionOnTweet: TD.services.TwitterActionOnTweet.prototype.render,
     TweetDetailView: TD.components.TweetDetailView.prototype._renderChirp

Resources/PostBuild.ps1

@@ -46,7 +46,7 @@ try{
   function Remove-Empty-Lines{
     Param([Parameter(Mandatory = $True, Position = 1)] $lines)
     
-    ForEach($line in $lines){
+    foreach($line in $lines){
       if ($line -ne ''){
         $line
       }
@@ -69,11 +69,19 @@ try{
   
   function Rewrite-File{
     Param([Parameter(Mandatory = $True, Position = 1)] $file,
-          [Parameter(Mandatory = $True, Position = 2)] $lines)
+          [Parameter(Mandatory = $True, Position = 2)] $lines,
+          [Parameter(Mandatory = $True, Position = 3)] $imports)
     
     $lines = Remove-Empty-Lines($lines)
     $relativePath = $file.FullName.Substring($targetDir.Length)
     
+    foreach($line in $lines){
+      if ($line.Contains('#import ')){
+        $imports.Add($file.FullName)
+        break
+      }
+    }
+    
     if ($relativePath.StartsWith("scripts\")){
       $lines = (,("#" + $version) + $lines)
     }
@@ -82,39 +90,68 @@ try{
     Write-Host "Processed" $relativePath
   }
   
-  # Post processing
+  # Validation
   
   Check-Carriage-Return(Join-Path $targetDir "plugins\official\emoji-keyboard\emoji-ordering.txt")
   
-  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.js" -Exclude "configuration.default.js" -Recurse){
+  # Processing
+  
+  $imports = New-Object "System.Collections.Generic.List[string]"
+  
+  foreach($file in Get-ChildItem -Path $targetDir -Filter "*.js" -Exclude "configuration.default.js" -Recurse){
     $lines = [IO.File]::ReadLines($file.FullName)
-    $lines = $lines | % { $_.TrimStart() }
+    $lines = $lines | ForEach-Object { $_.TrimStart() }
     $lines = $lines -Replace '^(.*?)((?<=^|[;{}()])\s?//(?:\s.*|$))?$', '$1'
-    $lines = $lines -Replace '(?<!\w)return(\s.*?)? if (.*?);', 'if ($2)return$1;'
+    $lines = $lines -Replace '(?<!\w)(return|throw)(\s.*?)? if (.*?);', 'if ($3)$1$2;'
-    Rewrite-File $file $lines
+    Rewrite-File $file $lines $imports
   }
   
-  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.css" -Recurse){
+  foreach($file in Get-ChildItem -Path $targetDir -Filter "*.css" -Recurse){
     $lines = [IO.File]::ReadLines($file.FullName)
     $lines = $lines -Replace '\s*/\*.*?\*/', ''
     $lines = $lines -Replace '^(\S.*) {$', '$1{'
     $lines = $lines -Replace '^\s+(.+?):\s*(.+?)(?:\s*(!important))?;$', '$1:$2$3;'
     $lines = @((Remove-Empty-Lines($lines)) -Join ' ')
-    Rewrite-File $file $lines
+    $lines = $lines -Replace '([{};])\s', '$1'
+    $lines = $lines -Replace ';}', '}'
+    Rewrite-File $file $lines $imports
   }
   
-  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.html" -Recurse){
+  foreach($file in Get-ChildItem -Path $targetDir -Filter "*.html" -Recurse){
     $lines = [IO.File]::ReadLines($file.FullName)
-    $lines = $lines | % { $_.TrimStart() }
+    $lines = $lines | ForEach-Object { $_.TrimStart() }
-    Rewrite-File $file $lines
+    Rewrite-File $file $lines $imports
   }
   
-  ForEach($file in Get-ChildItem -Path (Join-Path $targetDir "plugins") -Filter "*.meta" -Recurse){
+  foreach($file in Get-ChildItem -Path (Join-Path $targetDir "plugins") -Filter "*.meta" -Recurse){
     $lines = [IO.File]::ReadLines($file.FullName)
     $lines = $lines -Replace '\{version\}', $version
-    Rewrite-File $file $lines
+    Rewrite-File $file $lines $imports
   }
   
+  # Imports
+  
+  $importFolder = Join-Path $targetDir "scripts\imports"
+  
+  foreach($path in $imports){
+    $text = [IO.File]::ReadAllText($path)
+    $text = [Regex]::Replace($text, '#import "(.*?)"', {
+      $importPath = Join-Path $importFolder ($args[0].Groups[1].Value.Trim())
+      $importStr = [IO.File]::ReadAllText($importPath).TrimEnd()
+      
+      if ($importStr[0] -eq '#'){
+        $importStr = $importStr.Substring($importStr.IndexOf("`n") + 1)
+      }
+      
+      return $importStr
+    }, [System.Text.RegularExpressions.RegexOptions]::MultiLine)
+    
+    [IO.File]::WriteAllText($path, $text)
+    Write-Host "Resolved" $path.Substring($targetDir.Length)
+  }
+  
+  [IO.Directory]::Delete($importFolder, $True)
+  
   # Finished
   
   $sw.Stop()

Resources/PostCefUpdate.ps1

@@ -13,6 +13,8 @@ try{
   $propsFiles = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.props",
                 "..\packages\CefSharp.WinForms.${sharpVersion}\build\CefSharp.WinForms.props"
   
+  $targetFiles = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.targets"
+  
   # Greetings
   
   $title = "CEF ${cefVersion}, CefSharp ${sharpVersion}"
@@ -35,7 +37,7 @@ try{
   
   [IO.File]::WriteAllText($browserProj, $contents)
   
-  Write-Host "Removing x64 and AnyCPU from CefSharp props..."
+  Write-Host "Removing x64 and AnyCPU from package files..."
   
   foreach($file in $propsFiles){
     $contents = [IO.File]::ReadAllText($file)
@@ -44,6 +46,13 @@ try{
     [IO.File]::WriteAllText($file, $contents)
   }
   
+  foreach($file in $targetFiles){
+    $contents = [IO.File]::ReadAllText($file)
+    $contents = $contents -Replace '(?<=<ItemGroup Condition=")(''\$\(Platform\)'' == ''(AnyCPU|x64)'')(?=">)', 'false'
+    
+    [IO.File]::WriteAllText($file, $contents)
+  }
+  
   # Finished
   
   Write-Host ""

Resources/ScriptLoader.cs

@@ -1,10 +1,12 @@
 using CefSharp;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
+
 #if DEBUG
 using System.Diagnostics;
 using System.Reflection;
@@ -14,17 +16,29 @@ using TweetDuck.Plugins;
 
 namespace TweetDuck.Resources{
     static class ScriptLoader{
-        public static string LoadResource(string name, bool silent = false, Control sync = null){
+        private static readonly Dictionary<string, string> CachedData = new Dictionary<string, string>(16);
+
+        public static string LoadResourceSilent(string name){
+            return LoadResource(name, null);
+        }
+
+        public static string LoadResource(string name, Control sync){
+            if (CachedData.TryGetValue(name, out string resourceData)){
+                return resourceData;
+            }
+
+            string path = Program.ScriptPath;
+
+            #if DEBUG
+            if (Directory.Exists(HotSwapTargetDir)){
+                path = Path.Combine(HotSwapTargetDir, "scripts");
+                Debug.WriteLine("Hot swap active, redirecting "+name);
+            }
+            #endif
+
+            string resource;
+
             try{
-                string path = Program.ScriptPath;
-
-                #if DEBUG
-                if (Directory.Exists(HotSwapTargetDir)){
-                    path = Path.Combine(HotSwapTargetDir, "scripts");
-                    Debug.WriteLine("Hot swap active, redirecting "+name);
-                }
-                #endif
-
                 string contents = File.ReadAllText(Path.Combine(path, name), Encoding.UTF8);
                 int separator;
 
@@ -33,7 +47,7 @@ namespace TweetDuck.Resources{
                 // #<version>\n
 
                 if (contents[0] != '#'){
-                    ShowLoadError(silent, sync, $"File {name} appears to be corrupted, please try reinstalling the app.");
+                    ShowLoadError(sync, $"File {name} appears to be corrupted, please try reinstalling the app.");
                     separator = 0;
                 }
                 else{
@@ -41,44 +55,33 @@ namespace TweetDuck.Resources{
                     string fileVersion = contents.Substring(1, separator-1).TrimEnd();
 
                     if (fileVersion != Program.VersionTag){
-                        ShowLoadError(silent, sync, $"File {name} is made for a different version of TweetDuck ({fileVersion}) and may not function correctly in this version, please try reinstalling the app.");
+                        ShowLoadError(sync, $"File {name} is made for a different version of TweetDuck ({fileVersion}) and may not function correctly in this version, please try reinstalling the app.");
                     }
                 }
 
-                return contents.Substring(separator).TrimStart();
+                resource = contents.Substring(separator).TrimStart();
             }catch(Exception ex){
-                ShowLoadError(silent, sync, $"Could not load {name}. The program will continue running with limited functionality.\n\n{ex.Message}");
+                ShowLoadError(sync, $"Could not load {name}. The program will continue running with limited functionality.\n\n{ex.Message}");
-                return null;
+                resource = null;
             }
+
+            return CachedData[name] = resource;
         }
 
-        public static bool ExecuteFile(IFrame frame, string file, Control sync = null){
+        public static bool ExecuteFile(IFrame frame, string file, Control sync){
-            string script = LoadResource(file, sync == null, sync);
+            string script = LoadResource(file, sync);
-            ExecuteScript(frame, script, GetRootIdentifier(file));
+            ExecuteScript(frame, script, "root:"+Path.GetFileNameWithoutExtension(file));
             return script != null;
         }
 
         public static void ExecuteScript(IFrame frame, string script, string identifier){
             if (script != null){
-                frame.ExecuteJavaScriptAsync(script, "td:"+identifier, 1);
+                frame.ExecuteJavaScriptAsync(script, identifier, 1);
             }
         }
 
-        public static string GetRootIdentifier(string file){
+        private static void ShowLoadError(Control sync, string message){
-            return "root:"+Path.GetFileNameWithoutExtension(file);
+            sync?.InvokeSafe(() => FormMessage.Error("Resource Error", message, FormMessage.OK));
-        }
-
-        private static void ShowLoadError(bool silent, Control sync, string message){
-            if (silent){
-                return;
-            }
-
-            if (sync == null){
-                FormMessage.Error("Resource Error", message, FormMessage.OK);
-            }
-            else{
-                sync.InvokeSafe(() => FormMessage.Error("Resource Error", message, FormMessage.OK));
-            }
         }
         
         #if DEBUG
@@ -88,7 +91,7 @@ namespace TweetDuck.Resources{
 
         static ScriptLoader(){
             if (File.Exists(HotSwapRebuildScript)){
-                Debug.WriteLine("Activating resource hot swap");
+                Debug.WriteLine("Activating resource hot swap...");
 
                 ResetHotSwap();
                 Application.ApplicationExit += (sender, args) => ResetHotSwap();
@@ -104,6 +107,8 @@ namespace TweetDuck.Resources{
             ResetHotSwap();
             Directory.CreateDirectory(HotSwapTargetDir);
 
+            Stopwatch sw = Stopwatch.StartNew();
+
             using(Process process = Process.Start(new ProcessStartInfo{
                 FileName = "powershell",
                 Arguments = $"-ExecutionPolicy Unrestricted -File \"{HotSwapRebuildScript}\" \"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
@@ -120,20 +125,21 @@ namespace TweetDuck.Resources{
                 }
             }
 
+            sw.Stop();
+            Debug.WriteLine("Finished rebuild script in "+sw.ElapsedMilliseconds+" ms");
+
+            CachedData.Clear();
+
             // Force update plugin manager setup scripts
 
             string newPluginRoot = Path.Combine(HotSwapTargetDir, "plugins");
             
             const BindingFlags flagsInstance = BindingFlags.Instance | BindingFlags.NonPublic;
-            const BindingFlags flagsStatic = BindingFlags.Static | BindingFlags.NonPublic;
 
             Type typePluginManager = typeof(PluginManager);
             Type typeFormBrowser = typeof(FormBrowser);
 
             // ReSharper disable PossibleNullReferenceException
-            object pluginSetupScripts = typePluginManager.GetMethod("LoadSetupScripts", flagsStatic).Invoke(null, new object[0]);
-            typePluginManager.GetField("PluginSetupScripts", flagsStatic).SetValue(null, pluginSetupScripts);
-            
             object instPluginManager = typeFormBrowser.GetField("plugins", flagsInstance).GetValue(FormManager.TryFind<FormBrowser>());
             typePluginManager.GetField("rootPath", flagsInstance).SetValue(instPluginManager, newPluginRoot);
 

Resources/Scripts/imports/markup/introduction.html

@@ -0,0 +1,26 @@
+<div id="td-introduction-modal" class="ovl scroll-v scroll-styled-v">
+  <div class="mdl is-inverted-dark">
+    <header class="mdl-header">
+      <h3 class="mdl-header-title">Welcome to TweetDuck</h3>
+      <a href="#" class="mdl-dismiss link-normal-dark"><i class="icon icon-close"></i></a>
+    </header>
+    <div class="mdl-inner">
+      <div class="mdl-content">
+        <p>Thank you for downloading TweetDuck!</p>
+        <p><a id="td-introduction-follow" href="#">Follow @TryMyAwesomeApp</a> for latest news and updates about the app.</p>
+        <div class="main-menu"></div>
+        <p><strong>Right-click anywhere</strong> or click <strong>Settings&nbsp;–&nbsp;TweetDuck</strong> in the left panel to open the main menu. You can also right-click links, tweets, images and videos, and desktop notifications to access their respective context menus.</p>
+        <p>Click <strong>Show Guide</strong> to see awesome features TweetDuck offers, or view the guide later by going to <strong>About TweetDuck</strong> and clicking the help button on top.</p>
+      </div>
+      <footer class="txt-right">
+        <div class="anondata">
+          <input id="td-anonymous-data" type="checkbox" checked>
+          <label for="td-anonymous-data">Send anonymous usage data</label>
+          <label>&nbsp;(<a href="https://github.com/chylex/TweetDuck/wiki/Send-anonymous-data" rel="nofollow">learn more</a>)</label>
+        </div>
+        <button class="Button--primary" data-guide><span class="label">Show Guide</span></button>
+        <button class="Button--secondary"><span class="label">Close</span></button>
+      </footer>
+    </div>
+  </div>
+</div>

Resources/Scripts/imports/scripts/plugins.base.js

@@ -3,14 +3,14 @@
   // Block: Setup a simple JavaScript object configuration loader.
   //
   window.TDPF_loadConfigurationFile = function(pluginObject, fileNameUser, fileNameDefault, onSuccess, onFailure){
-    var identifier = pluginObject.$id;
+    let identifier = pluginObject.$id;
-    var token = pluginObject.$token;
+    let token = pluginObject.$token;
     
     $TDP.checkFileExists(token, fileNameUser).then(exists => {
-      var fileName = exists ? fileNameUser : fileNameDefault;
+      let fileName = exists ? fileNameUser : fileNameDefault;
       
       (exists ? $TDP.readFile(token, fileName, true) : $TDP.readFileRoot(token, fileName)).then(contents => {
-        var obj;
+        let obj;
         
         try{
           obj = eval("("+contents+")");
@@ -39,16 +39,14 @@
   // Block: Setup a function to add/remove custom CSS.
   //
   window.TDPF_createCustomStyle = function(pluginObject){
-    var element = document.createElement("style");
+    let element = document.createElement("style");
     element.id = "plugin-"+pluginObject.$id+"-"+Math.random().toString(36).substring(2, 7);
     document.head.appendChild(element);
     
-    var obj = {
+    return {
       insert: (rule) => element.sheet.insertRule(rule, 0),
-      remove: () => $(element).remove()
+      remove: () => element.remove(),
+      element: element
     };
-    
-    obj.element = element;
-    return obj;
   };
 })($TDP);

Resources/Scripts/imports/styles/introduction.css

@@ -0,0 +1,69 @@
+#td-introduction-modal {
+  display: flex;
+}
+
+#td-introduction-modal .mdl {
+  width: 90%;
+  min-width: 515px;
+  max-width: 835px;
+  height: 328px;
+}
+
+#td-introduction-modal .mdl-inner {
+  padding-top: 0;
+}
+
+#td-introduction-modal .mdl-header-title {
+  cursor: default;
+}
+
+#td-introduction-modal .mdl-content {
+  padding: 4px 16px 0;
+  overflow-y: auto;
+}
+
+#td-introduction-modal p {
+  margin: 12px 0;
+  font-size: 1.4rem;
+}
+
+#td-introduction-modal p strong {
+  font-weight: normal;
+  text-shadow: 0 0 #000;
+}
+
+#td-introduction-modal .main-menu {
+  float: left;
+  width: 187px;
+  height: 124px;
+  margin-right: 12px;
+  box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.33);
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALsAAAB8CAMAAAAGozFUAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACZUExURQAAAAAANgAAYQA2YQA2iABhYQBhrDYAADYANjYAYTY2ADY2NjY2YTY2iDZhrDaIiDaIz2EAAGEANmEAYWE2NmE2iGFhNmFhYWGs8og2AIg2Nog2YYiIYYisiIjPrIjPz4jP8qxhAKxhNqzPiKzyrKzy8szMzM+INs/PiM/yrM/yz8/y8tfX1/Dw8PKsYfLPiPLyrPLyz/Ly8nG9GIQAAARDSURBVHja7ZyPd9IwEMdDxbI5cemcWJjbWrWrDi2Q//+PM7m7pOGHfcORlD6v7w1ok2wfwqXkvrs78TTcQzypoR6DZ//dcTA7szM7s8dgX2dCiJxGrG+Kvd+C1w619M+uoZqkGiy7AxvivI+XajURSWVO9AtjQ6UQqTIn18R+PxFSP82SCnuUOYxdfdjMzSmNn9mPMJa9p/QWpH5cZ5rjgqbanNQjOMnGS315nWl+7NGkqrmSqpb6hRuvm+PO++qygtkWKZ2YOW2EGBWr6dK3mTKHmcYeuu3r/fR5UawmUrXjY9tMLRFItez6abPYYd/MffbN4uHT89033UPVInfje1ir+Glbm7msGjKR1mbg/UFv7KFqYzGfwUhq6cbHZle1Jp3QZ65fjMwcize3hbEcu1ZnZkVCb+wBq8L86D4JGl1sm+E9AbMzO7MzO7MzO7Mze586QQqdcav7ggO3juMfF8Whlsj+6hXuzx17x0aWmswO/nBLbPaZ8RqatzdHsO/36In94WOltAOnXSZwoR7A+Qa3H5q/CEH+aA5+OfaQ6ASCYGAuZq3nAi4KjML2oH6T9qxX05+W3T5pt5+WQ5NUpA1s99jMpZt05zpiPxzVpOF1gukSFACPDN3+1p0l/3qbHf1rVBQO9gMFISz7ZnE/Xe6wX3oqXzc7KgoH+4GCEFoXA8VL20CuGprCTG6xkzZwyGZIUTjUDxSEwOybu4regzC3mxLXqm8zVhsoYUXai2aF5qQolL7KQB1QQeDvVWZndmZndmZn9nNn/3WuB9sMszM7szM7sw+WXXvEQgYTRYOyNxA9IEMJiyHZjSijWi1pUOxIDcqWiao6uSgalN0E70BYT7YncJ1CFI0074Uvg55KFI1i715U1SlF0bD3maRSGH4nfbn0VKJo+Pt77qKqTi2KRvlePZObI7PzXozZmZ3ZmZ3Zmf1/YjdO3qjY3xH0rBW8PN9jvDyv3cyR+R7DZvdCNq7pQk8iwfE243l7NUTR9CYSHLNWk8qPRsKcJu9CdJHgmHlXqos9vkhwPLsNuWptpi+R4Hh2G3KF+Vgte3yR4FXfq620Orw9QTleDpLd3M6Tvqed95HMzuzMzuzMzuw9sJep6v7XQSnEXsyBd0AZmN3WVzrAL2Rfvb8t/vK3OgukKM/ddelpkdlraVyLV7LvbZujsLuyG1CkxcURtGlalsQVbaHELfP43YYfeP9WRmGBfPWw7Bpc47dFWnaTsBy7K9ri6r3Q4w47BrSsbx7neeh5NwZTp7ZIy34ik2P3iraYxK22aguyb+c46RfvZGibgZsElfzRc9fB7oq2uJysHXvfZs+u0tDspl4RhqBgOAHGEXhpWu3Ks0VbqF6Lq9piC7vQIGszRSkDs+MfqFMbTkBJWF6almO3RVsocQsfS0yihOxXGgQpW2D4/+728p6A2Zmd2Zmd2c+SfaCHZh/u8QdspaeBZ15I7gAAAABJRU5ErkJggg==);
+}
+
+#td-introduction-modal .main-menu + p {
+  margin-top: 15px;
+}
+
+#td-introduction-modal footer {
+  padding: 10px 0;
+}
+
+#td-introduction-modal button {
+  margin-left: 8px;
+}
+
+#td-introduction-modal .anondata {
+  float: left;
+  margin: 5px 7px;
+}
+
+#td-introduction-modal .anondata input {
+  vertical-align: -10%;
+}
+
+#td-introduction-modal .anondata label {
+  cursor: pointer;
+  display: inline-block;
+  font-size: 14px;
+}