Fix image pasting allowing more than 1 image in DMs

Closes #153

Configuration/Arguments.cs

@@ -1,5 +1,5 @@
 using System;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
 namespace TweetDuck.Configuration{
     static class Arguments{

Configuration/LockManager.cs

@@ -2,28 +2,26 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Threading;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Configuration{
     sealed class LockManager{
+        private const int RetryDelay = 250;
+
         public enum Result{
             Success, HasProcess, Fail
         }
 
-        public Process LockingProcess { get; private set; }
-
         private readonly string file;
         private FileStream lockStream;
+        private Process lockingProcess;
 
         public LockManager(string file){
             this.file = file;
         }
 
-        private void CreateLockFileStream(){
+        // Lock file
-            lockStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.Read);
-            WriteIntToStream(lockStream, GetCurrentProcessId());
-            lockStream.Flush(true);
-        }
 
         private bool ReleaseLockFileStream(){
             if (lockStream != null){
@@ -37,8 +35,10 @@ namespace TweetDuck.Configuration{
         }
 
         private Result TryCreateLockFile(){
-            if (lockStream != null){
+            void CreateLockFileStream(){
-                throw new InvalidOperationException("Lock file already exists.");
+                lockStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.Read);
+                lockStream.Write(BitConverter.GetBytes(WindowsUtils.CurrentProcessID), 0, sizeof(int));
+                lockStream.Flush(true);
             }
 
             try{
@@ -60,6 +60,8 @@ namespace TweetDuck.Configuration{
             }
         }
 
+        // Lock management
+
         public Result Lock(){
             if (lockStream != null){
                 return Result.Success;
@@ -72,7 +74,9 @@ namespace TweetDuck.Configuration{
                     int pid;
 
                     using(FileStream fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)){
-                        pid = ReadIntFromStream(fileStream);
+                        byte[] bytes = new byte[sizeof(int)];
+                        fileStream.Read(bytes, 0, bytes.Length);
+                        pid = BitConverter.ToInt32(bytes, 0);
                     }
 
                     try{
@@ -80,7 +84,7 @@ namespace TweetDuck.Configuration{
 
                         using(Process currentProcess = Process.GetCurrentProcess()){
                             if (foundProcess.MainModule.FileVersionInfo.InternalName == currentProcess.MainModule.FileVersionInfo.InternalName){
-                                LockingProcess = foundProcess;
+                                lockingProcess = foundProcess;
                             }
                             else{
                                 foundProcess.Close();
@@ -91,7 +95,7 @@ namespace TweetDuck.Configuration{
                         // Process.MainModule can throw exceptions in some cases
                     }
 
-                    return LockingProcess == null ? Result.Fail : Result.HasProcess;
+                    return lockingProcess == null ? Result.Fail : Result.HasProcess;
                 }catch{
                     return Result.Fail;
                 }
@@ -100,45 +104,72 @@ namespace TweetDuck.Configuration{
             return initialResult;
         }
 
-        public bool Unlock(){
+        public Result LockWait(int timeout){
-            bool result = true;
+            for(int elapsed = 0; elapsed < timeout; elapsed += RetryDelay){
+                Result result = Lock();
 
+                if (result == Result.HasProcess){
+                    Thread.Sleep(RetryDelay);
+                }
+                else{
+                    return result;
+                }
+            }
+
+            return Lock();
+        }
+
+        public bool Unlock(){
             if (ReleaseLockFileStream()){
                 try{
                     File.Delete(file);
                 }catch(Exception e){
                     Program.Reporter.Log(e.ToString());
-                    result = false;
+                    return false;
                 }
             }
 
-            return result;
+            return true;
+        }
+
+        // Locking process
+
+        public bool RestoreLockingProcess(int failTimeout){
+            if (lockingProcess != null){
+                if (lockingProcess.MainWindowHandle == IntPtr.Zero){ // restore if the original process is in tray
+                    NativeMethods.PostMessage(NativeMethods.HWND_BROADCAST, Program.WindowRestoreMessage, new UIntPtr((uint)lockingProcess.Id), IntPtr.Zero);
+
+                    if (WindowsUtils.TrySleepUntil(() => CheckLockingProcessExited() || (lockingProcess.MainWindowHandle != IntPtr.Zero && lockingProcess.Responding), failTimeout, RetryDelay)){
+                        return true;
+                    }
+                }
+            }
+
+            return false;
         }
 
         public bool CloseLockingProcess(int closeTimeout, int killTimeout){
-            if (LockingProcess != null){
+            if (lockingProcess != null){
                 try{
-                    if (LockingProcess.CloseMainWindow()){
+                    if (lockingProcess.CloseMainWindow()){
-                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, closeTimeout, 250);
+                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, closeTimeout, RetryDelay);
                     }
 
-                    if (!LockingProcess.HasExited){
+                    if (!lockingProcess.HasExited){
-                        LockingProcess.Kill();
+                        lockingProcess.Kill();
-                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, killTimeout, 250);
+                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, killTimeout, RetryDelay);
                     }
 
-                    if (LockingProcess.HasExited){
+                    if (lockingProcess.HasExited){
-                        LockingProcess.Dispose();
+                        lockingProcess.Dispose();
-                        LockingProcess = null;
+                        lockingProcess = null;
                         return true;
                     }
                 }catch(Exception ex){
                     if (ex is InvalidOperationException || ex is Win32Exception){
-                        if (LockingProcess != null){
+                        if (lockingProcess != null){
-                            LockingProcess.Refresh();
+                            bool hasExited = CheckLockingProcessExited();
-
+                            lockingProcess.Dispose();
-                            bool hasExited = LockingProcess.HasExited;
-                            LockingProcess.Dispose();
                             return hasExited;
                         }
                     }
@@ -150,27 +181,8 @@ namespace TweetDuck.Configuration{
         }
 
         private bool CheckLockingProcessExited(){
-            LockingProcess.Refresh();
+            lockingProcess.Refresh();
-            return LockingProcess.HasExited;
+            return lockingProcess.HasExited;
-        }
-
-        // Utility functions
-
-        private static void WriteIntToStream(Stream stream, int value){
-            byte[] id = BitConverter.GetBytes(value);
-            stream.Write(id, 0, id.Length);
-        }
-
-        private static int ReadIntFromStream(Stream stream){
-            byte[] bytes = new byte[4];
-            stream.Read(bytes, 0, 4);
-            return BitConverter.ToInt32(bytes, 0);
-        }
-
-        private static int GetCurrentProcessId(){
-            using(Process process = Process.GetCurrentProcess()){
-                return process.Id;
-            }
         }
     }
 }

Configuration/SystemConfig.cs

@@ -1,45 +1,43 @@
 using System;
 using System.IO;
+using TweetDuck.Core.Utils;
+using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Configuration{
     sealed class SystemConfig{
+        private static readonly FileSerializer<SystemConfig> Serializer = new FileSerializer<SystemConfig>{
+            // HandleUnknownProperties = (obj, data) => {}
+        };
+
         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 EnableBrowserGCReload { get; set; } = true;
+        public int BrowserMemoryThreshold { get; set; } = 400;
+
+        // SPECIAL PROPERTIES
+        
         public bool HardwareAcceleration{
-            get => hardwareAcceleration && IsHardwareAccelerationSupported;
+            get => _hardwareAcceleration && IsHardwareAccelerationSupported;
-            set => hardwareAcceleration = value;
+            set => _hardwareAcceleration = value;
         }
 
-        private readonly string file;
+        // END OF CONFIG
 
-        private bool hardwareAcceleration;
+        private readonly string file;
         
         private SystemConfig(string file){
             this.file = file;
-
-            HardwareAcceleration = true;
-        }
-
-        private void WriteToStream(Stream stream){
-            stream.WriteByte((byte)(HardwareAcceleration ? 1 : 0));
-        }
-
-        private void ReadFromStream(Stream stream){
-            HardwareAcceleration = stream.ReadByte() > 0;
         }
 
         public bool Save(){
             try{
-                string directory = Path.GetDirectoryName(file);
+                WindowsUtils.CreateDirectoryForFile(file);
-                if (directory == null)return false;
+                Serializer.Write(file, this);
-
-                Directory.CreateDirectory(directory);
-
-                using(Stream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None)){
-                    WriteToStream(stream);
-                }
-
                 return true;
             }catch(Exception e){
                 Program.Reporter.HandleException("Configuration Error", "Could not save the system configuration file.", true, e);
@@ -51,11 +49,20 @@ namespace TweetDuck.Configuration{
             SystemConfig config = new SystemConfig(file);
             
             try{
-                using(Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)){
+                Serializer.Read(file, config);
-                    config.ReadFromStream(stream);
+                return config;
-                }
             }catch(FileNotFoundException){
             }catch(DirectoryNotFoundException){
+            }catch(FormatException){
+                try{
+                    using(Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)){
+                        config.HardwareAcceleration = stream.ReadByte() > 0;
+                    }
+
+                    config.Save();
+                }catch(Exception e){
+                    Program.Reporter.HandleException("Configuration Error", "Could not update the system configuration file.", true, e);
+                }
             }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);
             }

Configuration/UserConfig.cs

@@ -1,201 +1,164 @@
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
 using TweetDuck.Core;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
+using TweetDuck.Data;
+using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Configuration{
-    [Serializable]
     sealed class UserConfig{
-        private static readonly IFormatter Formatter = new BinaryFormatter{ Binder = new LegacyBinder() };
+        private static readonly FileSerializer<UserConfig> Serializer = new FileSerializer<UserConfig>{ HandleUnknownProperties = HandleUnknownProperties };
 
-        private class LegacyBinder : SerializationBinder{
+        private static void HandleUnknownProperties(UserConfig obj, Dictionary<string, string> data){
-            public override Type BindToType(string assemblyName, string typeName){
+            if (data.TryGetValue("EnableBrowserGCReload", out string propGCReload) && data.TryGetValue("BrowserMemoryThreshold", out string propMemThreshold)){
-                return Type.GetType(string.Format("{0}, {1}", typeName.Replace("TweetDck", "TweetDuck"), assemblyName.Replace("TweetDck", "TweetDuck")));
+                if (bool.TryParse(propGCReload, out bool isGCReloadEnabled) && isGCReloadEnabled && int.TryParse(propMemThreshold, out int memThreshold)){
+                    // SystemConfig initialization was moved before UserConfig to allow for this
+                    // TODO remove the migration soon
+                    Program.SystemConfig.EnableBrowserGCReload = true;
+                    Program.SystemConfig.BrowserMemoryThreshold = memThreshold;
+                    Program.SystemConfig.Save();
+                }
+            }
+
+            data.Remove("EnableBrowserGCReload");
+            data.Remove("BrowserMemoryThreshold");
+
+            if (data.Count == 0){
+                obj.Save();
             }
         }
 
-        private const int CurrentFileVersion = 9;
+        static UserConfig(){
+            Serializer.RegisterTypeConverter(typeof(WindowState), WindowState.Converter);
 
-        // START OF CONFIGURATION
+            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
 
-        public WindowState BrowserWindow { get; set; }
+        public WindowState BrowserWindow { get; set; } = new WindowState();
-        public bool DisplayNotificationColumn { get; set; }
+        public WindowState PluginsWindow { get; set; } = new WindowState();
-        public bool DisplayNotificationTimer { get; set; }
-        public bool NotificationTimerCountDown { get; set; }
-        public bool NotificationSkipOnLinkClick { get; set; }
-        public bool NotificationNonIntrusiveMode { get; set; }
 
-        public TweetNotification.Position NotificationPosition { get; set; }
+        public bool ExpandLinksOnHover     { get; set; } = true;
-        public Point CustomNotificationPosition { get; set; }
+        public bool SwitchAccountSelectors { get; set; } = true;
-        public int NotificationEdgeDistance { get; set; }
+        public bool BestImageQuality       { get; set; } = true;
-        public int NotificationDisplay { get; set; }
+        public bool EnableSpellCheck       { get; set; } = false;
-        public int NotificationIdlePauseSeconds { get; set; }
+        private int _zoomLevel                           = 100;
-        public int NotificationDurationValue { get; set; }
+        private bool _muteNotifications;
+        
+        private TrayIcon.Behavior _trayBehavior          = TrayIcon.Behavior.Disabled;
+        public bool EnableTrayHighlight    { get; set; } = true;
 
-        public bool EnableSpellCheck { get; set; }
+        public bool EnableUpdateCheck { get; set; } = true;
-        public bool ExpandLinksOnHover { get; set; }
+        public string DismissedUpdate { get; set; } = null;
-        public bool SwitchAccountSelectors { get; set; }
-        public bool EnableTrayHighlight { get; set; }
 
-        public bool EnableUpdateCheck { get; set; }
+        public bool DisplayNotificationColumn    { get; set; } = false;
-        public string DismissedUpdate { get; set; }
+        public bool NotificationMediaPreviews    { get; set; } = true;
+        public bool NotificationSkipOnLinkClick  { get; set; } = false;
+        public bool NotificationNonIntrusiveMode { get; set; } = true;
+        public int NotificationIdlePauseSeconds  { get; set; } = 0;
 
-        [Obsolete] public PluginConfig Plugins { get; set; } // TODO remove eventually
+        public bool DisplayNotificationTimer     { get; set; } = true;
-        public WindowState PluginsWindow { get; set; }
+        public bool NotificationTimerCountDown   { get; set; } = false;
+        public int NotificationDurationValue     { get; set; } = 25;
 
-        public string CustomCefArgs { get; set; }
+        public TweetNotification.Position NotificationPosition { get; set; } = TweetNotification.Position.TopRight;
-        public string CustomBrowserCSS { get; set; }
+        public Point CustomNotificationPosition                { get; set; } = ControlExtensions.InvisibleLocation;
-        public string CustomNotificationCSS { get; set; }
+        public int NotificationDisplay                         { get; set; } = 0;
+        public int NotificationEdgeDistance                    { get; set; } = 8;
+
+        public TweetNotification.Size NotificationSize { get; set; } = TweetNotification.Size.Auto;
+        public Size CustomNotificationSize             { get; set; } = Size.Empty;
+        public int NotificationScrollSpeed             { get; set; } = 10;
+
+        private string _notificationSoundPath;
+
+        public string CustomCefArgs         { get; set; } = null;
+        public string CustomBrowserCSS      { get; set; } = null;
+        public string CustomNotificationCSS { get; set; } = null;
+        
+        // SPECIAL PROPERTIES
 
         public bool IsCustomNotificationPositionSet => CustomNotificationPosition != ControlExtensions.InvisibleLocation;
+        public bool IsCustomNotificationSizeSet => CustomNotificationSize != Size.Empty;
+
+        public TwitterUtils.ImageQuality TwitterImageQuality => BestImageQuality ? TwitterUtils.ImageQuality.Orig : TwitterUtils.ImageQuality.Default;
 
         public string NotificationSoundPath{
-            get => string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
+            get => string.IsNullOrEmpty(_notificationSoundPath) ? string.Empty : _notificationSoundPath;
-            set => notificationSoundPath = value;
+            set => _notificationSoundPath = value;
         }
 
         public bool MuteNotifications{
-            get => muteNotifications;
+            get => _muteNotifications;
 
             set{
-                if (muteNotifications != value){
+                if (_muteNotifications != value){
-                    muteNotifications = value;
+                    _muteNotifications = value;
                     MuteToggled?.Invoke(this, new EventArgs());
                 }
             }
         }
 
         public int ZoomLevel{
-            get => zoomLevel;
+            get => _zoomLevel;
 
             set{
-                if (zoomLevel != value){
+                if (_zoomLevel != value){
-                    zoomLevel = value;
+                    _zoomLevel = value;
                     ZoomLevelChanged?.Invoke(this, new EventArgs());
                 }
             }
         }
 
-        public double ZoomMultiplier => zoomLevel/100.0;
+        public double ZoomMultiplier => _zoomLevel/100.0;
 
         public TrayIcon.Behavior TrayBehavior{
-            get => trayBehavior;
+            get => _trayBehavior;
 
             set{
-                if (trayBehavior != value){
+                if (_trayBehavior != value){
-                    trayBehavior = value;
+                    _trayBehavior = value;
                     TrayBehaviorChanged?.Invoke(this, new EventArgs());
                 }
             }
         }
 
-        // END OF CONFIGURATION
+        // EVENTS
         
-        [field:NonSerialized]
         public event EventHandler MuteToggled;
-        
-        [field:NonSerialized]
         public event EventHandler ZoomLevelChanged;
-        
-        [field:NonSerialized]
         public event EventHandler TrayBehaviorChanged;
 
-        [NonSerialized]
+        // END OF CONFIG
-        private string file;
+        
+        private readonly string file;
 
-        private int fileVersion;
+        public UserConfig(string file){ // TODO make private after removing UserConfigLegacy
-        private bool muteNotifications;
-        private int zoomLevel;
-        private string notificationSoundPath;
-        private TrayIcon.Behavior trayBehavior;
-
-        private UserConfig(string file){
             this.file = file;
-
-            BrowserWindow = new WindowState();
-            ZoomLevel = 100;
-            DisplayNotificationTimer = true;
-            NotificationNonIntrusiveMode = true;
-            NotificationPosition = TweetNotification.Position.TopRight;
-            CustomNotificationPosition = ControlExtensions.InvisibleLocation;
-            NotificationEdgeDistance = 8;
-            NotificationDurationValue = 25;
-            EnableUpdateCheck = true;
-            ExpandLinksOnHover = true;
-            SwitchAccountSelectors = true;
-            EnableTrayHighlight = true;
-            PluginsWindow = new WindowState();
-        }
-
-        private void UpgradeFile(){
-            if (fileVersion == CurrentFileVersion){
-                return;
-            }
-
-            // if outdated, cycle through all versions
-            if (fileVersion == 0){
-                DisplayNotificationTimer = true;
-                EnableUpdateCheck = true;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 1){
-                ExpandLinksOnHover = true;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 2){
-                BrowserWindow = new WindowState();
-                PluginsWindow = new WindowState();
-                ++fileVersion;
-            }
-
-            if (fileVersion == 3){
-                EnableTrayHighlight = true;
-                NotificationDurationValue = 25;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 4){
-                ++fileVersion;
-            }
-
-            if (fileVersion == 5){
-                ++fileVersion;
-            }
-
-            if (fileVersion == 6){
-                NotificationNonIntrusiveMode = true;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 7){
-                ZoomLevel = 100;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 8){
-                SwitchAccountSelectors = true;
-                ++fileVersion;
-            }
-
-            // update the version
-            fileVersion = CurrentFileVersion;
-            Save();
         }
 
         public bool Save(){
             try{
-                string directory = Path.GetDirectoryName(file);
+                WindowsUtils.CreateDirectoryForFile(file);
-                if (directory == null)return false;
-
-                Directory.CreateDirectory(directory);
 
                 if (File.Exists(file)){
                     string backupFile = GetBackupFile(file);
@@ -203,10 +166,7 @@ namespace TweetDuck.Configuration{
                     File.Move(file, backupFile);
                 }
 
-                using(Stream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None)){
+                Serializer.Write(file, this);
-                    Formatter.Serialize(stream, this);
-                }
-
                 return true;
             }catch(Exception e){
                 Program.Reporter.HandleException("Configuration Error", "Could not save the configuration file.", true, e);
@@ -215,38 +175,36 @@ namespace TweetDuck.Configuration{
         }
         
         public static UserConfig Load(string file){
-            UserConfig config = null;
             Exception firstException = null;
 
             for(int attempt = 0; attempt < 2; attempt++){
                 try{
-                    using(Stream stream = new FileStream(attempt == 0 ? file : GetBackupFile(file), FileMode.Open, FileAccess.Read, FileShare.Read)){
+                    UserConfig config = new UserConfig(file);
-                        if ((config = Formatter.Deserialize(stream) as UserConfig) != null){
+                    Serializer.Read(attempt == 0 ? file : GetBackupFile(file), config);
-                            config.file = file;
+                    return config;
-                        }
-                    }
-
-                    config?.UpgradeFile();
-                    break;
                 }catch(FileNotFoundException){
                 }catch(DirectoryNotFoundException){
                     break;
+                }catch(FormatException){
+                    UserConfig config = UserConfigLegacy.Load(file);
+                    config.Save();
+                    return config;
                 }catch(Exception e){
                     if (attempt == 0){
                         firstException = e;
                         Program.Reporter.Log(e.ToString());
                     }
                     else if (firstException != null){
-                        Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, you may lose your settings and list of enabled plugins.", true, e);
+                        Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, your program options will be reset.", true, e);
                     }
                 }
             }
 
-            if (firstException != null && config == null){
+            if (firstException != null){
                 Program.Reporter.HandleException("Configuration Error", "Could not open the configuration file.", true, firstException);
             }
 
-            return config ?? new UserConfig(file);
+            return new UserConfig(file);
         }
 
         public static string GetBackupFile(string file){

Configuration/UserConfigLegacy.cs

@@ -0,0 +1,210 @@
+using System;
+using System.Drawing;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using TweetDuck.Core;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Notification;
+using TweetDuck.Data;
+
+namespace TweetDuck.Configuration{
+    [Serializable]
+    sealed class UserConfigLegacy{ // TODO remove eventually
+        private static readonly IFormatter Formatter = new BinaryFormatter{ Binder = new LegacyBinder() };
+
+        private class LegacyBinder : SerializationBinder{
+            public override Type BindToType(string assemblyName, string typeName){
+                return Type.GetType(string.Format("{0}, {1}", typeName.Replace("TweetDck", "TweetDuck").Replace(".UserConfig", ".UserConfigLegacy").Replace("Core.Utils.WindowState", "Data.WindowState"), assemblyName.Replace("TweetDck", "TweetDuck")));
+            }
+        }
+        
+        private const int CurrentFileVersion = 11;
+
+        // START OF CONFIGURATION
+
+        public WindowState BrowserWindow { get; set; }
+        public WindowState PluginsWindow { get; set; }
+
+        public bool DisplayNotificationColumn { get; set; }
+        public bool DisplayNotificationTimer { get; set; }
+        public bool NotificationTimerCountDown { get; set; }
+        public bool NotificationSkipOnLinkClick { get; set; }
+        public bool NotificationNonIntrusiveMode { get; set; }
+
+        public int NotificationIdlePauseSeconds { get; set; }
+        public int NotificationDurationValue { get; set; }
+        public int NotificationScrollSpeed { get; set; }
+
+        public TweetNotification.Position NotificationPosition { get; set; }
+        public Point CustomNotificationPosition { get; set; }
+        public int NotificationEdgeDistance { get; set; }
+        public int NotificationDisplay { get; set; }
+
+        public TweetNotification.Size NotificationSize { get; set; }
+        public Size CustomNotificationSize { get; set; }
+
+        public bool EnableSpellCheck { get; set; }
+        public bool ExpandLinksOnHover { get; set; }
+        public bool SwitchAccountSelectors { get; set; }
+        public bool EnableTrayHighlight { get; set; }
+
+        public bool EnableUpdateCheck { get; set; }
+        public string DismissedUpdate { get; set; }
+
+        public string CustomCefArgs { get; set; }
+        public string CustomBrowserCSS { get; set; }
+        public string CustomNotificationCSS { get; set; }
+        
+        public string NotificationSoundPath{
+            get => string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
+            set => notificationSoundPath = value;
+        }
+
+        public bool MuteNotifications{
+            get => muteNotifications;
+            set => muteNotifications = value;
+        }
+
+        public int ZoomLevel{
+            get => zoomLevel;
+            set => zoomLevel = value;
+        }
+
+        public TrayIcon.Behavior TrayBehavior{
+            get => trayBehavior;
+            set => trayBehavior = value;
+        }
+
+        // END OF CONFIGURATION
+        
+        [NonSerialized]
+        private string file;
+
+        private int fileVersion;
+        private bool muteNotifications;
+        private int zoomLevel;
+        private string notificationSoundPath;
+        private TrayIcon.Behavior trayBehavior;
+
+        private UserConfigLegacy(string file){
+            this.file = file;
+
+            BrowserWindow = new WindowState();
+            ZoomLevel = 100;
+            DisplayNotificationTimer = true;
+            NotificationNonIntrusiveMode = true;
+            NotificationPosition = TweetNotification.Position.TopRight;
+            CustomNotificationPosition = ControlExtensions.InvisibleLocation;
+            NotificationSize = TweetNotification.Size.Auto;
+            NotificationEdgeDistance = 8;
+            NotificationDurationValue = 25;
+            NotificationScrollSpeed = 100;
+            EnableUpdateCheck = true;
+            ExpandLinksOnHover = true;
+            SwitchAccountSelectors = true;
+            EnableTrayHighlight = true;
+            PluginsWindow = new WindowState();
+        }
+
+        private void UpgradeFile(){
+            if (fileVersion == CurrentFileVersion){
+                return;
+            }
+
+            // if outdated, cycle through all versions
+            if (fileVersion <= 5){
+                DisplayNotificationTimer = true;
+                EnableUpdateCheck = true;
+                ExpandLinksOnHover = true;
+                BrowserWindow = new WindowState();
+                PluginsWindow = new WindowState();
+                EnableTrayHighlight = true;
+                NotificationDurationValue = 25;
+                fileVersion = 6;
+            }
+
+            if (fileVersion == 6){
+                NotificationNonIntrusiveMode = true;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 7){
+                ZoomLevel = 100;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 8){
+                SwitchAccountSelectors = true;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 9){
+                NotificationScrollSpeed = 100;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 10){
+                NotificationSize = TweetNotification.Size.Auto;
+                ++fileVersion;
+            }
+
+            // update the version
+            fileVersion = CurrentFileVersion;
+        }
+
+        public UserConfig ConvertLegacy(){
+            return new UserConfig(file){
+                BrowserWindow = BrowserWindow,
+                PluginsWindow = PluginsWindow,
+                DisplayNotificationColumn = DisplayNotificationColumn,
+                DisplayNotificationTimer = DisplayNotificationTimer,
+                NotificationTimerCountDown = NotificationTimerCountDown,
+                NotificationSkipOnLinkClick = NotificationSkipOnLinkClick,
+                NotificationNonIntrusiveMode = NotificationNonIntrusiveMode,
+                NotificationIdlePauseSeconds = NotificationIdlePauseSeconds,
+                NotificationDurationValue = NotificationDurationValue,
+                NotificationScrollSpeed = NotificationScrollSpeed,
+                NotificationPosition = NotificationPosition,
+                CustomNotificationPosition = CustomNotificationPosition,
+                NotificationEdgeDistance = NotificationEdgeDistance,
+                NotificationDisplay = NotificationDisplay,
+                NotificationSize = NotificationSize,
+                CustomNotificationSize = CustomNotificationSize,
+                EnableSpellCheck = EnableSpellCheck,
+                ExpandLinksOnHover = ExpandLinksOnHover,
+                SwitchAccountSelectors = SwitchAccountSelectors,
+                EnableTrayHighlight = EnableTrayHighlight,
+                EnableUpdateCheck = EnableUpdateCheck,
+                DismissedUpdate = DismissedUpdate,
+                CustomCefArgs = CustomCefArgs,
+                CustomBrowserCSS = CustomBrowserCSS,
+                CustomNotificationCSS = CustomNotificationCSS,
+                NotificationSoundPath = NotificationSoundPath,
+                MuteNotifications = MuteNotifications,
+                ZoomLevel = ZoomLevel,
+                TrayBehavior = TrayBehavior
+            };
+        }
+        
+        public static UserConfig Load(string file){
+            UserConfigLegacy config = null;
+            
+            try{
+                using(Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)){
+                    if ((config = Formatter.Deserialize(stream) as UserConfigLegacy) != null){
+                        config.file = file;
+                    }
+                }
+
+                config?.UpgradeFile();
+            }catch(FileNotFoundException){
+            }catch(DirectoryNotFoundException){
+            }catch(Exception e){
+                Program.Reporter.HandleException("Configuration Error", "Could not open the configuration file.", true, e);
+            }
+
+            return (config ?? new UserConfigLegacy(file)).ConvertLegacy();
+        }
+    }
+}

Core/Bridge/PropertyBridge.cs

@@ -1,45 +1,32 @@
-using System;
+using System.Text;
-using System.Text;
 
 namespace TweetDuck.Core.Bridge{
     static class PropertyBridge{
-        [Flags]
+        public enum Environment{
-        public enum Properties{
+            Browser, Notification
-            ExpandLinksOnHover = 1,
-            MuteNotifications = 2,
-            HasCustomNotificationSound = 4,
-            SkipOnLinkClick = 8,
-            SwitchAccountSelectors = 16,
-            AllBrowser = ExpandLinksOnHover | SwitchAccountSelectors | MuteNotifications | HasCustomNotificationSound,
-            AllNotification = ExpandLinksOnHover | SkipOnLinkClick
         }
 
-        public static string GenerateScript(Properties properties){
+        public static string GenerateScript(Environment environment){
-            StringBuilder build = new StringBuilder();
+            string Bool(bool value){
-            build.Append("(function(c){");
+                return value ? "true;" : "false;";
-
-            if (properties.HasFlag(Properties.ExpandLinksOnHover)){
-                build.Append("c.expandLinksOnHover=").Append(Program.UserConfig.ExpandLinksOnHover ? "true;" : "false;");
             }
 
-            if (properties.HasFlag(Properties.SwitchAccountSelectors)){
+            StringBuilder build = new StringBuilder().Append("(function(x){");
-                build.Append("c.switchAccountSelectors=").Append(Program.UserConfig.SwitchAccountSelectors ? "true;" : "false;");
+
+            build.Append("x.expandLinksOnHover=").Append(Bool(Program.UserConfig.ExpandLinksOnHover));
+            
+            if (environment == Environment.Browser){
+                build.Append("x.switchAccountSelectors=").Append(Bool(Program.UserConfig.SwitchAccountSelectors));
+                build.Append("x.muteNotifications=").Append(Bool(Program.UserConfig.MuteNotifications));
+                build.Append("x.hasCustomNotificationSound=").Append(Bool(Program.UserConfig.NotificationSoundPath.Length > 0));
+                build.Append("x.notificationMediaPreviews=").Append(Bool(Program.UserConfig.NotificationMediaPreviews));
             }
 
-            if (properties.HasFlag(Properties.MuteNotifications)){
+            if (environment == Environment.Notification){
-                build.Append("c.muteNotifications=").Append(Program.UserConfig.MuteNotifications ? "true;" : "false;");
+                build.Append("x.skipOnLinkClick=").Append(Bool(Program.UserConfig.NotificationSkipOnLinkClick));
             }
-
+            
-            if (properties.HasFlag(Properties.HasCustomNotificationSound)){
+            return build.Append("})(window.$TDX=window.$TDX||{})").ToString();
-                build.Append("c.hasCustomNotificationSound=").Append(Program.UserConfig.NotificationSoundPath.Length > 0 ? "true;" : "false;");
-            }
-
-            if (properties.HasFlag(Properties.SkipOnLinkClick)){
-                build.Append("c.skipOnLinkClick=").Append(Program.UserConfig.NotificationSkipOnLinkClick ? "true;" : "false;");
-            }
-
-            build.Append("})(window.$TDX=window.$TDX||{})");
-            return build.ToString();
         }
     }
 }

Core/Bridge/TweetDeckBridge.cs

@@ -1,16 +1,39 @@
-using System.Windows.Forms;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
+using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
+using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Bridge{
     sealed class TweetDeckBridge{
         public static string LastRightClickedLink = string.Empty;
+        public static string LastRightClickedImage = string.Empty;
         public static string LastHighlightedTweet = string.Empty;
         public static string LastHighlightedQuotedTweet = string.Empty;
+        public static string LastHighlightedTweetAuthor = string.Empty;
+        public static string[] LastHighlightedTweetImages = StringUtils.EmptyArray;
+        public static Dictionary<string, string> SessionData = new Dictionary<string, string>(2);
 
         public static void ResetStaticProperties(){
-            LastRightClickedLink = LastHighlightedTweet = LastHighlightedQuotedTweet = string.Empty;
+            LastRightClickedLink = LastRightClickedImage = LastHighlightedTweet = LastHighlightedQuotedTweet = LastHighlightedTweetAuthor = string.Empty;
+            LastHighlightedTweetImages = StringUtils.EmptyArray;
+        }
+
+        public static void RestoreSessionData(IFrame frame){
+            if (SessionData.Count > 0){
+                StringBuilder build = new StringBuilder().Append("window.TD_SESSION={");
+                
+                foreach(KeyValuePair<string, string> kvp in SessionData){
+                    build.Append(kvp.Key).Append(":'").Append(kvp.Value.Replace("'", "\\'")).Append("',");
+                }
+
+                ScriptLoader.ExecuteScript(frame, build.Append("}").ToString(), "gen:session");
+                SessionData.Clear();
+            }
         }
 
         private readonly FormBrowser form;
@@ -37,10 +60,16 @@ namespace TweetDuck.Core.Bridge{
             form.InvokeAsyncSafe(() => LastRightClickedLink = link);
         }
 
-        public void SetLastHighlightedTweet(string link, string quotedLink){
+        public void SetLastRightClickedImage(string link){
+            form.InvokeAsyncSafe(() => LastRightClickedImage = link);
+        }
+
+        public void SetLastHighlightedTweet(string link, string quotedLink, string author, string imageList){
             form.InvokeAsyncSafe(() => {
                 LastHighlightedTweet = link;
                 LastHighlightedQuotedTweet = quotedLink;
+                LastHighlightedTweetAuthor = author;
+                LastHighlightedTweetImages = imageList.Split(';');
             });
         }
 
@@ -71,6 +100,12 @@ namespace TweetDuck.Core.Bridge{
             }
         }
 
+        public void SetSessionData(string key, string value){
+            form.InvokeSafe(() => { // do not use InvokeAsyncSafe, return only after invocation
+                SessionData.Add(key, value);
+            });
+        }
+
         public void LoadNextNotification(){
             notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
         }
@@ -101,7 +136,7 @@ namespace TweetDuck.Core.Bridge{
                 default: icon = MessageBoxIcon.None; break;
             }
 
-            MessageBox.Show(contents, Program.BrandName+" Browser Message", MessageBoxButtons.OK, icon);
+            FormMessage.Show("TweetDuck Browser Message", contents, icon, FormMessage.OK);
         }
 
         public void CrashDebug(string message){

Core/Controls/ControlExtensions.cs

@@ -21,6 +21,12 @@ namespace TweetDuck.Core.Controls{
             control.BeginInvoke(func);
         }
 
+        public static float GetDPIScale(this Control control){
+            using(Graphics graphics = control.CreateGraphics()){
+                return graphics.DpiY/96F;
+            }
+        }
+
         public static bool IsFullyOutsideView(this Form form){
             return !Screen.AllScreens.Any(screen => screen.WorkingArea.IntersectsWith(form.Bounds));
         }
@@ -41,16 +47,30 @@ namespace TweetDuck.Core.Controls{
             }
         }
 
+        public static void SetValueSafe(this NumericUpDown numUpDown, int value){
+            if (value >= numUpDown.Minimum && value <= numUpDown.Maximum){
+                numUpDown.Value = value;
+            }
+        }
+
         public static void SetValueSafe(this TrackBar trackBar, int value){
             if (value >= trackBar.Minimum && value <= trackBar.Maximum){
                 trackBar.Value = value;
             }
         }
 
+        public static bool AlignValueToTick(this TrackBar trackBar){
+            if (trackBar.Value % trackBar.SmallChange != 0){
+                trackBar.Value = trackBar.SmallChange*(int)Math.Floor(((double)trackBar.Value/trackBar.SmallChange)+0.5);
+                return false;
+            }
+            else return true;
+        }
+
         public static void SetElevated(this Button button){
             button.Text = " "+button.Text;
             button.FlatStyle = FlatStyle.System;
-            NativeMethods.SendMessage(button.Handle, NativeMethods.BCM_SETSHIELD, 0, new IntPtr(1));
+            NativeMethods.SendMessage(button.Handle, NativeMethods.BCM_SETSHIELD, new UIntPtr(0), new IntPtr(1));
         }
 
         public static void EnableMultilineShortcuts(this TextBox textBox){

Core/Controls/LabelVertical.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace TweetDuck.Core.Controls{
+    sealed class LabelVertical : Label{
+        public int LineHeight { get; set; }
+
+        protected override void OnPaint(PaintEventArgs e){
+            int y = (int)Math.Floor((ClientRectangle.Height-Text.Length*LineHeight)/2F)-2; // 2 = random
+
+            using(Brush brush = new SolidBrush(ForeColor)){
+                foreach(char chr in Text){
+                    string str = chr.ToString();
+                    float x = (ClientRectangle.Width-e.Graphics.MeasureString(str, Font).Width)/2F;
+
+                    e.Graphics.DrawString(str, Font, brush, x, y);
+                    y += LineHeight;
+                }
+            }
+        }
+    }
+}

Core/Controls/NumericUpDownEx.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace TweetDuck.Core.Controls{
+    sealed class NumericUpDownEx : NumericUpDown{
+        public string TextSuffix { get; set ; }
+
+        protected override void UpdateEditText(){
+            base.UpdateEditText();
+
+            if (LicenseManager.UsageMode != LicenseUsageMode.Designtime){
+                ChangingText = true;
+                Text += TextSuffix;
+                ChangingText = false;
+            }
+        }
+    }
+}

Core/Controls/TabButton.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace TweetDuck.Core.Controls{
-    sealed class TabButton : FlatButton{
-        public Action Callback { get; private set; }
-
-        public void SetupButton(int locationX, int sizeWidth, string title, Action callback){
-            Callback = callback;
-
-            SuspendLayout();
-            FlatAppearance.BorderColor = Color.DimGray;
-            FlatAppearance.MouseDownBackColor = Color.White;
-            FlatAppearance.MouseOverBackColor = Color.White;
-            FlatStyle = FlatStyle.Flat;
-            Location = new Point(locationX, 0);
-            Margin = new Padding(0);
-            Size = new Size(sizeWidth, 30);
-            Text = title;
-            UseVisualStyleBackColor = true;
-            ResumeLayout(true);
-        }
-    }
-}

Core/Controls/TabPanel.Designer.cs

@@ -1,68 +0,0 @@
-namespace TweetDuck.Core.Controls {
-    partial class TabPanel {
-        /// <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.panelButtons = new System.Windows.Forms.Panel();
-            this.panelContent = new System.Windows.Forms.Panel();
-            this.SuspendLayout();
-            // 
-            // panelButtons
-            // 
-            this.panelButtons.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panelButtons.Location = new System.Drawing.Point(0, 0);
-            this.panelButtons.Margin = new System.Windows.Forms.Padding(0);
-            this.panelButtons.Name = "panelButtons";
-            this.panelButtons.Size = new System.Drawing.Size(640, 30);
-            this.panelButtons.TabIndex = 0;
-            // 
-            // panelContent
-            // 
-            this.panelContent.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.panelContent.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panelContent.Location = new System.Drawing.Point(0, 29);
-            this.panelContent.Margin = new System.Windows.Forms.Padding(0);
-            this.panelContent.Name = "panelContent";
-            this.panelContent.Size = new System.Drawing.Size(640, 451);
-            this.panelContent.TabIndex = 1;
-            // 
-            // TabPanel
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.panelContent);
-            this.Controls.Add(this.panelButtons);
-            this.Name = "TabPanel";
-            this.Size = new System.Drawing.Size(640, 480);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panelButtons;
-        private System.Windows.Forms.Panel panelContent;
-    }
-}

Core/Controls/TabPanel.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace TweetDuck.Core.Controls{
-    sealed partial class TabPanel : UserControl{
-        public Panel Content => panelContent;
-        public IEnumerable<TabButton> Buttons => panelButtons.Controls.Cast<TabButton>();
-
-        public TabButton ActiveButton { get; private set; }
-
-        private int btnWidth;
-
-        public TabPanel(){
-            InitializeComponent();
-        }
-
-        public void SetupTabPanel(int buttonWidth){
-            this.btnWidth = buttonWidth;
-        }
-
-        public TabButton AddButton(string title, Action callback){
-            TabButton button = new TabButton();
-            button.SetupButton((btnWidth-1)*panelButtons.Controls.Count, btnWidth, title, callback);
-            button.Click += (sender, args) => SelectTab((TabButton)sender);
-
-            panelButtons.Controls.Add(button);
-            return button;
-        }
-
-        public void SelectTab(TabButton button){
-            if (ActiveButton != null){
-                ActiveButton.BackColor = SystemColors.Control;
-            }
-
-            button.BackColor = Color.White;
-            button.Callback();
-
-            ActiveButton = button;
-        }
-
-        public void ReplaceContent(Control newControl){
-            newControl.Dock = DockStyle.Fill;
-            Content.SuspendLayout();
-            Content.Controls.Clear();
-            Content.Controls.Add(newControl);
-            Content.ResumeLayout(true);
-        }
-    }
-}

Core/FormBrowser.Designer.cs

@@ -26,13 +26,19 @@
             this.components = new System.ComponentModel.Container();
             this.trayIcon = new TweetDuck.Core.TrayIcon(this.components);
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.timerResize = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
+            // timerResize
+            // 
+            this.timerResize.Interval = 500;
+            this.timerResize.Tick += new System.EventHandler(this.timerResize_Tick);
+            // 
             // FormBrowser
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = TweetDuck.Core.Utils.BrowserUtils.BackgroundColor;
+            this.BackColor = TweetDuck.Core.Utils.TwitterUtils.BackgroundColor;
             this.ClientSize = new System.Drawing.Size(324, 386);
             this.Icon = Properties.Resources.icon;
             this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
@@ -42,6 +48,7 @@
             this.Activated += new System.EventHandler(this.FormBrowser_Activated);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormBrowser_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormBrowser_FormClosed);
+            this.LocationChanged += new System.EventHandler(this.FormBrowser_LocationChanged);
             this.ResizeEnd += new System.EventHandler(this.FormBrowser_ResizeEnd);
             this.Resize += new System.EventHandler(this.FormBrowser_Resize);
             this.ResumeLayout(false);
@@ -52,6 +59,7 @@
 
         private TrayIcon trayIcon;
         private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.Timer timerResize;
     }
 }
 

Core/FormBrowser.cs

@@ -1,7 +1,6 @@
 using CefSharp;
 using CefSharp.WinForms;
 using System;
-using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -9,10 +8,11 @@ using TweetDuck.Configuration;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
+using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Notification.Screenshot;
-using TweetDuck.Core.Notification.Sound;
 using TweetDuck.Core.Other;
+using TweetDuck.Core.Other.Settings;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Enums;
@@ -20,11 +20,29 @@ using TweetDuck.Plugins.Events;
 using TweetDuck.Resources;
 using TweetDuck.Updates;
 using TweetDuck.Updates.Events;
+using TweetLib.Audio;
 
 namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form{
         private static UserConfig Config => Program.UserConfig;
 
+        public bool IsWaiting{
+            set{
+                if (value){
+                    browser.Enabled = false;
+                    Cursor = Cursors.WaitCursor;
+                }
+                else{
+                    browser.Enabled = true;
+                    Cursor = Cursors.Default;
+
+                    if (Focused){ // re-focus browser only if the window or a child is activated
+                        browser.Focus();
+                    }
+                }
+            }
+        }
+
         public string UpdateInstallerPath { get; private set; }
 
         private readonly ChromiumWebBrowser browser;
@@ -32,13 +50,14 @@ namespace TweetDuck.Core{
         private readonly UpdateHandler updates;
         private readonly FormNotificationTweet notification;
         private readonly ContextMenu contextMenu;
+        private readonly MemoryUsageTracker memoryUsageTracker;
 
         private bool isLoaded;
         private bool isBrowserReady;
         private FormWindowState prevState;
 
         private TweetScreenshotManager notificationScreenshotManager;
-        private ISoundNotificationPlayer soundNotification;
+        private SoundNotification soundNotification;
 
         public FormBrowser(PluginManager pluginManager, UpdaterSettings updaterSettings){
             InitializeComponent();
@@ -50,6 +69,7 @@ namespace TweetDuck.Core{
             this.plugins.PluginChangedState += plugins_PluginChangedState;
 
             this.contextMenu = ContextMenuBrowser.CreateMenu(this);
+            this.memoryUsageTracker = new MemoryUsageTracker("TDGF_tryRunCleanup");
 
             this.notification = new FormNotificationTweet(this, plugins){
                 #if DEBUG
@@ -79,7 +99,7 @@ namespace TweetDuck.Core{
             this.browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(this, notification));
             this.browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
             
-            browser.BrowserSettings.BackgroundColor = (uint)BrowserUtils.BackgroundColor.ToArgb();
+            browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
             Controls.Add(browser);
@@ -87,6 +107,8 @@ namespace TweetDuck.Core{
             Controls.Add(new MenuStrip{ Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
 
             Disposed += (sender, args) => {
+                memoryUsageTracker.Dispose();
+
                 browser.Dispose();
                 contextMenu.Dispose();
 
@@ -103,7 +125,7 @@ namespace TweetDuck.Core{
             Config.MuteToggled += Config_MuteToggled;
             Config.ZoomLevelChanged += Config_ZoomLevelChanged;
 
-            this.updates = new UpdateHandler(browser, this, updaterSettings);
+            this.updates = new UpdateHandler(browser, updaterSettings);
             this.updates.UpdateAccepted += updates_UpdateAccepted;
             this.updates.UpdateDismissed += updates_UpdateDismissed;
 
@@ -154,7 +176,7 @@ namespace TweetDuck.Core{
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
             if (!e.IsLoading){
-                foreach(string word in BrowserUtils.DictionaryWords){
+                foreach(string word in TwitterUtils.DictionaryWords){
                     browser.AddWordToDictionary(word);
                 }
 
@@ -165,21 +187,24 @@ namespace TweetDuck.Core{
 
         private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
             if (e.Frame.IsMain){
+                memoryUsageTracker.Stop();
+
                 if (Config.ZoomLevel != 100){
                     BrowserUtils.SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
                 }
 
-                if (BrowserUtils.IsTwitterWebsite(e.Frame)){
+                if (TwitterUtils.IsTwitterWebsite(e.Frame)){
                     ScriptLoader.ExecuteFile(e.Frame, "twitter.js");
                 }
             }
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
+            if (e.Frame.IsMain && TwitterUtils.IsTweetDeckWebsite(e.Frame)){
-                e.Frame.ExecuteJavaScriptAsync(BrowserUtils.BackgroundColorFix);
+                e.Frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorFix);
 
-                UpdateProperties(PropertyBridge.Properties.AllBrowser);
+                UpdateProperties(PropertyBridge.Environment.Browser);
+                TweetDeckBridge.RestoreSessionData(e.Frame);
                 ScriptLoader.ExecuteFile(e.Frame, "code.js");
                 ReinjectCustomCSS(Config.CustomBrowserCSS);
 
@@ -190,6 +215,10 @@ namespace TweetDuck.Core{
                 }
 
                 TweetDeckBridge.ResetStaticProperties();
+
+                if (Program.SystemConfig.EnableBrowserGCReload){
+                    memoryUsageTracker.Start(this, e.Browser, Program.SystemConfig.BrowserMemoryThreshold);
+                }
             }
         }
 
@@ -198,7 +227,7 @@ namespace TweetDuck.Core{
                 return;
             }
 
-            if (!e.FailedUrl.StartsWith("http://td/")){
+            if (!e.FailedUrl.StartsWith("http://td/", StringComparison.Ordinal)){
                 string errorPage = ScriptLoader.LoadResource("pages/error.html", true);
 
                 if (errorPage != null){
@@ -207,10 +236,25 @@ namespace TweetDuck.Core{
             }
         }
 
+        private void timerResize_Tick(object sender, EventArgs e){
+            FormBrowser_ResizeEnd(this, e); // also stops timer
+        }
+
         private void FormBrowser_Activated(object sender, EventArgs e){
             if (!isLoaded)return;
 
             trayIcon.HasNotifications = false;
+
+            if (!browser.Enabled){      // when taking a screenshot, the window is unfocused and
+                browser.Enabled = true; // the browser is disabled; if the user clicks back into
+            }                           // the window, enable the browser again
+        }
+
+        private void FormBrowser_LocationChanged(object sender, EventArgs e){
+            if (!isLoaded)return;
+            
+            timerResize.Stop();
+            timerResize.Start();
         }
 
         private void FormBrowser_Resize(object sender, EventArgs e){
@@ -228,11 +272,17 @@ namespace TweetDuck.Core{
                     FormBrowser_ResizeEnd(sender, e);
                 }
             }
+            else{
+                timerResize.Stop();
+                timerResize.Start();
+            }
         }
 
         private void FormBrowser_ResizeEnd(object sender, EventArgs e){ // also triggers when the window moves
             if (!isLoaded)return;
 
+            timerResize.Stop();
+            
             if (Location != ControlExtensions.InvisibleLocation){
                 Config.BrowserWindow.Save(this);
                 Config.Save();
@@ -255,7 +305,7 @@ namespace TweetDuck.Core{
         }
 
         private void Config_MuteToggled(object sender, EventArgs e){
-            UpdateProperties(PropertyBridge.Properties.MuteNotifications);
+            UpdateProperties(PropertyBridge.Environment.Browser);
         }
 
         private void Config_ZoomLevelChanged(object sender, EventArgs e){
@@ -278,7 +328,7 @@ namespace TweetDuck.Core{
         }
         
         private void plugins_Reloaded(object sender, PluginErrorEventArgs e){
-            browser.GetBrowser().Reload();
+            ReloadToTweetDeck();
         }
 
         private void plugins_PluginChangedState(object sender, PluginChangedStateEventArgs e){
@@ -286,53 +336,66 @@ namespace TweetDuck.Core{
         }
 
         private void updates_UpdateAccepted(object sender, UpdateAcceptedEventArgs e){
-            foreach(Form form in Application.OpenForms.Cast<Form>().Reverse()){
+            this.InvokeAsyncSafe(() => {
-                if (form is FormSettings || form is FormPlugins || form is FormAbout){
+                foreach(Form form in Application.OpenForms.Cast<Form>().Reverse()){
-                    form.Close();
+                    if (form is FormSettings || form is FormPlugins || form is FormAbout){
+                        form.Close();
+                    }
                 }
-            }
             
-            updates.BeginUpdateDownload(this, e.UpdateInfo, update => {
+                updates.BeginUpdateDownload(this, e.UpdateInfo, update => {
-                if (update.DownloadStatus == UpdateDownloadStatus.Done){
+                    if (update.DownloadStatus == UpdateDownloadStatus.Done){
-                    UpdateInstallerPath = update.InstallerPath;
+                        UpdateInstallerPath = update.InstallerPath;
-                }
+                    }
 
-                ForceClose();
+                    ForceClose();
+                });
             });
         }
 
         private void updates_UpdateDismissed(object sender, UpdateDismissedEventArgs e){
-            Config.DismissedUpdate = e.VersionTag;
+            this.InvokeAsyncSafe(() => {
-            Config.Save();
+                Config.DismissedUpdate = e.VersionTag;
+                Config.Save();
+            });
         }
 
         private void soundNotification_PlaybackError(object sender, PlaybackErrorEventArgs e){
             e.Ignore = true;
 
-            using(FormMessage form = new FormMessage("Notification Sound Error", "Could not play custom notification sound."+Environment.NewLine+e.Message, MessageBoxIcon.Error)){
+            using(FormMessage form = new FormMessage("Notification Sound Error", "Could not play custom notification sound.\n"+e.Message, MessageBoxIcon.Error)){
-                form.CancelButton = form.AddButton("Ignore");
+                form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
 
-                Button btnOpenSettings = form.AddButton("Open Settings");
+                Button btnOpenSettings = form.AddButton("View Options");
                 btnOpenSettings.Width += 16;
                 btnOpenSettings.Location = new Point(btnOpenSettings.Location.X-16, btnOpenSettings.Location.Y);
 
                 if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnOpenSettings){
-                    OpenSettings(FormSettings.TabIndexNotification);
+                    OpenSettings(typeof(TabSettingsSounds));
                 }
             }
         }
 
         protected override void WndProc(ref Message m){
-            if (isLoaded && m.Msg == Program.WindowRestoreMessage){
+            if (isLoaded){
-                using(Process process = Process.GetCurrentProcess()){
+                if (m.Msg == Program.WindowRestoreMessage){
-                    if (process.Id == m.WParam.ToInt32()){
+                    if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
                         trayIcon_ClickRestore(trayIcon, new EventArgs());
                     }
+
+                    return;
                 }
+                else if (m.Msg == Program.SubProcessMessage){
+                    int processId = m.WParam.ToInt32();
 
-                return;
+                    if (WindowsUtils.IsChildProcess(processId)){ // child process is checked in two places for safety
+                        BrowserProcesses.Link(m.LParam.ToInt32(), processId);
+                    }
+
+                    return;
+                }
             }
-
+            
             if (isBrowserReady && m.Msg == NativeMethods.WM_PARENTNOTIFY && (m.WParam.ToInt32() & 0xFFFF) == NativeMethods.WM_XBUTTONDOWN){
                 browser.ExecuteScriptAsync("TDGF_onMouseClickExtra", (m.WParam.ToInt32() >> 16) & 0xFFFF);
                 return;
@@ -361,12 +424,12 @@ namespace TweetDuck.Core{
             browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
         }
 
-        public void UpdateProperties(PropertyBridge.Properties properties){
+        public void UpdateProperties(PropertyBridge.Environment environment){
-            browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(properties));
+            browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(environment));
         }
 
         public void ReloadToTweetDeck(){
-            browser.ExecuteScriptAsync("window.location.href = 'https://tweetdeck.twitter.com'");
+            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUtils.TweetDeckURL}'");
         }
 
         // callback handlers
@@ -376,14 +439,14 @@ namespace TweetDuck.Core{
         }
 
         public void OpenSettings(){
-            OpenSettings(0);
+            OpenSettings(null);
         }
 
-        public void OpenSettings(int tabIndex){
+        public void OpenSettings(Type startTab){
             if (!TryBringToFront<FormSettings>()){
                 bool prevEnableUpdateCheck = Config.EnableUpdateCheck;
 
-                FormSettings form = new FormSettings(this, plugins, updates, tabIndex);
+                FormSettings form = new FormSettings(this, plugins, updates, startTab);
 
                 form.FormClosed += (sender, args) => {
                     if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){
@@ -395,7 +458,16 @@ namespace TweetDuck.Core{
                         trayIcon.HasNotifications = false;
                     }
 
-                    UpdateProperties(PropertyBridge.Properties.ExpandLinksOnHover | PropertyBridge.Properties.SwitchAccountSelectors | PropertyBridge.Properties.HasCustomNotificationSound);
+                    if (Program.SystemConfig.EnableBrowserGCReload){
+                        memoryUsageTracker.Start(this, browser.GetBrowser(), Program.SystemConfig.BrowserMemoryThreshold);
+                    }
+                    else{
+                        memoryUsageTracker.Stop();
+                    }
+                    
+                    UpdateProperties(PropertyBridge.Environment.Browser);
+
+                    notification.RequiresResize = true;
                     form.Dispose();
                 };
 
@@ -427,7 +499,7 @@ namespace TweetDuck.Core{
             }
 
             if (soundNotification == null){
-                soundNotification = SoundNotification.New();
+                soundNotification = new SoundNotification();
                 soundNotification.PlaybackError += soundNotification_PlaybackError;
             }
 
@@ -436,7 +508,7 @@ namespace TweetDuck.Core{
 
         public void OnTweetScreenshotReady(string html, int width, int height){
             if (notificationScreenshotManager == null){
-                notificationScreenshotManager = new TweetScreenshotManager(this);
+                notificationScreenshotManager = new TweetScreenshotManager(this, plugins);
             }
 
             notificationScreenshotManager.Trigger(html, width, height);

Core/FormBrowser.resx

@@ -117,11 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <metadata name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-  <data name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing">
     <value>17, 17</value>
-  </data>
+  </metadata>
-  <data name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing">
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>112, 17</value>
-  </data>
+  </metadata>
+  <metadata name="timerResize.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>202, 17</value>
+  </metadata>
 </root>

Core/Handling/ContextMenuBase.cs

@@ -1,34 +1,56 @@
-using CefSharp;
+using System;
-using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
-        private static readonly Lazy<Regex> RegexTwitterAccount = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/([^/]+)/?$", RegexOptions.Compiled), false);
         protected static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
 
+        private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality;
+
+        private static string GetLink(IContextMenuParams parameters){
+            return string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedLink) ? parameters.UnfilteredLinkUrl : TweetDeckBridge.LastRightClickedLink;
+        }
+
+        private static string GetImage(IContextMenuParams parameters){
+            return string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedImage) ? parameters.SourceUrl : TweetDeckBridge.LastRightClickedImage;
+        }
+
         private const int MenuOpenLinkUrl = 26500;
         private const int MenuCopyLinkUrl = 26501;
         private const int MenuCopyUsername = 26502;
-        private const int MenuOpenImage = 26503;
+        private const int MenuOpenImageUrl = 26503;
-        private const int MenuSaveImage = 26504;
+        private const int MenuCopyImageUrl = 26504;
-        private const int MenuCopyImageUrl = 26505;
+        private const int MenuSaveImage = 26505;
+        private const int MenuSaveAllImages = 26506;
         private const int MenuOpenDevTools = 26599;
 
         private readonly Form form;
+        
+        private string lastHighlightedTweetAuthor;
+        private string[] lastHighlightedTweetImageList;
 
         protected ContextMenuBase(Form form){
             this.form = form;
         }
 
         public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal)){
+            bool hasTweetImage = !string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedImage);
-                if (RegexTwitterAccount.Value.IsMatch(parameters.UnfilteredLinkUrl)){
+            lastHighlightedTweetAuthor = TweetDeckBridge.LastHighlightedTweetAuthor;
+            lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImages;
+
+            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
+                lastHighlightedTweetAuthor = string.Empty;
+                lastHighlightedTweetImageList = StringUtils.EmptyArray;
+            }
+
+            if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal) && !hasTweetImage){
+                if (TwitterUtils.RegexAccount.IsMatch(parameters.UnfilteredLinkUrl)){
                     model.AddItem((CefMenuCommand)MenuOpenLinkUrl, "Open account in browser");
                     model.AddItem((CefMenuCommand)MenuCopyLinkUrl, "Copy account address");
                     model.AddItem((CefMenuCommand)MenuCopyUsername, "Copy account username");
@@ -41,10 +63,15 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
 
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents){
+            if ((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage){
-                model.AddItem((CefMenuCommand)MenuOpenImage, "Open image in browser");
+                model.AddItem((CefMenuCommand)MenuOpenImageUrl, "Open image in browser");
-                model.AddItem((CefMenuCommand)MenuSaveImage, "Save image as...");
                 model.AddItem((CefMenuCommand)MenuCopyImageUrl, "Copy image address");
+                model.AddItem((CefMenuCommand)MenuSaveImage, "Save image as...");
+
+                if (lastHighlightedTweetImageList.Length > 1){
+                    model.AddItem((CefMenuCommand)MenuSaveAllImages, "Save all images as...");
+                }
+
                 model.AddSeparator();
             }
         }
@@ -56,42 +83,27 @@ namespace TweetDuck.Core.Handling{
                     break;
 
                 case MenuCopyLinkUrl:
-                    SetClipboardText(string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedLink) ? parameters.UnfilteredLinkUrl : TweetDeckBridge.LastRightClickedLink);
+                    SetClipboardText(GetLink(parameters));
                     break;
 
-                case MenuOpenImage:
+                case MenuOpenImageUrl:
-                    BrowserUtils.OpenExternalBrowser(parameters.SourceUrl);
+                    BrowserUtils.OpenExternalBrowser(TwitterUtils.GetImageLink(GetImage(parameters), ImageQuality));
                     break;
 
                 case MenuSaveImage:
-                    string fileName = GetImageFileName(parameters.SourceUrl);
+                    TwitterUtils.DownloadImage(GetImage(parameters), lastHighlightedTweetAuthor, ImageQuality);
-                    string extension = Path.GetExtension(fileName);
+                    break;
-                    string saveTarget;
-
-                    using(SaveFileDialog dialog = new SaveFileDialog{
-                        AutoUpgradeEnabled = true,
-                        OverwritePrompt = true,
-                        Title = "Save image",
-                        FileName = fileName,
-                        Filter = "Image ("+(string.IsNullOrEmpty(extension) ? "unknown" : extension)+")|*.*"
-                    }){
-                        saveTarget = dialog.ShowDialog() == DialogResult.OK ? dialog.FileName : null;
-                    }
-
-                    if (saveTarget != null){
-                        BrowserUtils.DownloadFileAsync(parameters.SourceUrl, saveTarget, null, ex => {
-                            MessageBox.Show("An error occurred while downloading the image: "+ex.Message, Program.BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        });
-                    }
 
+                case MenuSaveAllImages:
+                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, lastHighlightedTweetAuthor, ImageQuality);
                     break;
 
                 case MenuCopyImageUrl:
-                    SetClipboardText(parameters.SourceUrl);
+                    SetClipboardText(TwitterUtils.GetImageLink(GetImage(parameters), ImageQuality));
                     break;
 
                 case MenuCopyUsername:
-                    Match match = RegexTwitterAccount.Value.Match(parameters.UnfilteredLinkUrl);
+                    Match match = TwitterUtils.RegexAccount.Match(parameters.UnfilteredLinkUrl);
                     SetClipboardText(match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
                     break;
                     
@@ -103,7 +115,10 @@ namespace TweetDuck.Core.Handling{
             return false;
         }
 
-        public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){}
+        public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
+            TweetDeckBridge.LastRightClickedLink = string.Empty;
+            TweetDeckBridge.LastRightClickedImage = string.Empty;
+        }
 
         public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){
             return false;
@@ -113,7 +128,7 @@ namespace TweetDuck.Core.Handling{
             form.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
         }
         
-        protected void AddDebugMenuItems(IMenuModel model){
+        protected static void AddDebugMenuItems(IMenuModel model){
             model.AddItem((CefMenuCommand)MenuOpenDevTools, "Open dev tools");
         }
 
@@ -128,21 +143,5 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
         }
-
-        private static string GetImageFileName(string url){
-            // twimg adds a colon after file extension
-            int dot = url.LastIndexOf('.');
-
-            if (dot != -1){
-                int colon = url.IndexOf(':', dot);
-            
-                if (colon != -1){
-                    url = url.Substring(0, colon);
-                }
-            }
-
-            // return file name
-            return BrowserUtils.GetFileNameFromUrl(url) ?? "unknown";
-        }
     }
 }

Core/Handling/ContextMenuBrowser.cs

@@ -20,7 +20,7 @@ namespace TweetDuck.Core.Handling{
 
         private const string TitleReloadBrowser = "Reload browser";
         private const string TitleMuteNotifications = "Mute notifications";
-        private const string TitleSettings = "Settings";
+        private const string TitleSettings = "Options";
         private const string TitlePlugins = "Plugins";
         private const string TitleAboutProgram = "About "+Program.BrandName;
 
@@ -49,7 +49,7 @@ namespace TweetDuck.Core.Handling{
             lastHighlightedTweet = TweetDeckBridge.LastHighlightedTweet;
             lastHighlightedQuotedTweet = TweetDeckBridge.LastHighlightedQuotedTweet;
 
-            if (!BrowserUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
+            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
                 lastHighlightedTweet = string.Empty;
                 lastHighlightedQuotedTweet = string.Empty;
             }

Core/Handling/General/BrowserProcessHandler.cs

@@ -1,7 +1,7 @@
-using CefSharp;
+using System;
-using System;
+using CefSharp;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Core.Handling.General{
     class BrowserProcessHandler : IBrowserProcessHandler{
         void IBrowserProcessHandler.OnContextInitialized(){
             using(IRequestContext ctx = Cef.GetGlobalRequestContext()){

Core/Handling/General/JavaScriptDialogHandler.cs

@@ -1,38 +1,48 @@
-using CefSharp;
+using System.Drawing;
-using CefSharp.WinForms;
-using System.Drawing;
 using System.Windows.Forms;
+using CefSharp;
+using CefSharp.WinForms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
+using TweetDuck.Core.Utils;
 
-namespace TweetDuck.Core.Handling {
+namespace TweetDuck.Core.Handling.General{
     class JavaScriptDialogHandler : IJsDialogHandler{
         bool IJsDialogHandler.OnJSDialog(IWebBrowser browserControl, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage){
             ((ChromiumWebBrowser)browserControl).InvokeSafe(() => {
-                FormMessage form = new FormMessage(Program.BrandName, messageText, MessageBoxIcon.None);
+                FormMessage form;
                 TextBox input = null;
 
                 if (dialogType == CefJsDialogType.Alert){
-                    form.AcceptButton = form.AddButton("OK");
+                    form = new FormMessage("Browser Message", messageText, MessageBoxIcon.None);
+                    form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
                 }
                 else if (dialogType == CefJsDialogType.Confirm){
-                    form.CancelButton = form.AddButton("No", DialogResult.No);
+                    form = new FormMessage("Browser Confirmation", messageText, MessageBoxIcon.None);
-                    form.AcceptButton = form.AddButton("Yes");
+                    form.AddButton(FormMessage.No, DialogResult.No, ControlType.Cancel);
+                    form.AddButton(FormMessage.Yes, ControlType.Focused);
                 }
                 else if (dialogType == CefJsDialogType.Prompt){
-                    form.CancelButton = form.AddButton("Cancel", DialogResult.Cancel);
+                    form = new FormMessage("Browser Prompt", messageText, MessageBoxIcon.None);
-                    form.AcceptButton = form.AddButton("OK");
+                    form.AddButton(FormMessage.Cancel, DialogResult.Cancel, ControlType.Cancel);
+                    form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
+
+                    float dpiScale = form.GetDPIScale();
 
                     input = new TextBox{
                         Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
-                        Location = new Point(27, form.ActionPanelY-46),
+                        Location = new Point(BrowserUtils.Scale(22, dpiScale), form.ActionPanelY-BrowserUtils.Scale(46, dpiScale)),
-                        Size = new Size(form.ClientSize.Width-54, 20)
+                        Size = new Size(form.ClientSize.Width-BrowserUtils.Scale(44, dpiScale), 20)
                     };
 
                     form.Controls.Add(input);
                     form.ActiveControl = input;
                     form.Height += input.Size.Height+input.Margin.Vertical;
                 }
+                else{
+                    callback.Continue(false);
+                    return;
+                }
 
                 bool success = form.ShowDialog() == DialogResult.OK;
 

Core/Handling/General/LifeSpanHandler.cs

@@ -1,7 +1,7 @@
 using CefSharp;
 using TweetDuck.Core.Utils;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Core.Handling.General{
     class LifeSpanHandler : ILifeSpanHandler{
         public bool OnBeforePopup(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, string targetFrameName, WindowOpenDisposition targetDisposition, bool userGesture, IPopupFeatures popupFeatures, IWindowInfo windowInfo, IBrowserSettings browserSettings, ref bool noJavascriptAccess, out IWebBrowser newBrowser){
             newBrowser = null;

Core/Handling/General/RequestHandlerBase.cs

@@ -1,8 +1,8 @@
 using System.Security.Cryptography.X509Certificates;
 using CefSharp;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Core.Handling.General{
-    abstract class RequestHandler : IRequestHandler{
+    abstract class RequestHandlerBase : IRequestHandler{
         // Browser
 
         public virtual void OnRenderViewReady(IWebBrowser browserControl, IBrowser browser){}

Core/Handling/KeyboardHandlerNotification.cs

@@ -0,0 +1,38 @@
+using CefSharp;
+using System.Windows.Forms;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Notification;
+
+namespace TweetDuck.Core.Handling {
+    sealed class KeyboardHandlerNotification : IKeyboardHandler{
+        private readonly FormNotificationBase notification;
+
+        public KeyboardHandlerNotification(FormNotificationBase notification){
+            this.notification = notification;
+        }
+
+        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
+            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("chrome-devtools://")){
+                switch((Keys)windowsKeyCode){
+                    case Keys.Enter:
+                        notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
+                        return true;
+
+                    case Keys.Escape:
+                        notification.InvokeAsyncSafe(() => notification.HideNotification(true));
+                        return true;
+
+                    case Keys.Space:
+                        notification.InvokeAsyncSafe(() => notification.FreezeTimer = !notification.FreezeTimer);
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
+            return false;
+        }
+    }
+}

Core/Handling/RequestHandlerBrowser.cs

@@ -1,9 +1,18 @@
 using CefSharp;
+using TweetDuck.Core.Handling.General;
 
 namespace TweetDuck.Core.Handling{
-    class RequestHandlerBrowser : RequestHandler{
+    class RequestHandlerBrowser : RequestHandlerBase{
         public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
             browser.Reload();
         }
+
+        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (request.ResourceType == ResourceType.Script && request.Url.Contains("analytics.")){
+                return CefReturnValue.Cancel;
+            }
+
+            return CefReturnValue.Continue;
+        }
     }
 }

Core/Notification/FormNotificationBase.cs

@@ -6,6 +6,7 @@ using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
+using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Notification{
@@ -57,20 +58,25 @@ namespace TweetDuck.Core.Notification{
 
             set{
                 Visible = (base.Location = value) != ControlExtensions.InvisibleLocation;
-                
+                FormBorderStyle = GetBorderStyle(CanResizeWindow);
-                if (WindowsUtils.ShouldAvoidToolWindow){
-                    FormBorderStyle = Visible ? FormBorderStyle.FixedSingle : FormBorderStyle.FixedToolWindow; // workaround for alt+tab
-                }
             }
         }
+
+        public bool CanResizeWindow{
+            get => FormBorderStyle == FormBorderStyle.Sizable || FormBorderStyle == FormBorderStyle.SizableToolWindow;
+            set => FormBorderStyle = GetBorderStyle(value);
+        }
         
-        public Func<bool> CanMoveWindow = () => true;
+        public Func<bool> CanMoveWindow { get; set; } = () => true;
         protected override bool ShowWithoutActivation => true;
 
+        protected double SizeScale => dpiScale*Program.UserConfig.ZoomMultiplier;
+
         protected readonly Form owner;
         protected readonly ChromiumWebBrowser browser;
-
+        
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
+        private readonly float dpiScale;
 
         private string currentColumn;
         private int pauseCounter;
@@ -92,6 +98,7 @@ namespace TweetDuck.Core.Notification{
 
             this.browser = new ChromiumWebBrowser("about:blank"){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
+                JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler()
             };
 
@@ -103,8 +110,10 @@ namespace TweetDuck.Core.Notification{
             this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
             #endif
 
+            this.dpiScale = this.GetDPIScale();
+
             DefaultResourceHandlerFactory handlerFactory = (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
-            handlerFactory.RegisterHandler("https://tweetdeck.twitter.com", this.resourceHandler);
+            handlerFactory.RegisterHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
 
             Controls.Add(browser);
 
@@ -134,6 +143,9 @@ namespace TweetDuck.Core.Notification{
         private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
             if (e.IsBrowserInitialized){
                 Initialized?.Invoke(this, new EventArgs());
+
+                int identifier = browser.GetBrowser().Identifier;
+                Disposed += (sender2, args2) => BrowserProcesses.Forget(identifier);
             }
         }
 
@@ -173,11 +185,11 @@ namespace TweetDuck.Core.Notification{
             currentColumn = tweet.Column;
 
             resourceHandler.SetHTML(GetTweetHTML(tweet));
-            browser.Load("https://tweetdeck.twitter.com");
+            browser.Load(TwitterUtils.TweetDeckURL);
         }
 
         protected virtual void SetNotificationSize(int width, int height){
-            browser.ClientSize = ClientSize = new Size((int)Math.Round(width*Program.UserConfig.ZoomMultiplier), (int)Math.Round(height*Program.UserConfig.ZoomMultiplier));
+            browser.ClientSize = ClientSize = new Size(BrowserUtils.Scale(width, SizeScale), BrowserUtils.Scale(height, SizeScale));
         }
 
         protected virtual void OnNotificationReady(){
@@ -207,5 +219,14 @@ namespace TweetDuck.Core.Notification{
                 toolTip.Show(text, this, position);
             }
         }
+
+        private FormBorderStyle GetBorderStyle(bool sizable){
+            if (WindowsUtils.ShouldAvoidToolWindow && Visible){ // Visible = workaround for alt+tab
+                return sizable ? FormBorderStyle.Sizable : FormBorderStyle.FixedSingle;
+            }
+            else{
+                return sizable ? FormBorderStyle.SizableToolWindow : FormBorderStyle.FixedToolWindow;
+            }
+        }
     }
 }

Core/Notification/FormNotificationMain.Designer.cs

@@ -49,7 +49,7 @@
             this.progressBarTimer.Margin = new System.Windows.Forms.Padding(0);
             this.progressBarTimer.Maximum = 1000;
             this.progressBarTimer.Name = "progressBarTimer";
-            this.progressBarTimer.Size = new System.Drawing.Size(284, 4);
+            this.progressBarTimer.Size = new System.Drawing.Size(284, TimerBarHeight);
             this.progressBarTimer.TabIndex = 1;
             // 
             // FormNotification

Core/Notification/FormNotificationMain.cs

@@ -4,7 +4,9 @@ using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
+using TweetDuck.Core.Handling;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Resources;
@@ -12,32 +14,13 @@ using TweetDuck.Resources;
 namespace TweetDuck.Core.Notification{
     partial class FormNotificationMain : FormNotificationBase{
         private const string NotificationScriptFile = "notification.js";
+        private const int TimerBarHeight = 4;
 
         private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
         private static readonly string PluginScriptIdentifier = ScriptLoader.GetRootIdentifier(PluginManager.PluginNotificationScriptFile);
 
-        private static readonly string NotificationJS, PluginJS;
+        private static readonly string NotificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
-
+        private static readonly string PluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
-        static FormNotificationMain(){
-            NotificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
-            PluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
-        }
-
-        private static int BaseClientWidth{
-            get{
-                int level = TweetNotification.FontSizeLevel;
-                int width = level == 0 ? 284 : (int)Math.Round(284.0*(1.0+0.05*level));
-                return (int)Math.Round(width*Program.UserConfig.ZoomMultiplier);
-            }
-        }
-
-        private static int BaseClientHeight{
-            get{
-                int level = TweetNotification.FontSizeLevel;
-                int height = level == 0 ? 118 : (int)Math.Round(118.0*(1.0+0.075*level));
-                return (int)Math.Round(height*Program.UserConfig.ZoomMultiplier);
-            }
-        }
         
         private readonly PluginManager plugins;
 
@@ -51,9 +34,9 @@ namespace TweetDuck.Core.Notification{
         private bool? prevDisplayTimer;
         private int? prevFontSize;
 
-        private bool RequiresResize{
+        public bool RequiresResize{
             get{
-                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != TweetNotification.FontSizeLevel;
+                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != TweetNotification.FontSizeLevel || CanResizeWindow;
             }
 
             set{
@@ -68,11 +51,41 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
+        private int BaseClientWidth{
+            get{
+                switch(Program.UserConfig.NotificationSize){
+                    default:
+                        return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*TweetNotification.FontSizeLevel));
+
+                    case TweetNotification.Size.Custom:
+                        return Program.UserConfig.CustomNotificationSize.Width;
+                }
+            }
+        }
+
+        private int BaseClientHeight{
+            get{
+                switch(Program.UserConfig.NotificationSize){
+                    default:
+                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.075*TweetNotification.FontSizeLevel));
+
+                    case TweetNotification.Size.Custom:
+                        return Program.UserConfig.CustomNotificationSize.Height;
+                }
+            }
+        }
+
+        public Size BrowserSize{
+            get => Program.UserConfig.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height-TimerBarHeight) : ClientSize;
+        }
+
         public FormNotificationMain(FormBrowser owner, PluginManager pluginManager, bool enableContextMenu) : base(owner, enableContextMenu){
             InitializeComponent();
 
             this.plugins = pluginManager;
-
+            
+            browser.KeyboardHandler = new KeyboardHandlerNotification(this);
+            
             browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(owner, this));
             browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
 
@@ -103,8 +116,8 @@ namespace TweetDuck.Core.Notification{
             if (nCode == 0){
                 int eventType = wParam.ToInt32();
 
-                if (eventType == NativeMethods.WM_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position)) && !ContainsFocus && !owner.ContainsFocus){
+                if (eventType == NativeMethods.WM_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position))){
-                    browser.SendMouseWheelEvent(0, 0, 0, NativeMethods.GetMouseHookData(lParam), CefEventFlags.None);
+                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Program.UserConfig.NotificationScrollSpeed/100.0), CefEventFlags.None);
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONDOWN && DesktopBounds.Contains(Cursor.Position)){
@@ -154,7 +167,7 @@ namespace TweetDuck.Core.Notification{
 
         private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             if (e.Frame.IsMain && NotificationJS != null && browser.Address != "about:blank"){
-                e.Frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Properties.AllNotification));
+                e.Frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
                 ScriptLoader.ExecuteScript(e.Frame, NotificationJS, NotificationScriptIdentifier);
 
                 if (plugins.HasAnyPlugin(PluginEnvironment.Notification)){
@@ -175,7 +188,7 @@ namespace TweetDuck.Core.Notification{
 
             timeLeft -= timerProgress.Interval;
 
-            int value = (int)Math.Round(1025.0*(totalTime-timeLeft)/totalTime);
+            int value = BrowserUtils.Scale(1025, (totalTime-timeLeft)/(double)totalTime);
             progressBarTimer.SetValueInstant(Math.Min(1000, Math.Max(0, Program.UserConfig.NotificationTimerCountDown ? 1000-value : value)));
 
             if (timeLeft <= 0){
@@ -253,7 +266,7 @@ namespace TweetDuck.Core.Notification{
 
         protected override void SetNotificationSize(int width, int height){
             if (Program.UserConfig.DisplayNotificationTimer){
-                ClientSize = new Size(width, height+4);
+                ClientSize = new Size(width, height+TimerBarHeight);
                 progressBarTimer.Visible = true;
             }
             else{

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -2,24 +2,40 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Core.Bridge;
+using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
+using TweetDuck.Plugins;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{
-        public FormNotificationScreenshotable(Action callback, Form owner) : base(owner, false){
+        private readonly PluginManager plugins;
+
+        public FormNotificationScreenshotable(Action callback, Form owner, PluginManager pluginManager) : base(owner, false){
+            this.plugins = pluginManager;
+
             browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback));
 
-            browser.FrameLoadEnd += (sender, args) => {
+            browser.LoadingStateChanged += (sender, args) => {
-                if (args.Frame.IsMain && browser.Address != "about:blank"){
+                if (!args.IsLoading){
-                    ScriptLoader.ExecuteScript(args.Frame, "window.setTimeout($TD_NotificationScreenshot.trigger, 67)", "gen:screenshot");
+                    using(IFrame frame = args.Browser.MainFrame){
+                        ScriptLoader.ExecuteScript(frame, "window.setTimeout($TD_NotificationScreenshot.trigger, 129)", "gen:screenshot");
+                    }
                 }
             };
         }
-
+        
         protected override string GetTweetHTML(TweetNotification tweet){
-            return tweet.GenerateHtml(enableCustomCSS: false);
+            string html = tweet.GenerateHtml("td-screenshot", false);
+
+            foreach(InjectedHTML injection in plugins.Bridge.NotificationInjections){
+                html = injection.Inject(html);
+            }
+
+            return html;
         }
 
         public void LoadNotificationForScreenshot(TweetNotification tweet, int width, int height){
@@ -31,7 +47,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
             IntPtr context = NativeMethods.GetDC(this.Handle);
 
             if (context == IntPtr.Zero){
-                MessageBox.Show("Could not retrieve a graphics context handle for the notification window to take the screenshot.", "Screenshot Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                FormMessage.Error("Screenshot Failed", "Could not retrieve a graphics context handle for the notification window to take the screenshot.", FormMessage.OK);
             }
             else{
                 using(Bitmap bmp = new Bitmap(ClientSize.Width, ClientSize.Height, PixelFormat.Format32bppRgb)){

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -4,17 +4,20 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
+using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Notification.Screenshot{
     sealed class TweetScreenshotManager : IDisposable{
-        private readonly Form owner;
+        private readonly FormBrowser owner;
+        private readonly PluginManager plugins;
         private readonly Timer timeout;
         private readonly Timer disposer;
         
         private FormNotificationScreenshotable screenshot;
 
-        public TweetScreenshotManager(Form owner){
+        public TweetScreenshotManager(FormBrowser owner, PluginManager pluginManager){
             this.owner = owner;
+            this.plugins = pluginManager;
 
             this.timeout = new Timer{ Interval = 8000 };
             this.timeout.Tick += timeout_Tick;
@@ -25,8 +28,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
 
         private void timeout_Tick(object sender, EventArgs e){
             timeout.Stop();
-            screenshot.Location = ControlExtensions.InvisibleLocation;
+            OnFinished();
-            disposer.Start();
         }
 
         private void disposer_Tick(object sender, EventArgs e){
@@ -40,13 +42,17 @@ namespace TweetDuck.Core.Notification.Screenshot{
                 return;
             }
 
-            screenshot = new FormNotificationScreenshotable(Callback, owner){
+            screenshot = new FormNotificationScreenshotable(Callback, owner, plugins){
                 CanMoveWindow = () => false
             };
 
             screenshot.LoadNotificationForScreenshot(new TweetNotification(string.Empty, html, 0, string.Empty, string.Empty), width, height);
             screenshot.Show();
             timeout.Start();
+
+            #if !(DEBUG && NO_HIDE_SCREENSHOTS)
+            owner.IsWaiting = true;
+            #endif
         }
 
         private void Callback(){
@@ -58,14 +64,19 @@ namespace TweetDuck.Core.Notification.Screenshot{
             screenshot.TakeScreenshot();
 
             #if !(DEBUG && NO_HIDE_SCREENSHOTS)
-            screenshot.Location = ControlExtensions.InvisibleLocation;
+            OnFinished();
-            disposer.Start();
             #else
             screenshot.MoveToVisibleLocation();
             screenshot.FormClosed += (sender, args) => disposer.Start();
             #endif
         }
 
+        private void OnFinished(){
+            screenshot.Location = ControlExtensions.InvisibleLocation;
+            owner.IsWaiting = false;
+            disposer.Start();
+        }
+
         public void Dispose(){
             timeout.Dispose();
             disposer.Dispose();

Core/Notification/Sound/ISoundNotificationPlayer.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace TweetDuck.Core.Notification.Sound{
-    interface ISoundNotificationPlayer : IDisposable{
-        string SupportedFormats { get; }
-
-        event EventHandler<PlaybackErrorEventArgs> PlaybackError;
-
-        void Play(string file);
-        void Stop();
-    }
-}

Core/Notification/SoundNotification.cs

@@ -1,28 +1,28 @@
-using System.Runtime.InteropServices;
+using System;
-using TweetDuck.Core.Notification.Sound;
+using TweetLib.Audio;
 
 namespace TweetDuck.Core.Notification{
-    static class SoundNotification{
+    sealed class SoundNotification : IDisposable{
-        private static bool? IsWMPAvailable;
+        public string SupportedFormats => player.SupportedFormats;
+        public event EventHandler<PlaybackErrorEventArgs> PlaybackError;
 
-        public static ISoundNotificationPlayer New(){
+        private readonly AudioPlayer player;
-            if (IsWMPAvailable.HasValue){
-                if (IsWMPAvailable.Value){
-                    return new SoundPlayerImplWMP();
-                }
-                else{
-                    return new SoundPlayerImplFallback();
-                }
-            }
 
-            try{
+        public SoundNotification(){
-                SoundPlayerImplWMP implWMP = new SoundPlayerImplWMP();
+            this.player = AudioPlayer.New();
-                IsWMPAvailable = true;
+            this.player.PlaybackError += Player_PlaybackError;
-                return implWMP;
+        }
-            }catch(COMException){
+
-                IsWMPAvailable = false;
+        public void Play(string file){
-                return new SoundPlayerImplFallback();
+            player.Play(file);
-            }
+        }
+
+        private void Player_PlaybackError(object sender, PlaybackErrorEventArgs e){
+            PlaybackError?.Invoke(this, e);
+        }
+
+        public void Dispose(){
+            player.Dispose();
         }
     }
 }

Core/Notification/TweetNotification.cs

@@ -9,7 +9,7 @@ namespace TweetDuck.Core.Notification{
 
         private const string DefaultFontSizeClass = "medium";
         private const string DefaultHeadTag = @"<meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'><style type='text/css'>body{background:#222426}</style>";
-        private const string CustomCSS = @"body:before{content:none}body{overflow-y:auto}.scroll-styled-v::-webkit-scrollbar{width:7px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}.scroll-styled-v::-webkit-scrollbar-track{border-left:0}#td-skip{opacity:0;cursor:pointer;transition:opacity 0.15s ease}.td-hover #td-skip{opacity:0.75}#td-skip:hover{opacity:1}";
+        private const string CustomCSS = @"body:before{content:none}body{overflow-y:auto}.scroll-styled-v::-webkit-scrollbar{width:7px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}.scroll-styled-v::-webkit-scrollbar-track{border-left:0}#td-skip{opacity:0;cursor:pointer;transition:opacity 0.15s ease}.td-hover #td-skip{opacity:0.75}#td-skip:hover{opacity:1}.media-size-medium{height:calc(100vh - 16px)!important;max-height:240px;border-radius:1px!important}.js-quote-detail .media-size-medium{height:calc(100vh - 28px)!important;}.js-media.margin-vm, .js-media-preview-container.margin-vm{margin-bottom:0!important}";
 
         public static int FontSizeLevel{
             get{
@@ -31,7 +31,7 @@ namespace TweetDuck.Core.Notification{
                     ExampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true);
 
                     #if DEBUG
-                    ExampleTweetHTML = ExampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:64px'>Scrollbar test padding...</div>");
+                    ExampleTweetHTML = ExampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
                     #endif
                 }
 
@@ -51,6 +51,10 @@ namespace TweetDuck.Core.Notification{
             TopLeft, TopRight, BottomLeft, BottomRight, Custom
         }
 
+        public enum Size{
+            Auto, Custom
+        }
+
         public string Column { get; }
         public string TweetUrl { get; }
         public string QuoteUrl { get; }

Core/Other/FormAbout.cs

@@ -11,7 +11,7 @@ namespace TweetDuck.Core.Other{
 
             Text = "About "+Program.BrandName+" "+Program.VersionTag;
 
-            labelDescription.Text = Program.BrandName+" was created by chylex as a replacement to the discontinued official TweetDeck client for Windows.\n\nThe program is available for free under the open source MIT license.";
+            labelDescription.Text = "TweetDuck was created by chylex as a replacement to the discontinued official TweetDeck client for Windows.\n\nThe program is available for free under the open source MIT license.";
             
             labelWebsite.Links.Add(new LinkLabel.Link(0, labelWebsite.Text.Length, Program.Website));
             labelTips.Links.Add(new LinkLabel.Link(0, labelTips.Text.Length, TipsLink));

Core/Other/FormMessage.cs

@@ -1,9 +1,63 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Other{
+    [Flags]
+    enum ControlType{
+        None = 0,
+        Accept = 1, // triggered by pressing enter when a non-button is focused
+        Cancel = 2, // triggered by closing the dialog without pressing a button
+        Focused = 4 // active control after the dialog is showed
+    }
+
     sealed partial class FormMessage : Form{
+        public const string OK = "OK";
+        public const string Yes = "Yes";
+        public const string No = "No";
+        public const string Cancel = "Cancel";
+        public const string Retry = "Retry";
+        public const string Ignore = "Ignore";
+        public const string Exit = "Exit";
+
+        public static bool Information(string caption, string text, string buttonAccept, string buttonCancel = null){
+            return Show(caption, text, MessageBoxIcon.Information, buttonAccept, buttonCancel);
+        }
+
+        public static bool Warning(string caption, string text, string buttonAccept, string buttonCancel = null){
+            return Show(caption, text, MessageBoxIcon.Warning, buttonAccept, buttonCancel);
+        }
+
+        public static bool Error(string caption, string text, string buttonAccept, string buttonCancel = null){
+            return Show(caption, text, MessageBoxIcon.Error, buttonAccept, buttonCancel);
+        }
+
+        public static bool Question(string caption, string text, string buttonAccept, string buttonCancel = null){
+            return Show(caption, text, MessageBoxIcon.Question, buttonAccept, buttonCancel);
+        }
+
+        public static bool Show(string caption, string text, MessageBoxIcon icon, string button){
+            return Show(caption, text, icon, button, null);
+        }
+
+        public static bool Show(string caption, string text, MessageBoxIcon icon, string buttonAccept, string buttonCancel){
+            using(FormMessage message = new FormMessage(caption, text, icon)){
+                if (buttonCancel == null){
+                    message.AddButton(buttonAccept, DialogResult.OK, ControlType.Cancel | ControlType.Focused);
+                }
+                else{
+                    message.AddButton(buttonCancel, DialogResult.Cancel, ControlType.Cancel);
+                    message.AddButton(buttonAccept, DialogResult.OK, ControlType.Accept | ControlType.Focused);
+                }
+
+                return message.ShowDialog() == DialogResult.OK;
+            }
+        }
+
+        // Instance
+
         public Button ClickedButton { get; private set; }
 
         public int ActionPanelY => panelActions.Location.Y;
@@ -13,8 +67,13 @@ namespace TweetDuck.Core.Other{
             set => ClientSize = new Size(value, ClientSize.Height);
         }
 
+        private int ButtonDistance{
+            get => BrowserUtils.Scale(96, dpiScale);
+        }
+
         private readonly Icon icon;
         private readonly bool isReady;
+        private readonly float dpiScale;
 
         private int realFormWidth, minFormWidth;
         private int buttonCount;
@@ -24,9 +83,11 @@ namespace TweetDuck.Core.Other{
         public FormMessage(string caption, string text, MessageBoxIcon messageIcon){
             InitializeComponent();
 
+            this.dpiScale = this.GetDPIScale();
+
             this.prevLabelWidth = labelMessage.Width;
             this.prevLabelHeight = labelMessage.Height;
-            this.minFormWidth = 40;
+            this.minFormWidth = BrowserUtils.Scale(42, dpiScale);
 
             switch(messageIcon){
                 case MessageBoxIcon.Information:
@@ -47,26 +108,30 @@ namespace TweetDuck.Core.Other{
 
                 default:
                     icon = null;
-                    labelMessage.Location = new Point(labelMessage.Location.X-38, labelMessage.Location.Y);
+                    labelMessage.Location = new Point(BrowserUtils.Scale(19, dpiScale), labelMessage.Location.Y); // 19 instead of 9 due to larger height
                     break;
             }
 
             this.isReady = true;
 
             this.Text = caption;
-            this.labelMessage.Text = text;
+            this.labelMessage.Text = text.Replace("\r", "").Replace("\n", Environment.NewLine);
         }
 
         private void FormMessage_SizeChanged(object sender, EventArgs e){
             RecalculateButtonLocation();
         }
 
-        public Button AddButton(string title, DialogResult result = DialogResult.OK){
+        public Button AddButton(string title, ControlType type){
+            return AddButton(title, DialogResult.OK, type);
+        }
+
+        public Button AddButton(string title, DialogResult result = DialogResult.OK, ControlType type = ControlType.None){
             Button button = new Button{
                 Anchor = AnchorStyles.Bottom,
                 Font = SystemFonts.MessageBoxFont,
                 Location = new Point(0, 12),
-                Size = new Size(88, 26),
+                Size = new Size(BrowserUtils.Scale(88, dpiScale), BrowserUtils.Scale(26, dpiScale)),
                 TabIndex = buttonCount,
                 Text = title,
                 UseVisualStyleBackColor = true
@@ -81,24 +146,41 @@ namespace TweetDuck.Core.Other{
             panelActions.Controls.Add(button);
             ++buttonCount;
 
-            minFormWidth += 96;
+            minFormWidth += ButtonDistance;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
             RecalculateButtonLocation();
 
+            if (type.HasFlag(ControlType.Accept)){
+                AcceptButton = button;
+            }
+
+            if (type.HasFlag(ControlType.Cancel)){
+                CancelButton = button;
+            }
+
+            if (type.HasFlag(ControlType.Focused)){
+                ActiveControl = button;
+            }
+
             return button;
         }
 
         public void AddActionControl(Control control){
             panelActions.Controls.Add(control);
+            
+            control.Size = new Size(BrowserUtils.Scale(control.Width, dpiScale), BrowserUtils.Scale(control.Height, dpiScale));
 
             minFormWidth += control.Width+control.Margin.Horizontal;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
         }
         
         private void RecalculateButtonLocation(){
+            int dist = ButtonDistance;
+            int start = ClientWidth-dist;
+
             for(int index = 0; index < buttonCount; index++){
                 Control control = panelActions.Controls[index];
-                control.Location = new Point(ClientWidth-97-index*96, control.Location.Y);
+                control.Location = new Point(start-index*dist, control.Location.Y);
             }
         }
 
@@ -108,17 +190,18 @@ namespace TweetDuck.Core.Other{
             }
 
             bool isMultiline = labelMessage.Height > labelMessage.MinimumSize.Height;
+            int labelOffset = BrowserUtils.Scale(8, dpiScale);
 
             if (isMultiline && !wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y-8);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y-labelOffset);
-                prevLabelHeight += 8;
+                prevLabelHeight += labelOffset;
             }
             else if (!isMultiline && wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y+8);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y+labelOffset);
-                prevLabelHeight -= 8;
+                prevLabelHeight -= labelOffset;
             }
 
-            realFormWidth = ClientWidth-(icon == null ? 50 : 0)+labelMessage.Width-prevLabelWidth;
+            realFormWidth = ClientWidth-(icon == null ? BrowserUtils.Scale(50, dpiScale) : 0)+labelMessage.Width-prevLabelWidth;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
             Height += labelMessage.Height-prevLabelHeight;
 
@@ -129,7 +212,7 @@ namespace TweetDuck.Core.Other{
 
         protected override void OnPaint(PaintEventArgs e){
             if (icon != null){
-                e.Graphics.DrawIcon(icon, 25, 26);
+                e.Graphics.DrawIcon(icon, BrowserUtils.Scale(25, dpiScale), 1+BrowserUtils.Scale(25, dpiScale));
             }
 
             base.OnPaint(e);

Core/Other/FormPlugins.Designer.cs

@@ -26,7 +26,7 @@
             this.btnClose = new System.Windows.Forms.Button();
             this.btnReload = new System.Windows.Forms.Button();
             this.btnOpenFolder = new System.Windows.Forms.Button();
-            this.tabPanelPlugins = new TweetDuck.Core.Controls.TabPanel();
+            this.flowLayoutPlugins = new TweetDuck.Plugins.Controls.PluginListFlowLayout();
             this.SuspendLayout();
             // 
             // btnClose
@@ -68,22 +68,26 @@
             this.btnOpenFolder.UseVisualStyleBackColor = true;
             this.btnOpenFolder.Click += new System.EventHandler(this.btnOpenFolder_Click);
             // 
-            // tabPanelPlugins
+            // flowLayoutPlugins
             // 
-            this.tabPanelPlugins.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.flowLayoutPlugins.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.tabPanelPlugins.Location = new System.Drawing.Point(12, 12);
+            this.flowLayoutPlugins.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tabPanelPlugins.Name = "tabPanelPlugins";
+            this.flowLayoutPlugins.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.tabPanelPlugins.Size = new System.Drawing.Size(680, 421);
+            this.flowLayoutPlugins.Location = new System.Drawing.Point(12, 12);
-            this.tabPanelPlugins.TabIndex = 0;
+            this.flowLayoutPlugins.Name = "flowLayoutPlugins";
+            this.flowLayoutPlugins.Size = new System.Drawing.Size(680, 421);
+            this.flowLayoutPlugins.TabIndex = 0;
+            this.flowLayoutPlugins.WrapContents = false;
+            this.flowLayoutPlugins.Resize += new System.EventHandler(this.flowLayoutPlugins_Resize);
             // 
             // FormPlugins
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(704, 474);
-            this.Controls.Add(this.tabPanelPlugins);
+            this.Controls.Add(this.flowLayoutPlugins);
             this.Controls.Add(this.btnOpenFolder);
             this.Controls.Add(this.btnReload);
             this.Controls.Add(this.btnClose);
@@ -101,6 +105,6 @@
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
-        private TweetDuck.Core.Controls.TabPanel tabPanelPlugins;
+        private Plugins.Controls.PluginListFlowLayout flowLayoutPlugins;
     }
 }

Core/Other/FormPlugins.cs

@@ -3,20 +3,13 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Controls;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Plugins.Events;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormPlugins : Form{
         private readonly PluginManager pluginManager;
-        private readonly TabButton tabBtnOfficial, tabBtnCustom;
+        
-        private readonly PluginListFlowLayout flowLayoutPlugins;
-
-        private PluginGroup? selectedGroup;
-
         public FormPlugins(){
             InitializeComponent();
 
@@ -25,66 +18,41 @@ namespace TweetDuck.Core.Other{
 
         public FormPlugins(PluginManager pluginManager) : this(){
             this.pluginManager = pluginManager;
-            this.pluginManager.Reloaded += pluginManager_Reloaded;
-
-            this.flowLayoutPlugins = new PluginListFlowLayout();
-            this.flowLayoutPlugins.Resize += flowLayoutPlugins_Resize;
-
-            this.tabPanelPlugins.SetupTabPanel(90);
-            this.tabPanelPlugins.ReplaceContent(flowLayoutPlugins);
-
-            this.tabBtnOfficial = tabPanelPlugins.AddButton("", () => SelectGroup(PluginGroup.Official));
-            this.tabBtnCustom = tabPanelPlugins.AddButton("", () => SelectGroup(PluginGroup.Custom));
-
-            this.pluginManager_Reloaded(pluginManager, null);
 
             Shown += (sender, args) => {
                 Program.UserConfig.PluginsWindow.Restore(this, false);
-                this.tabPanelPlugins.SelectTab(tabBtnOfficial);
+                ReloadPluginList();
             };
 
             FormClosed += (sender, args) => {
                 Program.UserConfig.PluginsWindow.Save(this);
                 Program.UserConfig.Save();
             };
-
-            Disposed += (sender, args) => this.pluginManager.Reloaded -= pluginManager_Reloaded;
         }
 
-        private void SelectGroup(PluginGroup group){
+        private int GetPluginOrderIndex(Plugin plugin){
-            if (selectedGroup.HasValue && selectedGroup == group)return;
+            return !plugin.CanRun ? 0 : pluginManager.Config.IsEnabled(plugin) ? 1 : 2;
-
-            selectedGroup = group;
-            
-            ReloadPluginTab();
         }
 
-        public void ReloadPluginTab(){
+        private void ReloadPluginList(){
-            if (!selectedGroup.HasValue)return;
-
             flowLayoutPlugins.SuspendLayout();
             flowLayoutPlugins.Controls.Clear();
 
-            Plugin[] plugins = pluginManager.GetPluginsByGroup(selectedGroup.Value).OrderBy(plugin => !plugin.CanRun ? 0 : pluginManager.Config.IsEnabled(plugin) ? 1 : 2).ThenBy(plugin => plugin.Name).ToArray();
+            foreach(Plugin plugin in pluginManager.Plugins.OrderBy(GetPluginOrderIndex).ThenBy(plugin => plugin.Name)){
+                flowLayoutPlugins.Controls.Add(new PluginControl(pluginManager, plugin));
 
-            for(int index = 0; index < plugins.Length; index++){
+                flowLayoutPlugins.Controls.Add(new Panel{
-                flowLayoutPlugins.Controls.Add(new PluginControl(pluginManager, plugins[index]));
+                    BackColor = Color.DimGray,
-
+                    Margin = new Padding(0),
-                if (index < plugins.Length-1){
+                    Size = new Size(1, 1)
-                    flowLayoutPlugins.Controls.Add(new Panel{
+                });
-                        BackColor = Color.DimGray,
-                        Size = new Size(1, 1)
-                    });
-                }
             }
 
             flowLayoutPlugins.ResumeLayout(true);
-            flowLayoutPlugins_Resize(flowLayoutPlugins, new EventArgs());
+            
-        }
+            // sorry, I guess...
-
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right+1, Padding.Bottom);
-        private void pluginManager_Reloaded(object sender, PluginErrorEventArgs e){
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right-1, Padding.Bottom);
-            tabBtnOfficial.Text = "Official: "+pluginManager.CountPluginByGroup(PluginGroup.Official);
-            tabBtnCustom.Text = "Custom: "+pluginManager.CountPluginByGroup(PluginGroup.Custom);
         }
 
         private void flowLayoutPlugins_Resize(object sender, EventArgs e){
@@ -102,7 +70,8 @@ namespace TweetDuck.Core.Other{
             foreach(Control control in flowLayoutPlugins.Controls){
                 control.Width = flowLayoutPlugins.Width-control.Margin.Horizontal-horizontalOffset;
             }
-
+            
+            lastControl.Visible = !showScrollBar;
             flowLayoutPlugins.Focus();
         }
 
@@ -111,9 +80,9 @@ namespace TweetDuck.Core.Other{
         }
 
         private void btnReload_Click(object sender, EventArgs e){
-            if (MessageBox.Show("This will also reload the browser window. Do you want to proceed?", "Reloading Plugins", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+            if (FormMessage.Warning("Reloading Plugins", "This will also reload the browser window. Do you want to proceed?", FormMessage.Yes, FormMessage.No)){
                 pluginManager.Reload();
-                ReloadPluginTab();
+                ReloadPluginList();
             }
         }
 

Core/Other/FormSettings.Designer.cs

@@ -24,51 +24,70 @@
         /// </summary>
         private void InitializeComponent() {
             this.btnClose = new System.Windows.Forms.Button();
-            this.labelTip = new System.Windows.Forms.Label();
+            this.panelContents = new System.Windows.Forms.Panel();
-            this.tabPanel = new TweetDuck.Core.Controls.TabPanel();
+            this.panelButtons = new System.Windows.Forms.Panel();
+            this.btnManageOptions = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // btnClose
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Location = new System.Drawing.Point(443, 349);
+            this.btnClose.Location = new System.Drawing.Point(449, 447);
             this.btnClose.Name = "btnClose";
             this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnClose.Size = new System.Drawing.Size(49, 23);
-            this.btnClose.TabIndex = 4;
+            this.btnClose.TabIndex = 3;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
-            // labelTip
+            // panelContents
             // 
-            this.labelTip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelContents.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            this.labelTip.AutoSize = true;
-            this.labelTip.Location = new System.Drawing.Point(12, 351);
-            this.labelTip.Name = "labelTip";
-            this.labelTip.Size = new System.Drawing.Size(310, 13);
-            this.labelTip.TabIndex = 5;
-            this.labelTip.Text = "Tip: Move your cursor over an option to see detailed explanation";
-            // 
-            // 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.Location = new System.Drawing.Point(12, 12);
+            this.panelContents.AutoScroll = true;
-            this.tabPanel.Name = "tabPanel";
+            this.panelContents.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tabPanel.Size = new System.Drawing.Size(480, 331);
+            this.panelContents.Location = new System.Drawing.Point(135, 12);
-            this.tabPanel.TabIndex = 3;
+            this.panelContents.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.panelContents.Name = "panelContents";
+            this.panelContents.Size = new System.Drawing.Size(363, 429);
+            this.panelContents.TabIndex = 1;
+            // 
+            // panelButtons
+            // 
+            this.panelButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelButtons.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            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, 429);
+            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.Location = new System.Drawing.Point(12, 447);
+            this.btnManageOptions.Name = "btnManageOptions";
+            this.btnManageOptions.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnManageOptions.Size = new System.Drawing.Size(101, 23);
+            this.btnManageOptions.TabIndex = 4;
+            this.btnManageOptions.Text = "Manage Options";
+            this.btnManageOptions.UseVisualStyleBackColor = true;
+            this.btnManageOptions.Click += new System.EventHandler(this.btnManageOptions_Click);
             // 
             // FormSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(504, 384);
+            this.ClientSize = new System.Drawing.Size(510, 482);
-            this.Controls.Add(this.labelTip);
+            this.Controls.Add(this.btnManageOptions);
+            this.Controls.Add(this.panelContents);
+            this.Controls.Add(this.panelButtons);
             this.Controls.Add(this.btnClose);
-            this.Controls.Add(this.tabPanel);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = global::TweetDuck.Properties.Resources.icon;
             this.MaximizeBox = false;
@@ -82,9 +101,9 @@
         }
 
         #endregion
-
-        private Controls.TabPanel tabPanel;
         private System.Windows.Forms.Button btnClose;
-        private System.Windows.Forms.Label labelTip;
+        private System.Windows.Forms.Panel panelContents;
+        private System.Windows.Forms.Panel panelButtons;
+        private System.Windows.Forms.Button btnManageOptions;
     }
 }

Core/Other/FormSettings.cs

@@ -1,68 +1,161 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Drawing;
 using System.Windows.Forms;
+using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other.Settings;
+using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
 using TweetDuck.Updates;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormSettings : Form{
-        public const int TabIndexNotification = 1;
-
         private readonly FormBrowser browser;
-        private readonly Dictionary<Type, BaseTabSettings> tabs = new Dictionary<Type, BaseTabSettings>(4);
+        private readonly PluginManager plugins;
 
-        public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, int startTabIndex = 0){
+        private readonly int buttonHeight;
+
+        private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(4);
+        private SettingsTab currentTab;
+
+        public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, Type startTab){
             InitializeComponent();
 
-            Text = Program.BrandName+" Settings";
+            Text = Program.BrandName+" Options";
 
             this.browser = browser;
             this.browser.PauseNotification();
 
-            this.tabPanel.SetupTabPanel(100);
+            this.plugins = plugins;
-            this.tabPanel.AddButton("General", () => SelectTab(() => new TabSettingsGeneral(updates)));
+            
-            this.tabPanel.AddButton("Notifications", () => SelectTab(() => new TabSettingsNotifications(browser.CreateNotificationForm(false))));
+            this.buttonHeight = BrowserUtils.Scale(39, this.GetDPIScale()) | 1;
-            this.tabPanel.AddButton("Sounds", () => SelectTab(() => new TabSettingsSounds()));
-            this.tabPanel.AddButton("Advanced", () => SelectTab(() => new TabSettingsAdvanced(browser.ReinjectCustomCSS, plugins)));
 
-            this.tabPanel.SelectTab(tabPanel.Buttons.ElementAt(startTabIndex));
+            AddButton("General", () => new TabSettingsGeneral(updates));
-        }
+            AddButton("Notifications", () => new TabSettingsNotifications(browser.CreateNotificationForm(false)));
+            AddButton("Sounds", () => new TabSettingsSounds());
+            AddButton("Advanced", () => new TabSettingsAdvanced(browser.ReinjectCustomCSS));
 
-        private void SelectTab<T>(Func<T> constructor) where T : BaseTabSettings{
+            SelectTab(tabs[startTab ?? typeof(TabSettingsGeneral)]);
-            if (tabs.TryGetValue(typeof(T), out BaseTabSettings control)){
-                tabPanel.ReplaceContent(control);
-            }
-            else{
-                control = tabs[typeof(T)] = constructor();
-                control.OnReady();
-                tabPanel.ReplaceContent(control);
-            }
         }
 
         private void FormSettings_FormClosing(object sender, FormClosingEventArgs e){
-            foreach(BaseTabSettings control in tabs.Values){
+            foreach(SettingsTab tab in tabs.Values){
-                control.OnClosing();
+                if (tab.IsInitialized){
+                    tab.Control.OnClosing();
+                    tab.Control.Dispose();
+                }
             }
-
+            
             Program.UserConfig.Save();
-
-            foreach(BaseTabSettings control in tabs.Values){
-                control.Dispose();
-            }
-
             browser.ResumeNotification();
         }
 
+        private void btnManageOptions_Click(object sender, EventArgs e){
+            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
+                if (dialog.ShowDialog() == DialogResult.OK && dialog.ShouldReloadUI){
+                    foreach(SettingsTab tab in tabs.Values){
+                        tab.Control = null;
+                    }
+
+                    SelectTab(currentTab);
+                }
+            }
+        }
+
         private void btnClose_Click(object sender, EventArgs e){
             Close();
         }
 
-        public void ReloadUI(){
+        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTabSettings{
-            tabs.Clear();
+            FlatButton btn = new FlatButton{
-            tabPanel.Content.Controls.Clear();
+                BackColor = SystemColors.Control,
-            tabPanel.ActiveButton.Callback();
+                FlatStyle = FlatStyle.Flat,
+                Location = new Point(0, (buttonHeight+1)*(panelButtons.Controls.Count/2)),
+                Margin = new Padding(0),
+                Size = new Size(panelButtons.Width, buttonHeight),
+                Text = title,
+                UseVisualStyleBackColor = true
+            };
+
+            btn.FlatAppearance.BorderSize = 0;
+            btn.FlatAppearance.MouseDownBackColor = Color.FromArgb(179, 213, 232);
+            btn.FlatAppearance.MouseOverBackColor = Color.FromArgb(216, 230, 237);
+            
+            panelButtons.Controls.Add(btn);
+
+            panelButtons.Controls.Add(new Panel{
+                BackColor = Color.DimGray,
+                Location = new Point(0, panelButtons.Controls[panelButtons.Controls.Count-1].Location.Y+buttonHeight),
+                Margin = new Padding(0),
+                Size = new Size(panelButtons.Width, 1)
+            });
+
+            tabs.Add(typeof(T), new SettingsTab(btn, constructor));
+
+            btn.Click += (sender, args) => SelectTab<T>();
+        }
+
+        private void SelectTab<T>() where T : BaseTabSettings{
+            SelectTab(tabs[typeof(T)]);
+        }
+
+        private void SelectTab(SettingsTab tab){
+            if (currentTab != null){
+                currentTab.Button.BackColor = SystemColors.Control;
+            }
+            
+            tab.Button.BackColor = tab.Button.FlatAppearance.MouseDownBackColor;
+
+            if (!tab.IsInitialized){
+                foreach(Control control in tab.Control.InteractiveControls){
+                    if (control is ComboBox){
+                        control.MouseLeave += control_MouseLeave;
+                    }
+                    else if (control is TrackBar){
+                        control.MouseWheel += control_MouseWheel;
+                    }
+                }
+
+                tab.Control.OnReady();
+            }
+            
+            panelContents.SuspendLayout();
+            panelContents.VerticalScroll.Value = 0; // https://gfycat.com/GrotesqueTastyAstarte
+            panelContents.Controls.Clear();
+            panelContents.Controls.Add(tab.Control);
+            panelContents.ResumeLayout(true);
+            panelContents.Focus();
+
+            currentTab = tab;
+        }
+
+        private void control_MouseLeave(object sender, EventArgs e){
+            panelContents.Focus();
+        }
+
+        private void control_MouseWheel(object sender, MouseEventArgs e){
+            ((HandledMouseEventArgs)e).Handled = true;
+            panelContents.Focus();
+        }
+
+        private class SettingsTab{
+            public Button Button { get; }
+
+            public BaseTabSettings Control{
+                get => control ?? (control = constructor());
+                set => control = value;
+            }
+
+            public bool IsInitialized => control != null;
+
+            private readonly Func<BaseTabSettings> constructor;
+            private BaseTabSettings control;
+
+            public SettingsTab(Button button, Func<BaseTabSettings> constructor){
+                this.Button = button;
+                this.constructor = constructor;
+            }
         }
     }
 }

Core/Other/Settings/BaseTabSettings.cs

@@ -1,10 +1,22 @@
-using System.Windows.Forms;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
 using TweetDuck.Configuration;
 
 namespace TweetDuck.Core.Other.Settings{
     class BaseTabSettings : UserControl{
         protected static UserConfig Config => Program.UserConfig;
 
+        public IEnumerable<Control> InteractiveControls{
+            get{
+                foreach(Panel panel in Controls.OfType<Panel>()){
+                    foreach(Control control in panel.Controls){
+                        yield return control;
+                    }
+                }
+            }
+        }
+
         public BaseTabSettings(){
             Padding = new Padding(6);
         }
@@ -13,7 +25,7 @@ namespace TweetDuck.Core.Other.Settings{
         public virtual void OnClosing(){}
 
         protected static void PromptRestart(){
-            if (MessageBox.Show("The application must restart for the setting to take place. Do you want to restart now?", Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes){
+            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/DialogSettingsCSS.Designer.cs

@@ -42,16 +42,14 @@
             // 
             // 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.Bottom;
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             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(373, 253);
+            this.textBoxBrowserCSS.Size = new System.Drawing.Size(378, 253);
             this.textBoxBrowserCSS.TabIndex = 1;
             this.textBoxBrowserCSS.WordWrap = false;
             this.textBoxBrowserCSS.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxBrowserCSS_KeyUp);
@@ -100,7 +98,7 @@
             this.splitContainer.Panel2.Controls.Add(this.textBoxNotificationCSS);
             this.splitContainer.Panel2MinSize = 64;
             this.splitContainer.Size = new System.Drawing.Size(760, 269);
-            this.splitContainer.SplitterDistance = 373;
+            this.splitContainer.SplitterDistance = 378;
             this.splitContainer.SplitterWidth = 5;
             this.splitContainer.TabIndex = 0;
             // 
@@ -126,16 +124,14 @@
             // 
             // 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.Bottom;
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             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, 253);
+            this.textBoxNotificationCSS.Size = new System.Drawing.Size(377, 253);
             this.textBoxNotificationCSS.TabIndex = 1;
             this.textBoxNotificationCSS.WordWrap = false;
             // 
@@ -152,7 +148,6 @@
             // btnOpenWiki
             // 
             this.btnOpenWiki.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOpenWiki.AutoSize = true;
             this.btnOpenWiki.Location = new System.Drawing.Point(12, 287);
             this.btnOpenWiki.Name = "btnOpenWiki";
             this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -13,7 +13,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         public DialogSettingsCSS(Action<string> reinjectBrowserCSS){
             InitializeComponent();
             
-            Text = Program.BrandName+" Settings - CSS";
+            Text = Program.BrandName+" Options - CSS";
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
             

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

@@ -69,7 +69,6 @@
             // btnHelp
             // 
             this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnHelp.AutoSize = true;
             this.btnHelp.Location = new System.Drawing.Point(12, 227);
             this.btnHelp.Name = "btnHelp";
             this.btnHelp.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCefArgs : Form{
@@ -10,7 +11,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         public DialogSettingsCefArgs(){
             InitializeComponent();
             
-            Text = Program.BrandName+" Settings - CEF Arguments";
+            Text = Program.BrandName+" Options - CEF Arguments";
             
             textBoxArgs.EnableMultilineShortcuts();
             textBoxArgs.Text = Program.UserConfig.CustomCefArgs ?? "";
@@ -30,10 +31,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 return;
             }
 
-            int count = CommandLineArgsParser.ReadCefArguments(CefArgs).Count;
+            int count = CommandLineArgs.ReadCefArguments(CefArgs).Count;
-            string prompt = count == 0 && !string.IsNullOrWhiteSpace(prevArgs) ? "All arguments will be removed from the settings. Continue?" : count+(count == 1 ? " argument" : " arguments")+" will be added to the settings. Continue?";
+            string prompt = count == 0 && !string.IsNullOrWhiteSpace(prevArgs) ? "All current arguments will be removed. Continue?" : count+(count == 1 ? " argument was" : " arguments were")+" detected. Continue?";
 
-            if (MessageBox.Show(prompt, "Confirm CEF Arguments", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.OK){
+            if (FormMessage.Question("Confirm CEF Arguments", prompt, FormMessage.OK, FormMessage.Cancel)){
                 DialogResult = DialogResult.OK;
                 Close();
             }

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

@@ -1,130 +0,0 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
-    partial class DialogSettingsExport {
-        /// <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 Windows Form 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.btnCancel = new System.Windows.Forms.Button();
-            this.btnApply = new System.Windows.Forms.Button();
-            this.cbConfig = new System.Windows.Forms.CheckBox();
-            this.cbSession = new System.Windows.Forms.CheckBox();
-            this.cbPluginData = new System.Windows.Forms.CheckBox();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.SuspendLayout();
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.AutoSize = true;
-            this.btnCancel.Location = new System.Drawing.Point(176, 97);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 4;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // btnApply
-            // 
-            this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.AutoSize = true;
-            this.btnApply.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnApply.Location = new System.Drawing.Point(144, 97);
-            this.btnApply.Name = "btnApply";
-            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnApply.Size = new System.Drawing.Size(26, 23);
-            this.btnApply.TabIndex = 3;
-            this.btnApply.Text = " ";
-            this.btnApply.UseVisualStyleBackColor = true;
-            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
-            // 
-            // cbConfig
-            // 
-            this.cbConfig.AutoSize = true;
-            this.cbConfig.Location = new System.Drawing.Point(13, 13);
-            this.cbConfig.Name = "cbConfig";
-            this.cbConfig.Size = new System.Drawing.Size(106, 17);
-            this.cbConfig.TabIndex = 0;
-            this.cbConfig.Text = "Program Settings";
-            this.toolTip.SetToolTip(this.cbConfig, "Interface, notification, and update settings.\r\nIncludes a list of disabled plugin" +
-        "s.");
-            this.cbConfig.UseVisualStyleBackColor = true;
-            this.cbConfig.CheckedChanged += new System.EventHandler(this.cbConfig_CheckedChanged);
-            // 
-            // cbSession
-            // 
-            this.cbSession.AutoSize = true;
-            this.cbSession.Location = new System.Drawing.Point(13, 37);
-            this.cbSession.Name = "cbSession";
-            this.cbSession.Size = new System.Drawing.Size(92, 17);
-            this.cbSession.TabIndex = 1;
-            this.cbSession.Text = "Login Session";
-            this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
-            this.cbSession.UseVisualStyleBackColor = true;
-            this.cbSession.CheckedChanged += new System.EventHandler(this.cbSession_CheckedChanged);
-            // 
-            // cbPluginData
-            // 
-            this.cbPluginData.AutoSize = true;
-            this.cbPluginData.Location = new System.Drawing.Point(13, 61);
-            this.cbPluginData.Name = "cbPluginData";
-            this.cbPluginData.Size = new System.Drawing.Size(81, 17);
-            this.cbPluginData.TabIndex = 2;
-            this.cbPluginData.Text = "Plugin Data";
-            this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
-            this.cbPluginData.UseVisualStyleBackColor = true;
-            this.cbPluginData.CheckedChanged += new System.EventHandler(this.cbPluginData_CheckedChanged);
-            // 
-            // DialogSettingsExport
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(244, 132);
-            this.Controls.Add(this.cbPluginData);
-            this.Controls.Add(this.cbSession);
-            this.Controls.Add(this.cbConfig);
-            this.Controls.Add(this.btnApply);
-            this.Controls.Add(this.btnCancel);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(200, 170);
-            this.Name = "DialogSettingsExport";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Button btnApply;
-        private System.Windows.Forms.CheckBox cbConfig;
-        private System.Windows.Forms.CheckBox cbSession;
-        private System.Windows.Forms.CheckBox cbPluginData;
-        private System.Windows.Forms.ToolTip toolTip;
-    }
-}

Core/Other/Settings/Dialogs/DialogSettingsExport.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Windows.Forms;
-using TweetDuck.Core.Other.Settings.Export;
-
-namespace TweetDuck.Core.Other.Settings.Dialogs{
-    sealed partial class DialogSettingsExport : Form{
-        public static DialogSettingsExport Import(ExportFileFlags flags){
-            return new DialogSettingsExport(flags);
-        }
-
-        public static DialogSettingsExport Export(){
-            return new DialogSettingsExport(ExportFileFlags.None);
-        }
-
-        public ExportFileFlags Flags{
-            get => selectedFlags;
-
-            set{
-                // this will call events and SetFlag, which also updates the UI
-                cbConfig.Checked = value.HasFlag(ExportFileFlags.Config);
-                cbSession.Checked = value.HasFlag(ExportFileFlags.Session);
-                cbPluginData.Checked = value.HasFlag(ExportFileFlags.PluginData);
-            }
-        }
-        
-        private readonly bool isExporting;
-        private ExportFileFlags selectedFlags = ExportFileFlags.None;
-
-        private DialogSettingsExport(ExportFileFlags importFlags){
-            InitializeComponent();
-
-            this.isExporting = importFlags == ExportFileFlags.None;
-
-            if (isExporting){
-                Text = "Export Profile";
-                btnApply.Text = "Export Profile";
-                Flags = ExportFileFlags.All & ~ExportFileFlags.Session;
-            }
-            else{
-                Text = "Import Profile";
-                Flags = importFlags;
-
-                cbConfig.Enabled = cbConfig.Checked;
-                cbSession.Enabled = cbSession.Checked;
-                cbPluginData.Enabled = cbPluginData.Checked;
-            }
-        }
-
-        private void SetFlag(ExportFileFlags flag, bool enable){
-            selectedFlags = enable ? selectedFlags | flag : selectedFlags & ~flag;
-            btnApply.Enabled = selectedFlags != ExportFileFlags.None;
-
-            if (!isExporting){
-                btnApply.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Import && Restart" : "Import Profile";
-            }
-        }
-
-        private void cbConfig_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ExportFileFlags.Config, cbConfig.Checked);
-        }
-
-        private void cbSession_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ExportFileFlags.Session, cbSession.Checked);
-        }
-
-        private void cbPluginData_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ExportFileFlags.PluginData, cbPluginData.Checked);
-        }
-
-        private void btnApply_Click(object sender, EventArgs e){
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-
-        private void btnCancel_Click(object sender, EventArgs e){
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

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

@@ -0,0 +1,201 @@
+namespace TweetDuck.Core.Other.Settings.Dialogs {
+    partial class DialogSettingsManage {
+        /// <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 Windows Form 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.btnCancel = new System.Windows.Forms.Button();
+            this.btnContinue = new System.Windows.Forms.Button();
+            this.cbConfig = new System.Windows.Forms.CheckBox();
+            this.cbSession = new System.Windows.Forms.CheckBox();
+            this.cbPluginData = new System.Windows.Forms.CheckBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.panelExport = new System.Windows.Forms.Panel();
+            this.panelDecision = new System.Windows.Forms.Panel();
+            this.radioReset = new System.Windows.Forms.RadioButton();
+            this.radioExport = new System.Windows.Forms.RadioButton();
+            this.radioImport = new System.Windows.Forms.RadioButton();
+            this.panelExport.SuspendLayout();
+            this.panelDecision.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.Location = new System.Drawing.Point(176, 97);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.TabIndex = 4;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnContinue
+            // 
+            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.Location = new System.Drawing.Point(125, 97);
+            this.btnContinue.Name = "btnContinue";
+            this.btnContinue.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnContinue.Size = new System.Drawing.Size(45, 23);
+            this.btnContinue.TabIndex = 3;
+            this.btnContinue.Text = "Next";
+            this.btnContinue.UseVisualStyleBackColor = true;
+            this.btnContinue.Click += new System.EventHandler(this.btnContinue_Click);
+            // 
+            // cbConfig
+            // 
+            this.cbConfig.AutoSize = true;
+            this.cbConfig.Location = new System.Drawing.Point(0, 3);
+            this.cbConfig.Name = "cbConfig";
+            this.cbConfig.Size = new System.Drawing.Size(104, 17);
+            this.cbConfig.TabIndex = 0;
+            this.cbConfig.Text = "Program Options";
+            this.toolTip.SetToolTip(this.cbConfig, "Interface, notification, and update options.");
+            this.cbConfig.UseVisualStyleBackColor = true;
+            this.cbConfig.CheckedChanged += new System.EventHandler(this.cbConfig_CheckedChanged);
+            // 
+            // cbSession
+            // 
+            this.cbSession.AutoSize = true;
+            this.cbSession.Location = new System.Drawing.Point(0, 27);
+            this.cbSession.Name = "cbSession";
+            this.cbSession.Size = new System.Drawing.Size(92, 17);
+            this.cbSession.TabIndex = 1;
+            this.cbSession.Text = "Login Session";
+            this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
+            this.cbSession.UseVisualStyleBackColor = true;
+            this.cbSession.CheckedChanged += new System.EventHandler(this.cbSession_CheckedChanged);
+            // 
+            // cbPluginData
+            // 
+            this.cbPluginData.AutoSize = true;
+            this.cbPluginData.Location = new System.Drawing.Point(0, 51);
+            this.cbPluginData.Name = "cbPluginData";
+            this.cbPluginData.Size = new System.Drawing.Size(81, 17);
+            this.cbPluginData.TabIndex = 2;
+            this.cbPluginData.Text = "Plugin Data";
+            this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
+            this.cbPluginData.UseVisualStyleBackColor = true;
+            this.cbPluginData.CheckedChanged += new System.EventHandler(this.cbPluginData_CheckedChanged);
+            // 
+            // panelExport
+            // 
+            this.panelExport.Controls.Add(this.cbConfig);
+            this.panelExport.Controls.Add(this.cbPluginData);
+            this.panelExport.Controls.Add(this.cbSession);
+            this.panelExport.Location = new System.Drawing.Point(12, 12);
+            this.panelExport.Name = "panelExport";
+            this.panelExport.Size = new System.Drawing.Size(220, 79);
+            this.panelExport.TabIndex = 5;
+            this.panelExport.Visible = false;
+            // 
+            // panelDecision
+            // 
+            this.panelDecision.Controls.Add(this.radioReset);
+            this.panelDecision.Controls.Add(this.radioExport);
+            this.panelDecision.Controls.Add(this.radioImport);
+            this.panelDecision.Location = new System.Drawing.Point(12, 12);
+            this.panelDecision.Name = "panelDecision";
+            this.panelDecision.Size = new System.Drawing.Size(220, 79);
+            this.panelDecision.TabIndex = 6;
+            // 
+            // radioReset
+            // 
+            this.radioReset.AutoSize = true;
+            this.radioReset.Location = new System.Drawing.Point(3, 49);
+            this.radioReset.Name = "radioReset";
+            this.radioReset.Size = new System.Drawing.Size(104, 17);
+            this.radioReset.TabIndex = 2;
+            this.radioReset.TabStop = true;
+            this.radioReset.Text = "Restore Defaults";
+            this.radioReset.UseVisualStyleBackColor = true;
+            this.radioReset.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // radioExport
+            // 
+            this.radioExport.AutoSize = true;
+            this.radioExport.Location = new System.Drawing.Point(3, 26);
+            this.radioExport.Name = "radioExport";
+            this.radioExport.Size = new System.Drawing.Size(87, 17);
+            this.radioExport.TabIndex = 1;
+            this.radioExport.TabStop = true;
+            this.radioExport.Text = "Export Profile";
+            this.radioExport.UseVisualStyleBackColor = true;
+            this.radioExport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // radioImport
+            // 
+            this.radioImport.AutoSize = true;
+            this.radioImport.Location = new System.Drawing.Point(3, 3);
+            this.radioImport.Name = "radioImport";
+            this.radioImport.Size = new System.Drawing.Size(86, 17);
+            this.radioImport.TabIndex = 0;
+            this.radioImport.TabStop = true;
+            this.radioImport.Text = "Import Profile";
+            this.radioImport.UseVisualStyleBackColor = true;
+            this.radioImport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // DialogSettingsManage
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(244, 132);
+            this.Controls.Add(this.panelDecision);
+            this.Controls.Add(this.panelExport);
+            this.Controls.Add(this.btnContinue);
+            this.Controls.Add(this.btnCancel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(200, 170);
+            this.Name = "DialogSettingsManage";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Manage Options";
+            this.panelExport.ResumeLayout(false);
+            this.panelExport.PerformLayout();
+            this.panelDecision.ResumeLayout(false);
+            this.panelDecision.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnContinue;
+        private System.Windows.Forms.CheckBox cbConfig;
+        private System.Windows.Forms.CheckBox cbSession;
+        private System.Windows.Forms.CheckBox cbPluginData;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.Panel panelExport;
+        private System.Windows.Forms.Panel panelDecision;
+        private System.Windows.Forms.RadioButton radioReset;
+        private System.Windows.Forms.RadioButton radioExport;
+        private System.Windows.Forms.RadioButton radioImport;
+    }
+}

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -0,0 +1,170 @@
+using System;
+using System.Windows.Forms;
+using TweetDuck.Core.Other.Settings.Export;
+using TweetDuck.Plugins;
+
+namespace TweetDuck.Core.Other.Settings.Dialogs{
+    sealed partial class DialogSettingsManage : Form{
+        private enum State{
+            Deciding, Import, Export
+        }
+
+        public ExportFileFlags Flags{
+            get => selectedFlags;
+
+            set{
+                // this will call events and SetFlag, which also updates the UI
+                cbConfig.Checked = value.HasFlag(ExportFileFlags.Config);
+                cbSession.Checked = value.HasFlag(ExportFileFlags.Session);
+                cbPluginData.Checked = value.HasFlag(ExportFileFlags.PluginData);
+            }
+        }
+
+        public bool ShouldReloadUI { get; private set; }
+        
+        private readonly PluginManager plugins;
+        private State currentState;
+
+        private ExportManager importManager;
+        private ExportFileFlags selectedFlags = ExportFileFlags.None;
+
+        public DialogSettingsManage(PluginManager plugins){
+            InitializeComponent();
+
+            this.plugins = plugins;
+            this.currentState = State.Deciding;
+        }
+
+        private void radioDecision_CheckedChanged(object sender, EventArgs e){
+            btnContinue.Enabled = true;
+        }
+
+        private void cbConfig_CheckedChanged(object sender, EventArgs e){
+            SetFlag(ExportFileFlags.Config, cbConfig.Checked);
+        }
+
+        private void cbSession_CheckedChanged(object sender, EventArgs e){
+            SetFlag(ExportFileFlags.Session, cbSession.Checked);
+        }
+
+        private void cbPluginData_CheckedChanged(object sender, EventArgs e){
+            SetFlag(ExportFileFlags.PluginData, cbPluginData.Checked);
+        }
+
+        private void btnContinue_Click(object sender, EventArgs e){
+            string file;
+
+            switch(currentState){
+                case State.Deciding:
+                    // Reset
+                    if (radioReset.Checked){
+                        if (FormMessage.Warning("Reset TweetDuck Options", "This will reset all of your program options. Plugins will not be affected. Do you want to proceed?", FormMessage.Yes, FormMessage.No)){
+                            Program.ResetConfig();
+
+                            ShouldReloadUI = true;
+                            DialogResult = DialogResult.OK;
+                            Close();
+                        }
+
+                        return;
+                    }
+
+                    // Import
+                    else if (radioImport.Checked){
+                        using(OpenFileDialog dialog = new OpenFileDialog{
+                            AutoUpgradeEnabled = true,
+                            DereferenceLinks = true,
+                            Title = "Import TweetDuck Profile",
+                            Filter = "TweetDuck Profile (*.tdsettings)|*.tdsettings"
+                        }){
+                            if (dialog.ShowDialog() != DialogResult.OK){
+                                return;
+                            }
+
+                            file = dialog.FileName;
+                        }
+
+                        importManager = new ExportManager(file, plugins);
+                        currentState = State.Import;
+
+                        Text = "Import Profile";
+                        Flags = importManager.GetImportFlags();
+
+                        cbConfig.Enabled = cbConfig.Checked;
+                        cbSession.Enabled = cbSession.Checked;
+                        cbPluginData.Enabled = cbPluginData.Checked;
+                    }
+
+                    // Export
+                    else if (radioExport.Checked){
+                        currentState = State.Export;
+
+                        Text = "Export Profile";
+                        btnContinue.Text = "Export Profile";
+                        Flags = ExportFileFlags.All & ~ExportFileFlags.Session;
+                    }
+                    
+                    // Continue...
+                    panelDecision.Visible = false;
+                    panelExport.Visible = true;
+                    break;
+
+                case State.Import:
+                    if (importManager.Import(Flags)){
+                        if (!importManager.IsRestarting){
+                            ShouldReloadUI = true;
+                        }
+                    }
+                    else{
+                        Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing TweetDuck profile.", true, importManager.LastException);
+                    }
+                    
+                    DialogResult = DialogResult.OK;
+                    Close();
+                    break;
+
+                case State.Export:
+                    using(SaveFileDialog dialog = new SaveFileDialog{
+                        AddExtension = true,
+                        AutoUpgradeEnabled = true,
+                        OverwritePrompt = true,
+                        DefaultExt = "tdsettings",
+                        FileName = "TweetDuck.tdsettings",
+                        Title = "Export TweetDuck Profile",
+                        Filter = "TweetDuck Profile (*.tdsettings)|*.tdsettings"
+                    }){
+                        if (dialog.ShowDialog() != DialogResult.OK){
+                            return;
+                        }
+
+                        file = dialog.FileName;
+                    }
+
+                    Program.UserConfig.Save();
+                    ExportManager manager = new ExportManager(file, plugins);
+
+                    if (!manager.Export(Flags)){
+                        Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting TweetDuck profile.", true, manager.LastException);
+                    }
+
+                    DialogResult = DialogResult.OK;
+                    Close();
+                    break;
+            }
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e){
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void SetFlag(ExportFileFlags flag, bool enable){
+            selectedFlags = enable ? selectedFlags | flag : selectedFlags & ~flag;
+            btnContinue.Enabled = selectedFlags != ExportFileFlags.None;
+
+            if (currentState == State.Import){
+                btnContinue.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Import && Restart" : "Import Profile";
+            }
+        }
+    }
+}

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

@@ -38,7 +38,6 @@
             // btnCancel
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.AutoSize = true;
             this.btnCancel.Location = new System.Drawing.Point(160, 171);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
@@ -51,7 +50,6 @@
             // btnRestart
             // 
             this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRestart.AutoSize = true;
             this.btnRestart.Location = new System.Drawing.Point(97, 171);
             this.btnRestart.Name = "btnRestart";
             this.btnRestart.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsRestart : Form{

Core/Other/Settings/Export/ExportManager.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 using TweetDuck.Configuration;
+using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Enums;
 
@@ -38,7 +38,7 @@ namespace TweetDuck.Core.Other.Settings.Export{
                                 try{
                                     stream.WriteFile(new string[]{ "plugin.data", plugin.Identifier, path.Relative }, path.Full);
                                 }catch(ArgumentOutOfRangeException e){
-                                    MessageBox.Show("Could not include a plugin file in the export. "+e.Message, "Export Profile", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                    FormMessage.Warning("Export Profile", "Could not include a plugin file in the export. "+e.Message, FormMessage.OK);
                                 }
                             }
                         }
@@ -138,11 +138,11 @@ namespace TweetDuck.Core.Other.Settings.Export{
                 }
 
                 if (missingPlugins.Count > 0){
-                    MessageBox.Show("Detected missing plugins when importing plugin data:"+Environment.NewLine+string.Join(Environment.NewLine, missingPlugins), "Importing "+Program.BrandName+" Profile", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    FormMessage.Information("Importing TweetDuck Profile", "Detected missing plugins when importing plugin data:\n"+string.Join("\n", missingPlugins), FormMessage.OK);
                 }
 
                 if (IsRestarting){
-                    Program.Restart(new string[]{ Arguments.ArgImportCookies });
+                    Program.Restart(Arguments.ArgImportCookies);
                 }
                 else{
                     Program.ReloadConfig();

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -33,46 +33,50 @@
             this.btnRestart = new System.Windows.Forms.Button();
             this.btnOpenAppFolder = new System.Windows.Forms.Button();
             this.btnOpenDataFolder = new System.Windows.Forms.Button();
-            this.btnReset = new System.Windows.Forms.Button();
+            this.numMemoryThreshold = new TweetDuck.Core.Controls.NumericUpDownEx();
-            this.btnImport = new System.Windows.Forms.Button();
+            this.checkBrowserGCReload = new System.Windows.Forms.CheckBox();
-            this.btnExport = new System.Windows.Forms.Button();
+            this.labelApp = new System.Windows.Forms.Label();
-            this.groupPerformance = new System.Windows.Forms.GroupBox();
+            this.panelApp = new System.Windows.Forms.Panel();
-            this.groupConfiguration = new System.Windows.Forms.GroupBox();
+            this.labelPerformance = new System.Windows.Forms.Label();
-            this.groupApp = new System.Windows.Forms.GroupBox();
+            this.panelPerformance = new System.Windows.Forms.Panel();
-            this.groupPerformance.SuspendLayout();
+            this.labelMemoryUsage = new System.Windows.Forms.Label();
-            this.groupConfiguration.SuspendLayout();
+            this.panelConfiguration = new System.Windows.Forms.Panel();
-            this.groupApp.SuspendLayout();
+            this.labelConfiguration = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numMemoryThreshold)).BeginInit();
+            this.panelApp.SuspendLayout();
+            this.panelPerformance.SuspendLayout();
+            this.panelConfiguration.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClearCache
             // 
-            this.btnClearCache.Location = new System.Drawing.Point(6, 44);
+            this.btnClearCache.Location = new System.Drawing.Point(5, 28);
+            this.btnClearCache.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnClearCache.Name = "btnClearCache";
-            this.btnClearCache.Size = new System.Drawing.Size(171, 23);
+            this.btnClearCache.Size = new System.Drawing.Size(144, 23);
             this.btnClearCache.TabIndex = 1;
             this.btnClearCache.Text = "Clear Cache (calculating)";
-            this.toolTip.SetToolTip(this.btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources." +
+            this.toolTip.SetToolTip(this.btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources.");
-        "");
             this.btnClearCache.UseVisualStyleBackColor = true;
             // 
             // checkHardwareAcceleration
             // 
             this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(9, 21);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 5);
             this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
             this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
             this.checkHardwareAcceleration.TabIndex = 0;
             this.checkHardwareAcceleration.Text = "Hardware Acceleration";
-            this.toolTip.SetToolTip(this.checkHardwareAcceleration, "Uses your graphics card to improve performance.\r\nDisable if you experience issues" +
+            this.toolTip.SetToolTip(this.checkHardwareAcceleration, "Uses graphics card to improve performance. Disable if you experience\r\nvisual glitches. This option will not be exported in a profile.");
-        " with rendering.");
             this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
             // 
             // btnEditCefArgs
             // 
-            this.btnEditCefArgs.Location = new System.Drawing.Point(6, 19);
+            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(171, 23);
+            this.btnEditCefArgs.Size = new System.Drawing.Size(144, 23);
             this.btnEditCefArgs.TabIndex = 0;
             this.btnEditCefArgs.Text = "Edit CEF Arguments";
             this.toolTip.SetToolTip(this.btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
@@ -80,9 +84,9 @@
             // 
             // btnEditCSS
             // 
-            this.btnEditCSS.Location = new System.Drawing.Point(6, 48);
+            this.btnEditCSS.Location = new System.Drawing.Point(155, 3);
             this.btnEditCSS.Name = "btnEditCSS";
-            this.btnEditCSS.Size = new System.Drawing.Size(171, 23);
+            this.btnEditCSS.Size = new System.Drawing.Size(144, 23);
             this.btnEditCSS.TabIndex = 1;
             this.btnEditCSS.Text = "Edit CSS";
             this.toolTip.SetToolTip(this.btnEditCSS, "Set custom CSS for browser and notification windows.");
@@ -90,9 +94,9 @@
             // 
             // btnRestartArgs
             // 
-            this.btnRestartArgs.Location = new System.Drawing.Point(6, 106);
+            this.btnRestartArgs.Location = new System.Drawing.Point(155, 32);
             this.btnRestartArgs.Name = "btnRestartArgs";
-            this.btnRestartArgs.Size = new System.Drawing.Size(171, 23);
+            this.btnRestartArgs.Size = new System.Drawing.Size(144, 23);
             this.btnRestartArgs.TabIndex = 3;
             this.btnRestartArgs.Text = "Restart with Arguments";
             this.toolTip.SetToolTip(this.btnRestartArgs, "Restarts the program with customizable\r\ncommand line arguments.");
@@ -100,20 +104,20 @@
             // 
             // btnRestart
             // 
-            this.btnRestart.Location = new System.Drawing.Point(6, 77);
+            this.btnRestart.Location = new System.Drawing.Point(155, 3);
             this.btnRestart.Name = "btnRestart";
-            this.btnRestart.Size = new System.Drawing.Size(171, 23);
+            this.btnRestart.Size = new System.Drawing.Size(144, 23);
             this.btnRestart.TabIndex = 2;
             this.btnRestart.Text = "Restart the Program";
-            this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at lau" +
+            this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at launch.");
-        "nch.");
             this.btnRestart.UseVisualStyleBackColor = true;
             // 
             // btnOpenAppFolder
             // 
-            this.btnOpenAppFolder.Location = new System.Drawing.Point(6, 19);
+            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(171, 23);
+            this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 23);
             this.btnOpenAppFolder.TabIndex = 0;
             this.btnOpenAppFolder.Text = "Open Program Folder";
             this.toolTip.SetToolTip(this.btnOpenAppFolder, "Opens the folder where the app is located.");
@@ -121,102 +125,142 @@
             // 
             // btnOpenDataFolder
             // 
-            this.btnOpenDataFolder.Location = new System.Drawing.Point(6, 48);
+            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(171, 23);
+            this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 23);
             this.btnOpenDataFolder.TabIndex = 1;
             this.btnOpenDataFolder.Text = "Open Data Folder";
             this.toolTip.SetToolTip(this.btnOpenDataFolder, "Opens the folder where your profile data is located.");
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
             // 
-            // btnReset
+            // numMemoryThreshold
             // 
-            this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.numMemoryThreshold.Increment = new decimal(new int[] {
-            this.btnReset.AutoSize = true;
+            50,
-            this.btnReset.Location = new System.Drawing.Point(190, 268);
+            0,
-            this.btnReset.Name = "btnReset";
+            0,
-            this.btnReset.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            0});
-            this.btnReset.Size = new System.Drawing.Size(102, 23);
+            this.numMemoryThreshold.Location = new System.Drawing.Point(202, 82);
-            this.btnReset.TabIndex = 5;
+            this.numMemoryThreshold.Maximum = 2000;
-            this.btnReset.Text = "Restore Defaults";
+            this.numMemoryThreshold.Minimum = 200;
-            this.btnReset.UseVisualStyleBackColor = true;
+            this.numMemoryThreshold.Name = "numMemoryThreshold";
+            this.numMemoryThreshold.Size = new System.Drawing.Size(97, 20);
+            this.numMemoryThreshold.TabIndex = 4;
+            this.numMemoryThreshold.TextSuffix = " MB";
+            this.toolTip.SetToolTip(this.numMemoryThreshold, "Minimum amount of memory usage by the browser process to trigger the cleanup.\r\nThis is not a limit, the usage is allowed to exceed this value.");
+            this.numMemoryThreshold.Value = 400;
             // 
-            // btnImport
+            // checkBrowserGCReload
             // 
-            this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.checkBrowserGCReload.AutoSize = true;
-            this.btnImport.AutoSize = true;
+            this.checkBrowserGCReload.Location = new System.Drawing.Point(6, 84);
-            this.btnImport.Location = new System.Drawing.Point(100, 268);
+            this.checkBrowserGCReload.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
-            this.btnImport.Name = "btnImport";
+            this.checkBrowserGCReload.Name = "checkBrowserGCReload";
-            this.btnImport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.checkBrowserGCReload.Size = new System.Drawing.Size(190, 17);
-            this.btnImport.Size = new System.Drawing.Size(84, 23);
+            this.checkBrowserGCReload.TabIndex = 3;
-            this.btnImport.TabIndex = 4;
+            this.checkBrowserGCReload.Text = "Enable Browser Memory Threshold";
-            this.btnImport.Text = "Import Profile";
+            this.toolTip.SetToolTip(this.checkBrowserGCReload, "Automatically reloads TweetDeck to save memory. This option only works if\r\nthe browser is in a \'default state\', i.e. all modals and drawers are closed, and\r\nall columns are scrolled to top. This option will not be exported in a profile.");
-            this.btnImport.UseVisualStyleBackColor = true;
+            this.checkBrowserGCReload.UseVisualStyleBackColor = true;
             // 
-            // btnExport
+            // labelApp
             // 
-            this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.labelApp.AutoSize = true;
-            this.btnExport.AutoSize = true;
+            this.labelApp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.btnExport.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.labelApp.Location = new System.Drawing.Point(6, 8);
-            this.btnExport.Location = new System.Drawing.Point(9, 268);
+            this.labelApp.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
-            this.btnExport.Name = "btnExport";
+            this.labelApp.Name = "labelApp";
-            this.btnExport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.labelApp.Size = new System.Drawing.Size(38, 20);
-            this.btnExport.Size = new System.Drawing.Size(85, 23);
+            this.labelApp.TabIndex = 0;
-            this.btnExport.TabIndex = 3;
+            this.labelApp.Text = "App";
-            this.btnExport.Text = "Export Profile";
-            this.btnExport.UseVisualStyleBackColor = true;
             // 
-            // groupPerformance
+            // panelApp
             // 
-            this.groupPerformance.Controls.Add(this.checkHardwareAcceleration);
+            this.panelApp.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            this.groupPerformance.Controls.Add(this.btnClearCache);
+            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupPerformance.Location = new System.Drawing.Point(9, 9);
+            this.panelApp.Controls.Add(this.btnOpenDataFolder);
-            this.groupPerformance.Name = "groupPerformance";
+            this.panelApp.Controls.Add(this.btnOpenAppFolder);
-            this.groupPerformance.Size = new System.Drawing.Size(183, 74);
+            this.panelApp.Controls.Add(this.btnRestart);
-            this.groupPerformance.TabIndex = 0;
+            this.panelApp.Controls.Add(this.btnRestartArgs);
-            this.groupPerformance.TabStop = false;
+            this.panelApp.Location = new System.Drawing.Point(9, 31);
-            this.groupPerformance.Text = "Performance";
+            this.panelApp.Name = "panelApp";
+            this.panelApp.Size = new System.Drawing.Size(322, 59);
+            this.panelApp.TabIndex = 1;
             // 
-            // groupConfiguration
+            // labelPerformance
             // 
-            this.groupConfiguration.Controls.Add(this.btnEditCSS);
+            this.labelPerformance.AutoSize = true;
-            this.groupConfiguration.Controls.Add(this.btnEditCefArgs);
+            this.labelPerformance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.groupConfiguration.Location = new System.Drawing.Point(9, 89);
+            this.labelPerformance.Location = new System.Drawing.Point(6, 114);
-            this.groupConfiguration.Name = "groupConfiguration";
+            this.labelPerformance.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
-            this.groupConfiguration.Size = new System.Drawing.Size(183, 77);
+            this.labelPerformance.Name = "labelPerformance";
-            this.groupConfiguration.TabIndex = 1;
+            this.labelPerformance.Size = new System.Drawing.Size(100, 20);
-            this.groupConfiguration.TabStop = false;
+            this.labelPerformance.TabIndex = 2;
-            this.groupConfiguration.Text = "Configuration";
+            this.labelPerformance.Text = "Performance";
             // 
-            // groupApp
+            // panelPerformance
             // 
-            this.groupApp.Controls.Add(this.btnOpenDataFolder);
+            this.panelPerformance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            this.groupApp.Controls.Add(this.btnOpenAppFolder);
+            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupApp.Controls.Add(this.btnRestartArgs);
+            this.panelPerformance.Controls.Add(this.checkBrowserGCReload);
-            this.groupApp.Controls.Add(this.btnRestart);
+            this.panelPerformance.Controls.Add(this.numMemoryThreshold);
-            this.groupApp.Location = new System.Drawing.Point(198, 9);
+            this.panelPerformance.Controls.Add(this.labelMemoryUsage);
-            this.groupApp.Name = "groupApp";
+            this.panelPerformance.Controls.Add(this.checkHardwareAcceleration);
-            this.groupApp.Size = new System.Drawing.Size(183, 135);
+            this.panelPerformance.Controls.Add(this.btnClearCache);
-            this.groupApp.TabIndex = 2;
+            this.panelPerformance.Location = new System.Drawing.Point(9, 137);
-            this.groupApp.TabStop = false;
+            this.panelPerformance.Name = "panelPerformance";
-            this.groupApp.Text = "App";
+            this.panelPerformance.Size = new System.Drawing.Size(322, 105);
+            this.panelPerformance.TabIndex = 3;
+            // 
+            // labelMemoryUsage
+            // 
+            this.labelMemoryUsage.AutoSize = true;
+            this.labelMemoryUsage.Location = new System.Drawing.Point(3, 66);
+            this.labelMemoryUsage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelMemoryUsage.Name = "labelMemoryUsage";
+            this.labelMemoryUsage.Size = new System.Drawing.Size(78, 13);
+            this.labelMemoryUsage.TabIndex = 2;
+            this.labelMemoryUsage.Text = "Memory Usage";
+            // 
+            // panelConfiguration
+            // 
+            this.panelConfiguration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelConfiguration.Controls.Add(this.btnEditCSS);
+            this.panelConfiguration.Controls.Add(this.btnEditCefArgs);
+            this.panelConfiguration.Location = new System.Drawing.Point(9, 289);
+            this.panelConfiguration.Name = "panelConfiguration";
+            this.panelConfiguration.Size = new System.Drawing.Size(322, 29);
+            this.panelConfiguration.TabIndex = 5;
+            // 
+            // labelConfiguration
+            // 
+            this.labelConfiguration.AutoSize = true;
+            this.labelConfiguration.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelConfiguration.Location = new System.Drawing.Point(6, 266);
+            this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelConfiguration.Name = "labelConfiguration";
+            this.labelConfiguration.Size = new System.Drawing.Size(104, 20);
+            this.labelConfiguration.TabIndex = 4;
+            this.labelConfiguration.Text = "Configuration";
             // 
             // TabSettingsAdvanced
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupApp);
+            this.Controls.Add(this.labelConfiguration);
-            this.Controls.Add(this.groupConfiguration);
+            this.Controls.Add(this.panelConfiguration);
-            this.Controls.Add(this.groupPerformance);
+            this.Controls.Add(this.panelPerformance);
-            this.Controls.Add(this.btnReset);
+            this.Controls.Add(this.labelPerformance);
-            this.Controls.Add(this.btnImport);
+            this.Controls.Add(this.panelApp);
-            this.Controls.Add(this.btnExport);
+            this.Controls.Add(this.labelApp);
             this.Name = "TabSettingsAdvanced";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 328);
-            this.groupPerformance.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numMemoryThreshold)).EndInit();
-            this.groupPerformance.PerformLayout();
+            this.panelApp.ResumeLayout(false);
-            this.groupConfiguration.ResumeLayout(false);
+            this.panelPerformance.ResumeLayout(false);
-            this.groupApp.ResumeLayout(false);
+            this.panelPerformance.PerformLayout();
+            this.panelConfiguration.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -227,17 +271,20 @@
         private System.Windows.Forms.Button btnClearCache;
         private System.Windows.Forms.CheckBox checkHardwareAcceleration;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.Button btnReset;
-        private System.Windows.Forms.Button btnImport;
-        private System.Windows.Forms.Button btnExport;
-        private System.Windows.Forms.GroupBox groupPerformance;
-        private System.Windows.Forms.GroupBox groupConfiguration;
         private System.Windows.Forms.Button btnEditCefArgs;
         private System.Windows.Forms.Button btnEditCSS;
-        private System.Windows.Forms.GroupBox groupApp;
         private System.Windows.Forms.Button btnRestartArgs;
         private System.Windows.Forms.Button btnRestart;
         private System.Windows.Forms.Button btnOpenAppFolder;
         private System.Windows.Forms.Button btnOpenDataFolder;
+        private System.Windows.Forms.Label labelApp;
+        private System.Windows.Forms.Panel panelApp;
+        private System.Windows.Forms.Label labelPerformance;
+        private System.Windows.Forms.Panel panelPerformance;
+        private System.Windows.Forms.Panel panelConfiguration;
+        private System.Windows.Forms.Label labelConfiguration;
+        private System.Windows.Forms.Label labelMemoryUsage;
+        private Controls.NumericUpDownEx numMemoryThreshold;
+        private System.Windows.Forms.CheckBox checkBrowserGCReload;
     }
 }

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -4,29 +4,31 @@ using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other.Settings.Dialogs;
-using TweetDuck.Core.Other.Settings.Export;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsAdvanced : BaseTabSettings{
-        private readonly Action<string> reinjectBrowserCSS;
+        private static SystemConfig SysConfig => Program.SystemConfig;
-        private readonly PluginManager plugins;
 
-        public TabSettingsAdvanced(Action<string> reinjectBrowserCSS, PluginManager plugins){
+        private readonly Action<string> reinjectBrowserCSS;
+
+        public TabSettingsAdvanced(Action<string> reinjectBrowserCSS){
             InitializeComponent();
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
-            this.plugins = plugins;
 
             if (SystemConfig.IsHardwareAccelerationSupported){
-                checkHardwareAcceleration.Checked = Program.SystemConfig.HardwareAcceleration;
+                checkHardwareAcceleration.Checked = SysConfig.HardwareAcceleration;
             }
             else{
                 checkHardwareAcceleration.Enabled = false;
                 checkHardwareAcceleration.Checked = false;
             }
 
+            checkBrowserGCReload.Checked = SysConfig.EnableBrowserGCReload;
+            numMemoryThreshold.Enabled = checkBrowserGCReload.Checked;
+            numMemoryThreshold.SetValueSafe(SysConfig.BrowserMemoryThreshold);
+
             BrowserCache.CalculateCacheSize(bytes => this.InvokeSafe(() => {
                 if (bytes == -1L){
                     btnClearCache.Text = "Clear Cache (unknown size)";
@@ -41,12 +43,11 @@ namespace TweetDuck.Core.Other.Settings{
             btnClearCache.Click += btnClearCache_Click;
             checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
 
+            checkBrowserGCReload.CheckedChanged += checkBrowserGCReload_CheckedChanged;
+            numMemoryThreshold.ValueChanged += numMemoryThreshold_ValueChanged;
+
             btnEditCefArgs.Click += btnEditCefArgs_Click;
             btnEditCSS.Click += btnEditCSS_Click;
-
-            btnExport.Click += btnExport_Click;
-            btnImport.Click += btnImport_Click;
-            btnReset.Click += btnReset_Click;
             
             btnOpenAppFolder.Click += btnOpenAppFolder_Click;
             btnOpenDataFolder.Click += btnOpenDataFolder_Click;
@@ -54,17 +55,28 @@ namespace TweetDuck.Core.Other.Settings{
             btnRestartArgs.Click += btnRestartArgs_Click;
         }
 
+        public override void OnClosing(){
+            SysConfig.Save();
+        }
+
         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);
-            MessageBox.Show("Cache will be automatically cleared when "+Program.BrandName+" exits.", "Clear Cache", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
         private void checkHardwareAcceleration_CheckedChanged(object sender, EventArgs e){
-            Program.SystemConfig.HardwareAcceleration = checkHardwareAcceleration.Checked;
+            SysConfig.HardwareAcceleration = checkHardwareAcceleration.Checked;
-            Program.SystemConfig.Save();
+            PromptRestart(); // calls OnClosing
-            PromptRestart();
+        }
+
+        private void checkBrowserGCReload_CheckedChanged(object sender, EventArgs e){
+            SysConfig.EnableBrowserGCReload = checkBrowserGCReload.Checked;
+            numMemoryThreshold.Enabled = checkBrowserGCReload.Checked;
+        }
+
+        private void numMemoryThreshold_ValueChanged(object sender, EventArgs e){
+            SysConfig.BrowserMemoryThreshold = (int)numMemoryThreshold.Value;
         }
 
         private void btnEditCefArgs_Click(object sender, EventArgs e){
@@ -79,8 +91,8 @@ namespace TweetDuck.Core.Other.Settings{
 
                 if (form.DialogResult == DialogResult.OK){
                     Config.CustomCefArgs = form.CefArgs;
-                    form.Dispose();
                     PromptRestart();
+                    form.Dispose();
                 }
                 else form.Dispose();
             };
@@ -112,88 +124,6 @@ namespace TweetDuck.Core.Other.Settings{
             NativeMethods.SetFormDisabled(ParentForm, true);
         }
 
-        private void btnExport_Click(object sender, EventArgs e){
-            ExportFileFlags flags;
-
-            using(DialogSettingsExport dialog = DialogSettingsExport.Export()){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                flags = dialog.Flags;
-            }
-
-            string file;
-
-            using(SaveFileDialog dialog = new SaveFileDialog{
-                AddExtension = true,
-                AutoUpgradeEnabled = true,
-                OverwritePrompt = true,
-                DefaultExt = "tdsettings",
-                FileName = Program.BrandName+".tdsettings",
-                Title = "Export "+Program.BrandName+" Settings",
-                Filter = Program.BrandName+" Settings (*.tdsettings)|*.tdsettings"
-            }){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                file = dialog.FileName;
-            }
-
-            Program.UserConfig.Save();
-
-            ExportManager manager = new ExportManager(file, plugins);
-            
-            if (!manager.Export(flags)){
-                Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting "+Program.BrandName+" settings.", true, manager.LastException);
-            }
-        }
-
-        private void btnImport_Click(object sender, EventArgs e){
-            string file;
-
-            using(OpenFileDialog dialog = new OpenFileDialog{
-                AutoUpgradeEnabled = true,
-                DereferenceLinks = true,
-                Title = "Import "+Program.BrandName+" Settings",
-                Filter = Program.BrandName+" Settings (*.tdsettings)|*.tdsettings"
-            }){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                file = dialog.FileName;
-            }
-
-            ExportManager manager = new ExportManager(file, plugins);
-            ExportFileFlags flags;
-
-            using(DialogSettingsExport dialog = DialogSettingsExport.Import(manager.GetImportFlags())){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                flags = dialog.Flags;
-            }
-
-            if (manager.Import(flags)){
-                if (!manager.IsRestarting){
-                    ((FormSettings)ParentForm).ReloadUI();
-                }
-            }
-            else{
-                Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing "+Program.BrandName+" settings.", true, manager.LastException);
-            }
-        }
-
-        private void btnReset_Click(object sender, EventArgs e){
-            if (MessageBox.Show("This will reset all of your program settings. Plugins will not be affected. Do you want to proceed?", "Reset "+Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
-                Program.ResetConfig();
-                ((FormSettings)ParentForm).ReloadUI();
-            }
-        }
-
         private void btnOpenAppFolder_Click(object sender, EventArgs e){
             using(Process.Start("explorer.exe", "\""+Program.ProgramPath+"\"")){}
         }

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -33,63 +33,66 @@
             this.btnCheckUpdates = new System.Windows.Forms.Button();
             this.labelZoomValue = new System.Windows.Forms.Label();
             this.checkSwitchAccountSelectors = new System.Windows.Forms.CheckBox();
-            this.groupTray = new System.Windows.Forms.GroupBox();
             this.labelTrayIcon = new System.Windows.Forms.Label();
-            this.groupInterface = new System.Windows.Forms.GroupBox();
             this.trackBarZoom = new System.Windows.Forms.TrackBar();
             this.labelZoom = new System.Windows.Forms.Label();
-            this.groupUpdates = new System.Windows.Forms.GroupBox();
             this.zoomUpdateTimer = new System.Windows.Forms.Timer(this.components);
-            this.groupTray.SuspendLayout();
+            this.labelUI = new System.Windows.Forms.Label();
-            this.groupInterface.SuspendLayout();
+            this.panelUI = new System.Windows.Forms.Panel();
+            this.labelTray = new System.Windows.Forms.Label();
+            this.panelUpdates = new System.Windows.Forms.Panel();
+            this.panelTray = new System.Windows.Forms.Panel();
+            this.labelUpdates = new System.Windows.Forms.Label();
+            this.checkBestImageQuality = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
-            this.groupUpdates.SuspendLayout();
+            this.panelUI.SuspendLayout();
+            this.panelUpdates.SuspendLayout();
+            this.panelTray.SuspendLayout();
             this.SuspendLayout();
             // 
             // checkExpandLinks
             // 
             this.checkExpandLinks.AutoSize = true;
-            this.checkExpandLinks.Location = new System.Drawing.Point(9, 21);
+            this.checkExpandLinks.Location = new System.Drawing.Point(6, 5);
             this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkExpandLinks.Name = "checkExpandLinks";
             this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
             this.checkExpandLinks.TabIndex = 0;
             this.checkExpandLinks.Text = "Expand Links When Hovered";
-            this.toolTip.SetToolTip(this.checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a toolti" +
+            this.toolTip.SetToolTip(this.checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
-        "p instead.");
             this.checkExpandLinks.UseVisualStyleBackColor = true;
             // 
             // comboBoxTrayType
             // 
             this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxTrayType.FormattingEnabled = true;
-            this.comboBoxTrayType.Location = new System.Drawing.Point(6, 19);
+            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 5);
+            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 5, 3, 3);
             this.comboBoxTrayType.Name = "comboBoxTrayType";
-            this.comboBoxTrayType.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 21);
             this.comboBoxTrayType.TabIndex = 0;
             this.toolTip.SetToolTip(this.comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
             // 
             // checkTrayHighlight
             // 
             this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Location = new System.Drawing.Point(9, 70);
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 56);
             this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkTrayHighlight.Name = "checkTrayHighlight";
             this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
             this.checkTrayHighlight.TabIndex = 2;
             this.checkTrayHighlight.Text = "Enable Highlight";
-            this.toolTip.SetToolTip(this.checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with po" +
+            this.toolTip.SetToolTip(this.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.");
-        "pup or audio notifications.\r\nThe icon resets when the main window is restored.");
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
             // 
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
-            this.checkSpellCheck.Location = new System.Drawing.Point(9, 67);
+            this.checkSpellCheck.Location = new System.Drawing.Point(6, 74);
             this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSpellCheck.Name = "checkSpellCheck";
             this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
-            this.checkSpellCheck.TabIndex = 2;
+            this.checkSpellCheck.TabIndex = 3;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.toolTip.SetToolTip(this.checkSpellCheck, "Underlines words that are spelled incorrectly.");
             this.checkSpellCheck.UseVisualStyleBackColor = true;
@@ -97,21 +100,21 @@
             // checkUpdateNotifications
             // 
             this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(9, 21);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 5);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
             this.checkUpdateNotifications.TabIndex = 0;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
-            this.toolTip.SetToolTip(this.checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear aga" +
+            this.toolTip.SetToolTip(this.checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
-        "in.");
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
             // btnCheckUpdates
             // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(6, 44);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 28);
+            this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
-            this.btnCheckUpdates.Size = new System.Drawing.Size(171, 23);
+            this.btnCheckUpdates.Size = new System.Drawing.Size(144, 23);
             this.btnCheckUpdates.TabIndex = 1;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.toolTip.SetToolTip(this.btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
@@ -119,13 +122,12 @@
             // 
             // labelZoomValue
             // 
-            this.labelZoomValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelZoomValue.Location = new System.Drawing.Point(139, 116);
+            this.labelZoomValue.Location = new System.Drawing.Point(141, 123);
             this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelZoomValue.Name = "labelZoomValue";
             this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
-            this.labelZoomValue.TabIndex = 5;
+            this.labelZoomValue.TabIndex = 6;
             this.labelZoomValue.Text = "100%";
             this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
             this.toolTip.SetToolTip(this.labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
@@ -133,114 +135,160 @@
             // checkSwitchAccountSelectors
             // 
             this.checkSwitchAccountSelectors.AutoSize = true;
-            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(9, 44);
+            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(6, 28);
             this.checkSwitchAccountSelectors.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSwitchAccountSelectors.Name = "checkSwitchAccountSelectors";
             this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
             this.checkSwitchAccountSelectors.TabIndex = 1;
             this.checkSwitchAccountSelectors.Text = "Shift Selects Multiple Accounts";
-            this.toolTip.SetToolTip(this.checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect mult" +
+            this.toolTip.SetToolTip(this.checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect multiple accounts, instead of TweetDeck\'s default behavior.");
-        "iple accounts, instead of TweetDeck\'s default behavior.");
             this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
             // 
-            // groupTray
-            // 
-            this.groupTray.Controls.Add(this.checkTrayHighlight);
-            this.groupTray.Controls.Add(this.labelTrayIcon);
-            this.groupTray.Controls.Add(this.comboBoxTrayType);
-            this.groupTray.Location = new System.Drawing.Point(9, 168);
-            this.groupTray.Name = "groupTray";
-            this.groupTray.Size = new System.Drawing.Size(183, 93);
-            this.groupTray.TabIndex = 1;
-            this.groupTray.TabStop = false;
-            this.groupTray.Text = "System Tray";
-            // 
             // labelTrayIcon
             // 
             this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Location = new System.Drawing.Point(6, 52);
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 38);
             this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
             this.labelTrayIcon.Name = "labelTrayIcon";
             this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
             this.labelTrayIcon.TabIndex = 1;
             this.labelTrayIcon.Text = "Tray Icon";
             // 
-            // groupInterface
-            // 
-            this.groupInterface.Controls.Add(this.checkSwitchAccountSelectors);
-            this.groupInterface.Controls.Add(this.labelZoomValue);
-            this.groupInterface.Controls.Add(this.trackBarZoom);
-            this.groupInterface.Controls.Add(this.labelZoom);
-            this.groupInterface.Controls.Add(this.checkSpellCheck);
-            this.groupInterface.Controls.Add(this.checkExpandLinks);
-            this.groupInterface.Location = new System.Drawing.Point(9, 9);
-            this.groupInterface.Name = "groupInterface";
-            this.groupInterface.Size = new System.Drawing.Size(183, 153);
-            this.groupInterface.TabIndex = 0;
-            this.groupInterface.TabStop = false;
-            this.groupInterface.Text = "User Interface";
-            // 
             // trackBarZoom
             // 
-            this.trackBarZoom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBarZoom.AutoSize = false;
+            this.trackBarZoom.BackColor = System.Drawing.SystemColors.Control;
             this.trackBarZoom.LargeChange = 25;
-            this.trackBarZoom.Location = new System.Drawing.Point(6, 115);
+            this.trackBarZoom.Location = new System.Drawing.Point(3, 122);
             this.trackBarZoom.Maximum = 200;
             this.trackBarZoom.Minimum = 50;
             this.trackBarZoom.Name = "trackBarZoom";
-            this.trackBarZoom.Size = new System.Drawing.Size(141, 30);
+            this.trackBarZoom.Size = new System.Drawing.Size(148, 30);
             this.trackBarZoom.SmallChange = 5;
-            this.trackBarZoom.TabIndex = 4;
+            this.trackBarZoom.TabIndex = 5;
             this.trackBarZoom.TickFrequency = 25;
             this.trackBarZoom.Value = 100;
             // 
             // labelZoom
             // 
-            this.labelZoom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(5, 99);
+            this.labelZoom.Location = new System.Drawing.Point(3, 106);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(34, 13);
-            this.labelZoom.TabIndex = 3;
+            this.labelZoom.TabIndex = 4;
             this.labelZoom.Text = "Zoom";
             // 
-            // groupUpdates
-            // 
-            this.groupUpdates.Controls.Add(this.checkUpdateNotifications);
-            this.groupUpdates.Controls.Add(this.btnCheckUpdates);
-            this.groupUpdates.Location = new System.Drawing.Point(198, 9);
-            this.groupUpdates.Name = "groupUpdates";
-            this.groupUpdates.Size = new System.Drawing.Size(183, 75);
-            this.groupUpdates.TabIndex = 2;
-            this.groupUpdates.TabStop = false;
-            this.groupUpdates.Text = "Updates";
-            // 
             // zoomUpdateTimer
             // 
             this.zoomUpdateTimer.Interval = 250;
             this.zoomUpdateTimer.Tick += new System.EventHandler(this.zoomUpdateTimer_Tick);
             // 
+            // labelUI
+            // 
+            this.labelUI.AutoSize = true;
+            this.labelUI.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUI.Location = new System.Drawing.Point(6, 8);
+            this.labelUI.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelUI.Name = "labelUI";
+            this.labelUI.Size = new System.Drawing.Size(111, 20);
+            this.labelUI.TabIndex = 0;
+            this.labelUI.Text = "User Interface";
+            // 
+            // panelUI
+            // 
+            this.panelUI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelUI.Controls.Add(this.checkBestImageQuality);
+            this.panelUI.Controls.Add(this.checkExpandLinks);
+            this.panelUI.Controls.Add(this.checkSwitchAccountSelectors);
+            this.panelUI.Controls.Add(this.checkSpellCheck);
+            this.panelUI.Controls.Add(this.labelZoom);
+            this.panelUI.Controls.Add(this.labelZoomValue);
+            this.panelUI.Controls.Add(this.trackBarZoom);
+            this.panelUI.Location = new System.Drawing.Point(9, 31);
+            this.panelUI.Name = "panelUI";
+            this.panelUI.Size = new System.Drawing.Size(322, 157);
+            this.panelUI.TabIndex = 1;
+            // 
+            // labelTray
+            // 
+            this.labelTray.AutoSize = true;
+            this.labelTray.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTray.Location = new System.Drawing.Point(6, 212);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelTray.Name = "labelTray";
+            this.labelTray.Size = new System.Drawing.Size(96, 20);
+            this.labelTray.TabIndex = 2;
+            this.labelTray.Text = "System Tray";
+            // 
+            // panelUpdates
+            // 
+            this.panelUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelUpdates.Controls.Add(this.checkUpdateNotifications);
+            this.panelUpdates.Controls.Add(this.btnCheckUpdates);
+            this.panelUpdates.Location = new System.Drawing.Point(9, 358);
+            this.panelUpdates.Name = "panelUpdates";
+            this.panelUpdates.Size = new System.Drawing.Size(322, 55);
+            this.panelUpdates.TabIndex = 5;
+            // 
+            // panelTray
+            // 
+            this.panelTray.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelTray.Controls.Add(this.checkTrayHighlight);
+            this.panelTray.Controls.Add(this.comboBoxTrayType);
+            this.panelTray.Controls.Add(this.labelTrayIcon);
+            this.panelTray.Location = new System.Drawing.Point(9, 235);
+            this.panelTray.Name = "panelTray";
+            this.panelTray.Size = new System.Drawing.Size(322, 76);
+            this.panelTray.TabIndex = 3;
+            // 
+            // labelUpdates
+            // 
+            this.labelUpdates.AutoSize = true;
+            this.labelUpdates.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUpdates.Location = new System.Drawing.Point(6, 335);
+            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelUpdates.Name = "labelUpdates";
+            this.labelUpdates.Size = new System.Drawing.Size(70, 20);
+            this.labelUpdates.TabIndex = 4;
+            this.labelUpdates.Text = "Updates";
+            // 
+            // checkBestImageQuality
+            // 
+            this.checkBestImageQuality.AutoSize = true;
+            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 51);
+            this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkBestImageQuality.Name = "checkBestImageQuality";
+            this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
+            this.checkBestImageQuality.TabIndex = 2;
+            this.checkBestImageQuality.Text = "Best Image Quality";
+            this.toolTip.SetToolTip(this.checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
+            this.checkBestImageQuality.UseVisualStyleBackColor = true;
+            // 
             // TabSettingsGeneral
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupUpdates);
+            this.Controls.Add(this.labelUpdates);
-            this.Controls.Add(this.groupInterface);
+            this.Controls.Add(this.panelTray);
-            this.Controls.Add(this.groupTray);
+            this.Controls.Add(this.panelUpdates);
+            this.Controls.Add(this.labelTray);
+            this.Controls.Add(this.panelUI);
+            this.Controls.Add(this.labelUI);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 422);
-            this.groupTray.ResumeLayout(false);
-            this.groupTray.PerformLayout();
-            this.groupInterface.ResumeLayout(false);
-            this.groupInterface.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
-            this.groupUpdates.ResumeLayout(false);
+            this.panelUI.ResumeLayout(false);
-            this.groupUpdates.PerformLayout();
+            this.panelUI.PerformLayout();
+            this.panelUpdates.ResumeLayout(false);
+            this.panelUpdates.PerformLayout();
+            this.panelTray.ResumeLayout(false);
+            this.panelTray.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -249,12 +297,9 @@
         private System.Windows.Forms.CheckBox checkExpandLinks;
         private System.Windows.Forms.ComboBox comboBoxTrayType;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.GroupBox groupTray;
-        private System.Windows.Forms.GroupBox groupInterface;
         private System.Windows.Forms.Label labelTrayIcon;
         private System.Windows.Forms.CheckBox checkTrayHighlight;
         private System.Windows.Forms.CheckBox checkSpellCheck;
-        private System.Windows.Forms.GroupBox groupUpdates;
         private System.Windows.Forms.CheckBox checkUpdateNotifications;
         private System.Windows.Forms.Button btnCheckUpdates;
         private System.Windows.Forms.Label labelZoom;
@@ -262,5 +307,12 @@
         private System.Windows.Forms.TrackBar trackBarZoom;
         private System.Windows.Forms.Timer zoomUpdateTimer;
         private System.Windows.Forms.CheckBox checkSwitchAccountSelectors;
+        private System.Windows.Forms.Label labelUI;
+        private System.Windows.Forms.Panel panelUI;
+        private System.Windows.Forms.Label labelTray;
+        private System.Windows.Forms.Panel panelUpdates;
+        private System.Windows.Forms.Panel panelTray;
+        private System.Windows.Forms.Label labelUpdates;
+        private System.Windows.Forms.CheckBox checkBestImageQuality;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Updates;
 using TweetDuck.Updates.Events;
@@ -29,6 +28,7 @@ namespace TweetDuck.Core.Other.Settings{
 
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
             checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
+            checkBestImageQuality.Checked = Config.BestImageQuality;
             checkSpellCheck.Checked = Config.EnableSpellCheck;
             checkTrayHighlight.Checked = Config.EnableTrayHighlight;
 
@@ -38,6 +38,7 @@ namespace TweetDuck.Core.Other.Settings{
         public override void OnReady(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
             checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
+            checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
             checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
             trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
 
@@ -60,16 +61,17 @@ namespace TweetDuck.Core.Other.Settings{
             Config.SwitchAccountSelectors = checkSwitchAccountSelectors.Checked;
         }
 
+        private void checkBestImageQuality_CheckedChanged(object sender, EventArgs e){
+            Config.BestImageQuality = checkBestImageQuality.Checked;
+        }
+
         private void checkSpellCheck_CheckedChanged(object sender, EventArgs e){
             Config.EnableSpellCheck = checkSpellCheck.Checked;
             PromptRestart();
         }
 
         private void trackBarZoom_ValueChanged(object sender, EventArgs e){
-            if (trackBarZoom.Value % trackBarZoom.SmallChange != 0){
+            if (trackBarZoom.AlignValueToTick()){
-                trackBarZoom.Value = trackBarZoom.SmallChange*(int)Math.Floor(((double)trackBarZoom.Value/trackBarZoom.SmallChange)+0.5);
-            }
-            else{
                 zoomUpdateTimer.Stop();
                 zoomUpdateTimer.Start();
                 labelZoomValue.Text = trackBarZoom.Value+"%";
@@ -92,7 +94,7 @@ namespace TweetDuck.Core.Other.Settings{
             updateCheckEventId = updates.Check(true);
 
             if (updateCheckEventId == -1){
-                MessageBox.Show("Sorry, your system is no longer supported.", "Unsupported System", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                FormMessage.Warning("Unsupported System", "Sorry, your system is no longer supported.", FormMessage.OK);
             }
             else{
                 btnCheckUpdates.Enabled = false;
@@ -101,13 +103,15 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
-            if (e.EventId == updateCheckEventId){
+            this.InvokeAsyncSafe(() => {
-                btnCheckUpdates.Enabled = true;
+                if (e.EventId == updateCheckEventId){
+                    btnCheckUpdates.Enabled = true;
 
-                if (!e.UpdateAvailable){
+                    if (!e.UpdateAvailable){
-                    MessageBox.Show("Your version of "+Program.BrandName+" is up to date.", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
+                    }
                 }
-            }
+            });
         }
 
         private void zoomUpdateTimer_Tick(object sender, EventArgs e){

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -24,7 +24,6 @@
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.groupNotificationLocation = new System.Windows.Forms.GroupBox();
             this.labelEdgeDistanceValue = new System.Windows.Forms.Label();
             this.labelDisplay = new System.Windows.Forms.Label();
             this.comboBoxDisplay = new System.Windows.Forms.ComboBox();
@@ -35,14 +34,12 @@
             this.radioLocTR = new System.Windows.Forms.RadioButton();
             this.radioLocTL = new System.Windows.Forms.RadioButton();
             this.trackBarEdgeDistance = new System.Windows.Forms.TrackBar();
-            this.groupNotificationDuration = new System.Windows.Forms.GroupBox();
             this.tableLayoutDurationButtons = new System.Windows.Forms.TableLayoutPanel();
             this.btnDurationMedium = new TweetDuck.Core.Controls.FlatButton();
             this.btnDurationLong = new TweetDuck.Core.Controls.FlatButton();
             this.btnDurationShort = new TweetDuck.Core.Controls.FlatButton();
             this.labelDurationValue = new System.Windows.Forms.Label();
             this.trackBarDuration = new System.Windows.Forms.TrackBar();
-            this.groupUserInterface = new System.Windows.Forms.GroupBox();
             this.checkSkipOnLinkClick = new System.Windows.Forms.CheckBox();
             this.checkColumnName = new System.Windows.Forms.CheckBox();
             this.labelIdlePause = new System.Windows.Forms.Label();
@@ -51,37 +48,35 @@
             this.checkTimerCountDown = new System.Windows.Forms.CheckBox();
             this.checkNotificationTimer = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.groupNotificationLocation.SuspendLayout();
+            this.radioSizeAuto = new System.Windows.Forms.RadioButton();
+            this.radioSizeCustom = new System.Windows.Forms.RadioButton();
+            this.labelGeneral = new System.Windows.Forms.Label();
+            this.panelGeneral = new System.Windows.Forms.Panel();
+            this.labelScrollSpeedValue = new System.Windows.Forms.Label();
+            this.trackBarScrollSpeed = new System.Windows.Forms.TrackBar();
+            this.labelScrollSpeed = new System.Windows.Forms.Label();
+            this.labelLocation = new System.Windows.Forms.Label();
+            this.panelLocation = new System.Windows.Forms.Panel();
+            this.panelTimer = new System.Windows.Forms.Panel();
+            this.labelDuration = new System.Windows.Forms.Label();
+            this.labelTimer = new System.Windows.Forms.Label();
+            this.labelSize = new System.Windows.Forms.Label();
+            this.panelMiscellaneous = new System.Windows.Forms.Panel();
+            this.durationUpdateTimer = new System.Windows.Forms.Timer(this.components);
+            this.checkMediaPreviews = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).BeginInit();
-            this.groupNotificationDuration.SuspendLayout();
             this.tableLayoutDurationButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).BeginInit();
-            this.groupUserInterface.SuspendLayout();
+            this.panelGeneral.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarScrollSpeed)).BeginInit();
+            this.panelLocation.SuspendLayout();
+            this.panelTimer.SuspendLayout();
+            this.panelMiscellaneous.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupNotificationLocation
-            // 
-            this.groupNotificationLocation.Controls.Add(this.labelEdgeDistanceValue);
-            this.groupNotificationLocation.Controls.Add(this.labelDisplay);
-            this.groupNotificationLocation.Controls.Add(this.comboBoxDisplay);
-            this.groupNotificationLocation.Controls.Add(this.labelEdgeDistance);
-            this.groupNotificationLocation.Controls.Add(this.radioLocCustom);
-            this.groupNotificationLocation.Controls.Add(this.radioLocBR);
-            this.groupNotificationLocation.Controls.Add(this.radioLocBL);
-            this.groupNotificationLocation.Controls.Add(this.radioLocTR);
-            this.groupNotificationLocation.Controls.Add(this.radioLocTL);
-            this.groupNotificationLocation.Controls.Add(this.trackBarEdgeDistance);
-            this.groupNotificationLocation.Location = new System.Drawing.Point(198, 9);
-            this.groupNotificationLocation.Name = "groupNotificationLocation";
-            this.groupNotificationLocation.Size = new System.Drawing.Size(183, 282);
-            this.groupNotificationLocation.TabIndex = 2;
-            this.groupNotificationLocation.TabStop = false;
-            this.groupNotificationLocation.Text = "Location";
-            // 
             // labelEdgeDistanceValue
             // 
-            this.labelEdgeDistanceValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(147, 129);
-            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(143, 217);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
             this.labelEdgeDistanceValue.Size = new System.Drawing.Size(34, 13);
@@ -92,7 +87,7 @@
             // labelDisplay
             // 
             this.labelDisplay.AutoSize = true;
-            this.labelDisplay.Location = new System.Drawing.Point(5, 144);
+            this.labelDisplay.Location = new System.Drawing.Point(3, 60);
             this.labelDisplay.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDisplay.Name = "labelDisplay";
             this.labelDisplay.Size = new System.Drawing.Size(41, 13);
@@ -105,15 +100,16 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(6, 160);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 76);
+            this.comboBoxDisplay.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxDisplay.Name = "comboBoxDisplay";
-            this.comboBoxDisplay.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxDisplay.Size = new System.Drawing.Size(144, 21);
             this.comboBoxDisplay.TabIndex = 6;
             // 
             // labelEdgeDistance
             // 
             this.labelEdgeDistance.AutoSize = true;
-            this.labelEdgeDistance.Location = new System.Drawing.Point(5, 196);
+            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 112);
             this.labelEdgeDistance.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelEdgeDistance.Name = "labelEdgeDistance";
             this.labelEdgeDistance.Size = new System.Drawing.Size(103, 13);
@@ -122,24 +118,22 @@
             // 
             // radioLocCustom
             // 
-            this.radioLocCustom.AutoSize = true;
+            this.radioLocCustom.Location = new System.Drawing.Point(205, 4);
-            this.radioLocCustom.Location = new System.Drawing.Point(8, 112);
+            this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocCustom.Name = "radioLocCustom";
-            this.radioLocCustom.Size = new System.Drawing.Size(60, 17);
+            this.radioLocCustom.Size = new System.Drawing.Size(65, 41);
             this.radioLocCustom.TabIndex = 4;
             this.radioLocCustom.TabStop = true;
             this.radioLocCustom.Text = "Custom";
-            this.toolTip.SetToolTip(this.radioLocCustom, "Drag the notification window to the desired location.");
+            this.toolTip.SetToolTip(this.radioLocCustom, "Drag the example notification window to the desired location.");
             this.radioLocCustom.UseVisualStyleBackColor = true;
             // 
             // radioLocBR
             // 
-            this.radioLocBR.AutoSize = true;
+            this.radioLocBR.Location = new System.Drawing.Point(105, 28);
-            this.radioLocBR.Location = new System.Drawing.Point(8, 89);
+            this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocBR.Name = "radioLocBR";
-            this.radioLocBR.Size = new System.Drawing.Size(86, 17);
+            this.radioLocBR.Size = new System.Drawing.Size(92, 17);
             this.radioLocBR.TabIndex = 3;
             this.radioLocBR.TabStop = true;
             this.radioLocBR.Text = "Bottom Right";
@@ -147,11 +141,10 @@
             // 
             // radioLocBL
             // 
-            this.radioLocBL.AutoSize = true;
+            this.radioLocBL.Location = new System.Drawing.Point(5, 28);
-            this.radioLocBL.Location = new System.Drawing.Point(8, 66);
+            this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocBL.Name = "radioLocBL";
-            this.radioLocBL.Size = new System.Drawing.Size(79, 17);
+            this.radioLocBL.Size = new System.Drawing.Size(92, 17);
             this.radioLocBL.TabIndex = 2;
             this.radioLocBL.TabStop = true;
             this.radioLocBL.Text = "Bottom Left";
@@ -159,11 +152,10 @@
             // 
             // radioLocTR
             // 
-            this.radioLocTR.AutoSize = true;
+            this.radioLocTR.Location = new System.Drawing.Point(105, 4);
-            this.radioLocTR.Location = new System.Drawing.Point(8, 43);
+            this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocTR.Name = "radioLocTR";
-            this.radioLocTR.Size = new System.Drawing.Size(72, 17);
+            this.radioLocTR.Size = new System.Drawing.Size(92, 17);
             this.radioLocTR.TabIndex = 1;
             this.radioLocTR.TabStop = true;
             this.radioLocTR.Text = "Top Right";
@@ -171,11 +163,10 @@
             // 
             // radioLocTL
             // 
-            this.radioLocTL.AutoSize = true;
+            this.radioLocTL.Location = new System.Drawing.Point(5, 4);
-            this.radioLocTL.Location = new System.Drawing.Point(8, 20);
             this.radioLocTL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTL.Name = "radioLocTL";
-            this.radioLocTL.Size = new System.Drawing.Size(65, 17);
+            this.radioLocTL.Size = new System.Drawing.Size(92, 17);
             this.radioLocTL.TabIndex = 0;
             this.radioLocTL.TabStop = true;
             this.radioLocTL.Text = "Top Left";
@@ -183,36 +174,20 @@
             // 
             // trackBarEdgeDistance
             // 
-            this.trackBarEdgeDistance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBarEdgeDistance.AutoSize = false;
             this.trackBarEdgeDistance.LargeChange = 8;
-            this.trackBarEdgeDistance.Location = new System.Drawing.Point(8, 212);
+            this.trackBarEdgeDistance.Location = new System.Drawing.Point(5, 128);
             this.trackBarEdgeDistance.Maximum = 40;
             this.trackBarEdgeDistance.Minimum = 8;
             this.trackBarEdgeDistance.Name = "trackBarEdgeDistance";
-            this.trackBarEdgeDistance.Size = new System.Drawing.Size(141, 30);
+            this.trackBarEdgeDistance.Size = new System.Drawing.Size(148, 30);
             this.trackBarEdgeDistance.SmallChange = 2;
             this.trackBarEdgeDistance.TabIndex = 8;
             this.trackBarEdgeDistance.TickFrequency = 4;
             this.trackBarEdgeDistance.Value = 8;
             // 
-            // groupNotificationDuration
-            // 
-            this.groupNotificationDuration.Controls.Add(this.tableLayoutDurationButtons);
-            this.groupNotificationDuration.Controls.Add(this.labelDurationValue);
-            this.groupNotificationDuration.Controls.Add(this.trackBarDuration);
-            this.groupNotificationDuration.Location = new System.Drawing.Point(9, 202);
-            this.groupNotificationDuration.Name = "groupNotificationDuration";
-            this.groupNotificationDuration.Size = new System.Drawing.Size(183, 89);
-            this.groupNotificationDuration.TabIndex = 1;
-            this.groupNotificationDuration.TabStop = false;
-            this.groupNotificationDuration.Text = "Duration";
-            // 
             // tableLayoutDurationButtons
             // 
-            this.tableLayoutDurationButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.tableLayoutDurationButtons.ColumnCount = 3;
             this.tableLayoutDurationButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32F));
             this.tableLayoutDurationButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36F));
@@ -220,12 +195,12 @@
             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(6, 56);
+            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 113);
             this.tableLayoutDurationButtons.Name = "tableLayoutDurationButtons";
             this.tableLayoutDurationButtons.RowCount = 1;
             this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutDurationButtons.Size = new System.Drawing.Size(171, 27);
-            this.tableLayoutDurationButtons.TabIndex = 2;
+            this.tableLayoutDurationButtons.TabIndex = 5;
             // 
             // btnDurationMedium
             // 
@@ -274,55 +249,36 @@
             // 
             // labelDurationValue
             // 
-            this.labelDurationValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.labelDurationValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelDurationValue.Location = new System.Drawing.Point(129, 20);
+            this.labelDurationValue.Location = new System.Drawing.Point(147, 77);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
             this.labelDurationValue.Size = new System.Drawing.Size(48, 13);
-            this.labelDurationValue.TabIndex = 1;
+            this.labelDurationValue.TabIndex = 4;
             this.labelDurationValue.Text = "0 ms/c";
             this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
             this.toolTip.SetToolTip(this.labelDurationValue, "Milliseconds per character.");
             // 
             // trackBarDuration
             // 
-            this.trackBarDuration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBarDuration.AutoSize = false;
-            this.trackBarDuration.Location = new System.Drawing.Point(6, 19);
+            this.trackBarDuration.Location = new System.Drawing.Point(3, 76);
             this.trackBarDuration.Maximum = 60;
             this.trackBarDuration.Minimum = 10;
             this.trackBarDuration.Name = "trackBarDuration";
-            this.trackBarDuration.Size = new System.Drawing.Size(128, 30);
+            this.trackBarDuration.Size = new System.Drawing.Size(148, 30);
-            this.trackBarDuration.TabIndex = 0;
+            this.trackBarDuration.TabIndex = 3;
             this.trackBarDuration.TickFrequency = 5;
             this.trackBarDuration.Value = 25;
             // 
-            // groupUserInterface
-            // 
-            this.groupUserInterface.Controls.Add(this.checkSkipOnLinkClick);
-            this.groupUserInterface.Controls.Add(this.checkColumnName);
-            this.groupUserInterface.Controls.Add(this.labelIdlePause);
-            this.groupUserInterface.Controls.Add(this.comboBoxIdlePause);
-            this.groupUserInterface.Controls.Add(this.checkNonIntrusive);
-            this.groupUserInterface.Controls.Add(this.checkTimerCountDown);
-            this.groupUserInterface.Controls.Add(this.checkNotificationTimer);
-            this.groupUserInterface.Location = new System.Drawing.Point(9, 9);
-            this.groupUserInterface.Name = "groupUserInterface";
-            this.groupUserInterface.Size = new System.Drawing.Size(183, 187);
-            this.groupUserInterface.TabIndex = 0;
-            this.groupUserInterface.TabStop = false;
-            this.groupUserInterface.Text = "General";
-            // 
             // checkSkipOnLinkClick
             // 
             this.checkSkipOnLinkClick.AutoSize = true;
-            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(9, 90);
+            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 51);
             this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSkipOnLinkClick.Name = "checkSkipOnLinkClick";
             this.checkSkipOnLinkClick.Size = new System.Drawing.Size(113, 17);
-            this.checkSkipOnLinkClick.TabIndex = 3;
+            this.checkSkipOnLinkClick.TabIndex = 2;
             this.checkSkipOnLinkClick.Text = "Skip On Link Click";
             this.toolTip.SetToolTip(this.checkSkipOnLinkClick, "Skips current notification when a link\r\ninside the notification is clicked.");
             this.checkSkipOnLinkClick.UseVisualStyleBackColor = true;
@@ -330,60 +286,56 @@
             // checkColumnName
             // 
             this.checkColumnName.AutoSize = true;
-            this.checkColumnName.Location = new System.Drawing.Point(9, 21);
+            this.checkColumnName.Location = new System.Drawing.Point(6, 5);
             this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkColumnName.Name = "checkColumnName";
             this.checkColumnName.Size = new System.Drawing.Size(129, 17);
             this.checkColumnName.TabIndex = 0;
             this.checkColumnName.Text = "Display Column Name";
-            this.toolTip.SetToolTip(this.checkColumnName, "Shows column name each notification originated\r\nfrom in the notification window t" +
+            this.toolTip.SetToolTip(this.checkColumnName, "Shows column name each notification originated\r\nfrom in the notification window title.");
-        "itle.");
             this.checkColumnName.UseVisualStyleBackColor = true;
             // 
             // labelIdlePause
             // 
-            this.labelIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(5, 141);
+            this.labelIdlePause.Location = new System.Drawing.Point(3, 106);
             this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelIdlePause.Name = "labelIdlePause";
             this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
-            this.labelIdlePause.TabIndex = 3;
+            this.labelIdlePause.TabIndex = 4;
             this.labelIdlePause.Text = "Pause When Idle";
             // 
             // comboBoxIdlePause
             // 
-            this.comboBoxIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxIdlePause.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(6, 157);
+            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 122);
+            this.comboBoxIdlePause.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxIdlePause.Name = "comboBoxIdlePause";
-            this.comboBoxIdlePause.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 21);
-            this.comboBoxIdlePause.TabIndex = 4;
+            this.comboBoxIdlePause.TabIndex = 5;
             this.toolTip.SetToolTip(this.comboBoxIdlePause, "Pauses new notifications after going idle for a set amount of time.");
             // 
             // checkNonIntrusive
             // 
             this.checkNonIntrusive.AutoSize = true;
-            this.checkNonIntrusive.Location = new System.Drawing.Point(9, 113);
+            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 74);
             this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkNonIntrusive.Name = "checkNonIntrusive";
             this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
-            this.checkNonIntrusive.TabIndex = 4;
+            this.checkNonIntrusive.TabIndex = 3;
             this.checkNonIntrusive.Text = "Non-Intrusive Popups";
-            this.toolTip.SetToolTip(this.checkNonIntrusive, "When not idle and the cursor is within the notification window area,\r\nit will be " +
+            this.toolTip.SetToolTip(this.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.");
-        "delayed until the cursor moves away to prevent accidental clicks.");
             this.checkNonIntrusive.UseVisualStyleBackColor = true;
             // 
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
-            this.checkTimerCountDown.Location = new System.Drawing.Point(9, 67);
+            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 28);
             this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkTimerCountDown.Name = "checkTimerCountDown";
             this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
-            this.checkTimerCountDown.TabIndex = 2;
+            this.checkTimerCountDown.TabIndex = 1;
             this.checkTimerCountDown.Text = "Timer Counts Down";
             this.toolTip.SetToolTip(this.checkTimerCountDown, "The notification timer counts down instead of up.");
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
@@ -391,39 +343,239 @@
             // checkNotificationTimer
             // 
             this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Location = new System.Drawing.Point(9, 44);
+            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 5);
-            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkNotificationTimer.Name = "checkNotificationTimer";
             this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
-            this.checkNotificationTimer.TabIndex = 1;
+            this.checkNotificationTimer.TabIndex = 0;
             this.checkNotificationTimer.Text = "Display Notification Timer";
             this.checkNotificationTimer.UseVisualStyleBackColor = true;
             // 
+            // radioSizeAuto
+            // 
+            this.radioSizeAuto.Location = new System.Drawing.Point(6, 4);
+            this.radioSizeAuto.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.radioSizeAuto.Name = "radioSizeAuto";
+            this.radioSizeAuto.Size = new System.Drawing.Size(92, 17);
+            this.radioSizeAuto.TabIndex = 0;
+            this.radioSizeAuto.TabStop = true;
+            this.radioSizeAuto.Text = "Auto";
+            this.toolTip.SetToolTip(this.radioSizeAuto, "Notification size is based on the font size and browser zoom level.");
+            this.radioSizeAuto.UseVisualStyleBackColor = true;
+            // 
+            // radioSizeCustom
+            // 
+            this.radioSizeCustom.Location = new System.Drawing.Point(106, 4);
+            this.radioSizeCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.radioSizeCustom.Name = "radioSizeCustom";
+            this.radioSizeCustom.Size = new System.Drawing.Size(92, 17);
+            this.radioSizeCustom.TabIndex = 1;
+            this.radioSizeCustom.TabStop = true;
+            this.radioSizeCustom.Text = "Custom";
+            this.toolTip.SetToolTip(this.radioSizeCustom, "Resize the example notification window to the desired size.");
+            this.radioSizeCustom.UseVisualStyleBackColor = true;
+            // 
+            // labelGeneral
+            // 
+            this.labelGeneral.AutoSize = true;
+            this.labelGeneral.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelGeneral.Location = new System.Drawing.Point(6, 8);
+            this.labelGeneral.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelGeneral.Name = "labelGeneral";
+            this.labelGeneral.Size = new System.Drawing.Size(66, 20);
+            this.labelGeneral.TabIndex = 0;
+            this.labelGeneral.Text = "General";
+            // 
+            // panelGeneral
+            // 
+            this.panelGeneral.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelGeneral.Controls.Add(this.checkMediaPreviews);
+            this.panelGeneral.Controls.Add(this.checkColumnName);
+            this.panelGeneral.Controls.Add(this.checkSkipOnLinkClick);
+            this.panelGeneral.Controls.Add(this.checkNonIntrusive);
+            this.panelGeneral.Controls.Add(this.labelIdlePause);
+            this.panelGeneral.Controls.Add(this.comboBoxIdlePause);
+            this.panelGeneral.Location = new System.Drawing.Point(9, 31);
+            this.panelGeneral.Name = "panelGeneral";
+            this.panelGeneral.Size = new System.Drawing.Size(322, 149);
+            this.panelGeneral.TabIndex = 1;
+            // 
+            // labelScrollSpeedValue
+            // 
+            this.labelScrollSpeedValue.Location = new System.Drawing.Point(147, 53);
+            this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
+            this.labelScrollSpeedValue.Size = new System.Drawing.Size(34, 13);
+            this.labelScrollSpeedValue.TabIndex = 4;
+            this.labelScrollSpeedValue.Text = "100%";
+            this.labelScrollSpeedValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
+            // trackBarScrollSpeed
+            // 
+            this.trackBarScrollSpeed.AutoSize = false;
+            this.trackBarScrollSpeed.LargeChange = 25;
+            this.trackBarScrollSpeed.Location = new System.Drawing.Point(5, 52);
+            this.trackBarScrollSpeed.Maximum = 200;
+            this.trackBarScrollSpeed.Minimum = 25;
+            this.trackBarScrollSpeed.Name = "trackBarScrollSpeed";
+            this.trackBarScrollSpeed.Size = new System.Drawing.Size(148, 30);
+            this.trackBarScrollSpeed.SmallChange = 5;
+            this.trackBarScrollSpeed.TabIndex = 3;
+            this.trackBarScrollSpeed.TickFrequency = 25;
+            this.trackBarScrollSpeed.Value = 100;
+            // 
+            // labelScrollSpeed
+            // 
+            this.labelScrollSpeed.AutoSize = true;
+            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 36);
+            this.labelScrollSpeed.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelScrollSpeed.Name = "labelScrollSpeed";
+            this.labelScrollSpeed.Size = new System.Drawing.Size(67, 13);
+            this.labelScrollSpeed.TabIndex = 2;
+            this.labelScrollSpeed.Text = "Scroll Speed";
+            // 
+            // labelLocation
+            // 
+            this.labelLocation.AutoSize = true;
+            this.labelLocation.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelLocation.Location = new System.Drawing.Point(6, 395);
+            this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelLocation.Name = "labelLocation";
+            this.labelLocation.Size = new System.Drawing.Size(70, 20);
+            this.labelLocation.TabIndex = 4;
+            this.labelLocation.Text = "Location";
+            // 
+            // panelLocation
+            // 
+            this.panelLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelLocation.Controls.Add(this.labelEdgeDistanceValue);
+            this.panelLocation.Controls.Add(this.radioLocTL);
+            this.panelLocation.Controls.Add(this.labelDisplay);
+            this.panelLocation.Controls.Add(this.trackBarEdgeDistance);
+            this.panelLocation.Controls.Add(this.comboBoxDisplay);
+            this.panelLocation.Controls.Add(this.radioLocTR);
+            this.panelLocation.Controls.Add(this.labelEdgeDistance);
+            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(9, 418);
+            this.panelLocation.Name = "panelLocation";
+            this.panelLocation.Size = new System.Drawing.Size(322, 165);
+            this.panelLocation.TabIndex = 5;
+            // 
+            // panelTimer
+            // 
+            this.panelTimer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelTimer.Controls.Add(this.labelDuration);
+            this.panelTimer.Controls.Add(this.checkNotificationTimer);
+            this.panelTimer.Controls.Add(this.tableLayoutDurationButtons);
+            this.panelTimer.Controls.Add(this.checkTimerCountDown);
+            this.panelTimer.Controls.Add(this.labelDurationValue);
+            this.panelTimer.Controls.Add(this.trackBarDuration);
+            this.panelTimer.Location = new System.Drawing.Point(9, 227);
+            this.panelTimer.Name = "panelTimer";
+            this.panelTimer.Size = new System.Drawing.Size(322, 144);
+            this.panelTimer.TabIndex = 3;
+            // 
+            // labelDuration
+            // 
+            this.labelDuration.AutoSize = true;
+            this.labelDuration.Location = new System.Drawing.Point(3, 60);
+            this.labelDuration.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelDuration.Name = "labelDuration";
+            this.labelDuration.Size = new System.Drawing.Size(47, 13);
+            this.labelDuration.TabIndex = 2;
+            this.labelDuration.Text = "Duration";
+            // 
+            // labelTimer
+            // 
+            this.labelTimer.AutoSize = true;
+            this.labelTimer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTimer.Location = new System.Drawing.Point(6, 204);
+            this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelTimer.Name = "labelTimer";
+            this.labelTimer.Size = new System.Drawing.Size(48, 20);
+            this.labelTimer.TabIndex = 2;
+            this.labelTimer.Text = "Timer";
+            // 
+            // labelSize
+            // 
+            this.labelSize.AutoSize = true;
+            this.labelSize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSize.Location = new System.Drawing.Point(6, 607);
+            this.labelSize.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelSize.Name = "labelSize";
+            this.labelSize.Size = new System.Drawing.Size(40, 20);
+            this.labelSize.TabIndex = 6;
+            this.labelSize.Text = "Size";
+            // 
+            // panelMiscellaneous
+            // 
+            this.panelMiscellaneous.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelMiscellaneous.Controls.Add(this.radioSizeCustom);
+            this.panelMiscellaneous.Controls.Add(this.radioSizeAuto);
+            this.panelMiscellaneous.Controls.Add(this.labelScrollSpeedValue);
+            this.panelMiscellaneous.Controls.Add(this.trackBarScrollSpeed);
+            this.panelMiscellaneous.Controls.Add(this.labelScrollSpeed);
+            this.panelMiscellaneous.Location = new System.Drawing.Point(9, 630);
+            this.panelMiscellaneous.Name = "panelMiscellaneous";
+            this.panelMiscellaneous.Size = new System.Drawing.Size(322, 92);
+            this.panelMiscellaneous.TabIndex = 7;
+            // 
+            // durationUpdateTimer
+            // 
+            this.durationUpdateTimer.Interval = 200;
+            this.durationUpdateTimer.Tick += new System.EventHandler(this.durationUpdateTimer_Tick);
+            // 
+            // checkMediaPreviews
+            // 
+            this.checkMediaPreviews.AutoSize = true;
+            this.checkMediaPreviews.Location = new System.Drawing.Point(6, 28);
+            this.checkMediaPreviews.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkMediaPreviews.Name = "checkMediaPreviews";
+            this.checkMediaPreviews.Size = new System.Drawing.Size(131, 17);
+            this.checkMediaPreviews.TabIndex = 1;
+            this.checkMediaPreviews.Text = "Show Media Previews";
+            this.toolTip.SetToolTip(this.checkMediaPreviews, "Shows image and video thumbnails in the notification window.");
+            this.checkMediaPreviews.UseVisualStyleBackColor = true;
+            // 
             // TabSettingsNotifications
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupUserInterface);
+            this.Controls.Add(this.panelMiscellaneous);
-            this.Controls.Add(this.groupNotificationDuration);
+            this.Controls.Add(this.labelSize);
-            this.Controls.Add(this.groupNotificationLocation);
+            this.Controls.Add(this.labelTimer);
+            this.Controls.Add(this.panelLocation);
+            this.Controls.Add(this.labelLocation);
+            this.Controls.Add(this.panelGeneral);
+            this.Controls.Add(this.labelGeneral);
+            this.Controls.Add(this.panelTimer);
             this.Name = "TabSettingsNotifications";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 731);
             this.ParentChanged += new System.EventHandler(this.TabSettingsNotifications_ParentChanged);
-            this.groupNotificationLocation.ResumeLayout(false);
-            this.groupNotificationLocation.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
-            this.groupNotificationDuration.ResumeLayout(false);
             this.tableLayoutDurationButtons.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).EndInit();
-            this.groupUserInterface.ResumeLayout(false);
+            this.panelGeneral.ResumeLayout(false);
-            this.groupUserInterface.PerformLayout();
+            this.panelGeneral.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarScrollSpeed)).EndInit();
+            this.panelLocation.ResumeLayout(false);
+            this.panelLocation.PerformLayout();
+            this.panelTimer.ResumeLayout(false);
+            this.panelTimer.PerformLayout();
+            this.panelMiscellaneous.ResumeLayout(false);
+            this.panelMiscellaneous.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
-
-        private System.Windows.Forms.GroupBox groupNotificationLocation;
         private System.Windows.Forms.Label labelDisplay;
         private System.Windows.Forms.ComboBox comboBoxDisplay;
         private System.Windows.Forms.Label labelEdgeDistance;
@@ -433,8 +585,6 @@
         private System.Windows.Forms.RadioButton radioLocBL;
         private System.Windows.Forms.RadioButton radioLocTR;
         private System.Windows.Forms.RadioButton radioLocTL;
-        private System.Windows.Forms.GroupBox groupNotificationDuration;
-        private System.Windows.Forms.GroupBox groupUserInterface;
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Label labelEdgeDistanceValue;
         private System.Windows.Forms.Label labelDurationValue;
@@ -450,5 +600,21 @@
         private System.Windows.Forms.CheckBox checkSkipOnLinkClick;
         private System.Windows.Forms.CheckBox checkTimerCountDown;
         private System.Windows.Forms.CheckBox checkNotificationTimer;
+        private System.Windows.Forms.Label labelGeneral;
+        private System.Windows.Forms.Panel panelGeneral;
+        private System.Windows.Forms.Label labelLocation;
+        private System.Windows.Forms.Panel panelLocation;
+        private System.Windows.Forms.Panel panelTimer;
+        private System.Windows.Forms.Label labelTimer;
+        private System.Windows.Forms.Label labelScrollSpeedValue;
+        private System.Windows.Forms.TrackBar trackBarScrollSpeed;
+        private System.Windows.Forms.Label labelScrollSpeed;
+        private System.Windows.Forms.Label labelSize;
+        private System.Windows.Forms.Panel panelMiscellaneous;
+        private System.Windows.Forms.Label labelDuration;
+        private System.Windows.Forms.Timer durationUpdateTimer;
+        private System.Windows.Forms.RadioButton radioSizeCustom;
+        private System.Windows.Forms.RadioButton radioSizeAuto;
+        private System.Windows.Forms.CheckBox checkMediaPreviews;
     }
 }

Core/Other/Settings/TabSettingsNotifications.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
@@ -14,16 +13,13 @@ namespace TweetDuck.Core.Other.Settings{
             InitializeComponent();
 
             this.notification = notification;
-            this.notification.CanMoveWindow = () => radioLocCustom.Checked;
-
-            this.notification.Move += (sender, args) => {
-                if (radioLocCustom.Checked && this.notification.Location != ControlExtensions.InvisibleLocation){
-                    Config.CustomNotificationPosition = this.notification.Location;
-                }
-            };
             
             this.notification.Initialized += (sender, args) => {
-                this.InvokeAsyncSafe(() => this.notification.ShowNotificationForSettings(true));
+                this.InvokeAsyncSafe(() => {
+                    this.notification.ShowNotificationForSettings(true);
+                    this.notification.Move += notification_Move;
+                    this.notification.ResizeEnd += notification_ResizeEnd;
+                });
             };
 
             this.notification.Activated += notification_Activated;
@@ -38,6 +34,11 @@ namespace TweetDuck.Core.Other.Settings{
             }
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
+
+            switch(Config.NotificationSize){
+                case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
+                case TweetNotification.Size.Custom: radioSizeCustom.Checked = true; break;
+            }
             
             toolTip.SetToolTip(trackBarDuration, toolTip.GetToolTip(labelDurationValue));
             trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
@@ -50,10 +51,10 @@ namespace TweetDuck.Core.Other.Settings{
             comboBoxIdlePause.Items.Add("5 minutes");
             comboBoxIdlePause.SelectedIndex = Math.Max(0, Array.FindIndex(IdlePauseSeconds, val => val == Config.NotificationIdlePauseSeconds));
 
-            comboBoxDisplay.Items.Add("(Same As "+Program.BrandName+")");
+            comboBoxDisplay.Items.Add("(Same as TweetDuck)");
 
             foreach(Screen screen in Screen.AllScreens){
-                comboBoxDisplay.Items.Add(screen.DeviceName+" ("+screen.Bounds.Width+"x"+screen.Bounds.Height+")");
+                comboBoxDisplay.Items.Add(screen.DeviceName.TrimStart('\\', '.')+" ("+screen.Bounds.Width+"x"+screen.Bounds.Height+")");
             }
 
             comboBoxDisplay.SelectedIndex = Math.Min(comboBoxDisplay.Items.Count-1, Config.NotificationDisplay);
@@ -62,11 +63,18 @@ namespace TweetDuck.Core.Other.Settings{
             checkNotificationTimer.Checked = Config.DisplayNotificationTimer;
             checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
             checkTimerCountDown.Checked = Config.NotificationTimerCountDown;
+            checkMediaPreviews.Checked = Config.NotificationMediaPreviews;
             checkSkipOnLinkClick.Checked = Config.NotificationSkipOnLinkClick;
             checkNonIntrusive.Checked = Config.NotificationNonIntrusiveMode;
 
+            trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
+            labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
+
             trackBarEdgeDistance.SetValueSafe(Config.NotificationEdgeDistance);
-            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value.ToString(CultureInfo.InvariantCulture)+" px";
+            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
+            
+            this.notification.CanMoveWindow = () => radioLocCustom.Checked;
+            this.notification.CanResizeWindow = radioSizeCustom.Checked;
 
             Disposed += (sender, args) => this.notification.Dispose();
         }
@@ -78,6 +86,9 @@ namespace TweetDuck.Core.Other.Settings{
             radioLocBR.CheckedChanged += radioLoc_CheckedChanged;
             radioLocCustom.Click += radioLocCustom_Click;
 
+            radioSizeAuto.CheckedChanged += radioSize_CheckedChanged;
+            radioSizeCustom.Click += radioSizeCustom_Click;
+
             trackBarDuration.ValueChanged += trackBarDuration_ValueChanged;
             btnDurationShort.Click += btnDurationShort_Click;
             btnDurationMedium.Click += btnDurationMedium_Click;
@@ -86,10 +97,12 @@ namespace TweetDuck.Core.Other.Settings{
             checkColumnName.CheckedChanged += checkColumnName_CheckedChanged;
             checkNotificationTimer.CheckedChanged += checkNotificationTimer_CheckedChanged;
             checkTimerCountDown.CheckedChanged += checkTimerCountDown_CheckedChanged;
+            checkMediaPreviews.CheckedChanged += checkMediaPreviews_CheckedChanged;
             checkSkipOnLinkClick.CheckedChanged += checkSkipOnLinkClick_CheckedChanged;
             checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
 
             comboBoxIdlePause.SelectedValueChanged += comboBoxIdlePause_SelectedValueChanged;
+            trackBarScrollSpeed.ValueChanged += trackBarScrollSpeed_ValueChanged;
 
             comboBoxDisplay.SelectedValueChanged += comboBoxDisplay_SelectedValueChanged;
             trackBarEdgeDistance.ValueChanged += trackBarEdgeDistance_ValueChanged;
@@ -109,6 +122,19 @@ namespace TweetDuck.Core.Other.Settings{
             notification.Activated -= notification_Activated;
         }
 
+        private void notification_Move(object sender, EventArgs e){
+            if (radioLocCustom.Checked && notification.Location != ControlExtensions.InvisibleLocation){
+                Config.CustomNotificationPosition = notification.Location;
+            }
+        }
+
+        private void notification_ResizeEnd(object sender, EventArgs e){
+            if (radioSizeCustom.Checked){
+                Config.CustomNotificationSize = notification.BrowserSize;
+                notification.ShowNotificationForSettings(false);
+            }
+        }
+
         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;
@@ -129,7 +155,7 @@ namespace TweetDuck.Core.Other.Settings{
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = false;
             notification.ShowNotificationForSettings(false);
 
-            if (notification.IsFullyOutsideView() && MessageBox.Show("The notification seems to be outside of view, would you like to reset its position?", "Notification is outside view", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+            if (notification.IsFullyOutsideView() && FormMessage.Question("Notification is outside view", "The notification seems to be outside of view, would you like to reset its position?", FormMessage.Yes, FormMessage.No)){
                 Config.NotificationPosition = TweetNotification.Position.TopRight;
                 notification.MoveToVisibleLocation();
 
@@ -140,11 +166,30 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
+        private void radioSize_CheckedChanged(object sender, EventArgs e){
+            if (radioSizeAuto.Checked)Config.NotificationSize = TweetNotification.Size.Auto;
+            
+            notification.ShowNotificationForSettings(false);
+            notification.CanResizeWindow = false; // must be after ShowNotificationForSettings
+        }
+        
+        private void radioSizeCustom_Click(object sender, EventArgs e){
+            if (!Config.IsCustomNotificationSizeSet){
+                Config.CustomNotificationSize = notification.BrowserSize;
+            }
+
+            Config.NotificationSize = TweetNotification.Size.Custom;
+
+            notification.CanResizeWindow = true;
+            notification.ShowNotificationForSettings(false);
+        }
+
         private void trackBarDuration_ValueChanged(object sender, EventArgs e){
+            durationUpdateTimer.Stop();
+            durationUpdateTimer.Start();
+
             Config.NotificationDurationValue = trackBarDuration.Value;
             labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
-
-            notification.ShowNotificationForSettings(true);
         }
 
         private void btnDurationShort_Click(object sender, EventArgs e){
@@ -175,6 +220,10 @@ namespace TweetDuck.Core.Other.Settings{
             notification.ShowNotificationForSettings(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;
         }
@@ -187,15 +236,27 @@ namespace TweetDuck.Core.Other.Settings{
             Config.NotificationIdlePauseSeconds = IdlePauseSeconds[comboBoxIdlePause.SelectedIndex];
         }
 
+        private void trackBarScrollSpeed_ValueChanged(object sender, EventArgs e){
+            if (trackBarScrollSpeed.AlignValueToTick()){
+                labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
+                Config.NotificationScrollSpeed = trackBarScrollSpeed.Value;
+            }
+        }
+
         private void comboBoxDisplay_SelectedValueChanged(object sender, EventArgs e){
             Config.NotificationDisplay = comboBoxDisplay.SelectedIndex;
             notification.ShowNotificationForSettings(false);
         }
 
         private void trackBarEdgeDistance_ValueChanged(object sender, EventArgs e){
-            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value.ToString(CultureInfo.InvariantCulture)+" px";
+            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
             Config.NotificationEdgeDistance = trackBarEdgeDistance.Value;
             notification.ShowNotificationForSettings(false);
         }
+
+        private void durationUpdateTimer_Tick(object sender, EventArgs e){
+            notification.ShowNotificationForSettings(true);
+            durationUpdateTimer.Stop();
+        }
     }
 }

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -25,31 +25,20 @@
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.groupCustomSound = new System.Windows.Forms.GroupBox();
             this.btnPlaySound = new System.Windows.Forms.Button();
             this.btnResetSound = new System.Windows.Forms.Button();
             this.btnBrowseSound = new System.Windows.Forms.Button();
             this.tbCustomSound = new System.Windows.Forms.TextBox();
-            this.groupCustomSound.SuspendLayout();
+            this.labelSoundNotification = new System.Windows.Forms.Label();
+            this.panelSoundNotification = new System.Windows.Forms.Panel();
+            this.panelSoundNotification.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupCustomSound
-            // 
-            this.groupCustomSound.Controls.Add(this.btnPlaySound);
-            this.groupCustomSound.Controls.Add(this.btnResetSound);
-            this.groupCustomSound.Controls.Add(this.btnBrowseSound);
-            this.groupCustomSound.Controls.Add(this.tbCustomSound);
-            this.groupCustomSound.Location = new System.Drawing.Point(9, 9);
-            this.groupCustomSound.Name = "groupCustomSound";
-            this.groupCustomSound.Size = new System.Drawing.Size(372, 75);
-            this.groupCustomSound.TabIndex = 0;
-            this.groupCustomSound.TabStop = false;
-            this.groupCustomSound.Text = "Custom Sound Notification";
-            // 
             // btnPlaySound
             // 
+            this.btnPlaySound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnPlaySound.AutoSize = true;
-            this.btnPlaySound.Location = new System.Drawing.Point(250, 45);
+            this.btnPlaySound.Location = new System.Drawing.Point(203, 29);
             this.btnPlaySound.Name = "btnPlaySound";
             this.btnPlaySound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnPlaySound.Size = new System.Drawing.Size(43, 23);
@@ -60,7 +49,7 @@
             // btnResetSound
             // 
             this.btnResetSound.AutoSize = true;
-            this.btnResetSound.Location = new System.Drawing.Point(6, 45);
+            this.btnResetSound.Location = new System.Drawing.Point(3, 29);
             this.btnResetSound.Name = "btnResetSound";
             this.btnResetSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnResetSound.Size = new System.Drawing.Size(51, 23);
@@ -70,8 +59,9 @@
             // 
             // btnBrowseSound
             // 
+            this.btnBrowseSound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnBrowseSound.AutoSize = true;
-            this.btnBrowseSound.Location = new System.Drawing.Point(299, 45);
+            this.btnBrowseSound.Location = new System.Drawing.Point(252, 29);
             this.btnBrowseSound.Name = "btnBrowseSound";
             this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnBrowseSound.Size = new System.Drawing.Size(67, 23);
@@ -81,31 +71,61 @@
             // 
             // tbCustomSound
             // 
-            this.tbCustomSound.Location = new System.Drawing.Point(6, 19);
+            this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
             this.tbCustomSound.Name = "tbCustomSound";
-            this.tbCustomSound.Size = new System.Drawing.Size(360, 20);
+            this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
             this.tbCustomSound.TabIndex = 0;
+            this.toolTip.SetToolTip(this.tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
+            // 
+            // labelSoundNotification
+            // 
+            this.labelSoundNotification.AutoSize = true;
+            this.labelSoundNotification.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSoundNotification.Location = new System.Drawing.Point(6, 8);
+            this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelSoundNotification.Name = "labelSoundNotification";
+            this.labelSoundNotification.Size = new System.Drawing.Size(198, 20);
+            this.labelSoundNotification.TabIndex = 1;
+            this.labelSoundNotification.Text = "Custom Sound Notification";
+            // 
+            // panelSoundNotification
+            // 
+            this.panelSoundNotification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelSoundNotification.Controls.Add(this.btnPlaySound);
+            this.panelSoundNotification.Controls.Add(this.tbCustomSound);
+            this.panelSoundNotification.Controls.Add(this.btnResetSound);
+            this.panelSoundNotification.Controls.Add(this.btnBrowseSound);
+            this.panelSoundNotification.Location = new System.Drawing.Point(9, 31);
+            this.panelSoundNotification.Name = "panelSoundNotification";
+            this.panelSoundNotification.Size = new System.Drawing.Size(322, 56);
+            this.panelSoundNotification.TabIndex = 2;
             // 
             // TabSettingsSounds
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupCustomSound);
+            this.Controls.Add(this.panelSoundNotification);
+            this.Controls.Add(this.labelSoundNotification);
             this.Name = "TabSettingsSounds";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 97);
-            this.groupCustomSound.ResumeLayout(false);
+            this.panelSoundNotification.ResumeLayout(false);
-            this.groupCustomSound.PerformLayout();
+            this.panelSoundNotification.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
 
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.GroupBox groupCustomSound;
         private System.Windows.Forms.Button btnResetSound;
         private System.Windows.Forms.Button btnBrowseSound;
         private System.Windows.Forms.TextBox tbCustomSound;
         private System.Windows.Forms.Button btnPlaySound;
+        private System.Windows.Forms.Label labelSoundNotification;
+        private System.Windows.Forms.Panel panelSoundNotification;
     }
 }

Core/Other/Settings/TabSettingsSounds.cs

@@ -3,16 +3,16 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Core.Notification;
-using TweetDuck.Core.Notification.Sound;
+using TweetLib.Audio;
 
 namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsSounds : BaseTabSettings{
-        private readonly ISoundNotificationPlayer soundNotification;
+        private readonly SoundNotification soundNotification;
 
         public TabSettingsSounds(){
             InitializeComponent();
 
-            soundNotification = SoundNotification.New();
+            soundNotification = new SoundNotification();
             soundNotification.PlaybackError += sound_PlaybackError;
 
             tbCustomSound.Text = Config.NotificationSoundPath;
@@ -34,7 +34,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         private void tbCustomSound_TextChanged(object sender, EventArgs e){
             bool isEmpty = string.IsNullOrEmpty(tbCustomSound.Text);
-            tbCustomSound.ForeColor = isEmpty || File.Exists(tbCustomSound.Text) ? SystemColors.WindowText : Color.Maroon;
+            tbCustomSound.ForeColor = isEmpty || File.Exists(tbCustomSound.Text) ? SystemColors.WindowText : Color.Red;
             btnPlaySound.Enabled = !isEmpty;
             btnResetSound.Enabled = !isEmpty;
         }
@@ -44,7 +44,7 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void sound_PlaybackError(object sender, PlaybackErrorEventArgs e){
-            MessageBox.Show("Could not play custom notification sound."+Environment.NewLine+e.Message, "Notification Sound Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            FormMessage.Error("Notification Sound Error", "Could not play custom notification sound.\n"+e.Message, FormMessage.OK);
         }
 
         private void btnBrowseSound_Click(object sender, EventArgs e){

Core/Utils/BrowserProcesses.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+using CefSharp;
+
+namespace TweetDuck.Core.Utils{
+    static class BrowserProcesses{
+        private static readonly Dictionary<int, int> PIDs = new Dictionary<int, int>();
+
+        public static void Link(int identifier, int pid){
+            PIDs[identifier] = pid;
+        }
+
+        public static void Forget(int identifier){
+            PIDs.Remove(identifier);
+        }
+        
+        public static Process FindProcess(IBrowser browser){
+            if (PIDs.TryGetValue(browser.Identifier, out int pid) && WindowsUtils.IsChildProcess(pid)){ // child process is checked in two places for safety
+                return Process.GetProcessById(pid);
+            }
+            else{
+                return null;
+            }
+        }
+    }
+}

Core/Utils/BrowserUtils.cs

@@ -1,36 +1,46 @@
 using CefSharp;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
 using System.IO;
 using System.Net;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using TweetDuck.Core.Other;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
         public static string HeaderAcceptLanguage{
             get{
-                string culture = CultureInfo.CurrentCulture.Name;
+                string culture = Program.Culture.Name;
 
                 if (culture == "en"){
                     return "en-us,en";
                 }
                 else{
-                    return culture.ToLowerInvariant()+",en;q=0.9";
+                    return culture.ToLower()+",en;q=0.9";
                 }
             }
         }
 
         public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
 
-        public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
+        public static void SetupCefArgs(IDictionary<string, string> args){
-        public const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
+            if (!Program.SystemConfig.HardwareAcceleration){
+                args["disable-gpu"] = "1";
+                args["disable-gpu-vsync"] = "1";
+            }
+            
+            args["disable-extensions"] = "1";
+            args["disable-plugins-discovery"] = "1";
+            args["enable-system-flash"] = "0";
 
-        public static readonly string[] DictionaryWords = {
+            if (args.TryGetValue("js-flags", out string jsFlags)){
-            "tweetdeck", "TweetDeck", "tweetduck", "TweetDuck", "TD"
+                args["js-flags"] = "--expose-gc "+jsFlags;
-        };
+            }
+            else{
+                args["js-flags"] = "--expose-gc";
+            }
+        }
 
         public static bool IsValidUrl(string url){
             if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
@@ -48,7 +58,7 @@ namespace TweetDuck.Core.Utils{
                 OpenExternalBrowserUnsafe(url);
             }
             else{
-                MessageBox.Show("A potentially malicious URL was blocked from opening:"+Environment.NewLine+url, "Blocked URL", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n"+url, FormMessage.OK);
             }
         }
 
@@ -61,12 +71,8 @@ namespace TweetDuck.Core.Utils{
             return string.IsNullOrEmpty(file) ? null : file;
         }
 
-        public static string ConvertPascalCaseToScreamingSnakeCase(string str){
-            return Regex.Replace(str, @"(\p{Ll})(\P{Ll})|(\P{Ll})(\P{Ll}\p{Ll})", "$1$3_$2$4").ToUpperInvariant();
-        }
-
         public static string GetErrorName(CefErrorCode code){
-            return ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
+            return StringUtils.ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
         }
 
         public static WebClient DownloadFileAsync(string url, string target, Action onSuccess, Action<Exception> onFailure){
@@ -93,18 +99,14 @@ namespace TweetDuck.Core.Utils{
             return client;
         }
 
+        public static int Scale(int baseValue, double scaleFactor){
+            return (int)Math.Round(baseValue*scaleFactor);
+        }
+
         public static void SetZoomLevel(IBrowser browser, int percentage){
             browser.GetHost().SetZoomLevel(Math.Log(percentage/100.0, 1.2));
         }
 
-        public static bool IsTweetDeckWebsite(IFrame frame){
-            return frame.Url.Contains("//tweetdeck.twitter.com/");
-        }
-
-        public static bool IsTwitterWebsite(IFrame frame){
-            return frame.Url.Contains("//twitter.com/");
-        }
-
         #if DEBUG
         public static void HandleConsoleMessage(object sender, ConsoleMessageEventArgs e){
             Debug.WriteLine("[Console] {0} ({1}:{2})", e.Message, e.Source, e.Line);

Core/Utils/CommandLineArgsParser.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Text.RegularExpressions;
-
-namespace TweetDuck.Core.Utils{
-    static class CommandLineArgsParser{
-        private static readonly Lazy<Regex> SplitRegex = new Lazy<Regex>(() => new Regex(@"([^=\s]+(?:=(?:[^ ]*""[^""]*?""[^ ]*|[^ ]*))?)", RegexOptions.Compiled), false);
-        
-        public static CommandLineArgs ReadCefArguments(string argumentString){
-            CommandLineArgs args = new CommandLineArgs();
-
-            if (string.IsNullOrWhiteSpace(argumentString)){
-                return args;
-            }
-
-            foreach(Match match in SplitRegex.Value.Matches(argumentString)){
-                string matchValue = match.Value;
-
-                int indexEquals = matchValue.IndexOf('=');
-                string key, value;
-
-                if (indexEquals == -1){
-                    key = matchValue.TrimStart('-');
-                    value = "1";
-                }
-                else{
-                    key = matchValue.Substring(0, indexEquals).TrimStart('-');
-                    value = matchValue.Substring(indexEquals+1).Trim('"');
-                }
-
-                if (key.Length != 0){
-                    args.SetValue(key, value);
-                }
-            }
-
-            return args;
-        }
-    }
-}

Core/Utils/MemoryUsageTracker.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Diagnostics;
+using System.Timers;
+using System.Windows.Forms;
+using CefSharp;
+using Timer = System.Timers.Timer;
+
+namespace TweetDuck.Core.Utils{
+    sealed class MemoryUsageTracker : IDisposable{
+        private const int IntervalMemoryCheck = 60000*30; // 30 minutes
+        private const int IntervalCleanupAttempt = 60000*5; // 5 minutes
+
+        private readonly string script;
+        private readonly Timer timer;
+        private Form owner;
+        private IBrowser browser;
+
+        private long threshold;
+        private bool needsCleanup;
+
+        public MemoryUsageTracker(string cleanupFunctionName){
+            this.script = $"window.{cleanupFunctionName} && window.{cleanupFunctionName}()";
+
+            this.timer = new Timer{ Interval = IntervalMemoryCheck };
+            this.timer.Elapsed += timer_Elapsed;
+        }
+
+        public void Start(Form owner, IBrowser browser, int thresholdMB){
+            Stop();
+
+            this.owner = owner;
+            this.browser = browser;
+            this.threshold = thresholdMB*1024L*1024L;
+            this.timer.SynchronizingObject = owner;
+            this.timer.Start();
+        }
+
+        public void Stop(){
+            timer.Stop();
+            timer.SynchronizingObject = null;
+            owner = null;
+            browser = null;
+            SetNeedsCleanup(false);
+        }
+
+        public void Dispose(){
+            timer.SynchronizingObject = null;
+            timer.Dispose();
+            owner = null;
+            browser = null;
+        }
+
+        private void SetNeedsCleanup(bool value){
+            if (needsCleanup != value){
+                needsCleanup = value;
+                timer.Interval = value ? IntervalCleanupAttempt : IntervalMemoryCheck; // restarts timer
+            }
+        }
+
+        private void timer_Elapsed(object sender, ElapsedEventArgs e){
+            if (owner == null || browser == null){
+                return;
+            }
+            
+            if (needsCleanup){
+                if (!owner.ContainsFocus){
+                    using(IFrame frame = browser.MainFrame){
+                        frame.EvaluateScriptAsync(script).ContinueWith(task => {
+                            JavascriptResponse response = task.Result;
+
+                            if (response.Success && (response.Result as bool? ?? false)){
+                                SetNeedsCleanup(false);
+                            }
+                        });
+                    }
+                }
+            }
+            else{
+                try{
+                    using(Process process = BrowserProcesses.FindProcess(browser)){
+                        if (process?.PrivateMemorySize64 > threshold){
+                            SetNeedsCleanup(true);
+                        }
+                    }
+                }catch{
+                    // ignore I guess?
+                }
+            }
+        }
+    }
+}

Core/Utils/NativeMethods.cs

@@ -67,7 +67,10 @@ namespace TweetDuck.Core.Utils{
         private static extern bool BitBlt(IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, IntPtr hdcSrc, int nXSrc, int nYSrc, uint dwRop);
 
         [DllImport("user32.dll")]
-        public static extern IntPtr SendMessage(IntPtr hWnd, uint msg, int wParam, IntPtr lParam);
+        public static extern IntPtr SendMessage(IntPtr hWnd, uint msg, UIntPtr wParam, IntPtr lParam);
+        
+        [DllImport("user32.dll")]
+        public static extern bool PostMessage(IntPtr hWnd, uint msg, UIntPtr wParam, IntPtr lParam);
 
         [DllImport("user32.dll")]
         public static extern uint RegisterWindowMessage(string messageName);

Core/Utils/StringUtils.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace TweetDuck.Core.Utils{
+    static class StringUtils{
+        public static readonly string[] EmptyArray = new string[0];
+
+        public static string ExtractBefore(string str, char search, int startIndex = 0){
+            int index = str.IndexOf(search, startIndex);
+            return index == -1 ? str : str.Substring(0, index);
+        }
+
+        public static int[] ParseInts(string str, char separator){
+            return str.Split(new char[]{ separator }, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToArray();
+        }
+        
+        public static string ConvertPascalCaseToScreamingSnakeCase(string str){
+            return Regex.Replace(str, @"(\p{Ll})(\P{Ll})|(\P{Ll})(\P{Ll}\p{Ll})", "$1$3_$2$4").ToUpper();
+        }
+    }
+}

Core/Utils/TwitterUtils.cs

@@ -0,0 +1,104 @@
+using System;
+using CefSharp;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using TweetDuck.Core.Other;
+
+namespace TweetDuck.Core.Utils{
+    static class TwitterUtils{
+        public const string TweetDeckURL = "https://tweetdeck.twitter.com";
+
+        public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
+        public const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
+        
+        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/([^/]+)/?$", RegexOptions.Compiled), false);
+        public static Regex RegexAccount => RegexAccountLazy.Value;
+
+        public static readonly string[] DictionaryWords = {
+            "tweetdeck", "TweetDeck", "tweetduck", "TweetDuck", "TD"
+        };
+
+        public enum ImageQuality{
+            Default, Orig
+        }
+
+        public static bool IsTweetDeckWebsite(IFrame frame){
+            return frame.Url.Contains("//tweetdeck.twitter.com/");
+        }
+
+        public static bool IsTwitterWebsite(IFrame frame){
+            return frame.Url.Contains("//twitter.com/");
+        }
+
+        private static string ExtractImageBaseLink(string url){
+            int dot = url.LastIndexOf('.');
+            return dot == -1 ? url : StringUtils.ExtractBefore(url, ':', dot);
+        }
+
+        public static string GetImageLink(string url, ImageQuality quality){
+            if (quality == ImageQuality.Orig){
+                string result = ExtractImageBaseLink(url);
+
+                if (result != url){
+                    result += ":orig";
+                }
+
+                return result;
+            }
+            else{
+                return url;
+            }
+        }
+        
+        public static void DownloadImage(string url, string username, ImageQuality quality){
+            DownloadImages(new string[]{ url }, username, quality);
+        }
+
+        public static void DownloadImages(string[] urls, string username, ImageQuality quality){
+            if (urls.Length == 0){
+                return;
+            }
+
+            string firstImageLink = GetImageLink(urls[0], quality);
+            int qualityIndex = firstImageLink.LastIndexOf(':');
+
+            string file = BrowserUtils.GetFileNameFromUrl(ExtractImageBaseLink(firstImageLink));
+            string ext = Path.GetExtension(file); // includes dot
+
+            string[] fileNameParts = {
+                username,
+                Path.ChangeExtension(file, null),
+                qualityIndex == -1 ? string.Empty : firstImageLink.Substring(qualityIndex+1)
+            };
+            
+            using(SaveFileDialog dialog = new SaveFileDialog{
+                AutoUpgradeEnabled = true,
+                OverwritePrompt = urls.Length == 1,
+                Title = "Save image",
+                FileName = $"{string.Join(" ", fileNameParts.Where(part => part.Length > 0))}{ext}",
+                Filter = (urls.Length == 1 ? "Image" : "Images")+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
+            }){
+                if (dialog.ShowDialog() == DialogResult.OK){
+                    void OnFailure(Exception ex){
+                        FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                    }
+
+                    if (urls.Length == 1){
+                        BrowserUtils.DownloadFileAsync(firstImageLink, dialog.FileName, null, OnFailure);
+                    }
+                    else{
+                        string pathBase = Path.ChangeExtension(dialog.FileName, null);
+                        string pathExt = Path.GetExtension(dialog.FileName);
+
+                        for(int index = 0; index < urls.Length; index++){
+                            BrowserUtils.DownloadFileAsync(GetImageLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Core/Utils/WindowsUtils.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Management;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -11,13 +12,29 @@ namespace TweetDuck.Core.Utils{
         private static readonly Lazy<Regex> RegexStripHtmlStyles = new Lazy<Regex>(() => new Regex(@"\s?(?:style|class)="".*?"""), false);
         private static readonly Lazy<Regex> RegexOffsetClipboardHtml = new Lazy<Regex>(() => new Regex(@"(?<=EndHTML:|EndFragment:)(\d+)"), false);
 
+        public static int CurrentProcessID { get; }
         public static bool ShouldAvoidToolWindow { get; }
 
         static WindowsUtils(){
+            using(Process me = Process.GetCurrentProcess()){
+                CurrentProcessID = me.Id;
+            }
+
             Version ver = Environment.OSVersion.Version;
             ShouldAvoidToolWindow = ver.Major == 6 && ver.Minor == 2; // windows 8/10
         }
 
+        public static void CreateDirectoryForFile(string file){
+            string dir = Path.GetDirectoryName(file);
+
+            if (dir == null){
+                throw new ArgumentException("Invalid file path: "+file);
+            }
+            else if (dir.Length > 0){
+                Directory.CreateDirectory(dir);
+            }
+        }
+
         public static bool CheckFolderWritePermission(string path){
             string testFile = Path.Combine(path, ".test");
 
@@ -72,6 +89,20 @@ namespace TweetDuck.Core.Utils{
             }).Start();
         }
 
+        public static bool IsChildProcess(int pid){
+            try{
+                using(ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT ParentProcessId FROM Win32_Process WHERE ProcessId = "+pid)){
+                    foreach(ManagementBaseObject obj in searcher.Get()){
+                        return (uint)obj["ParentProcessId"] == CurrentProcessID;
+                    }
+                }
+
+                return false;
+            }catch{
+                return false;
+            }
+        }
+
         public static void ClipboardStripHtmlStyles(){
             if (!Clipboard.ContainsText(TextDataFormat.Html)){
                 return;
@@ -105,7 +136,7 @@ namespace TweetDuck.Core.Utils{
             try{
                 Clipboard.SetDataObject(obj);
             }catch(ExternalException e){
-                Program.Reporter.HandleException("Clipboard Error", Program.BrandName+" could not access the clipboard as it is currently used by another process.", true, e);
+                Program.Reporter.HandleException("Clipboard Error", "TweetDuck could not access the clipboard as it is currently used by another process.", true, e);
             }
         }
     }

Data/CombinedFileStream.cs

@@ -1,9 +1,10 @@
 using System;
 using System.IO;
 using System.Text;
+using TweetDuck.Core.Utils;
 
-namespace TweetDuck.Core.Other.Settings.Export{
+namespace TweetDuck.Data{
-    class CombinedFileStream : IDisposable{
+    sealed class CombinedFileStream : IDisposable{
         public const char KeySeparator = '|';
 
         private readonly Stream stream;
@@ -79,8 +80,7 @@ namespace TweetDuck.Core.Other.Settings.Export{
             stream.Position += BitConverter.ToInt32(contentLength, 0);
 
             string keyName = Encoding.UTF8.GetString(name);
-            int separatorIndex = keyName.IndexOf(KeySeparator);
+            return StringUtils.ExtractBefore(keyName, KeySeparator);
-            return separatorIndex == -1 ? keyName : keyName.Substring(0, separatorIndex);
         }
 
         public void Flush(){
@@ -96,15 +96,14 @@ namespace TweetDuck.Core.Other.Settings.Export{
 
             public string KeyName{
                 get{
-                    int index = Identifier.IndexOf(KeySeparator);
+                    return StringUtils.ExtractBefore(Identifier, KeySeparator);
-                    return index == -1 ? Identifier : Identifier.Substring(0, index);
                 }
             }
 
             public string[] KeyValue{
                 get{
                     int index = Identifier.IndexOf(KeySeparator);
-                    return index == -1 ? new string[0] : Identifier.Substring(index+1).Split(KeySeparator);
+                    return index == -1 ? StringUtils.EmptyArray : Identifier.Substring(index+1).Split(KeySeparator);
                 }
             }
 
@@ -121,11 +120,7 @@ namespace TweetDuck.Core.Other.Settings.Export{
 
             public void WriteToFile(string path, bool createDirectory){
                 if (createDirectory){
-                    string dir = Path.GetDirectoryName(path);
+                    WindowsUtils.CreateDirectoryForFile(path);
-
-                    if (!string.IsNullOrEmpty(dir)){
-                        Directory.CreateDirectory(dir);
-                    }
                 }
 
                 File.WriteAllBytes(path, contents);

Data/CommandLineArgs.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
-    class CommandLineArgs{
+    sealed class CommandLineArgs{
         public static CommandLineArgs FromStringArray(char entryChar, string[] array){
             CommandLineArgs args = new CommandLineArgs();
             ReadStringArray(entryChar, array, args);
@@ -32,37 +33,67 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
+        public static CommandLineArgs ReadCefArguments(string argumentString){
+            CommandLineArgs args = new CommandLineArgs();
+
+            if (string.IsNullOrWhiteSpace(argumentString)){
+                return args;
+            }
+            
+            foreach(Match match in Regex.Matches(argumentString, @"([^=\s]+(?:=(?:\S*""[^""]*?""\S*|\S*))?)")){
+                string matchValue = match.Value;
+
+                int indexEquals = matchValue.IndexOf('=');
+                string key, value;
+
+                if (indexEquals == -1){
+                    key = matchValue.TrimStart('-');
+                    value = "1";
+                }
+                else{
+                    key = matchValue.Substring(0, indexEquals).TrimStart('-');
+                    value = matchValue.Substring(indexEquals+1).Trim('"');
+                }
+
+                if (key.Length != 0){
+                    args.SetValue(key, value);
+                }
+            }
+
+            return args;
+        }
+
         private readonly HashSet<string> flags = new HashSet<string>();
         private readonly Dictionary<string, string> values = new Dictionary<string, string>();
 
         public int Count => flags.Count+values.Count;
 
         public void AddFlag(string flag){
-            flags.Add(flag.ToLowerInvariant());
+            flags.Add(flag.ToLower());
         }
 
         public bool HasFlag(string flag){
-            return flags.Contains(flag.ToLowerInvariant());
+            return flags.Contains(flag.ToLower());
         }
 
         public void RemoveFlag(string flag){
-            flags.Remove(flag.ToLowerInvariant());
+            flags.Remove(flag.ToLower());
         }
 
         public void SetValue(string key, string value){
-            values[key.ToLowerInvariant()] = value;
+            values[key.ToLower()] = value;
         }
 
         public bool HasValue(string key){
-            return values.ContainsKey(key.ToLowerInvariant());
+            return values.ContainsKey(key.ToLower());
         }
 
         public string GetValue(string key, string defaultValue){
-            return values.TryGetValue(key.ToLowerInvariant(), out string val) ? val : defaultValue;
+            return values.TryGetValue(key.ToLower(), out string val) ? val : defaultValue;
         }
 
         public void RemoveValue(string key){
-            values.Remove(key.ToLowerInvariant());
+            values.Remove(key.ToLower());
         }
 
         public CommandLineArgs Clone(){

Data/InjectedHTML.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
-    class InjectedHTML{
+    sealed class InjectedHTML{
         public enum Position{
             Before, After
         }

Data/Serialization/FileSerializer.cs

@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace TweetDuck.Data.Serialization{
+    sealed class FileSerializer<T>{
+        private const string NewLineReal = "\r\n";
+        private const string NewLineCustom = "\r~\n";
+
+        private static readonly ITypeConverter BasicSerializerObj = new BasicTypeConverter();
+        
+        public delegate void HandleUnknownPropertiesHandler(T obj, Dictionary<string, string> data);
+        public HandleUnknownPropertiesHandler HandleUnknownProperties { get; set; }
+        
+        private readonly Dictionary<string, PropertyInfo> props;
+        private readonly Dictionary<Type, ITypeConverter> converters;
+
+        public FileSerializer(){
+            this.props = typeof(T).GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(prop => prop.CanWrite).ToDictionary(prop => prop.Name);
+            this.converters = new Dictionary<Type, ITypeConverter>();
+        }
+
+        public void RegisterTypeConverter(Type type, ITypeConverter converter){
+            converters[type] = converter;
+        }
+
+        public void Write(string file, T obj){
+            using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
+                foreach(KeyValuePair<string, PropertyInfo> prop in props){
+                    Type type = prop.Value.PropertyType;
+                    object value = prop.Value.GetValue(obj);
+                    
+                    if (!converters.TryGetValue(type, out ITypeConverter serializer)) {
+                        serializer = BasicSerializerObj;
+                    }
+
+                    if (serializer.TryWriteType(type, value, out string converted)){
+                        if (converted != null){
+                            writer.Write($"{prop.Key} {converted.Replace(Environment.NewLine, NewLineCustom)}");
+                            writer.Write(NewLineReal);
+                        }
+                    }
+                    else{
+                        throw new SerializationException($"Invalid serialization type, conversion failed for: {type}");
+                    }
+                }
+            }
+        }
+
+        public void Read(string file, T obj){
+            Dictionary<string, string> unknownProperties = new Dictionary<string, string>(4);
+
+            using(StreamReader reader = new StreamReader(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read))){
+                if (reader.Peek() <= 1){
+                    throw new FormatException("Input appears to be a binary file.");
+                }
+
+                foreach(string line in reader.ReadToEnd().Split(new string[]{ NewLineReal }, StringSplitOptions.RemoveEmptyEntries)){
+                    int space = line.IndexOf(' ');
+
+                    if (space == -1){
+                        throw new SerializationException($"Invalid file format, missing separator: {line}");
+                    }
+
+                    string property = line.Substring(0, space);
+                    string value = line.Substring(space+1).Replace(NewLineCustom, Environment.NewLine);
+
+                    if (props.TryGetValue(property, out PropertyInfo info)){
+                        if (!converters.TryGetValue(info.PropertyType, out ITypeConverter serializer)) {
+                            serializer = BasicSerializerObj;
+                        }
+
+                        if (serializer.TryReadType(info.PropertyType, value, out object converted)){
+                            info.SetValue(obj, converted);
+                        }
+                        else{
+                            throw new SerializationException($"Invalid file format, cannot convert value: {value} (property: {property})");
+                        }
+                    }
+                    else{
+                        unknownProperties[property] = value;
+                    }
+                }
+            }
+
+            if (unknownProperties.Count > 0){
+                HandleUnknownProperties?.Invoke(obj, unknownProperties);
+
+                if (unknownProperties.Count > 0){
+                    throw new SerializationException($"Invalid file format, unknown properties: {string.Join(", ", unknownProperties.Keys)}+");
+                }
+            }
+        }
+
+        private class BasicTypeConverter : ITypeConverter{
+            bool ITypeConverter.TryWriteType(Type type, object value, out string converted){
+                switch(Type.GetTypeCode(type)){
+                    case TypeCode.Boolean:
+                        converted = value.ToString();
+                        return true;
+
+                    case TypeCode.Int32:
+                        converted = ((int)value).ToString(); // cast required for enums
+                        return true;
+
+                    case TypeCode.String:
+                        converted = value?.ToString();
+                        return true;
+
+                    default:
+                        converted = null;
+                        return false;
+                }
+            }
+
+            bool ITypeConverter.TryReadType(Type type, string value, out object converted){
+                switch(Type.GetTypeCode(type)){
+                    case TypeCode.Boolean:
+                        if (bool.TryParse(value, out bool b)){
+                            converted = b;
+                            return true;
+                        }
+                        else goto default;
+
+                    case TypeCode.Int32:
+                        if (int.TryParse(value, out int i)){
+                            converted = i;
+                            return true;
+                        }
+                        else goto default;
+
+                    case TypeCode.String:
+                        converted = value;
+                        return true;
+
+                    default:
+                        converted = null;
+                        return false;
+                }
+            }
+        }
+    }
+}

Data/Serialization/ITypeConverter.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace TweetDuck.Data.Serialization{
+    interface ITypeConverter{
+        bool TryWriteType(Type type, object value, out string converted);
+        bool TryReadType(Type type, string value, out object converted);
+    }
+}

Data/Serialization/SingleTypeConverter.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace TweetDuck.Data.Serialization{
+    sealed class SingleTypeConverter<T> : ITypeConverter{
+        public Func<T, string> ConvertToString { get; set; }
+        public Func<string, T> ConvertToObject { get; set; }
+
+        bool ITypeConverter.TryWriteType(Type type, object value, out string converted){
+            try{
+                converted = ConvertToString((T)value);
+                return true;
+            }catch{
+                converted = null;
+                return false;
+            }
+        }
+
+        bool ITypeConverter.TryReadType(Type type, string value, out object converted){
+            try{
+                converted = ConvertToObject(value);
+                return true;
+            }catch{
+                converted = null;
+                return false;
+            }
+        }
+    }
+}

Data/TwoKeyDictionary.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
-    class TwoKeyDictionary<K1, K2, V>{
+    sealed class TwoKeyDictionary<K1, K2, V>{
         private readonly Dictionary<K1, Dictionary<K2, V>> dict;
         private readonly int innerCapacity;
 

Data/WindowState.cs

@@ -2,10 +2,12 @@
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
+using TweetDuck.Core.Utils;
+using TweetDuck.Data.Serialization;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
-    [Serializable]
+    [Serializable] // TODO remove attribute with UserConfigLegacy
-    class WindowState{
+    sealed class WindowState{
         private Rectangle rect;
         private bool isMaximized;
 
@@ -26,5 +28,17 @@ namespace TweetDuck.Core.Utils{
                 Save(form);
             }
         }
+
+        public static readonly SingleTypeConverter<WindowState> Converter = new SingleTypeConverter<WindowState>{
+            ConvertToString = value => $"{(value.isMaximized ? 'M' : '_')}{value.rect.X} {value.rect.Y} {value.rect.Width} {value.rect.Height}",
+            ConvertToObject = value => {
+                int[] elements = StringUtils.ParseInts(value.Substring(1), ' ');
+                
+                return new WindowState{
+                    rect = new Rectangle(elements[0], elements[1], elements[2], elements[3]),
+                    isMaximized = value[0] == 'M'
+                };
+            }
+        };
     }
 }

Plugins/Controls/PluginControl.Designer.cs

@@ -32,6 +32,7 @@
             this.labelWebsite = new System.Windows.Forms.Label();
             this.labelVersion = new System.Windows.Forms.Label();
             this.btnOpenConfig = new System.Windows.Forms.Button();
+            this.labelType = new TweetDuck.Core.Controls.LabelVertical();
             this.panelDescription.SuspendLayout();
             this.flowLayoutInfo.SuspendLayout();
             this.SuspendLayout();
@@ -39,7 +40,7 @@
             // btnToggleState
             // 
             this.btnToggleState.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnToggleState.Location = new System.Drawing.Point(459, 80);
+            this.btnToggleState.Location = new System.Drawing.Point(456, 80);
             this.btnToggleState.Name = "btnToggleState";
             this.btnToggleState.Size = new System.Drawing.Size(65, 23);
             this.btnToggleState.TabIndex = 5;
@@ -51,7 +52,7 @@
             // 
             this.labelName.AutoSize = true;
             this.labelName.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelName.Location = new System.Drawing.Point(7, 7);
+            this.labelName.Location = new System.Drawing.Point(24, 7);
             this.labelName.Name = "labelName";
             this.labelName.Size = new System.Drawing.Size(61, 24);
             this.labelName.TabIndex = 0;
@@ -65,9 +66,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelDescription.AutoScroll = true;
             this.panelDescription.Controls.Add(this.labelDescription);
-            this.panelDescription.Location = new System.Drawing.Point(11, 35);
+            this.panelDescription.Location = new System.Drawing.Point(28, 35);
             this.panelDescription.Name = "panelDescription";
-            this.panelDescription.Size = new System.Drawing.Size(513, 39);
+            this.panelDescription.Size = new System.Drawing.Size(493, 39);
             this.panelDescription.TabIndex = 2;
             this.panelDescription.Resize += new System.EventHandler(this.panelDescription_Resize);
             // 
@@ -101,9 +102,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.flowLayoutInfo.Controls.Add(this.labelAuthor);
             this.flowLayoutInfo.Controls.Add(this.labelWebsite);
-            this.flowLayoutInfo.Location = new System.Drawing.Point(11, 85);
+            this.flowLayoutInfo.Location = new System.Drawing.Point(28, 85);
             this.flowLayoutInfo.Name = "flowLayoutInfo";
-            this.flowLayoutInfo.Size = new System.Drawing.Size(368, 18);
+            this.flowLayoutInfo.Size = new System.Drawing.Size(348, 18);
             this.flowLayoutInfo.TabIndex = 3;
             this.flowLayoutInfo.WrapContents = false;
             // 
@@ -128,7 +129,7 @@
             this.labelVersion.Location = new System.Drawing.Point(14, 12);
             this.labelVersion.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
             this.labelVersion.Name = "labelVersion";
-            this.labelVersion.Size = new System.Drawing.Size(513, 13);
+            this.labelVersion.Size = new System.Drawing.Size(510, 13);
             this.labelVersion.TabIndex = 1;
             this.labelVersion.Text = "Version";
             this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -137,7 +138,7 @@
             // btnOpenConfig
             // 
             this.btnOpenConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnOpenConfig.Location = new System.Drawing.Point(385, 80);
+            this.btnOpenConfig.Location = new System.Drawing.Point(382, 80);
             this.btnOpenConfig.Name = "btnOpenConfig";
             this.btnOpenConfig.Size = new System.Drawing.Size(68, 23);
             this.btnOpenConfig.TabIndex = 4;
@@ -145,20 +146,34 @@
             this.btnOpenConfig.UseVisualStyleBackColor = true;
             this.btnOpenConfig.Click += new System.EventHandler(this.btnOpenConfig_Click);
             // 
+            // labelType
+            // 
+            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.Location = new System.Drawing.Point(0, 0);
+            this.labelType.Name = "labelType";
+            this.labelType.Size = new System.Drawing.Size(18, 109);
+            this.labelType.TabIndex = 6;
+            this.labelType.Text = "TYPE";
+            // 
             // PluginControl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.labelType);
             this.Controls.Add(this.btnOpenConfig);
             this.Controls.Add(this.flowLayoutInfo);
             this.Controls.Add(this.panelDescription);
             this.Controls.Add(this.labelName);
             this.Controls.Add(this.btnToggleState);
             this.Controls.Add(this.labelVersion);
+            this.Margin = new System.Windows.Forms.Padding(0);
             this.MaximumSize = new System.Drawing.Size(65535, 109);
             this.MinimumSize = new System.Drawing.Size(0, 61);
             this.Name = "PluginControl";
-            this.Padding = new System.Windows.Forms.Padding(3);
+            this.Padding = new System.Windows.Forms.Padding(3, 3, 6, 3);
             this.Size = new System.Drawing.Size(530, 109);
             this.panelDescription.ResumeLayout(false);
             this.panelDescription.PerformLayout();
@@ -180,5 +195,6 @@
         private System.Windows.Forms.Label labelWebsite;
         private System.Windows.Forms.Label labelVersion;
         private System.Windows.Forms.Button btnOpenConfig;
+        private Core.Controls.LabelVertical labelType;
     }
 }

Plugins/Controls/PluginControl.cs

@@ -3,13 +3,17 @@ using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
+using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
+using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins.Controls{
     partial class PluginControl : UserControl{
         private readonly PluginManager pluginManager;
         private readonly Plugin plugin;
 
+        private readonly float dpiScale;
+
         public PluginControl(){
             InitializeComponent();
         }
@@ -18,11 +22,15 @@ namespace TweetDuck.Plugins.Controls{
             this.pluginManager = pluginManager;
             this.plugin = plugin;
 
+            this.dpiScale = this.GetDPIScale();
+
             this.labelName.Text = plugin.Name;
-            this.labelDescription.Text = plugin.CanRun ? plugin.Description : "This plugin requires "+Program.BrandName+" "+plugin.RequiredVersion+" or newer.";
+            this.labelDescription.Text = plugin.CanRun ? plugin.Description : "This plugin requires TweetDuck "+plugin.RequiredVersion+" or newer.";
             this.labelVersion.Text = plugin.Version;
             this.labelAuthor.Text = plugin.Author;
             this.labelWebsite.Text = plugin.Website;
+            
+            this.labelType.LineHeight = BrowserUtils.Scale(9, dpiScale);
 
             UpdatePluginState();
 
@@ -30,7 +38,7 @@ namespace TweetDuck.Plugins.Controls{
                 labelDescription.Visible = false;
             }
 
-            panelDescription_Resize(panelDescription, new EventArgs());
+            panelDescription_Resize(panelDescription, null);
         }
 
         private void panelDescription_Resize(object sender, EventArgs e){
@@ -39,7 +47,7 @@ namespace TweetDuck.Plugins.Controls{
             }
             else{
                 labelDescription.MaximumSize = new Size(panelDescription.Width-SystemInformation.VerticalScrollBarWidth, 0);
-                Height = Math.Min(MinimumSize.Height+9+labelDescription.Height, MaximumSize.Height);
+                Height = Math.Min(MinimumSize.Height+BrowserUtils.Scale(9, dpiScale)+labelDescription.Height, MaximumSize.Height);
             }
         }
 
@@ -68,6 +76,15 @@ namespace TweetDuck.Plugins.Controls{
             labelAuthor.ForeColor = textColor;
             labelWebsite.ForeColor = isEnabled ? Color.Blue : Color.FromArgb(90, 90, 249);
 
+            if (plugin.Group == PluginGroup.Official){
+                labelType.Text = "OFFICIAL";
+                labelType.BackColor = isEnabled ? Color.FromArgb(154, 195, 217) : Color.FromArgb(185, 185, 185);
+            }
+            else{
+                labelType.Text = "CUSTOM";
+                labelType.BackColor = isEnabled ? Color.FromArgb(208, 154, 217) : Color.FromArgb(185, 185, 185);
+            }
+
             if (plugin.CanRun){
                 labelName.ForeColor = textColor;
                 labelDescription.ForeColor = textColor;

Plugins/Plugin.cs

@@ -6,7 +6,7 @@ using System.Text;
 using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins{
-    class Plugin{
+    sealed class Plugin{
         public string Identifier { get; }
         public PluginGroup Group { get; }
         public PluginEnvironment Environments { get; private set; }
@@ -42,7 +42,7 @@ namespace TweetDuck.Plugins{
 
         private readonly string pathRoot;
         private readonly string pathData;
-        private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(4){
+        private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(8){
             { "NAME", "" },
             { "DESCRIPTION", "" },
             { "AUTHOR", "(anonymous)" },
@@ -132,8 +132,7 @@ namespace TweetDuck.Plugins{
         }
 
         public override bool Equals(object obj){
-            Plugin plugin = obj as Plugin;
+            return obj is Plugin plugin && plugin.Identifier.Equals(Identifier);
-            return plugin != null && plugin.Identifier.Equals(Identifier);
         }
 
         public static Plugin CreateFromFolder(string path, PluginGroup group, out string error){
@@ -184,7 +183,7 @@ namespace TweetDuck.Plugins{
                         plugin.metadata[currentTag] = currentContents;
                     }
 
-                    currentTag = line.Substring(1, line.Length-2).ToUpperInvariant();
+                    currentTag = line.Substring(1, line.Length-2).ToUpper();
                     currentContents = "";
 
                     if (line.Equals(endTag[0])){

Plugins/PluginBridge.cs

@@ -3,11 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 
 namespace TweetDuck.Plugins{
-    class PluginBridge{
+    sealed class PluginBridge{
         private static string SanitizeCacheKey(string key){
             return key.Replace('\\', '/').Trim();
         }
@@ -47,9 +48,9 @@ namespace TweetDuck.Plugins{
 
             if (fullPath.Length == 0){
                 switch(folder){
-                    case PluginFolder.Data: throw new Exception("File path has to be relative to the plugin data folder.");
+                    case PluginFolder.Data: throw new ArgumentException("File path has to be relative to the plugin data folder.");
-                    case PluginFolder.Root: throw new Exception("File path has to be relative to the plugin root folder.");
+                    case PluginFolder.Root: throw new ArgumentException("File path has to be relative to the plugin root folder.");
-                    default: throw new Exception("Invalid folder type "+folder+", this is a "+Program.BrandName+" error.");
+                    default: throw new ArgumentException("Invalid folder type "+folder+", this is a TweetDuck error.");
                 }
             }
             else{
@@ -67,9 +68,9 @@ namespace TweetDuck.Plugins{
             try{
                 return fileCache[token, cacheKey] = File.ReadAllText(fullPath, Encoding.UTF8);
             }catch(FileNotFoundException){
-                throw new Exception("File not found.");
+                throw new FileNotFoundException("File not found.");
             }catch(DirectoryNotFoundException){
-                throw new Exception("Directory not found.");
+                throw new DirectoryNotFoundException("Directory not found.");
             }
         }
 
@@ -78,9 +79,7 @@ namespace TweetDuck.Plugins{
         public void WriteFile(int token, string path, string contents){
             string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
 
-            // ReSharper disable once AssignNullToNotNullAttribute
+            WindowsUtils.CreateDirectoryForFile(fullPath);
-            Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
-
             File.WriteAllText(fullPath, contents, Encoding.UTF8);
             fileCache[token, SanitizeCacheKey(path)] = contents;
         }

Plugins/PluginConfig.cs

@@ -5,9 +5,7 @@ using System.Text;
 using TweetDuck.Plugins.Events;
 
 namespace TweetDuck.Plugins{
-    [Serializable]
     sealed class PluginConfig{
-        [field:NonSerialized]
         public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
 
         public IEnumerable<string> DisabledPlugins => Disabled;
@@ -18,14 +16,6 @@ namespace TweetDuck.Plugins{
             "official/reply-account"
         };
 
-        public void ImportLegacy(PluginConfig config){
-            Disabled.Clear();
-            
-            foreach(string plugin in config.Disabled){
-                Disabled.Add(plugin);
-            }
-        }
-
         public void SetEnabled(Plugin plugin, bool enabled){
             if ((enabled && Disabled.Remove(plugin.Identifier)) || (!enabled && Disabled.Add(plugin.Identifier))){
                 InternalPluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
@@ -38,8 +28,7 @@ namespace TweetDuck.Plugins{
 
         public void Load(string file){
             try{
-                using(FileStream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read))
+                using(StreamReader reader = new StreamReader(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.UTF8)){
-                using(StreamReader reader = new StreamReader(stream, Encoding.UTF8)){
                     string line = reader.ReadLine();
 
                     if (line == "#Disabled"){
@@ -51,6 +40,7 @@ namespace TweetDuck.Plugins{
                     }
                 }
             }catch(FileNotFoundException){
+                Save(file);
             }catch(DirectoryNotFoundException){
             }catch(Exception e){
                 Program.Reporter.HandleException("Plugin Configuration Error", "Could not read the plugin configuration file. If you continue, the list of disabled plugins will be reset to default.", true, e);
@@ -59,8 +49,7 @@ namespace TweetDuck.Plugins{
 
         public void Save(string file){
             try{
-                using(FileStream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))
+                using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){
-                using(StreamWriter writer = new StreamWriter(stream, Encoding.UTF8)){
                     writer.WriteLine("#Disabled");
 
                     foreach(string disabled in Disabled){

Plugins/PluginManager.cs

@@ -42,29 +42,14 @@ namespace TweetDuck.Plugins{
             this.Config = new PluginConfig();
             this.Bridge = new PluginBridge(this);
 
-            LoadConfig();
+            Config.Load(configPath);
             
             Config.InternalPluginChangedState += Config_InternalPluginChangedState;
             Program.UserConfigReplaced += Program_UserConfigReplaced;
         }
 
-        private void LoadConfig(){
-            #pragma warning disable 612
-            if (Program.UserConfig.Plugins != null){
-                Config.ImportLegacy(Program.UserConfig.Plugins);
-                Config.Save(configPath);
-
-                Program.UserConfig.Plugins = null;
-                Program.UserConfig.Save();
-            }
-            #pragma warning restore 612
-            else{
-                Config.Load(configPath);
-            }
-        }
-
         private void Program_UserConfigReplaced(object sender, EventArgs e){
-            LoadConfig();
+            Config.Load(configPath);
             Reload();
         }
 
@@ -77,14 +62,6 @@ namespace TweetDuck.Plugins{
             return plugins.Any(plugin => plugin.Identifier.Equals(identifier));
         }
 
-        public IEnumerable<Plugin> GetPluginsByGroup(PluginGroup group){
-            return plugins.Where(plugin => plugin.Group == group);
-        }
-
-        public int CountPluginByGroup(PluginGroup group){
-            return plugins.Count(plugin => plugin.Group == group);
-        }
-
         public bool HasAnyPlugin(PluginEnvironment environment){
             return plugins.Any(plugin => plugin.Environments.HasFlag(environment));
         }

Plugins/PluginScriptGenerator.cs

@@ -1,5 +1,4 @@
-using System.Text;
+using TweetDuck.Plugins.Enums;
-using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins{
     static class PluginScriptGenerator{
@@ -8,22 +7,29 @@ namespace TweetDuck.Plugins{
         }
 
         public static string GeneratePlugin(string pluginIdentifier, string pluginContents, int pluginToken, PluginEnvironment environment){
-            StringBuilder build = new StringBuilder(2*pluginIdentifier.Length+pluginContents.Length+165);
+            return PluginGen
-
+                .Replace("%params", environment.GetScriptVariables())
-            build.Append("(function(").Append(environment.GetScriptVariables()).Append("){");
+                .Replace("%id", pluginIdentifier)
-            
+                .Replace("%token", pluginToken.ToString())
-            build.Append("let tmp={");
+                .Replace("%contents", pluginContents);
-            build.Append("id:\"").Append(pluginIdentifier).Append("\",");
-            build.Append("obj:new class extends PluginBase{").Append(pluginContents).Append("}");
-            build.Append("};");
-            
-            build.Append("tmp.obj.$id=\"").Append(pluginIdentifier).Append("\";");
-            build.Append("tmp.obj.$token=").Append(pluginToken).Append(";");
-            build.Append("window.TD_PLUGINS.install(tmp);");
-
-            build.Append("})(").Append(environment.GetScriptVariables()).Append(");");
-
-            return build.ToString();
         }
+
+        private const string PluginGen = "(function(%params,$d){let tmp={id:'%id',obj:new class extends PluginBase{%contents}};$d(tmp.obj,'$id',{value:'%id'});$d(tmp.obj,'$token',{value:%token});window.TD_PLUGINS.install(tmp);})(%params,Object.defineProperty);";
+
+/* PluginGen
+
+(function(%params, $d){
+  let tmp = {
+    id: '%id',
+    obj: new class extends PluginBase{%contents}
+  };
+  
+  $d(tmp.obj, '$id', { value: '%id' });
+  $d(tmp.obj, '$token', { value: %token });
+  
+  window.TD_PLUGINS.install(tmp);
+})(%params, Object.defineProperty);
+
+*/
     }
 }

Program.cs

@@ -1,16 +1,18 @@
 using CefSharp;
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core;
-using TweetDuck.Core.Handling;
+using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Settings.Export;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Updates;
@@ -20,8 +22,8 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.7.7";
+        public const string VersionTag = "1.8.4.1";
-        public const string VersionFull = "1.7.7.0";
+        public const string VersionFull = "1.8.4.1";
 
         public static readonly Version Version = new Version(VersionTag);
         public static readonly bool IsPortable = File.Exists("makeportable");
@@ -32,102 +34,89 @@ namespace TweetDuck{
         public static readonly string ScriptPath = Path.Combine(ProgramPath, "scripts");
         public static readonly string PluginPath = Path.Combine(ProgramPath, "plugins");
 
-        public static readonly string UserConfigFilePath = Path.Combine(StoragePath, "TD_UserConfig.cfg");
-        public static readonly string SystemConfigFilePath = Path.Combine(StoragePath, "TD_SystemConfig.cfg");
-        public static readonly string PluginConfigFilePath = Path.Combine(StoragePath, "TD_PluginConfig.cfg");
-
         public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
         private static readonly string InstallerPath = Path.Combine(StoragePath, "TD_Updates");
 
+        public static string UserConfigFilePath => Path.Combine(StoragePath, "TD_UserConfig.cfg");
+        public static string SystemConfigFilePath => Path.Combine(StoragePath, "TD_SystemConfig.cfg");
+        public static string PluginConfigFilePath => Path.Combine(StoragePath, "TD_PluginConfig.cfg");
+
         private static string ErrorLogFilePath => Path.Combine(StoragePath, "TD_Log.txt");
         private static string ConsoleLogFilePath => Path.Combine(StoragePath, "TD_Console.txt");
 
         public static uint WindowRestoreMessage;
+        public static uint SubProcessMessage;
 
         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; private set; }
+        public static Reporter Reporter { get; }
+        public static CultureInfo Culture { get; }
 
         public static event EventHandler UserConfigReplaced;
 
+        static Program(){
+            Culture = CultureInfo.CurrentCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+
+            Reporter = new Reporter(ErrorLogFilePath);
+            Reporter.SetupUnhandledExceptionHandler("TweetDuck Has Failed :(");
+        }
+
         [STAThread]
         private static void Main(){
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-
+            
             WindowRestoreMessage = NativeMethods.RegisterWindowMessage("TweetDuckRestore");
+            SubProcessMessage = NativeMethods.RegisterWindowMessage("TweetDuckSubProcess");
 
             if (!WindowsUtils.CheckFolderWritePermission(StoragePath)){
-                MessageBox.Show(BrandName+" does not have write permissions to the storage folder: "+StoragePath, "Permission Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                FormMessage.Warning("Permission Error", "TweetDuck does not have write permissions to the storage folder: "+StoragePath, FormMessage.OK);
                 return;
             }
-
+            
-            Reporter = new Reporter(ErrorLogFilePath);
-            Reporter.SetupUnhandledExceptionHandler(BrandName+" Has Failed :(");
-
             if (Arguments.HasFlag(Arguments.ArgRestart)){
-                for(int attempt = 0; attempt < 21; attempt++){
+                LockManager.Result lockResult = LockManager.LockWait(10000);
-                    LockManager.Result lockResult = LockManager.Lock();
 
-                    if (lockResult == LockManager.Result.Success){
+                while(lockResult != LockManager.Result.Success){
-                        break;
+                    if (lockResult == LockManager.Result.Fail){
-                    }
+                        FormMessage.Error("TweetDuck Has Failed :(", "An unknown error occurred accessing the data folder. Please, make sure TweetDuck is not already running. If the problem persists, try restarting your system.", FormMessage.OK);
-                    else if (lockResult == LockManager.Result.Fail){
-                        MessageBox.Show("An unknown error occurred accessing the data folder. Please, make sure "+BrandName+" is not already running. If the problem persists, try restarting your system.", BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return;
                     }
-                    else if (attempt == 20){
+                    else if (!FormMessage.Warning("TweetDuck Cannot Restart", "TweetDuck is taking too long to close.", FormMessage.Retry, FormMessage.Exit)){
-                        using(FormMessage form = new FormMessage(BrandName+" Cannot Restart", BrandName+" is taking too long to close.", MessageBoxIcon.Warning)){
+                        return;
-                            form.CancelButton = form.AddButton("Exit");
-                            form.ActiveControl = form.AddButton("Retry", DialogResult.Retry);
-
-                            if (form.ShowDialog() == DialogResult.Retry){
-                                attempt /= 2;
-                                continue;
-                            }
-
-                            return;
-                        }
                     }
-                    else Thread.Sleep(500);
+
+                    lockResult = LockManager.LockWait(5000);
                 }
             }
             else{
                 LockManager.Result lockResult = LockManager.Lock();
-
+                
                 if (lockResult == LockManager.Result.HasProcess){
-                    if (LockManager.LockingProcess.MainWindowHandle == IntPtr.Zero){ // restore if the original process is in tray
+                    if (!LockManager.RestoreLockingProcess(2000) && FormMessage.Error("TweetDuck is Already Running", "Another instance of TweetDuck is already running.\nDo you want to close it?", FormMessage.Yes, FormMessage.No)){
-                        NativeMethods.SendMessage(NativeMethods.HWND_BROADCAST, WindowRestoreMessage, LockManager.LockingProcess.Id, IntPtr.Zero);
-
-                        if (WindowsUtils.TrySleepUntil(() => {
-                            LockManager.LockingProcess.Refresh();
-                            return LockManager.LockingProcess.HasExited || (LockManager.LockingProcess.MainWindowHandle != IntPtr.Zero && LockManager.LockingProcess.Responding);
-                        }, 2000, 250)){
-                            return; // should trigger on first attempt if succeeded, but wait just in case
-                        }
-                    }
-                    
-                    if (MessageBox.Show("Another instance of "+BrandName+" is already running.\r\nDo you want to close it?", BrandName+" is Already Running", MessageBoxButtons.YesNo, MessageBoxIcon.Error, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
                         if (!LockManager.CloseLockingProcess(10000, 5000)){
-                            MessageBox.Show("Could not close the other process.", BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            FormMessage.Error("TweetDuck Has Failed :(", "Could not close the other process.", FormMessage.OK);
                             return;
                         }
 
-                        LockManager.Lock();
+                        lockResult = LockManager.Lock();
                     }
                     else return;
                 }
-                else if (lockResult != LockManager.Result.Success){
+
-                    MessageBox.Show("An unknown error occurred accessing the data folder. Please, make sure "+BrandName+" is not already running. If the problem persists, try restarting your system.", BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                if (lockResult != LockManager.Result.Success){
+                    FormMessage.Error("TweetDuck Has Failed :(", "An unknown error occurred accessing the data folder. Please, make sure TweetDuck is not already running. If the problem persists, try restarting your system.", FormMessage.OK);
                     return;
                 }
             }
-
+            
-            ReloadConfig();
             SystemConfig = SystemConfig.Load(SystemConfigFilePath);
+            ReloadConfig();
 
             if (Arguments.HasFlag(Arguments.ArgImportCookies)){
                 ExportManager.ImportCookies();
@@ -151,17 +140,10 @@ namespace TweetDuck{
                 #endif
             };
 
-            CommandLineArgsParser.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
+            CommandLineArgs.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
-
+            BrowserUtils.SetupCefArgs(settings.CefCommandLineArgs);
-            if (!SystemConfig.HardwareAcceleration){
-                settings.CefCommandLineArgs["disable-gpu"] = "1";
-                settings.CefCommandLineArgs["disable-gpu-vsync"] = "1";
-            }
             
-            settings.CefCommandLineArgs["disable-extensions"] = "1";
+            Cef.EnableHighDPISupport();
-            settings.CefCommandLineArgs["disable-plugins-discovery"] = "1";
-            settings.CefCommandLineArgs["enable-system-flash"] = "0";
-
             Cef.Initialize(settings, false, new BrowserProcessHandler());
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
@@ -171,12 +153,13 @@ namespace TweetDuck{
             plugins.Executed += plugins_Executed;
             plugins.Reload();
 
-            FormBrowser mainForm = new FormBrowser(plugins, new UpdaterSettings{
+            UpdaterSettings updaterSettings = new UpdaterSettings{
                 AllowPreReleases = Arguments.HasFlag(Arguments.ArgDebugUpdates),
                 DismissedUpdate = UserConfig.DismissedUpdate,
                 InstallerDownloadFolder = InstallerPath
-            });
+            };
 
+            FormBrowser mainForm = new FormBrowser(plugins, updaterSettings);
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){
@@ -193,15 +176,13 @@ namespace TweetDuck{
 
         private static void plugins_Reloaded(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                string doubleNL = Environment.NewLine+Environment.NewLine;
+                FormMessage.Error("Error Loading Plugins", "The following plugins will not be available until the issues are resolved:\n\n"+string.Join("\n\n", e.Errors), FormMessage.OK);
-                MessageBox.Show("The following plugins will not be available until the issues are resolved:"+doubleNL+string.Join(doubleNL, e.Errors), "Error Loading Plugins", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
         private static void plugins_Executed(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                string doubleNL = Environment.NewLine+Environment.NewLine;
+                FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n"+string.Join("\n\n", e.Errors), FormMessage.OK);
-                MessageBox.Show("Failed to execute the following plugins:"+doubleNL+string.Join(doubleNL, e.Errors), "Error Executing Plugins", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
@@ -233,18 +214,14 @@ namespace TweetDuck{
                 File.Delete(UserConfigFilePath);
                 File.Delete(UserConfig.GetBackupFile(UserConfigFilePath));
             }catch(Exception e){
-                Reporter.HandleException("Configuration Reset Error", "Could not delete configuration files to reset the settings.", true, e);
+                Reporter.HandleException("Configuration Reset Error", "Could not delete configuration files to reset the options.", true, e);
                 return;
             }
 
             ReloadConfig();
         }
 
-        public static void Restart(){
+        public static void Restart(params string[] extraArgs){
-            Restart(new string[0]);
-        }
-
-        public static void Restart(string[] extraArgs){
             CommandLineArgs args = Arguments.GetCurrentClean();
             CommandLineArgs.ReadStringArray('-', extraArgs, args);
             RestartWithArgs(args);

Properties/AssemblyInfo.cs

@@ -39,7 +39,7 @@ using TweetDuck;
 
 [assembly: NeutralResourcesLanguage("en")]
 
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(true)]
 
 #if DEBUG
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTests")]

Reporter.cs

@@ -1,14 +1,13 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
-using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using TweetDuck.Core.Other;
 
 namespace TweetDuck{
-    class Reporter{
+    sealed class Reporter{
         private readonly string logFile;
 
         public Reporter(string logFile){
@@ -17,9 +16,7 @@ namespace TweetDuck{
 
         public void SetupUnhandledExceptionHandler(string caption){
             AppDomain.CurrentDomain.UnhandledException += (sender, args) => {
-                Exception ex = args.ExceptionObject as Exception;
+                if (args.ExceptionObject is Exception ex) {
-
-                if (ex != null){
                     HandleException(caption, "An unhandled exception has occurred.", false, ex);
                 }
             };
@@ -32,7 +29,7 @@ namespace TweetDuck{
                 build.Append("Please, report all issues to: https://github.com/chylex/TweetDuck/issues\r\n\r\n");
             }
 
-            build.Append("[").Append(DateTime.Now.ToString("G", CultureInfo.CurrentCulture)).Append("]\r\n");
+            build.Append("[").Append(DateTime.Now.ToString("G", Program.Culture)).Append("]\r\n");
             build.Append(data).Append("\r\n\r\n");
 
             try{
@@ -46,22 +43,21 @@ namespace TweetDuck{
         public void HandleException(string caption, string message, bool canIgnore, Exception e){
             bool loggedSuccessfully = Log(e.ToString());
 
-            FormMessage form = new FormMessage(caption, message+"\r\nError: "+e.Message, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
+            FormMessage form = new FormMessage(caption, message+"\nError: "+e.Message, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
             
-            Button btnExit = form.AddButton("Exit");
+            Button btnExit = form.AddButton(FormMessage.Exit);
-            Button btnIgnore = form.AddButton("Ignore", DialogResult.Ignore);
+            Button btnIgnore = form.AddButton(FormMessage.Ignore, DialogResult.Ignore, ControlType.Cancel);
 
             btnIgnore.Enabled = canIgnore;
             form.ActiveControl = canIgnore ? btnIgnore : btnExit;
-            form.CancelButton = btnIgnore;
 
             Button btnOpenLog = new Button{
                 Anchor = AnchorStyles.Bottom | AnchorStyles.Left,
                 Enabled = loggedSuccessfully,
                 Font = SystemFonts.MessageBoxFont,
-                Location = new Point(6, 12),
+                Location = new Point(9, 12),
                 Margin = new Padding(0, 0, 48, 0),
-                Size = new Size(88, 26),
+                Size = new Size(106, 26),
                 Text = "Show Error Log",
                 UseVisualStyleBackColor = true
             };
@@ -87,9 +83,7 @@ namespace TweetDuck{
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            FormMessage form = new FormMessage(caption, message, MessageBoxIcon.Error);
+            FormMessage.Error(caption, message, "Exit");
-            form.ActiveControl = form.AddButton("Exit");
-            form.ShowDialog();
 
             try{
                 Process.GetCurrentProcess().Kill();

Resources/Plugins/.debug/browser.js

@@ -8,7 +8,7 @@ enabled(){
     
     if (e.keyCode === 115){
       this.isDebugging = !this.isDebugging;
-      $(".app-title").first().css("background-color", this.isDebugging ? "#5A6B75" : "#292F33");
+      $(".nav-user-info").first().css("background-color", this.isDebugging ? "#5A6B75" : "#292F33");
     }
     
     // Debug mode handling

Resources/Plugins/edit-design/.meta

@@ -8,7 +8,7 @@ Edit layout & design
 chylex
 
 [version]
-1.0
+1.1.1
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/edit-design/browser.js

@@ -1,12 +1,7 @@
-constructor(){
-  super({
-    requiresPageReload: true
-  })
-}
-
 enabled(){
   // elements & data
   this.css = null;
+  this.icons = null;
   this.htmlModal = null;
   this.config = null;
   
@@ -15,14 +10,15 @@ enabled(){
     fontSize: "12px",
     hideTweetActions: true,
     moveTweetActionsToRight: true,
-    revertReplies: false,
     themeColorTweaks: true,
-    roundedScrollBars: false,
+    revertIcons: true,
     smallComposeTextSize: false,
     optimizeAnimations: true,
-    avatarRadius: 10
+    avatarRadius: 2
   };
   
+  this.firstTimeLoad = null;
+  
   // modal dialog loading
   $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
     this.htmlModal = contents;
@@ -32,30 +28,57 @@ enabled(){
   
   // configuration
   const configFile = "config.json";
+  
   this.tmpConfig = null;
+  this.currentStage = 0;
   
-  var loadConfigObject = obj => {
+  this.onStageReady = () => {
-    this.tmpConfig = obj || {};
+    if (this.currentStage === 0){
-    
+      this.currentStage = 1;
-    if (TD.ready){
-      this.onAppReady();
     }
-    
+    else if (this.tmpConfig !== null){
-    this.injectDeciderReplyHook(this.tmpConfig.revertReplies);
-  };
-  
-  this.onAppReady = () => {
-    if (this.tmpConfig !== null){
       this.config = $.extend(this.defaultConfig, this.tmpConfig);
       this.tmpConfig = null;
       this.reinjectAll();
+      
+      if (this.firstTimeLoad){
+        $TDP.writeFile(this.$token, configFile, JSON.stringify(this.config));
+      }
     }
   };
   
+  var loadConfigObject = obj => {
+    this.tmpConfig = obj || {};
+    this.firstTimeLoad = obj === null;
+    
+    this.onStageReady();
+  };
+  
+  if (this.$$wasLoadedBefore){
+    this.onStageReady();
+  }
+  else{
+    $(document).one("dataSettingsValues", () => {
+      switch(TD.settings.getColumnWidth()){
+        case "wide": this.defaultConfig.columnWidth = "350px"; break;
+        case "narrow": this.defaultConfig.columnWidth = "270px"; break;
+      }
+
+      switch(TD.settings.getFontSize()){
+        case "small": this.defaultConfig.fontSize = "13px"; break;
+        case "medium": this.defaultConfig.fontSize = "14px"; break;
+        case "large": this.defaultConfig.fontSize = "15px"; break;
+        case "largest": this.defaultConfig.fontSize = "16px"; break;
+      }
+      
+      this.$$wasLoadedBefore = true;
+      this.onStageReady();
+    });
+  }
+    
   $TDP.checkFileExists(this.$token, configFile).then(exists => {
     if (!exists){
       loadConfigObject(null);
-      $TDP.writeFile(this.$token, configFile, JSON.stringify(this.defaultConfig));
     }
     else{
       $TDP.readFile(this.$token, configFile, true).then(contents => {
@@ -97,9 +120,7 @@ enabled(){
       let itemEditDesign = $('<li class="is-selectable"><a href="#" data-action>Edit layout &amp; design</a></li>');
       itemTD.after(itemEditDesign);
       
-      itemEditDesign.on("click", "a", function(){
+      itemEditDesign.on("click", "a", this.openEditDesignDialog);
-        new customDesignModal();
-      });
       
       itemEditDesign.hover(function(){
         $(this).addClass("is-selected");
@@ -208,7 +229,7 @@ enabled(){
     _render: () => $(this.htmlModal),
     destroy: function(){
       if (this.reloadPage){
-        location.reload();
+        window.TDPF_requestReload();
         return;
       }
       
@@ -217,18 +238,7 @@ enabled(){
     }
   });
   
-  // decider injections
+  this.openEditDesignDialog = () => new customDesignModal();
-  this.injectDeciderReplyHook = enable => {
-    let prevFunc = TD.decider.updateFromBackend;
-    
-    TD.decider.updateFromBackend = function(data){
-      data["simplified_replies"] = !enable;
-      return prevFunc.apply(this, arguments);
-    };
-    
-    TD.decider.updateForGuestId();
-    this.$pluginSettings.requiresPageReload = enable;
-  };
   
   // animation optimization
   this.optimizations = null;
@@ -282,13 +292,13 @@ enabled(){
   };
   
   this.onWindowFocusEvent = () => {
-    if (this.config.optimizeAnimations){
+    if (this.config && this.config.optimizeAnimations){
       injectOptimizations(true);
     }
   };
   
   this.onWindowBlurEvent = () => {
-    if (this.config.optimizeAnimations){
+    if (this.config && this.config.optimizeAnimations){
       disableOptimizations();
       clearOptimizationTimer();
     }
@@ -301,6 +311,11 @@ enabled(){
     }
     
     this.css = window.TDPF_createCustomStyle(this);
+  
+    if (this.icons){
+      document.head.removeChild(this.icons);
+      this.icons = null;
+    }
   };
   
   this.reinjectAll = () => {
@@ -316,7 +331,7 @@ enabled(){
     }
     
     this.css.insert("#general_settings .cf { display: none !important }");
-    this.css.insert("#general_settings .divider-bar::after { display: inline-block; padding-top: 10px; line-height: 17px; content: 'Use the new | Edit layout & design | option in the Settings to modify TweetDeck theme, column width, font size, and other features.' }");
+    this.css.insert("#settings-modal .js-setting-list li:nth-child(3) { border-bottom: 1px solid #ccd6dd }");
     
     this.css.insert(".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: "+this.config.fontSize+" !important }");
     this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
@@ -338,8 +353,9 @@ enabled(){
     
     if (this.config.hideTweetActions){
       this.css.insert(".tweet-action { opacity: 0; }");
+      this.css.insert(".tweet-actions.is-visible .tweet-action { opacity: 0.5; }");
       this.css.insert(".is-favorite .tweet-action, .is-retweet .tweet-action { opacity: 0.5; visibility: visible !important }");
-      this.css.insert(".tweet:hover .tweet-action, .is-favorite .tweet-action[rel='favorite'], .is-retweet .tweet-action[rel='retweet'] { opacity: 1; visibility: visible !important }");
+      this.css.insert(".tweet:hover .tweet-action, .tweet-action.is-selected, .is-favorite .tweet-action[rel='favorite'], .is-retweet .tweet-action[rel='retweet'] { opacity: 1 !important; visibility: visible !important }");
     }
     
     if (this.config.moveTweetActionsToRight){
@@ -351,27 +367,111 @@ enabled(){
       this.css.insert(".compose-text { font-size: 12px !important; height: 120px !important }");
     }
     
-    if (!this.config.roundedScrollBars){
+    if (this.config.revertIcons){
-      this.css.insert(".scroll-styled-v:not(.antiscroll-inner)::-webkit-scrollbar { width: 8px }");
+      this.icons = document.createElement("style");
-      this.css.insert(".scroll-styled-h:not(.antiscroll-inner)::-webkit-scrollbar { height: 8px }");
+      this.icons.innerHTML = `
-      this.css.insert(".scroll-styled-v::-webkit-scrollbar-thumb { border-radius: 0 }");
+@font-face {
-      this.css.insert(".scroll-styled-h::-webkit-scrollbar-thumb { border-radius: 0 }");
+  font-family: 'tweetdeckold';
-      this.css.insert(".antiscroll-scrollbar { border-radius: 0 }");
+  src: url("https://ton.twimg.com/tweetdeck-web/web/assets/fonts/tweetdeck-regular-webfont.5f4ea87976.woff") format("woff");
-      this.css.insert(".antiscroll-scrollbar-vertical { margin-top: 0 }");
+  font-weight: normal;
-      this.css.insert(".antiscroll-scrollbar-horizontal { margin-left: 0 }");
+  font-style: normal;
-      this.css.insert(".app-columns-container::-webkit-scrollbar { height: 9px !important }");
+}
-    }
+
-    
+.icon-twitter-bird:before{content:"\\f000";font-family:tweetdeckold}
-    if (this.config.revertReplies){
+.icon-mention:before{content:"\\f001";font-family:tweetdeckold}
-      this.css.insert(".activity-header + .tweet .tweet-context { margin-left: -35px }");
+.icon-following:before{content:"\\f002";font-family:tweetdeckold}
-      this.css.insert(".activity-header + .tweet .tweet-context .obj-left { margin-right: 5px }");
+.icon-message:before{content:"\\f003";font-family:tweetdeckold}
+.icon-home:before{content:"\\f004";font-family:tweetdeckold}
+.icon-hashtag:before{content:"\\f005";font-family:tweetdeckold}
+.icon-reply:before{content:"\\f006";font-family:tweetdeckold}
+.icon-favorite:before{content:"\\f055";font-family:tweetdeckold}
+.icon-retweet:before{content:"\\f008";font-family:tweetdeckold}
+.icon-drafts:before{content:"\\f009";font-family:tweetdeckold}
+.icon-search:before{content:"\\f00a";font-family:tweetdeckold}
+.icon-trash:before{content:"\\f00c";font-family:tweetdeckold}
+.icon-close:before{content:"\\f00d";font-family:tweetdeckold}
+.icon-arrow-r:before,.Icon--caretRight:before{content:"\\f00e";font-family:tweetdeckold}
+.icon-arrow-l:before,.Icon--caretLeft:before{content:"\\f00f";font-family:tweetdeckold}
+.icon-protected:before{content:"\\f013";font-family:tweetdeckold}
+.icon-list:before{content:"\\f014";font-family:tweetdeckold}
+.icon-camera:before{content:"\\f015";font-family:tweetdeckold}
+.icon-more:before{content:"\\f016";font-family:tweetdeckold}
+.icon-settings:before{content:"\\f018";font-family:tweetdeckold}
+.icon-notifications:before{content:"\\f019";font-family:tweetdeckold}
+.icon-user-dd:before{content:"\\f01a";font-family:tweetdeckold}
+.icon-activity:before{content:"\\f01c";font-family:tweetdeckold}
+.icon-trending:before{content:"\\f01d";font-family:tweetdeckold}
+.icon-minus:before{content:"\\f01e";font-family:tweetdeckold}
+.icon-plus:before{content:"\\f01f";font-family:tweetdeckold}
+.icon-geo:before{content:"\\f020";font-family:tweetdeckold}
+.icon-check:before{content:"\\f021";font-family:tweetdeckold}
+.icon-schedule:before{content:"\\f022";font-family:tweetdeckold}
+.icon-dot:before{content:"\\f023";font-family:tweetdeckold}
+.icon-user:before{content:"\\f024";font-family:tweetdeckold}
+.icon-content:before{content:"\\f025";font-family:tweetdeckold}
+.icon-arrow-d:before,.Icon--caretDown:before{content:"\\f026";font-family:tweetdeckold}
+.icon-arrow-u:before{content:"\\f027";font-family:tweetdeckold}
+.icon-share:before{content:"\\f028";font-family:tweetdeckold}
+.icon-info:before{content:"\\f029";font-family:tweetdeckold}
+.icon-verified:before{content:"\\f02a";font-family:tweetdeckold}
+.icon-translator:before{content:"\\f02b";font-family:tweetdeckold}
+.icon-blocked:before{content:"\\f02c";font-family:tweetdeckold}
+.icon-constrain:before{content:"\\f02d";font-family:tweetdeckold}
+.icon-play-video:before{content:"\\f02e";font-family:tweetdeckold}
+.icon-empty:before{content:"\\f02f";font-family:tweetdeckold}
+.icon-clear-input:before{content:"\\f030";font-family:tweetdeckold}
+.icon-compose:before{content:"\\f031";font-family:tweetdeckold}
+.icon-mark-read:before{content:"\\f032";font-family:tweetdeckold}
+.icon-arrow-r-double:before{content:"\\f033";font-family:tweetdeckold}
+.icon-arrow-l-double:before{content:"\\f034";font-family:tweetdeckold}
+.icon-follow:before{content:"\\f035";font-family:tweetdeckold}
+.icon-image:before{content:"\\f036";font-family:tweetdeckold}
+.icon-popout:before{content:"\\f037";font-family:tweetdeckold}
+.icon-move:before{content:"\\f039";font-family:tweetdeckold}
+.icon-compose-grid:before{content:"\\f03a";font-family:tweetdeckold}
+.icon-compose-minigrid:before{content:"\\f03b";font-family:tweetdeckold}
+.icon-compose-list:before{content:"\\f03c";font-family:tweetdeckold}
+.icon-edit:before{content:"\\f040";font-family:tweetdeckold}
+.icon-clear-timeline:before{content:"\\f041";font-family:tweetdeckold}
+.icon-sliders:before{content:"\\f042";font-family:tweetdeckold}
+.icon-custom-timeline:before{content:"\\f043";font-family:tweetdeckold}
+.icon-compose-dm:before{content:"\\f044";font-family:tweetdeckold}
+.icon-bg-dot:before{content:"\\f045";font-family:tweetdeckold}
+.icon-user-team-mgr:before{content:"\\f046";font-family:tweetdeckold}
+.icon-user-switch:before{content:"\\f047";font-family:tweetdeckold}
+.icon-conversation:before{content:"\\f048";font-family:tweetdeckold}
+.icon-dataminr:before{content:"\\f049";font-family:tweetdeckold}
+.icon-link:before{content:"\\f04a";font-family:tweetdeckold}
+.icon-flash:before{content:"\\f050";font-family:tweetdeckold}
+.icon-pointer-u:before{content:"\\f051";font-family:tweetdeckold}
+.icon-analytics:before{content:"\\f054";font-family:tweetdeckold}
+.icon-heart:before{content:"\\f055";font-family:tweetdeckold}
+.icon-calendar:before{content:"\\f056";font-family:tweetdeckold}
+.icon-attachment:before{content:"\\f057";font-family:tweetdeckold}
+.icon-play:before{content:"\\f058";font-family:tweetdeckold}
+.icon-bookmark:before{content:"\\f059";font-family:tweetdeckold}
+.icon-play-badge:before{content:"\\f060";font-family:tweetdeckold}
+.icon-gif-badge:before{content:"\\f061";font-family:tweetdeckold}
+.icon-poll:before{content:"\\f062";font-family:tweetdeckold}
+
+.icon-heart-filled:before{content:"\\f055";font-family:tweetdeckold}
+.icon-retweet-filled:before{content:"\\f008";font-family:tweetdeckold}
+.icon-list-filled:before{content:"\\f014";font-family:tweetdeckold}
+.icon-user-filled:before{content:"\\f035";font-family:tweetdeckold}
+
+.drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
+.column-header .column-type-icon { bottom: 26px !important }
+.is-options-open .column-type-icon { bottom: 25px !important }
+.tweet-footer { margin-top: 6px !important }`;
+      
+      document.head.appendChild(this.icons);
     }
     
     if (this.config.columnWidth[0] === '/'){
       let cols = this.config.columnWidth.slice(1);
       
-      this.css.insert(".column { width: calc((100vw - 205px) / "+cols+" - 8px) !important }");
+      this.css.insert(".column { width: calc((100vw - 205px) / "+cols+" - 6px) !important }");
-      this.css.insert(".is-condensed .column { width: calc((100vw - 55px) / "+cols+" - 8px) !important }");
+      this.css.insert(".is-condensed .column { width: calc((100vw - 55px) / "+cols+" - 6px) !important }");
     }
     else{
       this.css.insert(".column { width: "+this.config.columnWidth+" !important }");
@@ -399,13 +499,21 @@ enabled(){
       default: TD.settings.setFontSize(parseInt(this.config.fontSize, 10) >= 16 ? "largest" : "smallest"); break;
     }
     
-    $TDP.injectIntoNotificationsBefore(this.$token, "css", "</head>", [
+    $TDP.injectIntoNotificationsBefore(this.$token, "css", "</head>", `
-      "<style type='text/css'>",
+<style type='text/css'>
-      ".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: "+this.config.fontSize+" !important }",
+.txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: ${this.config.fontSize} !important }
-      ".avatar { border-radius: "+this.config.avatarRadius+"% !important }",
+.avatar { border-radius: ${this.config.avatarRadius}% !important }
-      (this.config.revertReplies ? ".activity-header + .tweet .tweet-context { margin-left: -35px } .activity-header + .tweet .tweet-context .obj-left { margin-right: 5px }" : ""),
+
-      "</style>"
+${this.config.revertIcons ? `
-    ].join(""));
+@font-face { font-family: 'tweetdeckold'; src: url(\"https://ton.twimg.com/tweetdeck-web/web/assets/fonts/tweetdeck-regular-webfont.5f4ea87976.woff\") format(\"woff\"); font-weight: normal; font-style: normal }
+.icon-reply:before{content:"\\f006";font-family:tweetdeckold}
+.icon-heart-filled:before{content:"\\f055";font-family:tweetdeckold}
+.icon-retweet-filled:before{content:"\\f008";font-family:tweetdeckold}
+.icon-list-filled:before{content:"\\f014";font-family:tweetdeckold}
+.icon-user-filled:before{content:"\\f035";font-family:tweetdeckold}
+.icon-user-dd:before{content:"\\f01a";font-family:tweetdeckold}
+` : ``}
+</style>`);
   };
   
   this.uiShowActionsMenuEvent = () => {
@@ -416,21 +524,6 @@ enabled(){
 }
 
 ready(){
-  // configuration
-  switch(TD.settings.getColumnWidth()){
-    case "wide": this.defaultConfig.columnWidth = "350px"; break;
-    case "narrow": this.defaultConfig.columnWidth = "270px"; break;
-  }
-  
-  switch(TD.settings.getFontSize()){
-    case "small": this.defaultConfig.fontSize = "13px"; break;
-    case "medium": this.defaultConfig.fontSize = "14px"; break;
-    case "large": this.defaultConfig.fontSize = "15px"; break;
-    case "largest": this.defaultConfig.fontSize = "16px"; break;
-  }
-  
-  this.onAppReady();
-  
   // optimization events
   $(window).on("focus", this.onWindowFocusEvent);
   $(window).on("blur", this.onWindowBlurEvent);
@@ -441,6 +534,32 @@ ready(){
   // modal
   $("[data-action='settings-menu']").on("click", this.onSettingsMenuClickedEvent);
   $(".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;
+  
+  this.prevFuncSettingsGetInfo = TD.components.GlobalSettings.prototype.getInfo;
+  this.prevFuncSettingsSwitchTab = TD.components.GlobalSettings.prototype.switchTab;
+  
+  TD.components.GlobalSettings.prototype.getInfo = function(){
+    let data = me.prevFuncSettingsGetInfo.apply(this, arguments);
+    
+    data.tabs.push({
+      title: "Layout & Design",
+      action: "tdp-edit-design"
+    });
+    
+    return data;
+  };
+  
+  TD.components.GlobalSettings.prototype.switchTab = function(tab){
+    if (tab === "tdp-edit-design"){
+      me.openEditDesignDialog();
+    }
+    else{
+      return me.prevFuncSettingsSwitchTab.apply(this, arguments);
+    }
+  };
 }
 
 disabled(){
@@ -448,6 +567,10 @@ disabled(){
     this.css.remove();
   }
   
+  if (this.icons){
+    document.head.removeChild(this.icons);
+  }
+  
   if (this.optimizations){
     this.optimizations.remove();
   }
@@ -460,6 +583,9 @@ disabled(){
   $(window).off("focus", this.onWindowFocusEvent);
   $(window).off("blur", this.onWindowBlurEvent);
   
+  TD.components.GlobalSettings.prototype.getInfo = this.prevFuncSettingsGetInfo;
+  TD.components.GlobalSettings.prototype.switchTab = this.prevFuncSettingsSwitchTab;
+  
   $("[data-action='settings-menu']").off("click", this.onSettingsMenuClickedEvent);
   $("#td-design-plugin-modal").remove();
 }

Resources/Plugins/edit-design/modal.html

@@ -88,10 +88,6 @@
             <input data-td-key="moveTweetActionsToRight" class="js-theme-checkbox touch-larger-label" type="checkbox">
             Tweet actions on the right side
           </label>
-          <label class="checkbox">
-            <input data-td-key="revertReplies" data-td-reload class="js-theme-checkbox touch-larger-label" type="checkbox">
-            Revert reply style (reloads page)
-          </label>
           
           <!-- DESIGN -->
           
@@ -103,8 +99,8 @@
             Theme color tweaks
           </label>
           <label class="checkbox">
-            <input data-td-key="roundedScrollBars" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            <input data-td-key="revertIcons" class="js-theme-checkbox touch-larger-label" type="checkbox">
-            Rounded scroll bars
+            Revert icon design
           </label>
           <label class="checkbox">
             <input data-td-key="smallComposeTextSize" class="js-theme-checkbox touch-larger-label" type="checkbox">
@@ -126,7 +122,7 @@
             </div>
             <div class="td-avatar-shape-item-outer" data-td-key="avatarRadius" data-td-value="10">
               <div class="td-avatar-shape" style="border-radius:10%"></div>
-              <label>Default</label>
+              <label>Legacy</label>
             </div>
             <div class="td-avatar-shape-item-outer" data-td-key="avatarRadius" data-td-value="30">
               <div class="td-avatar-shape" style="border-radius:30%"></div>

Resources/Plugins/emoji-keyboard/.meta

@@ -9,7 +9,7 @@ Emoji keyboard
 chylex
 
 [version]
-1.0
+1.2
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/emoji-keyboard/browser.js

@@ -1,5 +1,6 @@
 enabled(){
   this.selectedSkinTone = "";
+  this.currentKeywords = [];
   
   this.skinToneList = [
     "", "1F3FB", "1F3FC", "1F3FD", "1F3FE", "1F3FF"
@@ -18,22 +19,23 @@ enabled(){
     [ "1F3FF", "#8A6859" ],
   ];
   
-  this.emojiURL = "https://ton.twimg.com/tweetdeck-web/web/assets/emoji/";
+  this.emojiData1 = []; // no skin tones, prepended
-  
+  this.emojiData2 = {}; // contains emojis with skin tones
-  this.emojiHTML1 = ""; // no skin tones, prepended
+  this.emojiData3 = []; // no skin tones, appended
-  this.emojiHTML2 = {}; // contains emojis with skin tones
+  this.emojiNames = [];
-  this.emojiHTML3 = ""; // no skin tones, appended
   
   var me = this;
   
   // styles
   
   this.css = window.TDPF_createCustomStyle(this);
-  this.css.insert(".emoji-keyboard { position: absolute; width: 15.35em; background-color: white; border-radius: 2px 2px 3px 3px; font-size: 24px; z-index: 9999 }");
+  this.css.insert(".emoji-keyboard { position: absolute; width: 15.35em; background-color: white; border-radius: 1px; font-size: 24px; z-index: 9999 }");
   this.css.insert(".emoji-keyboard-list { height: 10.14em; padding: 0.1em; box-sizing: border-box; overflow-y: auto }");
   this.css.insert(".emoji-keyboard-list .separator { height: 26px }");
   this.css.insert(".emoji-keyboard-list img { padding: 0.1em !important; width: 1em; height: 1em; vertical-align: -0.1em; cursor: pointer }");
-  this.css.insert(".emoji-keyboard-skintones { height: 1.3em; text-align: center; background-color: #292f33; border-radius: 0 0 2px 2px }");
+  this.css.insert(".emoji-keyboard-search { height: auto; padding: 4px 10px 8px; background-color: #292f33; border-radius: 1px 1px 0 0 }");
+  this.css.insert(".emoji-keyboard-search input { width: 100%; border-radius: 1px; }");
+  this.css.insert(".emoji-keyboard-skintones { height: 1.3em; text-align: center; background-color: #292f33; border-radius: 0 0 1px 1px }");
   this.css.insert(".emoji-keyboard-skintones div { width: 0.8em; height: 0.8em; margin: 0.25em 0.1em; border-radius: 50%; display: inline-block; box-sizing: border-box; cursor: pointer }");
   this.css.insert(".emoji-keyboard-skintones .sel { border: 2px solid rgba(0, 0, 0, 0.35); box-shadow: 0 0 2px 0 rgba(255, 255, 255, 0.65), 0 0 1px 0 rgba(255, 255, 255, 0.4) inset }");
   this.css.insert(".emoji-keyboard-skintones :hover { border: 2px solid rgba(0, 0, 0, 0.25); box-shadow: 0 0 1px 0 rgba(255, 255, 255, 0.65), 0 0 1px 0 rgba(255, 255, 255, 0.25) inset }");
@@ -54,26 +56,72 @@ enabled(){
   // keyboard generation
   
   this.currentKeyboard = null;
+  this.currentSpanner = null;
   
   var hideKeyboard = () => {
     $(this.currentKeyboard).remove();
     this.currentKeyboard = null;
     
+    $(this.currentSpanner).remove();
+    this.currentSpanner = null;
+    
+    this.currentKeywords = [];
+    
+    this.composePanelScroller.trigger("scroll");
+    
     $(".emoji-keyboard-popup-btn").removeClass("is-selected");
     $(".js-compose-text").first().focus();
   };
   
   var generateEmojiHTML = skinTone => {
-    return (this.emojiHTML1+this.emojiHTML2[skinTone]+this.emojiHTML3).replace(/u#/g, this.emojiURL);
+    let index = 0;
+    let html = [ "<p style='font-size:13px;color:#444;margin:4px;text-align:center'>Please, note that most emoji will not show up properly in the text box above, but they will display in the tweet.</p>" ];
+    
+    for(let array of [ this.emojiData1, this.emojiData2[skinTone], this.emojiData3 ]){
+      for(let emoji of array){
+        if (emoji === "___"){
+          html.push("<div class='separator'></div>");
+        }
+        else{
+          html.push(TD.util.cleanWithEmoji(emoji).replace(' class="emoji" draggable="false"', ''));
+          index++;
+        }
+      }
+    }
+    
+    return html.join("");
+  };
+  
+  var updateFilters = () => {
+    let keywords = this.currentKeywords;
+    let container = $(this.currentKeyboard.children[1]);
+    
+    let emoji = container.children("img");
+    let info = container.children("p:first");
+    let separators = container.children("div");
+    
+    if (keywords.length === 0){
+      info.css("display", "block");
+      separators.css("display", "block");
+      emoji.css("display", "inline");
+    }
+    else{
+      info.css("display", "none");
+      separators.css("display", "none");
+      
+      emoji.css("display", "none");
+      emoji.filter(index => keywords.every(kw => me.emojiNames[index].includes(kw))).css("display", "inline");
+    }
   };
   
   var selectSkinTone = skinTone => {
-    let selectedEle = this.currentKeyboard.children[1].querySelector("[data-tone='"+this.selectedSkinTone+"']");
+    let selectedEle = this.currentKeyboard.children[2].querySelector("[data-tone='"+this.selectedSkinTone+"']");
     selectedEle && selectedEle.classList.remove("sel");
     
     this.selectedSkinTone = skinTone;
-    this.currentKeyboard.children[0].innerHTML = generateEmojiHTML(skinTone);
+    this.currentKeyboard.children[1].innerHTML = generateEmojiHTML(skinTone);
-    this.currentKeyboard.children[1].querySelector("[data-tone='"+this.selectedSkinTone+"']").classList.add("sel");
+    this.currentKeyboard.children[2].querySelector("[data-tone='"+this.selectedSkinTone+"']").classList.add("sel");
+    updateFilters();
   };
   
   this.generateKeyboard = (input, left, top) => {
@@ -103,10 +151,19 @@ enabled(){
       e.stopPropagation();
     });
     
+    var search = document.createElement("div");
+    search.innerHTML = "<input type='text' placeholder='Search...'>";
+    search.classList.add("emoji-keyboard-search");
+    
     var 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");
     
+    outer.appendChild(search);
+    outer.appendChild(keyboard);
+    outer.appendChild(skintones);
+    $(".js-app").append(outer);
+    
     skintones.addEventListener("click", function(e){
       if (e.target.hasAttribute("data-tone")){
         selectSkinTone(e.target.getAttribute("data-tone") || "");
@@ -115,23 +172,36 @@ enabled(){
       e.stopPropagation();
     });
     
-    outer.appendChild(keyboard);
+    search.addEventListener("click", function(e){
-    outer.appendChild(skintones);
+      e.stopPropagation();
-    document.body.appendChild(outer);
+    });
+    
+    var searchInput = search.children[0];
+    searchInput.focus();
+    
+    searchInput.addEventListener("input", function(e){
+      me.currentKeywords = e.target.value.split(" ").filter(kw => kw.length > 0).map(kw => kw.toLowerCase());
+      updateFilters();
+      e.stopPropagation();
+    });
+    
+    searchInput.addEventListener("focus", function(){
+      $(this).select();
+    });
     
     this.currentKeyboard = outer;
     selectSkinTone(this.selectedSkinTone);
+    
+    this.currentSpanner = document.createElement("div");
+    this.currentSpanner.style.height = ($(this.currentKeyboard).height()-10)+"px";
+    $(".emoji-keyboard-popup-btn").parent().after(this.currentSpanner);
+    
+    this.composePanelScroller.trigger("scroll");
   };
   
-  this.prevTryPasteImage = window.TDGF_tryPasteImage;
+  var getKeyboardTop = () => {
-  var prevTryPasteImageF = this.prevTryPasteImage;
+    let button = $(".emoji-keyboard-popup-btn");
-  
+    return button.offset().top+button.outerHeight()+me.composePanelScroller.scrollTop()+8;
-  window.TDGF_tryPasteImage = function(){
-    if (me.currentKeyboard){
-      hideKeyboard();
-    }
-    
-    return prevTryPasteImageF.apply(this, arguments);
   };
   
   // event handlers
@@ -139,18 +209,22 @@ enabled(){
   this.emojiKeyboardButtonClickEvent = function(e){
     if (me.currentKeyboard){
       hideKeyboard();
+      $(this).blur();
     }
     else{
-      var pos = $(this).offset();
+      me.generateKeyboard($(".js-compose-text").first(), $(this).offset().left, getKeyboardTop());
-      me.generateKeyboard($(".js-compose-text").first(), pos.left, pos.top+$(this).outerHeight()+8);
-      
       $(this).addClass("is-selected");
     }
     
-    $(this).blur();
     e.stopPropagation();
   };
   
+  this.composerScrollEvent = function(e){
+    if (me.currentKeyboard){
+      me.currentKeyboard.style.marginTop = (-$(this).scrollTop())+"px";
+    }
+  };
+  
   this.documentClickEvent = function(e){
     if (me.currentKeyboard && !e.target.classList.contains("js-compose-text")){
       hideKeyboard();
@@ -164,18 +238,21 @@ enabled(){
     }
   };
   
-  /*
+  this.uploadFilesEvent = function(e){
-   * TODO
+    if (me.currentKeyboard){
-   * ----
+      me.currentKeyboard.style.top = getKeyboardTop()+"px";
-   * add emoji search if I can be bothered
+    }
-   * lazy emoji loading
+  }
-   */
 }
 
 ready(){
+  this.composePanelScroller = $(".js-compose-scroller", ".js-docked-compose").first().children().first();
+  this.composePanelScroller.on("scroll", this.composerScrollEvent);
+  
   $(".emoji-keyboard-popup-btn").on("click", this.emojiKeyboardButtonClickEvent);
   $(document).on("click", this.documentClickEvent);
   $(document).on("keydown", this.documentKeyEvent);
+  $(document).on("uiComposeImageAdded", this.uploadFilesEvent);
   
   // HTML generation
   
@@ -190,18 +267,14 @@ ready(){
   };
   
   $TDP.readFileRoot(this.$token, "emoji-ordering.txt").then(contents => {
-    let generated1 = [];
-    let generated2 = {};
-    let generated3 = [];
-    
     for(let skinTone of this.skinToneList){
-      generated2[skinTone] = [];
+      this.emojiData2[skinTone] = [];
     }
     
     // declaration inserters
     
     let addDeclaration1 = decl => {
-      generated1.push(decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join(""));
+      this.emojiData1.push(decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join(""));
     };
     
     let addDeclaration2 = (tone, decl) => {
@@ -209,16 +282,16 @@ ready(){
       
       if (tone === null){
         for(let skinTone of this.skinToneList){
-          generated2[skinTone].push(gen);
+          this.emojiData2[skinTone].push(gen);
         }
       }
       else{
-        generated2[tone].push(gen);
+        this.emojiData2[tone].push(gen);
       }
     };
     
     let addDeclaration3 = decl => {
-      generated3.push(decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join(""));
+      this.emojiData3.push(decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join(""));
     };
     
     // line reading
@@ -228,20 +301,29 @@ ready(){
     for(let line of contents.split("\n")){
       if (line[0] === '@'){
         switch(skinToneState){
-          case 0: generated1.push("___"); break;
+          case 0: this.emojiData1.push("___"); break;
-          case 1: this.skinToneList.forEach(skinTone => generated2[skinTone].push("___")); break;
+          case 1: this.skinToneList.forEach(skinTone => this.emojiData2[skinTone].push("___")); break;
-          case 2: generated3.push("___"); break;
+          case 2: this.emojiData3.push("___"); break;
         }
         
+        continue;
+      }
+      else if (line[0] === '#'){
         if (line[1] === '1'){
           skinToneState = 1;
         }
         else if (line[1] === '2'){
           skinToneState = 2;
         }
+        
+        continue;
       }
-      else if (skinToneState === 1){
+      
-        let decl = line.slice(0, line.indexOf(';'));
+      let semicolon = line.indexOf(';');
+      let decl = line.slice(0, semicolon);
+      let desc = line.slice(semicolon+1).toLowerCase();
+      
+      if (skinToneState === 1){
         let skinIndex = decl.indexOf('$');
 
         if (skinIndex !== -1){
@@ -249,35 +331,24 @@ ready(){
           let declPost = decl.slice(skinIndex+1);
           
           for(let skinTone of this.skinToneNonDefaultList){
-            generated2[skinTone].pop();
+            this.emojiData2[skinTone].pop();
             addDeclaration2(skinTone, declPre+skinTone+declPost);
           }
         }
         else{
           addDeclaration2(null, decl);
+          this.emojiNames.push(desc);
         }
       }
       else if (skinToneState === 2){
-        addDeclaration3(line.slice(0, line.indexOf(';')));
+        addDeclaration3(decl);
+        this.emojiNames.push(desc);
       }
       else if (skinToneState === 0){
-        addDeclaration1(line.slice(0, line.indexOf(';')));
+        addDeclaration1(decl);
+        this.emojiNames.push(desc);
       }
     }
-    
-    // final processing
-    
-    let urlRegex = new RegExp(this.emojiURL.replace(/\./g, "\\."), "g");
-    let process = str => TD.util.cleanWithEmoji(str).replace(/ class=\"emoji\" draggable=\"false\"/g, "").replace(urlRegex, "u#").replace(/___/g, "<div class='separator'></div>");
-    
-    let start = "<p style='font-size:13px;color:#444;margin:4px;text-align:center'>Please, note that most emoji will not show up properly in the text box above, but they will display in the tweet.</p>";
-    this.emojiHTML1 = start+process(generated1.join(""));
-    
-    for(let skinTone of this.skinToneList){
-      this.emojiHTML2[skinTone] = process(generated2[skinTone].join(""));
-    }
-    
-    this.emojiHTML3 = process(generated3.join(""));
   }).catch(err => {
     $TD.alert("error", "Problem loading emoji keyboard: "+err.message);
   });
@@ -290,12 +361,17 @@ disabled(){
     $(this.currentKeyboard).remove();
   }
   
-  window.TDGF_tryPasteImage = this.prevTryPasteImage;
+  if (this.currentSpanner){
+    $(this.currentSpanner).remove();
+  }
+  
+  this.composePanelScroller.off("scroll", this.composerScrollEvent);
   
   $(".emoji-keyboard-popup-btn").off("click", this.emojiKeyboardButtonClickEvent);
   $(".emoji-keyboard-popup-btn").remove();
   
   $(document).off("click", this.documentClickEvent);
   $(document).off("keydown", this.documentKeyEvent);
+  $(document).off("uiComposeImageAdded", this.uploadFilesEvent);
   TD.mustaches["compose/docked_compose.mustache"] = this.prevComposeMustache;
 }

Resources/Plugins/emoji-keyboard/emoji-instructions.txt

@@ -0,0 +1,143 @@
+Emoji list:   http://unicode.org/emoji/charts/emoji-ordering.html
+Emoji order:  http://unicode.org/emoji/charts/emoji-ordering.txt
+
+The instructions contain search & replace regexes. Make sure your editor supports LF characters (\n).
+For Brackets, use Find -> Replace in Files with any regex that includes LF.
+
+
+------------------------
+Remove unnecessary info:
+
+  Search:   \s;.+?#.+?\s
+  Replace:  ;
+  
+  Search:   U\+
+  Replace:  
+
+
+-----------------------------
+Replace skin tone variations:
+
+  Example:
+  
+    1F9D2;child
+    1F9D2 1F3FB; child: light skin tone
+    1F9D2 1F3FC; child: medium-light skin tone
+    1F9D2 1F3FD; child: medium skin tone
+    1F9D2 1F3FE; child: medium-dark skin tone
+    1F9D2 1F3FF; child: dark skin tone
+    
+    1F9D2;child
+    1F9D2 $;child
+  
+  
+  Search:   1F3FB
+  Replace:  $
+  
+  Search:   ^.*1F3F[C-F].*$
+  Replace:  
+  
+  Search:   tone\n\n\n\n
+  Replace:  
+  
+  Search:   : light skin.*$
+  Replace:  
+
+
+----------------
+Move some emoji:
+  
+  1F443 $;nose
+> 1F91D;handshake
+  1F463;footprints
+
+
+-------------------------
+Remove unsupported emoji:
+
+  3030;wavy dash
+> remove copyright
+> remove registered trademark
+> remove trademark
+  0023 FE0F 20E3;keycap
+  
+  1F441;eye
+> remove eye in speech bubble
+  1F9E0;brain
+  
+  (more may be present after an emoji update)
+
+
+-------------------------------
+Remove non-gendered duplicates:
+
+  Search:   ^(1F(46E|575|482|477|473|471|9D9|9DA|9DB|9DC|9DD|9DE|9DF|64D|64E|645|646|481|64B|647|926|937|486|487|6B6|3C3|46F|9D6|9D7|9D8|3CC|3C4|6A3|3CA|3CB|6B4|6B5|938|93C|93D|93E|939)|26F9)(\s\$;|;).*?\n
+  Replace:  
+  
+  (new ones may be added with an emoji update)
+
+
+-----------------------------------
+Add skin tone preprocessor symbols:
+
+  #1 = enable skin tones below
+      find and replace '$;light skin ' with #1
+      
+  #2 = disable skin tones below
+      find the last entry containing '$' and insert #2 below
+  
+  
+----------------------
+Add separator symbols:
+
+  1F64A;speak-no-evil monkey
+> @
+  1F476;baby
+
+  1F469 200D 1F467 200D 1F467;family: woman, girl, girl
+> @
+  1F933;selfie
+  
+  
+  1F48E;gem stone
+> @
+  1F435;monkey face
+  
+  
+  1F982;scorpion
+> @
+  1F490;bouquet
+  
+  
+  1F52A;kitchen knife
+> @
+  1F3FA;amphora
+  
+  
+  1F6C1;bathtub
+> @
+  231B;hourglass done
+  
+  
+  1F6D2;shopping cart
+> @
+  1F3E7;ATM sign
+  
+  
+  1F3F3 FE0F 200D 1F308;rainbow flag
+> @
+  1F1E6 1F1E8;Ascension Island
+
+
+--------------
+Final cleanup:
+
+  Search:   & |,|“|”|o’
+  Replace:  
+  
+  ---
+  Make sure all emoji are formatted correctly and there are no empty lines (no line at the end of file).
+  
+  Test emoji search by searching for the first and last emoji. If broken, a single emoji could be formatted wrong, or an emoji is not supported by Twitter (such as the 'eye in speech bubble' which causes two images to display and messes up the offsets).
+  
+  If there is an error in 'td:plugin:official/emoji-keyboard' when typing into the search bar, add a breakpoint to the erroring line and check if 'me.emojiNames.length' equals 'emoji.length'.

Resources/Plugins/templates/.meta

@@ -0,0 +1,17 @@
+[name]
+Templates
+
+[description]
+- Adds a templating system for tweets
+
+[author]
+chylex
+
+[version]
+1.0.1
+
+[website]
+https://tweetduck.chylex.com
+
+[requires]
+1.5.3

Resources/Plugins/templates/browser.js

@@ -0,0 +1,479 @@
+enabled(){
+  let me = this;
+  
+  // configuration
+  
+  this.config = {
+    templates: {} // identifier: { name, contents }
+  };
+  
+  const configFile = "config.json";
+  
+  $TDP.checkFileExists(this.$token, configFile).then(exists => {
+    if (!exists){
+      $TDP.writeFile(this.$token, configFile, JSON.stringify(this.config));
+    }
+    else{
+      $TDP.readFile(this.$token, configFile, true).then(contents => {
+        try{
+          $.extend(true, this.config, JSON.parse(contents));
+        }catch(err){
+          // why :(
+        }
+      }).catch(err => {
+        $TD.alert("error", "Problem loading configuration for the template plugin: "+err.message);
+      });
+    }
+  });
+  
+  this.saveConfig = () => {
+    $TDP.writeFile(this.$token, configFile, JSON.stringify(this.config)).catch(err => {
+      $TD.alert("error", "Problem saving configuration 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--9"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
+  
+  this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
+  TD.mustaches["compose/docked_compose.mustache"] = TD.mustaches["compose/docked_compose.mustache"].replace('<div class="js-tweet-type-button">', buttonHTML+'<div class="js-tweet-type-button">');
+  
+  var 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%; 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: 150px; 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) => {
+    let startIndex = -1;
+    let endIndex = -1;
+    
+    let data = [];
+    let tokenNames = Object.keys(tokenData);
+    
+    for(let currentIndex = 0; currentIndex < contents.length; currentIndex++){
+      if (contents[currentIndex] === '\\'){
+        contents = contents.substring(0, currentIndex)+contents.substring(currentIndex+1);
+        continue;
+      }
+      else if (contents[currentIndex] !== '{'){
+        continue;
+      }
+      
+      startIndex = currentIndex+1;
+      
+      for(; startIndex < contents.length; startIndex++){
+        if (!tokenNames.some(name => contents[startIndex] === name[startIndex-currentIndex-1])){
+          break;
+        }
+      }
+      
+      endIndex = startIndex;
+      
+      let token = contents.substring(currentIndex+1, startIndex);
+      let replacement = tokenData[token] || "";
+      
+      let entry = [ token, currentIndex ];
+      
+      if (contents[endIndex] === '#'){
+        ++endIndex;
+        
+        let bracketCount = 1;
+        
+        for(; endIndex < contents.length; endIndex++){
+          if (contents[endIndex] === '{'){
+            ++bracketCount;
+          }
+          else if (contents[endIndex] === '}'){
+            if (--bracketCount === 0){
+              entry.push(contents.substring(startIndex+1, endIndex));
+              break;
+            }
+          }
+          else if (contents[endIndex] === '#'){
+            entry.push(contents.substring(startIndex+1, endIndex));
+            startIndex = endIndex;
+          }
+          else if (contents[endIndex] === '\\'){
+            contents = contents.substring(0, endIndex)+contents.substring(endIndex+1);
+          }
+        }
+      }
+      else if (contents[endIndex] !== '}'){
+        continue;
+      }
+      
+      data.push(entry);
+      
+      contents = contents.substring(0, currentIndex)+replacement+contents.substring(endIndex+1);
+      currentIndex += replacement.length;
+    }
+    
+    return [ contents, data ];
+  };
+  
+  var doAjaxRequest = (index, url, evaluator) => {
+    return new Promise((resolve, reject) => {
+      if (!url){
+        resolve([ index, "{ajax}" ]);
+        return;
+      }
+      
+      $.get(url, function(data){
+        if (evaluator){
+          resolve([ index, eval(evaluator.replace(/\$/g, "'"+data.replace(/(["'\\\n\r\u2028\u2029])/g, "\\$1")+"'"))]);
+        }
+        else{
+          resolve([ index, data ]);
+        }
+      }, "text").fail(function(){
+        resolve([ index, "" ]);
+      });
+    });
+  };
+  
+  var useTemplate = (contents, append) => {
+    let ele = $(".js-compose-text");
+    if (ele.length === 0)return;
+    
+    let value = append ? ele.val()+contents : contents;
+    let prevLength = value.length;
+    
+    let tokens = null;
+    
+    [value, tokens] = readTemplateTokens(value, {
+      "cursor": "",
+      "ajax": "(...)"
+    });
+    
+    ele.val(value);
+    ele.trigger("change");
+    ele.focus();
+    
+    ele[0].selectionStart = ele[0].selectionEnd = value.length;
+    
+    let promises = [];
+    let indexOffset = 0;
+    
+    for(let token of tokens){
+      switch(token[0]){
+        case "cursor":
+          let [, index1, length ] = token;
+          ele[0].selectionStart = index1;
+          ele[0].selectionEnd = index1+(length | 0 || 0);
+          break;
+          
+        case "ajax":
+          let [, index2, evaluator, url ] = token;
+          
+          if (!url){
+            url = evaluator;
+            evaluator = null;
+          }
+
+          promises.push(doAjaxRequest(index2, url, evaluator));
+          break;
+      }
+    }
+    
+    if (promises.length > 0){
+      let selStart = ele[0].selectionStart;
+      let selEnd = ele[0].selectionEnd;
+      
+      ele.prop("disabled", true);
+      
+      Promise.all(promises).then(values => {
+        const placeholderLen = 5; // "(...)".length
+        let indexOffset = 0;
+        
+        for(let value of values){
+          let diff = value[1].length-placeholderLen;
+          let realIndex = indexOffset+value[0];
+          
+          let val = ele.val();
+          ele.val(val.substring(0, realIndex)+value[1]+val.substring(realIndex+placeholderLen));
+          
+          indexOffset += diff;
+        }
+        
+        ele.prop("disabled", false);
+        ele.trigger("change");
+        ele.focus();
+        
+        ele[0].selectionStart = selStart+indexOffset;
+        ele[0].selectionEnd = selEnd+indexOffset;
+      });
+    }
+    
+    if (!append){
+      hideTemplateModal();
+    }
+  };
+  
+  // modal dialog
+  
+  this.editingTemplate = null;
+  
+  var showTemplateModal = () => {
+    $(".manage-templates-btn").addClass("active");
+    
+    let html = `
+<div class="templates-modal-wrap">
+  <div class="templates-modal">
+    <div class="template-list">
+      <ul></ul>
+      
+      <div class="templates-modal-bottom">
+        <button data-action="close" class="btn" style="background-color:#d2d2d2;border-color:#ccd0d2"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Close</span></button>
+        <button data-action="new-template" class="btn btn-positive"><i class="icon icon-plus icon-small padding-rs"></i><span class="label">New Template</span></button>
+      </div>
+    </div>
+
+    <div class="template-editor 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="btn"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Cancel</span></button>
+        <button data-action="editor-confirm" class="btn btn-positive" 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();
+    
+    ele.on("click", "li[data-template]", function(e){
+      let template = me.config.templates[$(this).attr("data-template")];
+      useTemplate(template.contents, e.shiftKey);
+    });
+    
+    ele.on("click", "li[data-template] i[data-action]", function(e){
+      let identifier = $(this).closest("li").attr("data-template");
+      
+      switch($(this).attr("data-action")){
+        case "edit-template":
+          let editor = $(".template-editor");
+          
+          if (editor.hasClass("invisible")){
+            toggleEditor();
+          }
+          
+          let template = me.config.templates[identifier];
+          $("[name='template-name']", editor).val(template.name);
+          $("[name='template-contents']", editor).val(template.contents);
+          
+          me.editingTemplate = identifier;
+          break;
+          
+        case "delete-template":
+          delete me.config.templates[identifier];
+          onTemplatesUpdated(true);
+          
+          if (me.editingTemplate === identifier){
+            me.editingTemplate = null;
+          }
+          
+          break;
+      }
+      
+      e.stopPropagation();
+    });
+    
+    ele.on("click", ".template-editor-tips-button", function(e){
+      $(this).children(".icon").toggleClass("icon-arrow-d icon-arrow-u");
+      ele.find(".template-editor-tips").toggle();
+    });
+    
+    ele.on("click", "button", function(e){
+      switch($(this).attr("data-action")){
+        case "new-template":
+        case "editor-cancel":
+          toggleEditor();
+          break;
+          
+        case "editor-confirm":
+          let editor = $(".template-editor");
+          
+          if (me.editingTemplate !== null){
+            delete me.config.templates[me.editingTemplate];
+          }
+          
+          let name = $("[name='template-name']", editor).val();
+          let identifier = name.toLowerCase().replace(/[^a-z0-9]/g, "")+"-"+(Math.random().toString(36).substring(2, 7));
+          
+          if (name.trim().length === 0){
+            alert("Please, include a name for your template.");
+            $("[name='template-name']", editor).focus();
+            return;
+          }
+          
+          me.config.templates[identifier] = {
+            name: name,
+            contents: $("[name='template-contents']", editor).val()
+          };
+          
+          toggleEditor();
+          onTemplatesUpdated(true);
+          break;
+        
+        case "close":
+          hideTemplateModal();
+          break;
+      }
+      
+      $(this).blur();
+    });
+    
+    onTemplatesUpdated(false);
+  };
+  
+  var hideTemplateModal = function(){
+    $(".templates-modal-wrap").remove();
+    $(".manage-templates-btn").removeClass("active");
+  };
+  
+  var toggleEditor = function(){
+    let editor = $(".template-editor");
+    $("[name]", editor).val("");
+    
+    if ($("button[data-action='new-template']", ".template-list").add(editor).toggleClass("invisible").hasClass("invisible")){
+      me.editingTemplate = null;
+    }
+  };
+  
+  var onTemplatesUpdated = (save) => {
+    let eles = [];
+    
+    for(let identifier of Object.keys(this.config.templates)){
+      eles.push(`<li data-template="${identifier}">
+<span class="template-name">${this.config.templates[identifier].name}</span>
+<span class="template-actions"><i class="icon icon-edit" data-action="edit-template"></i><i class="icon icon-close" data-action="delete-template"></i></span>
+</li>`);
+    }
+    
+    if (eles.length === 0){
+      eles.push("<li>No templates available</li>");
+    }
+    
+    $(".template-list").children("ul").html(eles.join(""));
+    
+    if (save){
+      this.saveConfig();
+    }
+  };
+  
+  // event handlers
+  
+  this.manageTemplatesButtonClickEvent = function(e){
+    if ($(".templates-modal-wrap").length){
+      hideTemplateModal();
+    }
+    else{
+      showTemplateModal();
+    }
+    
+    $(this).blur();
+  };
+  
+  this.drawerToggleEvent = function(e, data){
+    if (data.activeDrawer === null){
+      hideTemplateModal();
+    }
+  };
+}
+
+ready(){
+  $(".manage-templates-btn").on("click", this.manageTemplatesButtonClickEvent);
+  $(document).on("uiDrawerActive", this.drawerToggleEvent);
+}
+
+disabled(){
+  this.css.remove();
+  
+  $(".manage-templates-btn").remove();
+  $(".templates-modal-wrap").remove();
+  
+  $(document).off("uiDrawerActive", this.drawerToggleEvent);
+  
+  TD.mustaches["compose/docked_compose.mustache"] = this.prevComposeMustache;
+}

Resources/Plugins/timeline-polls/.meta

@@ -2,14 +2,13 @@
 Polls in timelines
 
 [description]
-- Adds poll result display directly into timelines
+- Adds poll results into timelines and quoted tweets
-- Experimental, may be buggy or break when TweetDeck updates
 
 [author]
 chylex
 
 [version]
-1.0.1
+1.1
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/timeline-polls/browser.js

@@ -1,25 +1,80 @@
-constructor(){
-  super({
-    requiresPageReload: true
-  });
-}
-
 enabled(){
-  // add a stylesheet
+  this.reloadColumns = () => {
-  window.TDPF_createCustomStyle(this).insert(".column-detail .timeline-poll-container { display: none }");
+    Object.values(TD.controller.columnManager.getAll()).forEach(column => column.reloadTweets());
+  };
   
-  // setup layout injecting
+  // styles
-  var injectLayout = (mustache, onlyIfNotFound, search, replace) => {
+  
-    if (TD.mustaches[mustache].indexOf(onlyIfNotFound) === -1){
+  this.css = window.TDPF_createCustomStyle(this);
-      TD.mustaches[mustache] = TD.mustaches[mustache].replace(search, replace);
+  this.css.insert("html[data-td-theme='dark'] .quoted-tweet .td-timeline-poll { color: #e1e8ed; }");
+  
+  // utility functions
+  
+  var hasPoll = function(tweet){
+    return tweet.hasPoll && tweet.hasPoll();
+  };
+  
+  var renderTweetPoll = function(tweet){
+    return `<div class='td-timeline-poll'>${TD.ui.template.render("status/poll", $.extend({}, tweet, {
+      chirp: tweet
+    }))}</div>`;
+  };
+  
+  var renderPollHook = function(tweet, html){
+    let ele = null;
+    
+    if (hasPoll(tweet)){
+      (ele || (ele = $(html))).find(".js-tweet-body").first().children("div").last().after(renderTweetPoll(tweet));
+    }
+    
+    if (tweet.quotedTweet && hasPoll(tweet.quotedTweet)){
+      (ele || (ele = $(html))).find(".js-quoted-tweet-text").first().after(renderTweetPoll(tweet.quotedTweet));
+    }
+    
+    if (ele){
+      ele.find(".js-card-container").css("display", "none");
+      return ele.prop("outerHTML");
+    }
+    else{
+      return html;
     }
   };
-
+  
-  // add poll rendering to tweets
+  // hooks
-  injectLayout("status/tweet_single.mustache", "status/poll", "{{/quotedTweetMissing}} {{#translation}}", "{{/quotedTweetMissing}} <div class='timeline-poll-container td-screenshot-remove'>{{#poll}}{{>duck/tweet_single/poll}}{{/poll}}</div> {{#translation}}");
+  
-  TD.mustaches["duck/tweet_single/poll.mustache"] = '<div class="js-poll margin-tl"> {{#poll}}  <ul class="margin-b--12"> {{#choices}} <li class="position-rel margin-b--8 height-3"> <div class="poll-bar pin-top height-p--100 br-1 {{#isWinner}}poll-bar--winner{{/isWinner}} {{#hasTimeLeft}}br-left{{/hasTimeLeft}} width-p--{{percentage}}"/>  <div class="poll-label position-rel padding-a--4"> <span class="txt-bold txt-right inline-block width-5 padding-r--4">{{percentage}}%</span> {{{label}}} {{#isSelectedChoice}} <i class="icon icon-check txt-size-variable--11"></i> {{/isSelectedChoice}} </div> </li> {{/choices}} </ul> <span class="inline-block txt-small padding-ls txt-seamful-deep-gray"> {{{prettyCount}}} &middot; {{#hasTimeLeft}} {{{prettyTimeLeft}}} {{/hasTimeLeft}} {{^hasTimeLeft}} {{_i}}Final results{{/i}} {{/hasTimeLeft}} </span> {{/poll}} </div>';
+  var funcs = {
+    TwitterStatus: TD.services.TwitterStatus.prototype.render,
+    TwitterActionOnTweet: TD.services.TwitterActionOnTweet.prototype.render,
+    TweetDetailView: TD.components.TweetDetailView.prototype._renderChirp
+  };
+  
+  TD.services.TwitterStatus.prototype.render = function(e){
+    return renderPollHook(this, funcs.TwitterStatus.apply(this, arguments));
+  };
+  
+  TD.services.TwitterActionOnTweet.prototype.render = function(e){
+    return renderPollHook(this.targetTweet, funcs.TwitterActionOnTweet.apply(this, arguments));
+  };
+  
+  TD.components.TweetDetailView.prototype._renderChirp = function(){
+    let result = funcs.TweetDetailView.apply(this, arguments);
+    
+    if (this.mainChirp.quotedTweet && hasPoll(this.mainChirp.quotedTweet)){
+      $(this.$tweetDetail).find(".js-quoted-tweet-text").first().after(renderTweetPoll(this.mainChirp.quotedTweet));
+    }
+    
+    return result;
+  };
+  
+  this.prevRenderFuncs = funcs;
+  this.reloadColumns();
 }
 
 disabled(){
-  // not needed, plugin reloads the page when enabled or disabled
+  TD.services.TwitterStatus.prototype.render = this.prevRenderFuncs.TwitterStatus;
+  TD.services.TwitterActionOnTweet.prototype.render = this.prevRenderFuncs.TwitterActionOnTweet;
+  TD.components.TweetDetailView.prototype._renderChirp = this.prevRenderFuncs.TweetDetailView;
+  
+  this.css.remove();
+  this.reloadColumns();
 }

Resources/ScriptLoader.cs

@@ -3,7 +3,7 @@ using CefSharp.WinForms;
 using System;
 using System.IO;
 using System.Text;
-using System.Windows.Forms;
+using TweetDuck.Core.Other;
 
 namespace TweetDuck.Resources{
     static class ScriptLoader{
@@ -14,7 +14,7 @@ namespace TweetDuck.Resources{
                 return File.ReadAllText(Path.Combine(Program.ScriptPath, name), Encoding.UTF8);
             }catch(Exception ex){
                 if (!silent){
-                    MessageBox.Show("Unfortunately, "+Program.BrandName+" could not load the "+name+" file. The program will continue running with limited functionality.\r\n\r\n"+ex.Message, Program.BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    FormMessage.Error("TweetDuck Has Failed :(", "Unfortunately, TweetDuck could not load the "+name+" file. The program will continue running with limited functionality.\n\n"+ex.Message, FormMessage.OK);
                 }
 
                 return null;

Resources/Scripts/code.js

@@ -56,7 +56,7 @@
   //
   var appendToFunction = function(func, extension){
     return function(){
-      var res = func.apply(this, arguments);
+      let res = func.apply(this, arguments);
       extension.apply(this, arguments);
       return res;
     };
@@ -66,7 +66,7 @@
   // Function: Returns true if an object has a specified property, otherwise returns false without throwing an error.
   //
   var ensurePropertyExists = function(obj, ...chain){
-    for(var index = 0; index < chain.length; index++){
+    for(let index = 0; index < chain.length; index++){
       if (!obj.hasOwnProperty(chain[index])){
         $TD.crashDebug("Missing property "+chain[index]+" in chain [obj]."+chain.join("."));
         return false;
@@ -108,7 +108,7 @@
       recentTweetTimer = window.setTimeout(() => {
         recentTweetTimer = null;
         recentTweets.clear();
-      }, 10000);
+      }, 20000);
     };
     
     let checkRecentTweet = id => {
@@ -124,31 +124,61 @@
       return false;
     };
     
+    let fixMedia = (html, media) => {
+      return html.find(".js-media a[data-media-entity-id='"+media.mediaId+"']").css("background-image", 'url("'+media.thumb()+'")').removeClass("is-zoomable");
+    };
+    
     return function(column, tweet){
       if (checkRecentTweet(tweet.id)){
         return;
       }
       
       if (column.model.getHasNotification()){
+        let previews = $TDX.notificationMediaPreviews;
+        
         let html = $(tweet.render({
           withFooter: false,
           withTweetActions: false,
           withMediaPreview: true,
-          isMediaPreviewOff: true,
+          isMediaPreviewOff: !previews,
-          isMediaPreviewSmall: false,
+          isMediaPreviewSmall: previews,
-          isMediaPreviewLarge: false
+          isMediaPreviewLarge: false,
+          isMediaPreviewCompact: false,
+          isMediaPreviewInQuoted: previews,
+          thumbSizeClass: "media-size-medium"
         }));
-
+        
         html.css("border", "0");
         html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
-        html.find(".js-media").last().remove(); // and quoted tweets still show media previews, nice nice
+        html.find(".js-quote-detail").removeClass("is-actionable margin-b--8"); // prevent quoted tweets from changing the cursor and reduce bottom margin
-        html.find(".js-quote-detail").removeClass("is-actionable"); // prevent quoted tweets from changing the cursor
+        
-
+        if (previews){
+          html.find(".reverse-image-search").remove();
+          
+          for(let media of tweet.getMedia()){
+            fixMedia(html, media);
+          }
+          
+          if (tweet.quotedTweet){
+            for(let media of tweet.quotedTweet.getMedia()){
+              fixMedia(html, media).addClass("media-size-medium");
+            }
+          }
+        }
+        else if (tweet instanceof TD.services.TwitterActionOnTweet){
+          html.find(".js-media").remove();
+        }
+        
         html.find("a[href='#']").each(function(){ // remove <a> tags around links that don't lead anywhere (such as account names the tweet replied to)
           this.outerHTML = this.innerHTML;
         });
-
+        
-        if (tweet.getChirpType().includes("list_member")){
+        let type = tweet.getChirpType();
+        
+        if (type === "follow"){
+          html.find(".js-user-actions-menu").parent().remove();
+        }
+        else if (type.includes("list_member")){
           html.find(".activity-header").first().css("margin-top", "2px");
           html.find(".avatar").first().css("margin-bottom", "0");
         }
@@ -195,12 +225,21 @@
     $TD.loadFontSizeClass(name);
   });
   
-  TD.settings.setTheme = appendToFunction(TD.settings.setTheme, function(){
+  TD.settings.setTheme = appendToFunction(TD.settings.setTheme, function(name){
+    document.documentElement.setAttribute("data-td-theme", name);
+    
     setTimeout(function(){
       $TD.loadNotificationHeadContents(getNotificationHeadContents());
     }, 0);
   });
   
+  onAppReady.push(function(){
+    document.documentElement.setAttribute("data-td-theme", TD.settings.getTheme());
+    
+    $TD.loadFontSizeClass(TD.settings.getFontSize());
+    $TD.loadNotificationHeadContents(getNotificationHeadContents());
+  });
+  
   //
   // Block: Enable popup notifications.
   //
@@ -226,12 +265,12 @@
   onAppReady.push(function(){
     $("[data-action='settings-menu']").click(function(){
       setTimeout(function(){
-        var menu = $(".js-dropdown-content").children("ul").first();
+        let menu = $(".js-dropdown-content").children("ul").first();
         if (menu.length === 0)return;
         
         menu.children(".drp-h-divider").last().before('<li class="is-selectable" data-std><a href="#" data-action="tweetduck">TweetDuck</a></li>');
         
-        var button = menu.children("[data-std]");
+        let button = menu.children("[data-std]");
 
         button.on("click", "a", function(){
           $TD.openContextMenu();
@@ -261,7 +300,7 @@
       var me = $(this);
 
       if (e.type === "mouseenter"){
-        var text = me.text();
+        let text = me.text();
         
         if (text.charCodeAt(text.length-1) !== 8230){ // horizontal ellipsis
           return;
@@ -269,7 +308,7 @@
         
         if ($TDX.expandLinksOnHover){
           tooltipTimer = window.setTimeout(function(){
-            var expanded = me.attr("data-full-url");
+            let expanded = me.attr("data-full-url");
             expanded = cutStart(expanded, "https://");
             expanded = cutStart(expanded, "http://");
             expanded = cutStart(expanded, "www.");
@@ -287,7 +326,7 @@
       }
       else if (e.type === "mouseleave"){
         if ($TDX.expandLinksOnHover){
-          var prevText = me.attr("td-prev-text");
+          let prevText = me.attr("td-prev-text");
 
           if (prevText){
             me.text(prevText);
@@ -312,17 +351,28 @@
   })();
   
   //
-  // Block: Allow bypassing of t.co in context menus.
+  // Block: Allow bypassing of t.co and include media previews in context menus.
   //
   $(document.body).delegate("a", "contextmenu", function(){
     $TD.setLastRightClickedLink($(this).attr("data-full-url") || "");
   });
   
+  $(document.body).delegate("a.js-media-image-link", "contextmenu", function(){
+    let me = $(this)[0];
+    
+    if (me.firstElementChild){
+      $TD.setLastRightClickedImage(me.firstElementChild.getAttribute("src"));
+    }
+    else{
+      $TD.setLastRightClickedImage(me.style.backgroundImage.replace(/url\(['"]?(.*?)['"]?\)/, "$1"));
+    }
+  });
+  
   //
   // Block: Hook into the notification sound effect.
   //
   (function(){
-    var soundEle = document.getElementById("update-sound");
+    let soundEle = document.getElementById("update-sound");
     
     soundEle.play = prependToFunction(soundEle.play, function(){
       return $TDX.muteNotifications || $TDX.hasCustomNotificationSound;
@@ -341,12 +391,12 @@
       return !!highlightedColumnObj;
     };
     
-    var updateHighlightedTweet = function(ele, obj, link, embeddedLink){
+    var updateHighlightedTweet = function(ele, obj, link, embeddedLink, author, imageList){
       highlightedTweetEle = ele;
       highlightedTweetObj = obj;
       
       if (lastTweet !== link){
-        $TD.setLastHighlightedTweet(link, embeddedLink);
+        $TD.setLastHighlightedTweet(link, embeddedLink, author, imageList);
         lastTweet = link;
       }
     };
@@ -364,28 +414,31 @@
     
     app.delegate("article.js-stream-item", "mouseenter mouseleave", function(e){
       if (e.type === "mouseenter"){
-        var me = $(this);
+        let me = $(this);
         
         if (!me[0].hasAttribute("data-account-key") || (!highlightedColumnObj && !updateHighlightedColumn(me.closest("section.js-column")))){
           return;
         }
         
-        var tweet = highlightedColumnObj.findChirp(me.attr("data-tweet-id")) || highlightedColumnObj.findChirp(me.attr("data-key"));
+        let tweet = highlightedColumnObj.findChirp(me.attr("data-tweet-id")) || highlightedColumnObj.findChirp(me.attr("data-key"));
         
         if (tweet){
           if (tweet.chirpType === TD.services.ChirpBase.TWEET){
-            var link = tweet.getChirpURL();
+            let link = tweet.getChirpURL();
-            var embedded = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+            let embedded = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
-
+            let username = tweet.getMainUser().screenName;
-            updateHighlightedTweet(me, tweet, link || "", embedded || "");
+            let images = tweet.hasImage() ? tweet.getMedia().filter(item => !item.isAnimatedGif).map(item => item.entity.media_url_https+":small").join(";") : "";
+            // TODO maybe handle embedded images too?
+            
+            updateHighlightedTweet(me, tweet, link || "", embedded || "", username, images);
           }
           else{
-            updateHighlightedTweet(me, tweet, "", "");
+            updateHighlightedTweet(me, tweet, "", "", "", "");
           }
         }
       }
       else if (e.type === "mouseleave"){
-        updateHighlightedTweet(null, null, "", "");
+        updateHighlightedTweet(null, null, "", "", "", "");
       }
     });
   })();
@@ -408,11 +461,11 @@
     
     window.TDGF_triggerScreenshot = function(){
       if (selectedTweet){
-        var tweetWidth = Math.floor(selectedTweet.width());
+        let tweetWidth = Math.floor(selectedTweet.width());
-        var parent = selectedTweet.parent();
+        let parent = selectedTweet.parent();
         
-        var isDetail = parent.hasClass("js-tweet-detail");
+        let isDetail = parent.hasClass("js-tweet-detail");
-        var isReply = !isDetail && (parent.hasClass("js-replies-to") || parent.hasClass("js-replies-before"));
+        let isReply = !isDetail && (parent.hasClass("js-replies-to") || parent.hasClass("js-replies-before"));
         
         selectedTweet = selectedTweet.clone();
         selectedTweet.children().first().addClass($(document.documentElement).attr("class")).css("padding-bottom", "0");
@@ -446,13 +499,13 @@
         selectedTweet.find(".js-poll-link").remove();
         selectedTweet.find(".td-screenshot-remove").remove();
         
-        var testTweet = selectedTweet.clone().css({
+        let testTweet = selectedTweet.clone().css({
           position: "absolute",
           left: "-999px",
           width: tweetWidth+"px"
         }).appendTo(document.body);
         
-        var realHeight = Math.floor(testTweet.height());
+        let realHeight = Math.floor(testTweet.height());
         testTweet.remove();
         
         $TD.screenshotTweet(selectedTweet.html(), tweetWidth, realHeight);
@@ -469,8 +522,15 @@
     app.delegate(".js-compose-text,.js-reply-tweetbox", "paste", function(e){
       for(let item of e.originalEvent.clipboardData.items){
         if (item.type.startsWith("image/")){
-          $(this).closest(".rpl").find(".js-reply-popout").click(); // popout direct messages
+          if (!$(this).closest(".rpl").find(".js-reply-popout").click().length){ // popout direct messages
+            if ($(".js-add-image-button").is(".is-disabled")){ // tweetdeck does not check upload count properly
+              return;
+            }
+          }
+          
           uploader.addFilesToUpload([ item.getAsFile() ]);
+          
+          $(".js-compose-text", ".js-docked-compose").focus();
           break;
         }
       }
@@ -485,26 +545,34 @@
       return $(selector, parent).click().length;
     };
     
-    var tryCloseModal = function(){
+    var tryCloseModal1 = function(){
-      var modal = $("#open-modal");
+      let modal = $("#open-modal");
-      return modal.is(":visible") && tryClickSelector("a[rel=dismiss]", modal);
+      return modal.is(":visible") && tryClickSelector("a.mdl-dismiss", modal);
+    };
+    
+    var tryCloseModal2 = function(){
+      let modal = $(".js-modals-container");
+      return modal.length && tryClickSelector("a.mdl-dismiss", modal);
     };
     
     var tryCloseHighlightedColumn = function(){
       if (highlightedColumnEle){
-        var column = highlightedColumnEle.closest(".js-column");
+        let column = highlightedColumnEle.closest(".js-column");
         return (column.is(".is-shifted-2") && tryClickSelector(".js-tweet-social-proof-back", column)) || (column.is(".is-shifted-1") && tryClickSelector(".js-column-back", column));
       }
     };
     
     window.TDGF_onMouseClickExtra = function(button){
       if (button === 1){ // back button
-        tryCloseModal() ||
+        tryClickSelector(".is-shifted-2 .js-tweet-social-proof-back", ".js-modal-panel") ||
+        tryClickSelector(".is-shifted-1 .js-column-back", ".js-modal-panel") ||
+        tryCloseModal1() ||
+        tryCloseModal2() ||
         tryClickSelector(".js-inline-compose-close") ||
         tryCloseHighlightedColumn() ||
         tryClickSelector(".js-app-content.is-open .js-drawer-close:visible") ||
         tryClickSelector(".is-shifted-2 .js-tweet-social-proof-back, .is-shifted-2 .js-dm-participants-back") ||
-        $(".js-column-back").click();
+        $(".is-shifted-1 .js-column-back").click();
       }
       else if (button === 2){ // forward button
         if (highlightedTweetEle){
@@ -519,7 +587,7 @@
   //
   $(document).on("dataTweetSent", function(e, data){
     if (data.response.state && data.response.state === "scheduled"){
-      var column = Object.values(TD.controller.columnManager.getAll()).find(column => column.model.state.type === "scheduled");
+      let column = Object.values(TD.controller.columnManager.getAll()).find(column => column.model.state.type === "scheduled");
 
       if (column){
         setTimeout(function(){
@@ -572,16 +640,18 @@
   })();
   
   //
-  // Block: Swap shift key functionality for selecting accounts.
+  // Block: Swap shift key functionality for selecting accounts, and refocus the textbox afterwards.
   //
   onAppReady.push(function(){
-    var toggleEventShiftKey = function(e){
+    var onAccountClick = function(e){
       if ($TDX.switchAccountSelectors){
         e.shiftKey = !e.shiftKey;
       }
+      
+      $(".js-compose-text", ".js-docked-compose").focus();
     };
     
-    $(".js-drawer[data-drawer='compose']").delegate(".js-account-list > .js-account-item", "click", toggleEventShiftKey);
+    $(".js-drawer[data-drawer='compose']").delegate(".js-account-list > .js-account-item", "click", onAccountClick);
     
     if (!ensurePropertyExists(TD, "components", "AccountSelector", "prototype", "refreshPostingAccounts")){
       return;
@@ -590,11 +660,31 @@
     TD.components.AccountSelector.prototype.refreshPostingAccounts = appendToFunction(TD.components.AccountSelector.prototype.refreshPostingAccounts, function(){
       if (!this.$node.attr("td-account-selector-hook")){
         this.$node.attr("td-account-selector-hook", "1");
-        this.$node.delegate(".js-account-item", "click", toggleEventShiftKey);
+        this.$node.delegate(".js-account-item", "click", onAccountClick);
       }
     });
   });
   
+  //
+  // Block: Make middle click on tweet reply icon open the compose drawer.
+  //
+  app.delegate(".js-reply-action", "mousedown", function(e){
+    if (e.which === 2){
+      if ($("[data-drawer='compose']").hasClass("is-hidden")){
+        $(document).trigger("uiDrawerShowDrawer", {
+          drawer: "compose",
+          withAnimation: true
+        });
+        
+        window.setTimeout(() => $(this).trigger("click"), 1);
+      }
+      
+      e.preventDefault();
+      e.stopPropagation();
+      e.stopImmediatePropagation();
+    }
+  });
+  
   //
   // Block: Work around clipboard HTML formatting.
   //
@@ -606,31 +696,63 @@
   // Block: Inject custom CSS and layout into the page.
   //
   (function(){
-    var styleOfficial = document.createElement("style");
+    let styleOfficial = document.createElement("style");
     document.head.appendChild(styleOfficial);
     
-    styleOfficial.sheet.insertRule("a[data-full-url] { word-break: break-all; }", 0); // break long urls
+    let addRule = (rule) => {
-    styleOfficial.sheet.insertRule(".column-nav-link .attribution { position: absolute; }", 0); // fix cut off account names
+      styleOfficial.sheet.insertRule(rule, 0);
-    styleOfficial.sheet.insertRule(".txt-base-smallest .sprite-verified-mini { width: 13px !important; height: 13px !important; background-position: -223px -99px !important; }", 0); // fix cut off badge icon when zoomed in
+    };
-    styleOfficial.sheet.insertRule(".keyboard-shortcut-list { vertical-align: top; }", 0); // fix keyboard navigation alignment
-    styleOfficial.sheet.insertRule(".sprite-logo { background-position: -5px -46px !important; }", 0); // fix TweetDeck logo on certain zoom levels
-    styleOfficial.sheet.insertRule(".app-navigator .tooltip { display: none !important; }", 0); // hide broken tooltips in the menu
-    styleOfficial.sheet.insertRule(".account-inline .username { vertical-align: 10%; }", 0); // move usernames a bit higher
     
-    styleOfficial.sheet.insertRule(".column .column-header { height: 49px !important; }", 0); // fix one pixel space below column header
+    addRule("a[data-full-url] { word-break: break-all; }"); // break long urls
-    styleOfficial.sheet.insertRule(".column:not(.is-options-open) .column-header { border-bottom: none; }", 0); // fix one pixel space below column header
+    addRule(".keyboard-shortcut-list { vertical-align: top; }"); // fix keyboard navigation alignment
+    addRule(".account-inline .username { vertical-align: 10%; }"); // move usernames a bit higher
+    addRule(".character-count-compose { width: 40px !important; }"); // fix strangely wide character count element
     
-    styleOfficial.sheet.insertRule(".activity-header { align-items: center !important; margin-bottom: 4px; }", 0); // tweak alignment of avatar and text in notifications
+    addRule(".column-nav-link .attribution { position: absolute; }"); // fix cut off account names
-    styleOfficial.sheet.insertRule(".activity-header .tweet-timestamp { line-height: unset }", 0); // fix timestamp position in notifications
+    addRule(".txt-base-smallest .sprite-verified-mini { width: 13px !important; height: 13px !important; background-position: -223px -99px !important; }"); // fix cut off badge icon when zoomed in
     
-    styleOfficial.sheet.insertRule(".app-columns-container::-webkit-scrollbar-track { border-left: 0; }", 0); // remove weird border in the column container scrollbar
+    addRule(".btn, .mdl, .mdl-content, .app-search-fake, .app-search-input, .popover, .lst-modal, .media-item { border-radius: 1px !important; }"); // square-ify buttons, inputs, dialogs, menus, media previews
-    styleOfficial.sheet.insertRule(".app-columns-container { bottom: 0 !important; }", 0); // move column container scrollbar to bottom to fit updated style
+    addRule(".dropdown-menu, .list-item-last, .quoted-tweet { border-radius: 0 !important; }"); // square-ify dropdowns, quoted tweets, and account selectors
+    addRule(".prf-header { border-radius: 0; }"); // fix user account header border
     
-    styleOfficial.sheet.insertRule(".js-column-header .column-header-link { padding: 0; }", 0); // fix column header tooltip hover box
+    addRule(".accs li, .accs img { border-radius: 0 !important; }"); // square-ify retweet account selector
-    styleOfficial.sheet.insertRule(".js-column-header .column-header-link .icon { padding: 9px 4px; width: calc(1em + 8px); height: 100%; box-sizing: border-box; }", 0); // fix column header tooltip hover box
+    addRule(".accs-header { padding-left: 0 !important; }"); // fix retweet account selector heading
     
-    styleOfficial.sheet.insertRule(".is-video a:not([href*='youtu']), .is-gif .js-media-gif-container { cursor: alias; }", 0); // change cursor on unsupported videos
+    addRule(".scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb, .antiscroll-scrollbar { border-radius: 0; }"); // square-ify scroll bars
-    styleOfficial.sheet.insertRule(".is-video a:not([href*='youtu']) .icon-bg-dot, .is-gif .icon-bg-dot { color: #bd3d37; }", 0); // change play icon color on unsupported videos
+    addRule(".antiscroll-scrollbar-vertical { margin-top: 0; }"); // square-ify scroll bars
+    addRule(".antiscroll-scrollbar-horizontal { margin-left: 0; }"); // square-ify scroll bars
+    addRule(".scroll-styled-v:not(.antiscroll-inner)::-webkit-scrollbar { width: 8px; }"); // square-ify scroll bars
+    addRule(".scroll-styled-h:not(.antiscroll-inner)::-webkit-scrollbar { height: 8px; }"); // square-ify scroll bars
+    addRule(".app-columns-container::-webkit-scrollbar { height: 9px !important; }"); // square-ify scroll bars
+    
+    addRule(".is-condensed .app-header-inner { padding-top: 10px !important; }"); // add extra padding to menu buttons when condensed
+    addRule(".is-condensed .btn-compose { padding: 8px !important; }"); // fix compose button icon when condensed
+    addRule(".app-header:not(.is-condensed) .nav-user-info { padding: 0 5px; }"); // add padding to user info
+    
+    addRule(".app-title { display: none; }"); // hide TweetDeck logo
+    addRule(".nav-user-info { bottom: 10px !important; }"); // move user info
+    addRule(".app-navigator { bottom: 50px !important; }"); // move navigation
+    addRule(".column-navigator-overflow { bottom: 192px !important; }"); // move column list
+    addRule(".app-navigator .tooltip { display: none !important; }"); // hide broken tooltips in the menu
+    
+    addRule(".column .column-header { height: 49px !important; }"); // fix one pixel space below column header
+    addRule(".column:not(.is-options-open) .column-header { border-bottom: none; }"); // fix one pixel space below column header
+    addRule(".is-options-open .column-type-icon { bottom: 27px; }"); // fix one pixel space below column header
+    
+    addRule(".activity-header { align-items: center !important; margin-bottom: 4px; }"); // tweak alignment of avatar and text in notifications
+    addRule(".activity-header .tweet-timestamp { line-height: unset; }"); // fix timestamp position in notifications
+    
+    addRule("html[data-td-theme='light'] .stream-item:not(:hover) .js-user-actions-menu { color: #000; border-color: #000; opacity: 0.25; }"); // make follow notification button nicer
+    addRule("html[data-td-theme='dark'] .stream-item:not(:hover) .js-user-actions-menu { color: #fff; border-color: #fff; opacity: 0.25; }"); // make follow notification button nicer
+    
+    addRule(".app-columns-container::-webkit-scrollbar-track { border-left: 0; }"); // remove weird border in the column container scrollbar
+    addRule(".app-columns-container { bottom: 0 !important; }"); // move column container scrollbar to bottom to fit updated style
+    
+    addRule(".js-column-header .column-header-link { padding: 0; }"); // fix column header tooltip hover box
+    addRule(".js-column-header .column-header-link .icon { padding: 9px 4px; width: calc(1em + 8px); height: 100%; box-sizing: border-box; }"); // fix column header tooltip hover box
+    
+    addRule(".is-video a:not([href*='youtu']), .is-gif .js-media-gif-container { cursor: alias; }"); // change cursor on unsupported videos
+    addRule(".is-video a:not([href*='youtu']) .icon-bg-dot, .is-gif .icon-bg-dot { color: #bd3d37; }"); // change play icon color on unsupported videos
     
     window.TDGF_reinjectCustomCSS = function(styles){
       $("#tweetduck-custom-css").remove();
@@ -641,6 +763,24 @@
     };
   })();
   
+  //
+  // Block: Let's make retweets lowercase again.
+  //
+  TD.mustaches["status/tweet_single.mustache"] = TD.mustaches["status/tweet_single.mustache"].replace("{{_i}} Retweeted{{/i}}", "{{_i}} retweeted{{/i}}");
+  
+  if (ensurePropertyExists(TD, "services", "TwitterActionRetweet", "prototype", "generateText")){
+    TD.services.TwitterActionRetweet.prototype.generateText = appendToFunction(TD.services.TwitterActionRetweet.prototype.generateText, function(){
+      this.text = this.text.replace(" Retweeted", " retweeted");
+      this.htmlText = this.htmlText.replace(" Retweeted", " retweeted");
+    });
+  }
+  
+  if (ensurePropertyExists(TD, "services", "TwitterActionRetweetedInteraction", "prototype", "generateText")){
+    TD.services.TwitterActionRetweetedInteraction.prototype.generateText = appendToFunction(TD.services.TwitterActionRetweetedInteraction.prototype.generateText, function(){
+      this.htmlText = this.htmlText.replace(" Retweeted", " retweeted").replace(" Retweet", " retweet");
+    });
+  }
+  
   //
   // Block: Setup unsupported video element hook.
   //
@@ -652,7 +792,7 @@
         !ensurePropertyExists(TD, "ui", "Column", "prototype", "playGifIfNotManuallyPaused"))return;
     
     TD.components.MediaGallery.prototype._loadTweet = appendToFunction(TD.components.MediaGallery.prototype._loadTweet, function(){
-      var media = this.chirp.getMedia().find(media => media.mediaId === this.clickedMediaEntityId);
+      let media = this.chirp.getMedia().find(media => media.mediaId === this.clickedMediaEntityId);
 
       if (media && media.isVideo && media.service !== "youtube"){
         $TD.openBrowser(this.clickedLink);
@@ -671,8 +811,8 @@
     TD.mustaches["status/media_thumb.mustache"] = TD.mustaches["status/media_thumb.mustache"].replace("is-gif", "is-gif is-paused");
     
     app.delegate(".js-gif-play", "click", function(e){
-      var parent = $(e.target).closest(".js-tweet").first();
+      let parent = $(e.target).closest(".js-tweet").first();
-      var link = (parent.hasClass("tweet-detail") ? parent.find("a[rel='url']") : parent.find("time").first().children("a")).first();
+      let link = (parent.hasClass("tweet-detail") ? parent.find("a[rel='url']") : parent.find("time").first().children("a")).first();
       
       $TD.openBrowser(link.attr("href"));
       e.stopPropagation();
@@ -683,7 +823,7 @@
   // Block: Fix youtu.be previews not showing up for https links.
   //
   if (ensurePropertyExists(TD, "services", "TwitterMedia")){
-    var media = TD.services.TwitterMedia;
+    let media = TD.services.TwitterMedia;
     
     if (!ensurePropertyExists(media, "YOUTUBE_TINY_RE") ||
         !ensurePropertyExists(media, "YOUTUBE_LONG_RE") ||
@@ -719,6 +859,102 @@
     };
   }
   
+  //
+  // Block: Custom reload function with memory cleanup.
+  //
+  window.TDGF_reload = function(){
+    let session = TD.storage.feedController.getAll()
+                    .filter(feed => !!feed.getTopSortIndex())
+                    .reduce((obj, feed) => (obj[feed.privateState.key] = feed.getTopSortIndex(), obj), {});
+    
+    $TD.setSessionData("gc", JSON.stringify(session)).then(() => {
+      window.gc && window.gc();
+      window.location.reload();
+    });
+  };
+  
+  window.TDGF_tryRunCleanup = function(){
+    // all textareas are empty
+    if ($("textarea").is(function(){
+      return $(this).val().length > 0;
+    })){
+      return false;
+    }
+    
+    // no modals are visible
+    if ($("#open-modal").is(":visible") || !$(".js-modals-container").is(":empty")){
+      return false;
+    }
+    
+    // all columns are in a default state
+    if ($("section.js-column").is(".is-shifted-1,.is-shifted-2")){
+      return false;
+    }
+    
+    // all columns are scrolled to top
+    if ($(".js-column-scroller").is(function(){
+      return $(this).scrollTop() > 0;
+    })){
+      return false;
+    }
+    
+    // cleanup
+    window.TDGF_reload();
+    return true;
+  };
+  
+  if (window.TD_SESSION && window.TD_SESSION.gc){
+    var state;
+    
+    try{
+      state = JSON.parse(window.TD_SESSION.gc);
+    }catch(err){
+      $TD.crashDebug("Invalid session gc data: "+window.TD_SESSION.gc);
+      state = {};
+    }
+    
+    var showMissedNotifications = function(){
+      let tweets = [];
+      let columns = {};
+      
+      let tmp = new TD.services.ChirpBase;
+      
+      for(let column of Object.values(TD.controller.columnManager.getAll())){
+        for(let feed of column.getFeeds()){
+          if (feed.privateState.key in state){
+            tmp.sortIndex = state[feed.privateState.key];
+            
+            for(let tweet of [].concat.apply([], column.updateArray.map(function(chirp){
+              return chirp.getUnreadChirps(tmp);
+            }))){
+              tweets.push(tweet);
+              columns[tweet.id] = column;
+            }
+          }
+        }
+      }
+      
+      tweets.sort(TD.util.chirpReverseColumnSort);
+      
+      for(let tweet of tweets){
+        onNewTweet(columns[tweet.id], tweet);
+      }
+    };
+    
+    $(document).one("dataColumnsLoaded", function(){
+      let columns = Object.values(TD.controller.columnManager.getAll());
+      let remaining = columns.length;
+
+      for(let column of columns){
+        column.ui.getChirpContainer().one("dataColumnFeedUpdated", () => {
+          if (--remaining === 0){
+            setTimeout(showMissedNotifications, 1);
+          }
+        });
+      }
+    });
+  }
+  
   //
   // Block: Disable TweetDeck metrics.
   //
@@ -741,9 +977,9 @@
   //
   $(document).one("TD.ready", function(){
     onAppReady.forEach(func => func());
+    onAppReady = null;
     
-    $TD.loadFontSizeClass(TD.settings.getFontSize());
+    delete window.TD_SESSION;
-    $TD.loadNotificationHeadContents(getNotificationHeadContents());
     
     if (window.TD_PLUGINS){
       window.TD_PLUGINS.onReady();

Resources/Scripts/plugins.browser.js

@@ -1,12 +1,14 @@
 (function(){
+  var isReloading = false;
+  
   //
   // Class: Abstract plugin base class.
   //
   window.PluginBase = class{
     constructor(pluginSettings){
-      this.$pluginSettings = pluginSettings || {};
+      this.$requiresReload = !!(pluginSettings && pluginSettings.requiresPageReload);
     }
-
+    
     enabled(){}
     ready(){}
     disabled(){}
@@ -49,11 +51,11 @@
     }
     
     setState(plugin, enable){
-      let reloading = plugin.obj.$pluginSettings.requiresPageReload;
+      let reloading = plugin.obj.$requiresReload;
       
       if (enable && this.isDisabled(plugin)){
         if (reloading){
-          location.reload();
+          window.TDPF_requestReload();
         }
         else{
           this.disabled.splice(this.disabled.indexOf(plugin.id), 1);
@@ -63,11 +65,17 @@
       }
       else if (!enable && !this.isDisabled(plugin)){
         if (reloading){
-          location.reload();
+          window.TDPF_requestReload();
         }
         else{
           this.disabled.push(plugin.id);
           plugin.obj.disabled();
+          
+          for(let key of Object.keys(plugin.obj)){
+            if (key[0] !== '$'){
+              delete plugin.obj[key];
+            }
+          }
         }
       }
     }
@@ -84,4 +92,14 @@
   window.TDPF_setPluginState = function(identifier, enable){
     window.TD_PLUGINS.setState(window.TD_PLUGINS.findObject(identifier), enable);
   };
-})();
+  
+  //
+  // Block: Setup global function to reload the page.
+  //
+  window.TDPF_requestReload = function(){
+    if (!isReloading){
+      window.setTimeout(window.TDGF_reload, 1);
+      isReloading = true;
+    }
+  };
+})();

Resources/Scripts/plugins.js

@@ -51,4 +51,4 @@
     obj.element = element;
     return obj;
   };
-})($TDP);
+})($TDP);