Release 1.8.4

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(){
-            lockStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.Read);
-            WriteIntToStream(lockStream, GetCurrentProcessId());
-            lockStream.Flush(true);
-        }
+        // Lock file
 
         private bool ReleaseLockFileStream(){
             if (lockStream != null){
@@ -37,8 +35,10 @@ namespace TweetDuck.Configuration{
         }
 
         private Result TryCreateLockFile(){
-            if (lockStream != null){
-                throw new InvalidOperationException("Lock file already exists.");
+            void CreateLockFileStream(){
+                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(){
-            bool result = true;
+        public Result LockWait(int timeout){
+            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()){
-                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, closeTimeout, 250);
+                    if (lockingProcess.CloseMainWindow()){
+                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, closeTimeout, RetryDelay);
                     }
 
-                    if (!LockingProcess.HasExited){
-                        LockingProcess.Kill();
-                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, killTimeout, 250);
+                    if (!lockingProcess.HasExited){
+                        lockingProcess.Kill();
+                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, killTimeout, RetryDelay);
                     }
 
-                    if (LockingProcess.HasExited){
-                        LockingProcess.Dispose();
-                        LockingProcess = null;
+                    if (lockingProcess.HasExited){
+                        lockingProcess.Dispose();
+                        lockingProcess = null;
                         return true;
                     }
                 }catch(Exception ex){
                     if (ex is InvalidOperationException || ex is Win32Exception){
-                        if (LockingProcess != null){
-                            LockingProcess.Refresh();
-
-                            bool hasExited = LockingProcess.HasExited;
-                            LockingProcess.Dispose();
+                        if (lockingProcess != null){
+                            bool hasExited = CheckLockingProcessExited();
+                            lockingProcess.Dispose();
                             return hasExited;
                         }
                     }
@@ -150,27 +181,8 @@ namespace TweetDuck.Configuration{
         }
 
         private bool CheckLockingProcessExited(){
-            LockingProcess.Refresh();
-            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;
-            }
+            lockingProcess.Refresh();
+            return lockingProcess.HasExited;
         }
     }
 }

Configuration/SystemConfig.cs

@@ -1,45 +1,40 @@
 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>{
+            OnReadUnknownProperty = (obj, property, value) => false
+        };
+
         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;
+
+        // SPECIAL PROPERTIES
+        
         public bool HardwareAcceleration{
-            get => hardwareAcceleration && IsHardwareAccelerationSupported;
-            set => hardwareAcceleration = value;
+            get => _hardwareAcceleration && IsHardwareAccelerationSupported;
+            set => _hardwareAcceleration = value;
         }
 
+        // END OF CONFIG
+
         private readonly string file;
         
-        private bool hardwareAcceleration;
-        
         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);
-                if (directory == null)return false;
-
-                Directory.CreateDirectory(directory);
-
-                using(Stream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None)){
-                    WriteToStream(stream);
-                }
-
+                WindowsUtils.CreateDirectoryForFile(file);
+                Serializer.Write(file, this);
                 return true;
             }catch(Exception e){
                 Program.Reporter.HandleException("Configuration Error", "Could not save the system configuration file.", true, e);
@@ -51,11 +46,20 @@ namespace TweetDuck.Configuration{
             SystemConfig config = new SystemConfig(file);
             
             try{
-                using(Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)){
-                    config.ReadFromStream(stream);
-                }
+                Serializer.Read(file, config);
+                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,217 +1,149 @@
 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.Core.Utils;
+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>{
+            OnReadUnknownProperty = (obj, property, value) => false
+        };
 
-        private class LegacyBinder : SerializationBinder{
-            public override Type BindToType(string assemblyName, string typeName){
-                return Type.GetType(string.Format("{0}, {1}", typeName.Replace("TweetDck", "TweetDuck"), assemblyName.Replace("TweetDck", "TweetDuck")));
-            }
+        static UserConfig(){
+            Serializer.RegisterTypeConverter(typeof(WindowState), WindowState.Converter);
+
+            Serializer.RegisterTypeConverter(typeof(Point), new SingleTypeConverter<Point>{
+                ConvertToString = value => $"{value.X} {value.Y}",
+                ConvertToObject = value => {
+                    int[] elements = StringUtils.ParseInts(value, ' ');
+                    return new Point(elements[0], elements[1]);
+                }
+            });
+            
+            Serializer.RegisterTypeConverter(typeof(Size), new SingleTypeConverter<Size>{
+                ConvertToString = value => $"{value.Width} {value.Height}",
+                ConvertToObject = value => {
+                    int[] elements = StringUtils.ParseInts(value, ' ');
+                    return new Size(elements[0], elements[1]);
+                }
+            });
         }
         
-        private const int CurrentFileVersion = 11;
+        // CONFIGURATION DATA
 
-        // START OF CONFIGURATION
+        public WindowState BrowserWindow { get; set; } = new WindowState();
+        public WindowState PluginsWindow { get; set; } = new WindowState();
 
-        public WindowState BrowserWindow { get; set; }
-        public WindowState PluginsWindow { get; set; }
+        public bool ExpandLinksOnHover     { get; set; } = true;
+        public bool SwitchAccountSelectors { get; set; } = true;
+        public bool BestImageQuality       { get; set; } = true;
+        public bool EnableSpellCheck       { get; set; } = false;
+        private int _zoomLevel                           = 100;
+        private bool _muteNotifications;
         
-        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; }
+        private TrayIcon.Behavior _trayBehavior          = TrayIcon.Behavior.Disabled;
+        public bool EnableTrayHighlight    { get; set; } = true;
 
-        public int NotificationIdlePauseSeconds { get; set; }
-        public int NotificationDurationValue { get; set; }
-        public int NotificationScrollSpeed { get; set; }
+        public bool EnableUpdateCheck { get; set; } = true;
+        public string DismissedUpdate { get; set; } = null;
 
-        public TweetNotification.Position NotificationPosition { get; set; }
-        public Point CustomNotificationPosition { get; set; }
-        public int NotificationEdgeDistance { get; set; }
-        public int NotificationDisplay { get; set; }
+        public bool DisplayNotificationColumn    { get; set; } = false;
+        public bool NotificationMediaPreviews    { get; set; } = true;
+        public bool NotificationSkipOnLinkClick  { get; set; } = false;
+        public bool NotificationNonIntrusiveMode { get; set; } = true;
+        public int NotificationIdlePauseSeconds  { get; set; } = 0;
 
-        public TweetNotification.Size NotificationSize { get; set; }
-        public Size CustomNotificationSize { get; set; }
+        public bool DisplayNotificationTimer     { get; set; } = true;
+        public bool NotificationTimerCountDown   { get; set; } = false;
+        public int NotificationDurationValue     { get; set; } = 25;
 
-        public bool EnableSpellCheck { get; set; }
-        public bool ExpandLinksOnHover { get; set; }
-        public bool SwitchAccountSelectors { get; set; }
-        public bool EnableTrayHighlight { get; set; }
+        public TweetNotification.Position NotificationPosition { get; set; } = TweetNotification.Position.TopRight;
+        public Point CustomNotificationPosition                { get; set; } = ControlExtensions.InvisibleLocation;
+        public int NotificationDisplay                         { get; set; } = 0;
+        public int NotificationEdgeDistance                    { get; set; } = 8;
 
-        public bool EnableUpdateCheck { get; set; }
-        public string DismissedUpdate { get; set; }
+        public TweetNotification.Size NotificationSize { get; set; } = TweetNotification.Size.Auto;
+        public Size CustomNotificationSize             { get; set; } = Size.Empty;
+        public int NotificationScrollSpeed             { get; set; } = 10;
 
-        public string CustomCefArgs { get; set; }
-        public string CustomBrowserCSS { get; set; }
-        public string CustomNotificationCSS { get; set; }
+        private string _notificationSoundPath;
+
+        public string CustomCefArgs         { get; set; } = null;
+        public string CustomBrowserCSS      { get; set; } = null;
+        public string CustomNotificationCSS { get; set; } = null;
+
+        public bool EnableBrowserGCReload { get; set; } = false;
+        public int BrowserMemoryThreshold { get; set; } = 350;
+        
+        // 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;
-            set => notificationSoundPath = value;
+            get => string.IsNullOrEmpty(_notificationSoundPath) ? string.Empty : _notificationSoundPath;
+            set => _notificationSoundPath = value;
         }
 
         public bool MuteNotifications{
-            get => muteNotifications;
+            get => _muteNotifications;
 
             set{
-                if (muteNotifications != value){
-                    muteNotifications = value;
+                if (_muteNotifications != value){
+                    _muteNotifications = value;
                     MuteToggled?.Invoke(this, new EventArgs());
                 }
             }
         }
 
         public int ZoomLevel{
-            get => zoomLevel;
+            get => _zoomLevel;
 
             set{
-                if (zoomLevel != value){
-                    zoomLevel = value;
+                if (_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){
-                    trayBehavior = value;
+                if (_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]
-        private string file;
+        // END OF CONFIG
         
-        private int fileVersion;
-        private bool muteNotifications;
-        private int zoomLevel;
-        private string notificationSoundPath;
-        private TrayIcon.Behavior trayBehavior;
+        private readonly string file;
 
-        private UserConfig(string file){
+        public UserConfig(string file){ // TODO make private after removing UserConfigLegacy
             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 == 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;
-            }
-
-            if (fileVersion == 9){
-                NotificationScrollSpeed = 100;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 10){
-                NotificationSize = TweetNotification.Size.Auto;
-                ++fileVersion;
-            }
-
-            // update the version
-            fileVersion = CurrentFileVersion;
-            Save();
         }
 
         public bool Save(){
             try{
-                string directory = Path.GetDirectoryName(file);
-                if (directory == null)return false;
-
-                Directory.CreateDirectory(directory);
+                WindowsUtils.CreateDirectoryForFile(file);
 
                 if (File.Exists(file)){
                     string backupFile = GetBackupFile(file);
@@ -219,10 +151,7 @@ namespace TweetDuck.Configuration{
                     File.Move(file, backupFile);
                 }
 
-                using(Stream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None)){
-                    Formatter.Serialize(stream, this);
-                }
-
+                Serializer.Write(file, this);
                 return true;
             }catch(Exception e){
                 Program.Reporter.HandleException("Configuration Error", "Could not save the configuration file.", true, e);
@@ -231,22 +160,20 @@ 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)){
-                        if ((config = Formatter.Deserialize(stream) as UserConfig) != null){
-                            config.file = file;
-                        }
-                    }
-
-                    config?.UpgradeFile();
-                    break;
+                    UserConfig config = new UserConfig(file);
+                    Serializer.Read(attempt == 0 ? file : GetBackupFile(file), config);
+                    return config;
                 }catch(FileNotFoundException){
                 }catch(DirectoryNotFoundException){
                     break;
+                }catch(FormatException){
+                    UserConfig config = UserConfigLegacy.Load(file);
+                    config.Save();
+                    return config;
                 }catch(Exception e){
                     if (attempt == 0){
                         firstException = e;
@@ -258,11 +185,11 @@ namespace TweetDuck.Configuration{
                 }
             }
 
-            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 Properties{
-            ExpandLinksOnHover = 1,
-            MuteNotifications = 2,
-            HasCustomNotificationSound = 4,
-            SkipOnLinkClick = 8,
-            SwitchAccountSelectors = 16,
-            AllBrowser = ExpandLinksOnHover | SwitchAccountSelectors | MuteNotifications | HasCustomNotificationSound,
-            AllNotification = ExpandLinksOnHover | SkipOnLinkClick
+        public enum Environment{
+            Browser, Notification
         }
 
-        public static string GenerateScript(Properties properties){
-            StringBuilder build = new StringBuilder();
-            build.Append("(function(c){");
-
-            if (properties.HasFlag(Properties.ExpandLinksOnHover)){
-                build.Append("c.expandLinksOnHover=").Append(Program.UserConfig.ExpandLinksOnHover ? "true;" : "false;");
+        public static string GenerateScript(Environment environment){
+            string Bool(bool value){
+                return value ? "true," : "false,";
             }
 
-            if (properties.HasFlag(Properties.SwitchAccountSelectors)){
-                build.Append("c.switchAccountSelectors=").Append(Program.UserConfig.SwitchAccountSelectors ? "true;" : "false;");
+            StringBuilder build = new StringBuilder().Append("window.$TDX={");
+
+            build.Append("expandLinksOnHover:").Append(Bool(Program.UserConfig.ExpandLinksOnHover));
+            
+            if (environment == Environment.Browser){
+                build.Append("switchAccountSelectors:").Append(Bool(Program.UserConfig.SwitchAccountSelectors));
+                build.Append("muteNotifications:").Append(Bool(Program.UserConfig.MuteNotifications));
+                build.Append("hasCustomNotificationSound:").Append(Bool(Program.UserConfig.NotificationSoundPath.Length > 0));
+                build.Append("notificationMediaPreviews:").Append(Bool(Program.UserConfig.NotificationMediaPreviews));
             }
 
-            if (properties.HasFlag(Properties.MuteNotifications)){
-                build.Append("c.muteNotifications=").Append(Program.UserConfig.MuteNotifications ? "true;" : "false;");
+            if (environment == Environment.Notification){
+                build.Append("skipOnLinkClick:").Append(Bool(Program.UserConfig.NotificationSkipOnLinkClick));
             }
             
-            if (properties.HasFlag(Properties.HasCustomNotificationSound)){
-                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();
+            return build.Append("}").ToString();
         }
     }
 }

Core/Bridge/TweetDeckBridge.cs

@@ -1,16 +1,20 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
+using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
 
 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[] LastHighlightedTweetImages = StringUtils.EmptyArray;
 
         public static void ResetStaticProperties(){
-            LastRightClickedLink = LastHighlightedTweet = LastHighlightedQuotedTweet = string.Empty;
+            LastRightClickedLink = LastRightClickedImage = LastHighlightedTweet = LastHighlightedQuotedTweet = string.Empty;
+            LastHighlightedTweetImages = StringUtils.EmptyArray;
         }
 
         private readonly FormBrowser form;
@@ -37,10 +41,15 @@ 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 imageList){
             form.InvokeAsyncSafe(() => {
                 LastHighlightedTweet = link;
                 LastHighlightedQuotedTweet = quotedLink;
+                LastHighlightedTweetImages = imageList.Split(';');
             });
         }
 
@@ -101,7 +110,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

@@ -47,6 +47,12 @@ 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;
@@ -64,7 +70,7 @@ namespace TweetDuck.Core.Controls{
         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/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/FormBrowser.Designer.cs

@@ -38,7 +38,7 @@
             // 
             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;

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,6 +8,7 @@ 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.Other;
@@ -20,12 +20,29 @@ using TweetDuck.Plugins.Events;
 using TweetDuck.Resources;
 using TweetDuck.Updates;
 using TweetDuck.Updates.Events;
-using TweetLib.Audio.Utils;
+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;
@@ -33,6 +50,7 @@ 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;
@@ -51,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
@@ -80,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);
@@ -88,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();
 
@@ -155,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);
                 }
 
@@ -166,21 +187,23 @@ 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)){
-                e.Frame.ExecuteJavaScriptAsync(BrowserUtils.BackgroundColorFix);
+            if (e.Frame.IsMain && TwitterUtils.IsTweetDeckWebsite(e.Frame)){
+                e.Frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorFix);
 
-                UpdateProperties(PropertyBridge.Properties.AllBrowser);
+                UpdateProperties(PropertyBridge.Environment.Browser);
                 ScriptLoader.ExecuteFile(e.Frame, "code.js");
                 ReinjectCustomCSS(Config.CustomBrowserCSS);
 
@@ -191,6 +214,10 @@ namespace TweetDuck.Core{
                 }
 
                 TweetDeckBridge.ResetStaticProperties();
+
+                if (Config.EnableBrowserGCReload){
+                    memoryUsageTracker.Start(this, e.Browser, Config.BrowserMemoryThreshold);
+                }
             }
         }
 
@@ -199,7 +226,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){
@@ -216,6 +243,10 @@ namespace TweetDuck.Core{
             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){
@@ -273,7 +304,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){
@@ -331,8 +362,8 @@ namespace TweetDuck.Core{
         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)){
-                form.CancelButton = form.AddButton("Ignore");
+            using(FormMessage form = new FormMessage("Notification Sound Error", "Could not play custom notification sound.\n"+e.Message, MessageBoxIcon.Error)){
+                form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
 
                 Button btnOpenSettings = form.AddButton("View Options");
                 btnOpenSettings.Width += 16;
@@ -345,14 +376,23 @@ namespace TweetDuck.Core{
         }
 
         protected override void WndProc(ref Message m){
-            if (isLoaded && m.Msg == Program.WindowRestoreMessage){
-                using(Process process = Process.GetCurrentProcess()){
-                    if (process.Id == m.WParam.ToInt32()){
+            if (isLoaded){
+                if (m.Msg == Program.WindowRestoreMessage){
+                    if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
                         trayIcon_ClickRestore(trayIcon, new EventArgs());
                     }
-                }
 
-                return;
+                    return;
+                }
+                else if (m.Msg == Program.SubProcessMessage){
+                    int processId = m.WParam.ToInt32();
+
+                    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){
@@ -383,12 +423,12 @@ namespace TweetDuck.Core{
             browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
         }
 
-        public void UpdateProperties(PropertyBridge.Properties properties){
-            browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(properties));
+        public void UpdateProperties(PropertyBridge.Environment environment){
+            browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(environment));
         }
 
         public void ReloadToTweetDeck(){
-            browser.ExecuteScriptAsync("window.location.href = 'https://tweetdeck.twitter.com'");
+            browser.ExecuteScriptAsync($"gc&&gc();window.location.href='{TwitterUtils.TweetDeckURL}'");
         }
 
         // callback handlers
@@ -417,7 +457,14 @@ namespace TweetDuck.Core{
                         trayIcon.HasNotifications = false;
                     }
 
-                    UpdateProperties(PropertyBridge.Properties.ExpandLinksOnHover | PropertyBridge.Properties.SwitchAccountSelectors | PropertyBridge.Properties.HasCustomNotificationSound);
+                    if (Config.EnableBrowserGCReload){
+                        memoryUsageTracker.Start(this, browser.GetBrowser(), Config.BrowserMemoryThreshold);
+                    }
+                    else{
+                        memoryUsageTracker.Stop();
+                    }
+                    
+                    UpdateProperties(PropertyBridge.Environment.Browser);
 
                     notification.RequiresResize = true;
                     form.Dispose();
@@ -460,7 +507,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/Handling/ContextMenuBase.cs

@@ -1,34 +1,53 @@
-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 MenuSaveImage = 26504;
-        private const int MenuCopyImageUrl = 26505;
+        private const int MenuOpenImageUrl = 26503;
+        private const int MenuCopyImageUrl = 26504;
+        private const int MenuSaveImage = 26505;
+        private const int MenuSaveAllImages = 26506;
         private const int MenuOpenDevTools = 26599;
 
         private readonly Form form;
         
+        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)){
-                if (RegexTwitterAccount.Value.IsMatch(parameters.UnfilteredLinkUrl)){
+            bool hasTweetImage = !string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedImage);
+            lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImages;
+
+            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
+                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 +60,15 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
 
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents){
-                model.AddItem((CefMenuCommand)MenuOpenImage, "Open image in browser");
-                model.AddItem((CefMenuCommand)MenuSaveImage, "Save image as...");
+            if ((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage){
+                model.AddItem((CefMenuCommand)MenuOpenImageUrl, "Open image in browser");
                 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 +80,27 @@ namespace TweetDuck.Core.Handling{
                     break;
 
                 case MenuCopyLinkUrl:
-                    SetClipboardText(string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedLink) ? parameters.UnfilteredLinkUrl : TweetDeckBridge.LastRightClickedLink);
+                    SetClipboardText(GetLink(parameters));
                     break;
 
-                case MenuOpenImage:
-                    BrowserUtils.OpenExternalBrowser(parameters.SourceUrl);
+                case MenuOpenImageUrl:
+                    BrowserUtils.OpenExternalBrowser(TwitterUtils.GetImageLink(GetImage(parameters), ImageQuality));
                     break;
 
                 case MenuSaveImage:
-                    string fileName = GetImageFileName(parameters.SourceUrl);
-                    string extension = Path.GetExtension(fileName);
-                    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);
-                        });
-                    }
+                    TwitterUtils.DownloadImage(GetImage(parameters), ImageQuality);
+                    break;
 
+                case MenuSaveAllImages:
+                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, 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 +112,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 +125,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 +140,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

@@ -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 CefSharp.WinForms;
-using System.Drawing;
+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.AcceptButton = form.AddButton("Yes");
+                    form = new FormMessage("Browser Confirmation", messageText, MessageBoxIcon.None);
+                    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.AcceptButton = form.AddButton("OK");
+                    form = new FormMessage("Browser Prompt", messageText, MessageBoxIcon.None);
+                    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),
-                        Size = new Size(form.ClientSize.Width-54, 20)
+                        Location = new Point(BrowserUtils.Scale(22, dpiScale), form.ActionPanelY-BrowserUtils.Scale(46, dpiScale)),
+                        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{
-    abstract class RequestHandler : IRequestHandler{
+namespace TweetDuck.Core.Handling.General{
+    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,7 +1,8 @@
 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();
         }

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{
@@ -97,6 +98,7 @@ namespace TweetDuck.Core.Notification{
 
             this.browser = new ChromiumWebBrowser("about:blank"){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
+                JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler()
             };
 
@@ -111,7 +113,7 @@ namespace TweetDuck.Core.Notification{
             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);
 
@@ -141,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);
             }
         }
 
@@ -180,7 +185,7 @@ 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){

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;
@@ -17,12 +19,8 @@ namespace TweetDuck.Core.Notification{
         private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
         private static readonly string PluginScriptIdentifier = ScriptLoader.GetRootIdentifier(PluginManager.PluginNotificationScriptFile);
 
-        private static readonly string NotificationJS, PluginJS;
-
-        static FormNotificationMain(){
-            NotificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
-            PluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
-        }
+        private static readonly string NotificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
+        private static readonly string PluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
         
         private readonly PluginManager plugins;
 
@@ -86,6 +84,8 @@ namespace TweetDuck.Core.Notification{
 
             this.plugins = pluginManager;
             
+            browser.KeyboardHandler = new KeyboardHandlerNotification(this);
+            
             browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(owner, this));
             browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
 
@@ -167,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)){

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) => {
-                if (args.Frame.IsMain && browser.Address != "about:blank"){
-                    ScriptLoader.ExecuteScript(args.Frame, "window.setTimeout($TD_NotificationScreenshot.trigger, 67)", "gen:screenshot");
+            browser.LoadingStateChanged += (sender, args) => {
+                if (!args.IsLoading){
+                    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;
-            disposer.Start();
+            OnFinished();
         }
 
         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;
-            disposer.Start();
+            OnFinished();
             #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/SoundNotification.cs

@@ -1,6 +1,5 @@
 using System;
 using TweetLib.Audio;
-using TweetLib.Audio.Utils;
 
 namespace TweetDuck.Core.Notification{
     sealed class SoundNotification : IDisposable{

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{

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

@@ -5,7 +5,59 @@ 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;
@@ -35,7 +87,7 @@ namespace TweetDuck.Core.Other{
 
             this.prevLabelWidth = labelMessage.Width;
             this.prevLabelHeight = labelMessage.Height;
-            this.minFormWidth = BrowserUtils.Scale(40, dpiScale);
+            this.minFormWidth = BrowserUtils.Scale(42, dpiScale);
 
             switch(messageIcon){
                 case MessageBoxIcon.Information:
@@ -56,21 +108,25 @@ 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,
@@ -94,6 +150,18 @@ namespace TweetDuck.Core.Other{
             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;
         }
 
@@ -108,7 +176,7 @@ namespace TweetDuck.Core.Other{
         
         private void RecalculateButtonLocation(){
             int dist = ButtonDistance;
-            int start = ClientWidth-dist-BrowserUtils.Scale(1, dpiScale);
+            int start = ClientWidth-dist;
 
             for(int index = 0; index < buttonCount; index++){
                 Control control = panelActions.Controls[index];
@@ -133,7 +201,7 @@ namespace TweetDuck.Core.Other{
                 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;
 
@@ -144,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.cs

@@ -80,7 +80,7 @@ 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();
                 ReloadPluginList();
             }

Core/Other/FormSettings.cs

@@ -109,7 +109,12 @@ namespace TweetDuck.Core.Other{
 
             if (!tab.IsInitialized){
                 foreach(Control control in tab.Control.InteractiveControls){
-                    control.MouseLeave += control_MouseLeave;
+                    if (control is ComboBox){
+                        control.MouseLeave += control_MouseLeave;
+                    }
+                    else if (control is TrackBar){
+                        control.MouseWheel += control_MouseWheel;
+                    }
                 }
 
                 tab.Control.OnReady();
@@ -129,6 +134,11 @@ namespace TweetDuck.Core.Other{
             panelContents.Focus();
         }
 
+        private void control_MouseWheel(object sender, MouseEventArgs e){
+            ((HandledMouseEventArgs)e).Handled = true;
+            panelContents.Focus();
+        }
+
         private class SettingsTab{
             public Button Button { get; }
 

Core/Other/Settings/BaseTabSettings.cs

@@ -25,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 option to take place. Do you want to restart now?", Program.BrandName+" Options", 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/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{
@@ -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 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/DialogSettingsManage.cs

@@ -58,7 +58,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 case State.Deciding:
                     // Reset
                     if (radioReset.Checked){
-                        if (MessageBox.Show("This will reset all of your program options. Plugins will not be affected. Do you want to proceed?", "Reset "+Program.BrandName+" Options", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                        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;
@@ -74,8 +74,8 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         using(OpenFileDialog dialog = new OpenFileDialog{
                             AutoUpgradeEnabled = true,
                             DereferenceLinks = true,
-                            Title = "Import "+Program.BrandName+" Profile",
-                            Filter = Program.BrandName+" Profile (*.tdsettings)|*.tdsettings"
+                            Title = "Import TweetDuck Profile",
+                            Filter = "TweetDuck Profile (*.tdsettings)|*.tdsettings"
                         }){
                             if (dialog.ShowDialog() != DialogResult.OK){
                                 return;
@@ -116,7 +116,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         }
                     }
                     else{
-                        Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing "+Program.BrandName+" profile.", true, importManager.LastException);
+                        Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing TweetDuck profile.", true, importManager.LastException);
                     }
                     
                     DialogResult = DialogResult.OK;
@@ -129,9 +129,9 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         AutoUpgradeEnabled = true,
                         OverwritePrompt = true,
                         DefaultExt = "tdsettings",
-                        FileName = Program.BrandName+".tdsettings",
-                        Title = "Export "+Program.BrandName+" Profile",
-                        Filter = Program.BrandName+" Profile (*.tdsettings)|*.tdsettings"
+                        FileName = "TweetDuck.tdsettings",
+                        Title = "Export TweetDuck Profile",
+                        Filter = "TweetDuck Profile (*.tdsettings)|*.tdsettings"
                     }){
                         if (dialog.ShowDialog() != DialogResult.OK){
                             return;
@@ -144,7 +144,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                     ExportManager manager = new ExportManager(file, plugins);
 
                     if (!manager.Export(Flags)){
-                        Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting "+Program.BrandName+" profile.", true, manager.LastException);
+                        Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting TweetDuck profile.", true, manager.LastException);
                     }
 
                     DialogResult = DialogResult.OK;

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,7 +138,7 @@ 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){

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -33,12 +33,16 @@
             this.btnRestart = new System.Windows.Forms.Button();
             this.btnOpenAppFolder = new System.Windows.Forms.Button();
             this.btnOpenDataFolder = new System.Windows.Forms.Button();
+            this.numMemoryThreshold = new TweetDuck.Core.Controls.NumericUpDownEx();
+            this.checkBrowserGCReload = new System.Windows.Forms.CheckBox();
             this.labelApp = new System.Windows.Forms.Label();
             this.panelApp = new System.Windows.Forms.Panel();
             this.labelPerformance = new System.Windows.Forms.Label();
             this.panelPerformance = new System.Windows.Forms.Panel();
+            this.labelMemoryUsage = new System.Windows.Forms.Label();
             this.panelConfiguration = new System.Windows.Forms.Panel();
             this.labelConfiguration = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numMemoryThreshold)).BeginInit();
             this.panelApp.SuspendLayout();
             this.panelPerformance.SuspendLayout();
             this.panelConfiguration.SuspendLayout();
@@ -52,8 +56,7 @@
             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
@@ -65,8 +68,7 @@
             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" +
-        " with rendering.");
+            this.toolTip.SetToolTip(this.checkHardwareAcceleration, "Uses your graphics card to improve performance.\r\nDisable if you experience issues with rendering.");
             this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
             // 
             // btnEditCefArgs
@@ -107,8 +109,7 @@
             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" +
-        "nch.");
+            this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at launch.");
             this.btnRestart.UseVisualStyleBackColor = true;
             // 
             // btnOpenAppFolder
@@ -133,6 +134,47 @@
             this.toolTip.SetToolTip(this.btnOpenDataFolder, "Opens the folder where your profile data is located.");
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
             // 
+            // numMemoryThreshold
+            // 
+            this.numMemoryThreshold.Increment = new decimal(new int[] {
+            50,
+            0,
+            0,
+            0});
+            this.numMemoryThreshold.Location = new System.Drawing.Point(202, 82);
+            this.numMemoryThreshold.Maximum = new decimal(new int[] {
+            3000,
+            0,
+            0,
+            0});
+            this.numMemoryThreshold.Minimum = new decimal(new int[] {
+            200,
+            0,
+            0,
+            0});
+            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 = new decimal(new int[] {
+            350,
+            0,
+            0,
+            0});
+            // 
+            // checkBrowserGCReload
+            // 
+            this.checkBrowserGCReload.AutoSize = true;
+            this.checkBrowserGCReload.Location = new System.Drawing.Point(6, 84);
+            this.checkBrowserGCReload.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
+            this.checkBrowserGCReload.Name = "checkBrowserGCReload";
+            this.checkBrowserGCReload.Size = new System.Drawing.Size(190, 17);
+            this.checkBrowserGCReload.TabIndex = 3;
+            this.checkBrowserGCReload.Text = "Enable Browser Memory Threshold";
+            this.toolTip.SetToolTip(this.checkBrowserGCReload, "Automatically reloads TweetDeck to save memory. This option only works\r\nif the browser is in a \'default state\', i.e. all modals and drawers are closed,\r\nand all columns are scrolled to top. Some notifications may be lost.");
+            this.checkBrowserGCReload.UseVisualStyleBackColor = true;
+            // 
             // labelApp
             // 
             this.labelApp.AutoSize = true;
@@ -172,20 +214,33 @@
             // 
             this.panelPerformance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelPerformance.Controls.Add(this.checkBrowserGCReload);
+            this.panelPerformance.Controls.Add(this.numMemoryThreshold);
+            this.panelPerformance.Controls.Add(this.labelMemoryUsage);
             this.panelPerformance.Controls.Add(this.checkHardwareAcceleration);
             this.panelPerformance.Controls.Add(this.btnClearCache);
             this.panelPerformance.Location = new System.Drawing.Point(9, 137);
             this.panelPerformance.Name = "panelPerformance";
-            this.panelPerformance.Size = new System.Drawing.Size(322, 54);
+            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, 238);
+            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;
@@ -194,7 +249,7 @@
             // 
             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, 215);
+            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);
@@ -212,7 +267,8 @@
             this.Controls.Add(this.panelApp);
             this.Controls.Add(this.labelApp);
             this.Name = "TabSettingsAdvanced";
-            this.Size = new System.Drawing.Size(340, 277);
+            this.Size = new System.Drawing.Size(340, 328);
+            ((System.ComponentModel.ISupportInitialize)(this.numMemoryThreshold)).EndInit();
             this.panelApp.ResumeLayout(false);
             this.panelPerformance.ResumeLayout(false);
             this.panelPerformance.PerformLayout();
@@ -239,5 +295,8 @@
         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

@@ -23,6 +23,10 @@ namespace TweetDuck.Core.Other.Settings{
                 checkHardwareAcceleration.Checked = false;
             }
 
+            checkBrowserGCReload.Checked = Config.EnableBrowserGCReload;
+            numMemoryThreshold.Enabled = checkBrowserGCReload.Checked;
+            numMemoryThreshold.SetValueSafe(Config.BrowserMemoryThreshold);
+
             BrowserCache.CalculateCacheSize(bytes => this.InvokeSafe(() => {
                 if (bytes == -1L){
                     btnClearCache.Text = "Clear Cache (unknown size)";
@@ -37,6 +41,9 @@ 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;
             
@@ -49,8 +56,7 @@ namespace TweetDuck.Core.Other.Settings{
         private void btnClearCache_Click(object sender, EventArgs e){
             btnClearCache.Enabled = false;
             BrowserCache.SetClearOnExit();
-
-            MessageBox.Show("Cache will be automatically cleared when "+Program.BrandName+" exits.", "Clear Cache", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            FormMessage.Information("Clear Cache", "Cache will be automatically cleared when TweetDuck exits.", FormMessage.OK);
         }
 
         private void checkHardwareAcceleration_CheckedChanged(object sender, EventArgs e){
@@ -59,6 +65,15 @@ namespace TweetDuck.Core.Other.Settings{
             PromptRestart();
         }
 
+        private void checkBrowserGCReload_CheckedChanged(object sender, EventArgs e){
+            Config.EnableBrowserGCReload = checkBrowserGCReload.Checked;
+            numMemoryThreshold.Enabled = checkBrowserGCReload.Checked;
+        }
+
+        private void numMemoryThreshold_ValueChanged(object sender, EventArgs e){
+            Config.BrowserMemoryThreshold = (int)numMemoryThreshold.Value;
+        }
+
         private void btnEditCefArgs_Click(object sender, EventArgs e){
             DialogSettingsCefArgs form = new DialogSettingsCefArgs();
 

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -43,6 +43,7 @@
             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.panelUI.SuspendLayout();
             this.panelUpdates.SuspendLayout();
@@ -58,8 +59,7 @@
             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" +
-        "p instead.");
+            this.toolTip.SetToolTip(this.checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
             this.checkExpandLinks.UseVisualStyleBackColor = true;
             // 
             // comboBoxTrayType
@@ -82,18 +82,17 @@
             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" +
-        "pup or audio notifications.\r\nThe icon resets when the main window is restored.");
+            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.");
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
             // 
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
-            this.checkSpellCheck.Location = new System.Drawing.Point(6, 51);
+            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;
@@ -107,8 +106,7 @@
             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" +
-        "in.");
+            this.toolTip.SetToolTip(this.checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
             // btnCheckUpdates
@@ -125,11 +123,11 @@
             // labelZoomValue
             // 
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelZoomValue.Location = new System.Drawing.Point(141, 100);
+            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.");
@@ -143,8 +141,7 @@
             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" +
-        "iple accounts, instead of TweetDeck\'s default behavior.");
+            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.");
             this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
             // 
             // labelTrayIcon
@@ -162,24 +159,24 @@
             this.trackBarZoom.AutoSize = false;
             this.trackBarZoom.BackColor = System.Drawing.SystemColors.Control;
             this.trackBarZoom.LargeChange = 25;
-            this.trackBarZoom.Location = new System.Drawing.Point(3, 99);
+            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(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.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(3, 83);
+            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";
             // 
             // zoomUpdateTimer
@@ -202,6 +199,7 @@
             // 
             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);
@@ -210,14 +208,14 @@
             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, 134);
+            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(5, 189);
+            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);
@@ -230,7 +228,7 @@
             | 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, 335);
+            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;
@@ -242,7 +240,7 @@
             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, 212);
+            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;
@@ -251,13 +249,25 @@
             // 
             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, 312);
+            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);
@@ -269,7 +279,7 @@
             this.Controls.Add(this.panelUI);
             this.Controls.Add(this.labelUI);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(340, 400);
+            this.Size = new System.Drawing.Size(340, 422);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.panelUI.ResumeLayout(false);
             this.panelUI.PerformLayout();
@@ -303,5 +313,6 @@
         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,6 +61,10 @@ 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();
@@ -89,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;
@@ -103,7 +108,7 @@ namespace TweetDuck.Core.Other.Settings{
                     btnCheckUpdates.Enabled = true;
 
                     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);
                     }
                 }
             });

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -63,6 +63,7 @@
             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.tableLayoutDurationButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).BeginInit();
@@ -273,11 +274,11 @@
             // checkSkipOnLinkClick
             // 
             this.checkSkipOnLinkClick.AutoSize = true;
-            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 28);
+            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 = 1;
+            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;
@@ -291,42 +292,40 @@
             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" +
-        "itle.");
+            this.toolTip.SetToolTip(this.checkColumnName, "Shows column name each notification originated\r\nfrom in the notification window title.");
             this.checkColumnName.UseVisualStyleBackColor = true;
             // 
             // labelIdlePause
             // 
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(3, 83);
+            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.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 99);
+            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(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(6, 51);
+            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 = 2;
+            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 " +
-        "delayed until the cursor moves away to prevent accidental clicks.");
+            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.");
             this.checkNonIntrusive.UseVisualStyleBackColor = true;
             // 
             // checkTimerCountDown
@@ -391,6 +390,7 @@
             // 
             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);
@@ -398,7 +398,7 @@
             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, 126);
+            this.panelGeneral.Size = new System.Drawing.Size(322, 149);
             this.panelGeneral.TabIndex = 1;
             // 
             // labelScrollSpeedValue
@@ -439,7 +439,7 @@
             // 
             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, 372);
+            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);
@@ -460,7 +460,7 @@
             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, 395);
+            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;
@@ -475,7 +475,7 @@
             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, 204);
+            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;
@@ -494,7 +494,7 @@
             // 
             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, 181);
+            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);
@@ -505,7 +505,7 @@
             // 
             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, 584);
+            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);
@@ -521,7 +521,7 @@
             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, 607);
+            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;
@@ -531,6 +531,18 @@
             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);
@@ -544,7 +556,7 @@
             this.Controls.Add(this.labelGeneral);
             this.Controls.Add(this.panelTimer);
             this.Name = "TabSettingsNotifications";
-            this.Size = new System.Drawing.Size(340, 708);
+            this.Size = new System.Drawing.Size(340, 731);
             this.ParentChanged += new System.EventHandler(this.TabSettingsNotifications_ParentChanged);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
             this.tableLayoutDurationButtons.ResumeLayout(false);
@@ -603,5 +615,6 @@
         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;
@@ -52,7 +51,7 @@ 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.TrimStart('\\', '.')+" ("+screen.Bounds.Width+"x"+screen.Bounds.Height+")");
@@ -64,14 +63,15 @@ 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.ToString(CultureInfo.InvariantCulture)+"%";
+            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;
@@ -97,6 +97,7 @@ 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;
 
@@ -154,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();
 
@@ -219,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;
         }
@@ -233,7 +238,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         private void trackBarScrollSpeed_ValueChanged(object sender, EventArgs e){
             if (trackBarScrollSpeed.AlignValueToTick()){
-                labelScrollSpeedValue.Text = trackBarScrollSpeed.Value.ToString(CultureInfo.InvariantCulture)+"%";
+                labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
                 Config.NotificationScrollSpeed = trackBarScrollSpeed.Value;
             }
         }
@@ -244,7 +249,7 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         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);
         }

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -77,6 +77,7 @@
             this.tbCustomSound.Name = "tbCustomSound";
             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
             // 

Core/Other/Settings/TabSettingsSounds.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Core.Notification;
-using TweetLib.Audio.Utils;
+using TweetLib.Audio;
 
 namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsSounds : BaseTabSettings{
@@ -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 const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
+        public static void SetupCefArgs(IDictionary<string, string> args){
+            if (!Program.SystemConfig.HardwareAcceleration){
+                args["disable-gpu"] = "1";
+                args["disable-gpu-vsync"] = "1";
+            }
             
-        public static readonly string[] DictionaryWords = {
-            "tweetdeck", "TweetDeck", "tweetduck", "TweetDuck", "TD"
-        };
+            args["disable-extensions"] = "1";
+            args["disable-plugins-discovery"] = "1";
+            args["enable-system-flash"] = "0";
+
+            if (args.TryGetValue("js-flags", out string jsFlags)){
+                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){
@@ -101,14 +107,6 @@ namespace TweetDuck.Core.Utils{
             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]+(?:=(?:\S*""[^""]*?""\S*|\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,94 @@
+using System;
+using CefSharp;
+using System.Drawing;
+using System.IO;
+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, ImageQuality quality){
+            DownloadImages(new string[]{ url }, quality);
+        }
+
+        public static void DownloadImages(string[] urls, ImageQuality quality){
+            if (urls.Length == 0){
+                return;
+            }
+
+            string file = BrowserUtils.GetFileNameFromUrl(ExtractImageBaseLink(urls[0]));
+            string ext = Path.GetExtension(file); // includes dot
+            
+            using(SaveFileDialog dialog = new SaveFileDialog{
+                AutoUpgradeEnabled = true,
+                OverwritePrompt = urls.Length == 1,
+                Title = "Save image",
+                FileName = file,
+                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(GetImageLink(urls[0], quality), 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{
-    class CombinedFileStream : IDisposable{
+namespace TweetDuck.Data{
+    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 separatorIndex == -1 ? keyName : keyName.Substring(0, separatorIndex);
+            return StringUtils.ExtractBefore(keyName, KeySeparator);
         }
 
         public void Flush(){
@@ -96,15 +96,14 @@ namespace TweetDuck.Core.Other.Settings.Export{
 
             public string KeyName{
                 get{
-                    int index = Identifier.IndexOf(KeySeparator);
-                    return index == -1 ? Identifier : Identifier.Substring(0, index);
+                    return StringUtils.ExtractBefore(Identifier, KeySeparator);
                 }
             }
 
             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);
-
-                    if (!string.IsNullOrEmpty(dir)){
-                        Directory.CreateDirectory(dir);
-                    }
+                    WindowsUtils.CreateDirectoryForFile(path);
                 }
 
                 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{
-    class CommandLineArgs{
+namespace TweetDuck.Data{
+    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{
-    class InjectedHTML{
+namespace TweetDuck.Data{
+    sealed class InjectedHTML{
         public enum Position{
             Before, After
         }

Data/Serialization/FileSerializer.cs

@@ -0,0 +1,136 @@
+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 bool OnReadUnknownPropertyHandler(T obj, string property, string value);
+        public OnReadUnknownPropertyHandler OnReadUnknownProperty { 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){
+            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 if (!(OnReadUnknownProperty?.Invoke(obj, property, value) ?? false)){
+                        throw new SerializationException($"Invalid file format, unknown property: {property}+");
+                    }
+                }
+            }
+        }
+
+        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{
-    class TwoKeyDictionary<K1, K2, V>{
+namespace TweetDuck.Data{
+    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{
-    [Serializable]
-    class WindowState{
+namespace TweetDuck.Data{
+    [Serializable] // TODO remove attribute with UserConfigLegacy
+    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.cs

@@ -25,7 +25,7 @@ namespace TweetDuck.Plugins.Controls{
             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;

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 plugin != null && plugin.Identifier.Equals(Identifier);
+            return obj is Plugin plugin && 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.Root: throw new Exception("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.");
+                    case PluginFolder.Data: throw new ArgumentException("File path has to be relative to the plugin data folder.");
+                    case PluginFolder.Root: throw new ArgumentException("File path has to be relative to the plugin root folder.");
+                    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
-            Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
-
+            WindowsUtils.CreateDirectoryForFile(fullPath);
             File.WriteAllText(fullPath, contents, Encoding.UTF8);
             fileCache[token, SanitizeCacheKey(path)] = contents;
         }

Plugins/PluginConfig.cs

@@ -28,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(stream, Encoding.UTF8)){
+                using(StreamReader reader = new StreamReader(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.UTF8)){
                     string line = reader.ReadLine();
 
                     if (line == "#Disabled"){
@@ -41,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);
@@ -49,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(stream, Encoding.UTF8)){
+                using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){
                     writer.WriteLine("#Disabled");
 
                     foreach(string disabled in Disabled){

Plugins/PluginScriptGenerator.cs

@@ -1,5 +1,4 @@
-using System.Globalization;
-using TweetDuck.Plugins.Enums;
+using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins{
     static class PluginScriptGenerator{
@@ -11,7 +10,7 @@ namespace TweetDuck.Plugins{
             return PluginGen
                 .Replace("%params", environment.GetScriptVariables())
                 .Replace("%id", pluginIdentifier)
-                .Replace("%token", pluginToken.ToString(CultureInfo.InvariantCulture))
+                .Replace("%token", pluginToken.ToString())
                 .Replace("%contents", pluginContents);
         }
 
@@ -19,7 +18,7 @@ namespace TweetDuck.Plugins{
 
 /* PluginGen
 
-(function(%params, $i, $d){
+(function(%params, $d){
   let tmp = {
     id: '%id',
     obj: new class extends PluginBase{%contents}

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.8.1";
-        public const string VersionFull = "1.8.1.0";
+        public const string VersionTag = "1.8.4";
+        public const string VersionFull = "1.8.4";
 
         public static readonly Version Version = new Version(VersionTag);
         public static readonly bool IsPortable = File.Exists("makeportable");
@@ -32,96 +34,83 @@ 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.Lock();
+                LockManager.Result lockResult = LockManager.LockWait(10000);
 
-                    if (lockResult == LockManager.Result.Success){
-                        break;
-                    }
-                    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);
+                while(lockResult != LockManager.Result.Success){
+                    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);
                         return;
                     }
-                    else if (attempt == 20){
-                        using(FormMessage form = new FormMessage(BrandName+" Cannot Restart", BrandName+" is taking too long to close.", MessageBoxIcon.Warning)){
-                            form.CancelButton = form.AddButton("Exit");
-                            form.ActiveControl = form.AddButton("Retry", DialogResult.Retry);
-
-                            if (form.ShowDialog() == DialogResult.Retry){
-                                attempt /= 2;
-                                continue;
-                            }
-
-                            return;
-                        }
+                    else if (!FormMessage.Warning("TweetDuck Cannot Restart", "TweetDuck is taking too long to close.", FormMessage.Retry, FormMessage.Exit)){
+                        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
-                        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.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)){
                         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;
                 }
             }
@@ -151,16 +140,8 @@ namespace TweetDuck{
                 #endif
             };
 
-            CommandLineArgsParser.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
-
-            if (!SystemConfig.HardwareAcceleration){
-                settings.CefCommandLineArgs["disable-gpu"] = "1";
-                settings.CefCommandLineArgs["disable-gpu-vsync"] = "1";
-            }
-            
-            settings.CefCommandLineArgs["disable-extensions"] = "1";
-            settings.CefCommandLineArgs["disable-plugins-discovery"] = "1";
-            settings.CefCommandLineArgs["enable-system-flash"] = "0";
+            CommandLineArgs.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
+            BrowserUtils.SetupCefArgs(settings.CefCommandLineArgs);
             
             Cef.EnableHighDPISupport();
             Cef.Initialize(settings, false, new BrowserProcessHandler());
@@ -195,15 +176,13 @@ namespace TweetDuck{
 
         private static void plugins_Reloaded(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                string doubleNL = Environment.NewLine+Environment.NewLine;
-                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);
+                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);
             }
         }
 
         private static void plugins_Executed(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                string doubleNL = Environment.NewLine+Environment.NewLine;
-                MessageBox.Show("Failed to execute the following plugins:"+doubleNL+string.Join(doubleNL, e.Errors), "Error Executing Plugins", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n"+string.Join("\n\n", e.Errors), FormMessage.OK);
             }
         }
 

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 (ex != null){
+                if (args.ExceptionObject is Exception ex) {
                     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,14 +43,13 @@ namespace TweetDuck{
         public void HandleException(string caption, string message, bool canIgnore, Exception e){
             bool loggedSuccessfully = Log(e.ToString());
 
-            FormMessage form = new FormMessage(caption, message+Environment.NewLine+"Error: "+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 btnIgnore = form.AddButton("Ignore", DialogResult.Ignore);
+            Button btnExit = form.AddButton(FormMessage.Exit);
+            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,
@@ -87,9 +83,7 @@ namespace TweetDuck{
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            FormMessage form = new FormMessage(caption, message, MessageBoxIcon.Error);
-            form.ActiveControl = form.AddButton("Exit");
-            form.ShowDialog();
+            FormMessage.Error(caption, message, "Exit");
 
             try{
                 Process.GetCurrentProcess().Kill();

Resources/Plugins/edit-design/browser.js

@@ -1,9 +1,3 @@
-constructor(){
-  super({
-    requiresPageReload: true
-  })
-}
-
 enabled(){
   // elements & data
   this.css = null;
@@ -16,9 +10,7 @@ enabled(){
     fontSize: "12px",
     hideTweetActions: true,
     moveTweetActionsToRight: true,
-    revertReplies: false,
     themeColorTweaks: true,
-    roundedScrollBars: false,
     revertIcons: true,
     smallComposeTextSize: false,
     optimizeAnimations: true,
@@ -60,7 +52,6 @@ enabled(){
     this.firstTimeLoad = obj === null;
     
     this.onStageReady();
-    this.injectDeciderReplyHook(obj && obj.revertReplies);
   };
   
   if (this.$$wasLoadedBefore){
@@ -129,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(){
-        new customDesignModal();
-      });
+      itemEditDesign.on("click", "a", this.openEditDesignDialog);
       
       itemEditDesign.hover(function(){
         $(this).addClass("is-selected");
@@ -249,18 +238,7 @@ enabled(){
     }
   });
   
-  // decider injections
-  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.$requiresReload = enable;
-  };
+  this.openEditDesignDialog = () => new customDesignModal();
   
   // animation optimization
   this.optimizations = null;
@@ -353,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 }");
@@ -389,22 +367,6 @@ enabled(){
       this.css.insert(".compose-text { font-size: 12px !important; height: 120px !important }");
     }
     
-    if (!this.config.roundedScrollBars){
-      this.css.insert(".scroll-styled-v:not(.antiscroll-inner)::-webkit-scrollbar { width: 8px }");
-      this.css.insert(".scroll-styled-h:not(.antiscroll-inner)::-webkit-scrollbar { height: 8px }");
-      this.css.insert(".scroll-styled-v::-webkit-scrollbar-thumb { border-radius: 0 }");
-      this.css.insert(".scroll-styled-h::-webkit-scrollbar-thumb { border-radius: 0 }");
-      this.css.insert(".antiscroll-scrollbar { border-radius: 0 }");
-      this.css.insert(".antiscroll-scrollbar-vertical { margin-top: 0 }");
-      this.css.insert(".antiscroll-scrollbar-horizontal { margin-left: 0 }");
-      this.css.insert(".app-columns-container::-webkit-scrollbar { height: 9px !important }");
-    }
-    
-    if (this.config.revertReplies){
-      this.css.insert(".activity-header + .tweet .tweet-context { margin-left: -35px }");
-      this.css.insert(".activity-header + .tweet .tweet-context .obj-left { margin-right: 5px }");
-    }
-    
     if (this.config.revertIcons){
       this.icons = document.createElement("style");
       this.icons.innerHTML = `
@@ -497,7 +459,8 @@ enabled(){
 .icon-list-filled:before{content:"\\f014";font-family:tweetdeckold}
 .icon-user-filled:before{content:"\\f035";font-family:tweetdeckold}
 
-.column-header .column-type-icon { bottom: 26px !important }
+.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);
@@ -540,11 +503,6 @@ enabled(){
 .txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: ${this.config.fontSize} !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 }
-` : ``}
-
 ${this.config.revertIcons ? `
 @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}
@@ -575,6 +533,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(){
@@ -598,6 +582,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 -->
           
@@ -102,10 +98,6 @@
             <input data-td-key="themeColorTweaks" class="js-theme-checkbox touch-larger-label" type="checkbox">
             Theme color tweaks
           </label>
-          <label class="checkbox">
-            <input data-td-key="roundedScrollBars" class="js-theme-checkbox touch-larger-label" type="checkbox">
-            Rounded scroll bars
-          </label>
           <label class="checkbox">
             <input data-td-key="revertIcons" class="js-theme-checkbox touch-larger-label" type="checkbox">
             Revert icon design

Resources/Plugins/emoji-keyboard/.meta

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

Resources/Plugins/emoji-keyboard/browser.js

@@ -29,13 +29,13 @@ enabled(){
   // 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-search { height: auto; padding: 4px 10px 8px; background-color: #292f33; border-radius: 2px 2px 0 0 }");
+  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 2px 2px }");
+  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 }");
@@ -306,6 +306,9 @@ ready(){
           case 2: this.emojiData3.push("___"); break;
         }
         
+        continue;
+      }
+      else if (line[0] === '#'){
         if (line[1] === '1'){
           skinToneState = 1;
         }

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

@@ -1,6 +1,9 @@
 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:
@@ -8,7 +11,7 @@ Remove unnecessary info:
   Search:   \s;.+?#.+?\s
   Replace:  ;
   
-  Search:  U+
+  Search:   U\+
   Replace:  
 
 
@@ -27,7 +30,18 @@ Replace skin tone variations:
     1F9D2;child
     1F9D2 $;child
   
-  TODO: Update this section with exact regexes
+  
+  Search:   1F3FB
+  Replace:  $
+  
+  Search:   ^.*1F3F[C-F].*$
+  Replace:  
+  
+  Search:   tone\n\n\n\n
+  Replace:  
+  
+  Search:   : light skin.*$
+  Replace:  
 
 
 ----------------
@@ -37,19 +51,9 @@ Move some emoji:
 > 1F91D;handshake
   1F463;footprints
 
-  1F939 $ 200D 2640 FE0F;woman juggling
-> 1F6CC;person in bed
-> 1F6CC $;person in bed
-> 1F6C0;person taking bath
-> 1F6C0 $;person taking bath
-  1F46B;man and woman holding hands
 
-
-------------------
-Remove some emoji:
-
-  1F469 $ 200D 1F692;woman firefighter
-> remove all non-gendered duplicates below here
+-------------------------
+Remove unsupported emoji:
 
   3030;wavy dash
 > remove copyright
@@ -59,12 +63,81 @@ Remove some emoji:
   
   1F441;eye
 > remove eye in speech bubble
-  1F445;tongue
+  1F9E0;brain
+  
+  (more may be present after an emoji update)
 
 
--------------------------
-Add preprocessor symbols:
+-------------------------------
+Remove non-gendered duplicates:
 
-  @ = group separator
-  @1 = enable skin tones below
-  @2 = disable skin tones below
+  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/emoji-keyboard/emoji-ordering.txt

@@ -1,14 +1,14 @@
 1F600;grinning face
-1F601;grinning face with smiling eyes
+1F601;beaming face with smiling eyes
 1F602;face with tears of joy
 1F923;rolling on the floor laughing
-1F603;smiling face with open mouth
-1F604;smiling face with open mouth & smiling eyes
-1F605;smiling face with open mouth & cold sweat
-1F606;smiling face with open mouth & closed eyes
+1F603;grinning face with big eyes
+1F604;grinning face with smiling eyes
+1F605;grinning face with sweat
+1F606;grinning squinting face
 1F609;winking face
 1F60A;smiling face with smiling eyes
-1F60B;face savouring delicious food
+1F60B;face savoring food
 1F60E;smiling face with sunglasses
 1F60D;smiling face with heart-eyes
 1F618;face blowing a kiss
@@ -18,14 +18,16 @@
 263A;smiling face
 1F642;slightly smiling face
 1F917;hugging face
+1F929;star-struck
 1F914;thinking face
+1F928;face with raised eyebrow
 1F610;neutral face
 1F611;expressionless face
 1F636;face without mouth
 1F644;face with rolling eyes
 1F60F;smirking face
 1F623;persevering face
-1F625;disappointed but relieved face
+1F625;sad but relieved face
 1F62E;face with open mouth
 1F910;zipper-mouth face
 1F62F;hushed face
@@ -33,13 +35,12 @@
 1F62B;tired face
 1F634;sleeping face
 1F60C;relieved face
-1F913;nerd face
-1F61B;face with stuck-out tongue
-1F61C;face with stuck-out tongue & winking eye
-1F61D;face with stuck-out tongue & closed eyes
+1F61B;face with tongue
+1F61C;winking face with tongue
+1F61D;squinting face with tongue
 1F924;drooling face
 1F612;unamused face
-1F613;face with cold sweat
+1F613;downcast face with sweat
 1F614;pensive face
 1F615;confused face
 1F643;upside-down face
@@ -57,22 +58,30 @@
 1F627;anguished face
 1F628;fearful face
 1F629;weary face
+1F92F;exploding head
 1F62C;grimacing face
-1F630;face with open mouth & cold sweat
+1F630;anxious face with sweat
 1F631;face screaming in fear
 1F633;flushed face
+1F92A;crazy face
 1F635;dizzy face
 1F621;pouting face
 1F620;angry face
-1F607;smiling face with halo
-1F920;cowboy hat face
-1F921;clown face
-1F925;lying face
+1F92C;face with symbols on mouth
 1F637;face with medical mask
 1F912;face with thermometer
 1F915;face with head-bandage
 1F922;nauseated face
+1F92E;face vomiting
 1F927;sneezing face
+1F607;smiling face with halo
+1F920;cowboy hat face
+1F921;clown face
+1F925;lying face
+1F92B;shushing face
+1F92D;face with hand over mouth
+1F9D0;face with monocle
+1F913;nerd face
 1F608;smiling face with horns
 1F47F;angry face with horns
 1F479;ogre
@@ -84,35 +93,40 @@
 1F47E;alien monster
 1F916;robot face
 1F4A9;pile of poo
-1F63A;smiling cat face with open mouth
+1F63A;grinning cat face
 1F638;grinning cat face with smiling eyes
 1F639;cat face with tears of joy
 1F63B;smiling cat face with heart-eyes
 1F63C;cat face with wry smile
-1F63D;kissing cat face with closed eyes
+1F63D;kissing cat face
 1F640;weary cat face
 1F63F;crying cat face
 1F63E;pouting cat face
 1F648;see-no-evil monkey
 1F649;hear-no-evil monkey
 1F64A;speak-no-evil monkey
-@1 enable skin tones
+@
+#1 enable skin tones
+1F476;baby
+1F476 $;baby
+1F9D2;child
+1F9D2 $;child
 1F466;boy
 1F466 $;boy
 1F467;girl
 1F467 $;girl
+1F9D1;adult
+1F9D1 $;adult
 1F468;man
 1F468 $;man
 1F469;woman
 1F469 $;woman
+1F9D3;older adult
+1F9D3 $;older adult
 1F474;old man
 1F474 $;old man
 1F475;old woman
 1F475 $;old woman
-1F476;baby
-1F476 $;baby
-1F47C;baby angel
-1F47C $;baby angel
 1F468 200D 2695 FE0F;man health worker
 1F468 $ 200D 2695 FE0F;man health worker
 1F469 200D 2695 FE0F;woman health worker
@@ -193,30 +207,62 @@
 1F477 $ 200D 2642 FE0F;man construction worker
 1F477 200D 2640 FE0F;woman construction worker
 1F477 $ 200D 2640 FE0F;woman construction worker
+1F934;prince
+1F934 $;prince
+1F478;princess
+1F478 $;princess
 1F473 200D 2642 FE0F;man wearing turban
 1F473 $ 200D 2642 FE0F;man wearing turban
 1F473 200D 2640 FE0F;woman wearing turban
 1F473 $ 200D 2640 FE0F;woman wearing turban
+1F472;man with Chinese cap
+1F472 $;man with Chinese cap
+1F9D5;woman with headscarf
+1F9D5 $;woman with headscarf
+1F9D4;bearded person
+1F9D4 $;bearded person
 1F471 200D 2642 FE0F;blond-haired man
 1F471 $ 200D 2642 FE0F;blond-haired man
 1F471 200D 2640 FE0F;blond-haired woman
 1F471 $ 200D 2640 FE0F;blond-haired woman
+1F935;man in tuxedo
+1F935 $;man in tuxedo
+1F470;bride with veil
+1F470 $;bride with veil
+1F930;pregnant woman
+1F930 $;pregnant woman
+1F931;breast-feeding
+1F931 $;breast-feeding
+1F47C;baby angel
+1F47C $;baby angel
 1F385;Santa Claus
 1F385 $;Santa Claus
 1F936;Mrs. Claus
 1F936 $;Mrs. Claus
-1F478;princess
-1F478 $;princess
-1F934;prince
-1F934 $;prince
-1F470;bride with veil
-1F470 $;bride with veil
-1F935;man in tuxedo
-1F935 $;man in tuxedo
-1F930;pregnant woman
-1F930 $;pregnant woman
-1F472;man with Chinese cap
-1F472 $;man with Chinese cap
+1F9D9 200D 2640 FE0F;woman mage
+1F9D9 $ 200D 2640 FE0F;woman mage
+1F9D9 200D 2642 FE0F;man mage
+1F9D9 $ 200D 2642 FE0F;man mage
+1F9DA 200D 2640 FE0F;woman fairy
+1F9DA $ 200D 2640 FE0F;woman fairy
+1F9DA 200D 2642 FE0F;man fairy
+1F9DA $ 200D 2642 FE0F;man fairy
+1F9DB 200D 2640 FE0F;woman vampire
+1F9DB $ 200D 2640 FE0F;woman vampire
+1F9DB 200D 2642 FE0F;man vampire
+1F9DB $ 200D 2642 FE0F;man vampire
+1F9DC 200D 2640 FE0F;mermaid
+1F9DC $ 200D 2640 FE0F;mermaid
+1F9DC 200D 2642 FE0F;merman
+1F9DC $ 200D 2642 FE0F;merman
+1F9DD 200D 2640 FE0F;woman elf
+1F9DD $ 200D 2640 FE0F;woman elf
+1F9DD 200D 2642 FE0F;man elf
+1F9DD $ 200D 2642 FE0F;man elf
+1F9DE 200D 2640 FE0F;woman genie
+1F9DE 200D 2642 FE0F;man genie
+1F9DF 200D 2640 FE0F;woman zombie
+1F9DF 200D 2642 FE0F;man zombie
 1F64D 200D 2642 FE0F;man frowning
 1F64D $ 200D 2642 FE0F;man frowning
 1F64D 200D 2640 FE0F;woman frowning
@@ -273,10 +319,26 @@
 1F483 $;woman dancing
 1F57A;man dancing
 1F57A $;man dancing
-1F46F 200D 2642 FE0F;men with bunny ears partying
-1F46F 200D 2640 FE0F;women with bunny ears partying
-1F574;man in business suit levitating
-1F574 $;man in business suit levitating
+1F46F 200D 2642 FE0F;men with bunny ears
+1F46F 200D 2640 FE0F;women with bunny ears
+1F9D6 200D 2640 FE0F;woman in steamy room
+1F9D6 $ 200D 2640 FE0F;woman in steamy room
+1F9D6 200D 2642 FE0F;man in steamy room
+1F9D6 $ 200D 2642 FE0F;man in steamy room
+1F9D7 200D 2640 FE0F;woman climbing
+1F9D7 $ 200D 2640 FE0F;woman climbing
+1F9D7 200D 2642 FE0F;man climbing
+1F9D7 $ 200D 2642 FE0F;man climbing
+1F9D8 200D 2640 FE0F;woman in lotus position
+1F9D8 $ 200D 2640 FE0F;woman in lotus position
+1F9D8 200D 2642 FE0F;man in lotus position
+1F9D8 $ 200D 2642 FE0F;man in lotus position
+1F6C0;person taking bath
+1F6C0 $;person taking bath
+1F6CC;person in bed
+1F6CC $;person in bed
+1F574;man in suit levitating
+1F574 $;man in suit levitating
 1F5E3;speaking head
 1F464;bust in silhouette
 1F465;busts in silhouette
@@ -338,52 +400,48 @@
 1F939 $ 200D 2642 FE0F;man juggling
 1F939 200D 2640 FE0F;woman juggling
 1F939 $ 200D 2640 FE0F;woman juggling
-1F6CC;person in bed
-1F6CC $;person in bed
-1F6C0;person taking bath
-1F6C0 $;person taking bath
 1F46B;man and woman holding hands
 1F46C;two men holding hands
 1F46D;two women holding hands
 1F48F;kiss
-1F469 200D 2764 FE0F 200D 1F48B 200D 1F468;kiss
-1F468 200D 2764 FE0F 200D 1F48B 200D 1F468;kiss
-1F469 200D 2764 FE0F 200D 1F48B 200D 1F469;kiss
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F468;kiss woman man
+1F468 200D 2764 FE0F 200D 1F48B 200D 1F468;kiss man man
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F469;kiss woman woman
 1F491;couple with heart
-1F469 200D 2764 FE0F 200D 1F468;couple with heart
-1F468 200D 2764 FE0F 200D 1F468;couple with heart
-1F469 200D 2764 FE0F 200D 1F469;couple with heart
+1F469 200D 2764 FE0F 200D 1F468;couple with heart woman man
+1F468 200D 2764 FE0F 200D 1F468;couple with heart man man
+1F469 200D 2764 FE0F 200D 1F469;couple with heart woman woman
 1F46A;family
-1F468 200D 1F469 200D 1F466;family
-1F468 200D 1F469 200D 1F467;family
-1F468 200D 1F469 200D 1F467 200D 1F466;family
-1F468 200D 1F469 200D 1F466 200D 1F466;family
-1F468 200D 1F469 200D 1F467 200D 1F467;family
-1F468 200D 1F468 200D 1F466;family
-1F468 200D 1F468 200D 1F467;family
-1F468 200D 1F468 200D 1F467 200D 1F466;family
-1F468 200D 1F468 200D 1F466 200D 1F466;family
-1F468 200D 1F468 200D 1F467 200D 1F467;family
-1F469 200D 1F469 200D 1F466;family
-1F469 200D 1F469 200D 1F467;family
-1F469 200D 1F469 200D 1F467 200D 1F466;family
-1F469 200D 1F469 200D 1F466 200D 1F466;family
-1F469 200D 1F469 200D 1F467 200D 1F467;family
-1F468 200D 1F466;family
-1F468 200D 1F466 200D 1F466;family
-1F468 200D 1F467;family
-1F468 200D 1F467 200D 1F466;family
-1F468 200D 1F467 200D 1F467;family
-1F469 200D 1F466;family
-1F469 200D 1F466 200D 1F466;family
-1F469 200D 1F467;family
-1F469 200D 1F467 200D 1F466;family
-1F469 200D 1F467 200D 1F467;family
+1F468 200D 1F469 200D 1F466;family man woman boy
+1F468 200D 1F469 200D 1F467;family man woman girl
+1F468 200D 1F469 200D 1F467 200D 1F466;family man woman girl boy
+1F468 200D 1F469 200D 1F466 200D 1F466;family man woman boy boy
+1F468 200D 1F469 200D 1F467 200D 1F467;family man woman girl girl
+1F468 200D 1F468 200D 1F466;family man man boy
+1F468 200D 1F468 200D 1F467;family man man girl
+1F468 200D 1F468 200D 1F467 200D 1F466;family man man girl boy
+1F468 200D 1F468 200D 1F466 200D 1F466;family man man boy boy
+1F468 200D 1F468 200D 1F467 200D 1F467;family man man girl girl
+1F469 200D 1F469 200D 1F466;family woman woman boy
+1F469 200D 1F469 200D 1F467;family woman woman girl
+1F469 200D 1F469 200D 1F467 200D 1F466;family woman woman girl boy
+1F469 200D 1F469 200D 1F466 200D 1F466;family woman woman boy boy
+1F469 200D 1F469 200D 1F467 200D 1F467;family woman woman girl girl
+1F468 200D 1F466;family man boy
+1F468 200D 1F466 200D 1F466;family man boy boy
+1F468 200D 1F467;family man girl
+1F468 200D 1F467 200D 1F466;family man girl boy
+1F468 200D 1F467 200D 1F467;family man girl girl
+1F469 200D 1F466;family woman boy
+1F469 200D 1F466 200D 1F466;family woman boy boy
+1F469 200D 1F467;family woman girl
+1F469 200D 1F467 200D 1F466;family woman girl boy
+1F469 200D 1F467 200D 1F467;family woman girl girl
 @
-1F4AA;flexed biceps
-1F4AA $;flexed biceps
 1F933;selfie
 1F933 $;selfie
+1F4AA;flexed biceps
+1F4AA $;flexed biceps
 1F448;backhand index pointing left
 1F448 $;backhand index pointing left
 1F449;backhand index pointing right
@@ -406,8 +464,8 @@
 1F918 $;sign of the horns
 1F919;call me hand
 1F919 $;call me hand
-1F590;raised hand with fingers splayed
-1F590 $;raised hand with fingers splayed
+1F590;hand with fingers splayed
+1F590 $;hand with fingers splayed
 270B;raised hand
 270B $;raised hand
 1F44C;OK hand
@@ -428,14 +486,18 @@
 1F91A $;raised back of hand
 1F44B;waving hand
 1F44B $;waving hand
-1F44F;clapping hands
-1F44F $;clapping hands
+1F91F;love-you gesture
+1F91F $;love-you gesture
 270D;writing hand
 270D $;writing hand
+1F44F;clapping hands
+1F44F $;clapping hands
 1F450;open hands
 1F450 $;open hands
 1F64C;raising hands
 1F64C $;raising hands
+1F932;palms up together
+1F932 $;palms up together
 1F64F;folded hands
 1F64F $;folded hands
 1F485;nail polish
@@ -444,10 +506,12 @@
 1F442 $;ear
 1F443;nose
 1F443 $;nose
+#2 no more skin tones beyond this point
 1F91D;handshake
 1F463;footprints
 1F440;eyes
 1F441;eye
+1F9E0;brain
 1F445;tongue
 1F444;mouth
 1F48B;kiss mark
@@ -461,6 +525,7 @@
 1F499;blue heart
 1F49A;green heart
 1F49B;yellow heart
+1F9E1;orange heart
 1F49C;purple heart
 1F5A4;black heart
 1F49D;heart with ribbon
@@ -485,6 +550,10 @@
 1F454;necktie
 1F455;t-shirt
 1F456;jeans
+1F9E3;scarf
+1F9E4;gloves
+1F9E5;coat
+1F9E6;socks
 1F457;dress
 1F458;kimono
 1F459;bikini
@@ -503,12 +572,13 @@
 1F452;woman’s hat
 1F3A9;top hat
 1F393;graduation cap
+1F9E2;billed cap
 26D1;rescue worker’s helmet
 1F4FF;prayer beads
 1F484;lipstick
 1F48D;ring
 1F48E;gem stone
-@2 no more skin tones beyond this point
+@
 1F435;monkey face
 1F412;monkey
 1F98D;gorilla
@@ -525,8 +595,9 @@
 1F406;leopard
 1F434;horse face
 1F40E;horse
-1F98C;deer
 1F984;unicorn face
+1F993;zebra
+1F98C;deer
 1F42E;cow face
 1F402;ox
 1F403;water buffalo
@@ -540,6 +611,7 @@
 1F410;goat
 1F42A;camel
 1F42B;two-hump camel
+1F992;giraffe
 1F418;elephant
 1F98F;rhinoceros
 1F42D;mouse face
@@ -549,6 +621,7 @@
 1F430;rabbit face
 1F407;rabbit
 1F43F;chipmunk
+1F994;hedgehog
 1F987;bat
 1F43B;bear face
 1F428;koala
@@ -573,6 +646,8 @@
 1F40D;snake
 1F432;dragon face
 1F409;dragon
+1F995;sauropod
+1F996;T-Rex
 1F433;spouting whale
 1F40B;whale
 1F42C;dolphin
@@ -585,12 +660,13 @@
 1F980;crab
 1F990;shrimp
 1F991;squid
-1F98B;butterfly
 1F40C;snail
+1F98B;butterfly
 1F41B;bug
 1F41C;ant
 1F41D;honeybee
 1F41E;lady beetle
+1F997;cricket
 1F577;spider
 1F578;spider web
 1F982;scorpion
@@ -618,7 +694,6 @@
 1F342;fallen leaf
 1F343;leaf fluttering in wind
 1F347;grapes
-@
 1F348;melon
 1F349;watermelon
 1F34A;tangerine
@@ -633,6 +708,7 @@
 1F353;strawberry
 1F95D;kiwi fruit
 1F345;tomato
+1F965;coconut
 1F951;avocado
 1F346;eggplant
 1F954;potato
@@ -640,21 +716,25 @@
 1F33D;ear of corn
 1F336;hot pepper
 1F952;cucumber
+1F966;broccoli
 1F344;mushroom
 1F95C;peanuts
 1F330;chestnut
 1F35E;bread
 1F950;croissant
 1F956;baguette bread
+1F968;pretzel
 1F95E;pancakes
 1F9C0;cheese wedge
 1F356;meat on bone
 1F357;poultry leg
+1F969;cut of meat
 1F953;bacon
 1F354;hamburger
 1F35F;french fries
 1F355;pizza
 1F32D;hot dog
+1F96A;sandwich
 1F32E;taco
 1F32F;burrito
 1F959;stuffed flatbread
@@ -662,8 +742,10 @@
 1F373;cooking
 1F958;shallow pan of food
 1F372;pot of food
+1F963;bowl with spoon
 1F957;green salad
 1F37F;popcorn
+1F96B;canned food
 1F371;bento box
 1F358;rice cracker
 1F359;rice ball
@@ -677,6 +759,9 @@
 1F364;fried shrimp
 1F365;fish cake with swirl
 1F361;dango
+1F95F;dumpling
+1F960;fortune cookie
+1F961;takeout box
 1F366;soft ice cream
 1F367;shaved ice
 1F368;ice cream
@@ -684,6 +769,7 @@
 1F36A;cookie
 1F382;birthday cake
 1F370;shortcake
+1F967;pie
 1F36B;chocolate bar
 1F36C;candy
 1F36D;lollipop
@@ -702,6 +788,8 @@
 1F37B;clinking beer mugs
 1F942;clinking glasses
 1F943;tumbler glass
+1F964;cup with straw
+1F962;chopsticks
 1F37D;fork and knife with plate
 1F374;fork and knife
 1F944;spoon
@@ -726,7 +814,7 @@
 1F3DF;stadium
 1F3DB;classical building
 1F3D7;building construction
-1F3D8;house
+1F3D8;houses
 1F3D9;cityscape
 1F3DA;derelict house
 1F3E0;house
@@ -775,7 +863,7 @@
 1F682;locomotive
 1F683;railway car
 1F684;high-speed train
-1F685;high-speed train with bullet nose
+1F685;bullet train
 1F686;train
 1F687;metro
 1F688;light rail
@@ -829,8 +917,9 @@
 1F69F;suspension railway
 1F6A0;mountain cableway
 1F6A1;aerial tramway
-1F680;rocket
 1F6F0;satellite
+1F680;rocket
+1F6F8;flying saucer
 1F6CE;bellhop bell
 1F6AA;door
 1F6CF;bed
@@ -839,36 +928,36 @@
 1F6BF;shower
 1F6C1;bathtub
 @
-231B;hourglass
-23F3;hourglass with flowing sand
+231B;hourglass done
+23F3;hourglass not done
 231A;watch
 23F0;alarm clock
 23F1;stopwatch
 23F2;timer clock
 1F570;mantelpiece clock
-1F55B;twelve o’clock
+1F55B;twelve clock
 1F567;twelve-thirty
-1F550;one o’clock
+1F550;one clock
 1F55C;one-thirty
-1F551;two o’clock
+1F551;two clock
 1F55D;two-thirty
-1F552;three o’clock
+1F552;three clock
 1F55E;three-thirty
-1F553;four o’clock
+1F553;four clock
 1F55F;four-thirty
-1F554;five o’clock
+1F554;five clock
 1F560;five-thirty
-1F555;six o’clock
+1F555;six clock
 1F561;six-thirty
-1F556;seven o’clock
+1F556;seven clock
 1F562;seven-thirty
-1F557;eight o’clock
+1F557;eight clock
 1F563;eight-thirty
-1F558;nine o’clock
+1F558;nine clock
 1F564;nine-thirty
-1F559;ten o’clock
+1F559;ten clock
 1F565;ten-thirty
-1F55A;eleven o’clock
+1F55A;eleven clock
 1F566;eleven-thirty
 1F311;new moon
 1F312;waxing crescent moon
@@ -880,11 +969,11 @@
 1F318;waning crescent moon
 1F319;crescent moon
 1F31A;new moon face
-1F31B;first quarter moon with face
-1F31C;last quarter moon with face
+1F31B;first quarter moon face
+1F31C;last quarter moon face
 1F321;thermometer
 2600;sun
-1F31D;full moon with face
+1F31D;full moon face
 1F31E;sun with face
 2B50;white medium star
 1F31F;glowing star
@@ -949,7 +1038,7 @@
 1F3BE;tennis
 1F3B1;pool 8 ball
 1F3B3;bowling
-1F3CF;cricket
+1F3CF;cricket game
 1F3D1;field hockey
 1F3D2;ice hockey
 1F3D3;ping pong
@@ -963,6 +1052,8 @@
 1F3A3;fishing pole
 1F3BD;running shirt
 1F3BF;skis
+1F6F7;sled
+1F94C;curling stone
 1F3AE;video game
 1F579;joystick
 1F3B2;game die
@@ -1024,8 +1115,8 @@
 1F4F8;camera with flash
 1F4F9;video camera
 1F4FC;videocassette
-1F50D;left-pointing magnifying glass
-1F50E;right-pointing magnifying glass
+1F50D;magnifying glass tilted left
+1F50E;magnifying glass tilted right
 1F52C;microscope
 1F52D;telescope
 1F4E1;satellite antenna
@@ -1177,7 +1268,7 @@
 2934;right arrow curving up
 2935;right arrow curving down
 1F503;clockwise vertical arrows
-1F504;anticlockwise arrows button
+1F504;counterclockwise arrows button
 1F519;BACK arrow
 1F51A;END arrow
 1F51B;ON! arrow
@@ -1232,11 +1323,14 @@
 1F4F6;antenna bars
 1F4F3;vibration mode
 1F4F4;mobile phone off
+2640;female sign
+2642;male sign
+2695;medical symbol
 267B;recycling symbol
-1F4DB;name badge
 269C;fleur-de-lis
-1F530;Japanese symbol for beginner
 1F531;trident emblem
+1F4DB;name badge
+1F530;Japanese symbol for beginner
 2B55;heavy large circle
 2705;white heavy check mark
 2611;ballot box with check
@@ -1245,9 +1339,6 @@
 274C;cross mark
 274E;cross mark button
 2795;heavy plus sign
-2640;female sign
-2642;male sign
-2695;medical symbol
 2796;heavy minus sign
 2797;heavy division sign
 27B0;curly loop
@@ -1263,18 +1354,18 @@
 2755;white exclamation mark
 2757;exclamation mark
 3030;wavy dash
-0023 FE0F 20E3;keycap
-002A FE0F 20E3;keycap
-0030 FE0F 20E3;keycap
-0031 FE0F 20E3;keycap
-0032 FE0F 20E3;keycap
-0033 FE0F 20E3;keycap
-0034 FE0F 20E3;keycap
-0035 FE0F 20E3;keycap
-0036 FE0F 20E3;keycap
-0037 FE0F 20E3;keycap
-0038 FE0F 20E3;keycap
-0039 FE0F 20E3;keycap
+0023 FE0F 20E3;keycap #
+002A FE0F 20E3;keycap *
+0030 FE0F 20E3;keycap 0
+0031 FE0F 20E3;keycap 1
+0032 FE0F 20E3;keycap 2
+0033 FE0F 20E3;keycap 3
+0034 FE0F 20E3;keycap 4
+0035 FE0F 20E3;keycap 5
+0036 FE0F 20E3;keycap 6
+0037 FE0F 20E3;keycap 7
+0038 FE0F 20E3;keycap 8
+0039 FE0F 20E3;keycap 9
 1F51F;keycap 10
 1F4AF;hundred points
 1F520;input latin uppercase
@@ -1299,23 +1390,23 @@
 1F198;SOS button
 1F199;UP! button
 1F19A;VS button
-1F201;Japanese “here” button
-1F202;Japanese “service charge” button
-1F237;Japanese “monthly amount” button
-1F236;Japanese “not free of charge” button
-1F22F;Japanese “reserved” button
-1F250;Japanese “bargain” button
-1F239;Japanese “discount” button
-1F21A;Japanese “free of charge” button
-1F232;Japanese “prohibited” button
-1F251;Japanese “acceptable” button
-1F238;Japanese “application” button
-1F234;Japanese “passing grade” button
-1F233;Japanese “vacancy” button
-3297;Japanese “congratulations” button
-3299;Japanese “secret” button
-1F23A;Japanese “open for business” button
-1F235;Japanese “no vacancy” button
+1F201;Japanese here button
+1F202;Japanese service charge button
+1F237;Japanese monthly amount button
+1F236;Japanese not free of charge button
+1F22F;Japanese reserved button
+1F250;Japanese bargain button
+1F239;Japanese discount button
+1F21A;Japanese free of charge button
+1F232;Japanese prohibited button
+1F251;Japanese acceptable button
+1F238;Japanese application button
+1F234;Japanese passing grade button
+1F233;Japanese vacancy button
+3297;Japanese congratulations button
+3299;Japanese secret button
+1F23A;Japanese open for business button
+1F235;Japanese no vacancy button
 25AA;black small square
 25AB;white small square
 25FB;white medium square
@@ -1349,7 +1440,7 @@
 1F1E6 1F1E9;Andorra
 1F1E6 1F1EA;United Arab Emirates
 1F1E6 1F1EB;Afghanistan
-1F1E6 1F1EC;Antigua & Barbuda
+1F1E6 1F1EC;Antigua Barbuda
 1F1E6 1F1EE;Anguilla
 1F1E6 1F1F1;Albania
 1F1E6 1F1F2;Armenia
@@ -1362,7 +1453,7 @@
 1F1E6 1F1FC;Aruba
 1F1E6 1F1FD;Åland Islands
 1F1E6 1F1FF;Azerbaijan
-1F1E7 1F1E6;Bosnia & Herzegovina
+1F1E7 1F1E6;Bosnia Herzegovina
 1F1E7 1F1E7;Barbados
 1F1E7 1F1E9;Bangladesh
 1F1E7 1F1EA;Belgium
@@ -1402,7 +1493,7 @@
 1F1E8 1F1FC;Curaçao
 1F1E8 1F1FD;Christmas Island
 1F1E8 1F1FE;Cyprus
-1F1E8 1F1FF;Czech Republic
+1F1E8 1F1FF;Czechia
 1F1E9 1F1EA;Germany
 1F1E9 1F1EC;Diego Garcia
 1F1E9 1F1EF;Djibouti
@@ -1410,7 +1501,7 @@
 1F1E9 1F1F2;Dominica
 1F1E9 1F1F4;Dominican Republic
 1F1E9 1F1FF;Algeria
-1F1EA 1F1E6;Ceuta & Melilla
+1F1EA 1F1E6;Ceuta Melilla
 1F1EA 1F1E8;Ecuador
 1F1EA 1F1EA;Estonia
 1F1EA 1F1EC;Egypt
@@ -1439,13 +1530,13 @@
 1F1EC 1F1F5;Guadeloupe
 1F1EC 1F1F6;Equatorial Guinea
 1F1EC 1F1F7;Greece
-1F1EC 1F1F8;South Georgia & South Sandwich Islands
+1F1EC 1F1F8;South Georgia South Sandwich Islands
 1F1EC 1F1F9;Guatemala
 1F1EC 1F1FA;Guam
 1F1EC 1F1FC;Guinea-Bissau
 1F1EC 1F1FE;Guyana
 1F1ED 1F1F0;Hong Kong SAR China
-1F1ED 1F1F2;Heard & McDonald Islands
+1F1ED 1F1F2;Heard McDonald Islands
 1F1ED 1F1F3;Honduras
 1F1ED 1F1F7;Croatia
 1F1ED 1F1F9;Haiti
@@ -1470,7 +1561,7 @@
 1F1F0 1F1ED;Cambodia
 1F1F0 1F1EE;Kiribati
 1F1F0 1F1F2;Comoros
-1F1F0 1F1F3;St. Kitts & Nevis
+1F1F0 1F1F3;St. Kitts Nevis
 1F1F0 1F1F5;North Korea
 1F1F0 1F1F7;South Korea
 1F1F0 1F1FC;Kuwait
@@ -1530,7 +1621,7 @@
 1F1F5 1F1ED;Philippines
 1F1F5 1F1F0;Pakistan
 1F1F5 1F1F1;Poland
-1F1F5 1F1F2;St. Pierre & Miquelon
+1F1F5 1F1F2;St. Pierre Miquelon
 1F1F5 1F1F3;Pitcairn Islands
 1F1F5 1F1F7;Puerto Rico
 1F1F5 1F1F8;Palestinian Territories
@@ -1551,7 +1642,7 @@
 1F1F8 1F1EC;Singapore
 1F1F8 1F1ED;St. Helena
 1F1F8 1F1EE;Slovenia
-1F1F8 1F1EF;Svalbard & Jan Mayen
+1F1F8 1F1EF;Svalbard Jan Mayen
 1F1F8 1F1F0;Slovakia
 1F1F8 1F1F1;Sierra Leone
 1F1F8 1F1F2;San Marino
@@ -1559,13 +1650,13 @@
 1F1F8 1F1F4;Somalia
 1F1F8 1F1F7;Suriname
 1F1F8 1F1F8;South Sudan
-1F1F8 1F1F9;São Tomé & Príncipe
+1F1F8 1F1F9;São Tomé Príncipe
 1F1F8 1F1FB;El Salvador
 1F1F8 1F1FD;Sint Maarten
 1F1F8 1F1FE;Syria
 1F1F8 1F1FF;Swaziland
 1F1F9 1F1E6;Tristan da Cunha
-1F1F9 1F1E8;Turks & Caicos Islands
+1F1F9 1F1E8;Turks Caicos Islands
 1F1F9 1F1E9;Chad
 1F1F9 1F1EB;French Southern Territories
 1F1F9 1F1EC;Togo
@@ -1577,7 +1668,7 @@
 1F1F9 1F1F3;Tunisia
 1F1F9 1F1F4;Tonga
 1F1F9 1F1F7;Turkey
-1F1F9 1F1F9;Trinidad & Tobago
+1F1F9 1F1F9;Trinidad Tobago
 1F1F9 1F1FB;Tuvalu
 1F1F9 1F1FC;Taiwan
 1F1F9 1F1FF;Tanzania
@@ -1589,13 +1680,13 @@
 1F1FA 1F1FE;Uruguay
 1F1FA 1F1FF;Uzbekistan
 1F1FB 1F1E6;Vatican City
-1F1FB 1F1E8;St. Vincent & Grenadines
+1F1FB 1F1E8;St. Vincent Grenadines
 1F1FB 1F1EA;Venezuela
 1F1FB 1F1EC;British Virgin Islands
 1F1FB 1F1EE;U.S. Virgin Islands
 1F1FB 1F1F3;Vietnam
 1F1FB 1F1FA;Vanuatu
-1F1FC 1F1EB;Wallis & Futuna
+1F1FC 1F1EB;Wallis Futuna
 1F1FC 1F1F8;Samoa
 1F1FD 1F1F0;Kosovo
 1F1FE 1F1EA;Yemen
@@ -1603,3 +1694,6 @@
 1F1FF 1F1E6;South Africa
 1F1FF 1F1F2;Zambia
 1F1FF 1F1FC;Zimbabwe
+1F3F4 E0067 E0062 E0065 E006E E0067 E007F;England
+1F3F4 E0067 E0062 E0073 E0063 E0074 E007F;Scotland
+1F3F4 E0067 E0062 E0077 E006C E0073 E007F;Wales

Resources/Plugins/templates/.meta

@@ -8,7 +8,7 @@ Templates
 chylex
 
 [version]
-1.0
+1.0.1
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/templates/browser.js

@@ -53,8 +53,10 @@ enabled(){
   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; text-align: right; }");
-  this.css.insert(".templates-modal-bottom button { margin-left: 4px; }");
+  
+  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; }");
@@ -265,6 +267,7 @@ enabled(){
       <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>
@@ -298,7 +301,7 @@ enabled(){
       
       <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"><i class="icon icon-check icon-small padding-rs"></i><span class="label">Confirm</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>
@@ -392,6 +395,10 @@ enabled(){
           toggleEditor();
           onTemplatesUpdated(true);
           break;
+        
+        case "close":
+          hideTemplateModal();
+          break;
       }
       
       $(this).blur();

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;
@@ -124,25 +124,47 @@
       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,
-          isMediaPreviewSmall: false,
-          isMediaPreviewLarge: false
+          isMediaPreviewOff: !previews,
+          isMediaPreviewSmall: previews,
+          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"); // prevent quoted tweets from changing the cursor
+        html.find(".js-quote-detail").removeClass("is-actionable margin-b--8"); // prevent quoted tweets from changing the cursor and reduce bottom margin
+        
+        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");
+            }
+          }
+        }
         
         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;
@@ -210,6 +232,9 @@
   
   onAppReady.push(function(){
     document.documentElement.setAttribute("data-td-theme", TD.settings.getTheme());
+    
+    $TD.loadFontSizeClass(TD.settings.getFontSize());
+    $TD.loadNotificationHeadContents(getNotificationHeadContents());
   });
   
   //
@@ -237,12 +262,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();
@@ -272,7 +297,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;
@@ -280,7 +305,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.");
@@ -298,7 +323,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);
@@ -323,17 +348,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;
@@ -352,12 +388,12 @@
       return !!highlightedColumnObj;
     };
     
-    var updateHighlightedTweet = function(ele, obj, link, embeddedLink){
+    var updateHighlightedTweet = function(ele, obj, link, embeddedLink, imageList){
       highlightedTweetEle = ele;
       highlightedTweetObj = obj;
       
       if (lastTweet !== link){
-        $TD.setLastHighlightedTweet(link, embeddedLink);
+        $TD.setLastHighlightedTweet(link, embeddedLink, imageList);
         lastTweet = link;
       }
     };
@@ -375,28 +411,30 @@
     
     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();
-            var embedded = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+            let link = tweet.getChirpURL();
+            let embedded = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+            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 || "");
+            updateHighlightedTweet(me, tweet, link || "", embedded || "", images);
           }
           else{
-            updateHighlightedTweet(me, tweet, "", "");
+            updateHighlightedTweet(me, tweet, "", "", "");
           }
         }
       }
       else if (e.type === "mouseleave"){
-        updateHighlightedTweet(null, null, "", "");
+        updateHighlightedTweet(null, null, "", "", "");
       }
     });
   })();
@@ -419,11 +457,11 @@
     
     window.TDGF_triggerScreenshot = function(){
       if (selectedTweet){
-        var tweetWidth = Math.floor(selectedTweet.width());
-        var parent = selectedTweet.parent();
+        let tweetWidth = Math.floor(selectedTweet.width());
+        let parent = selectedTweet.parent();
         
-        var isDetail = parent.hasClass("js-tweet-detail");
-        var isReply = !isDetail && (parent.hasClass("js-replies-to") || parent.hasClass("js-replies-before"));
+        let isDetail = parent.hasClass("js-tweet-detail");
+        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");
@@ -457,13 +495,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);
@@ -482,6 +520,8 @@
         if (item.type.startsWith("image/")){
           $(this).closest(".rpl").find(".js-reply-popout").click(); // popout direct messages
           uploader.addFilesToUpload([ item.getAsFile() ]);
+          
+          $(".js-compose-text", ".js-docked-compose").focus();
           break;
         }
       }
@@ -497,31 +537,33 @@
     };
     
     var tryCloseModal1 = function(){
-      var modal = $("#open-modal");
-      return modal.is(":visible") && tryClickSelector("a[rel=dismiss]", modal);
+      let modal = $("#open-modal");
+      return modal.is(":visible") && tryClickSelector("a.mdl-dismiss", modal);
     };
     
     var tryCloseModal2 = function(){
-      var modal = $(".js-modals-container");
+      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
+        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){
@@ -536,7 +578,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(){
@@ -589,16 +631,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;
@@ -607,7 +651,7 @@
     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);
       }
     });
   });
@@ -643,41 +687,57 @@
   // 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
-    styleOfficial.sheet.insertRule(".column-nav-link .attribution { position: absolute; }", 0); // fix cut off account names
-    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
+    let addRule = (rule) => {
+      styleOfficial.sheet.insertRule(rule, 0);
+    };
     
-    styleOfficial.sheet.insertRule(".btn-compose, .app-search-fake, .app-search-input { border-radius: 1px; }", 0); // use consistent menu button radius
-    styleOfficial.sheet.insertRule(".is-condensed .app-header-inner { padding-top: 10px !important; }", 0); // add extra padding to menu buttons when condensed
-    styleOfficial.sheet.insertRule(".is-condensed .btn-compose { padding: 8px !important; }", 0); // fix compose button icon when condensed
-    styleOfficial.sheet.insertRule(".app-header:not(.is-condensed) .nav-user-info { padding: 0 5px; }", 0); // add padding to user info
+    addRule("a[data-full-url] { word-break: break-all; }"); // break long urls
+    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(".app-title { display: none; }", 0); // hide TweetDeck logo
-    styleOfficial.sheet.insertRule(".nav-user-info { bottom: 10px !important; }", 0); // move user info
-    styleOfficial.sheet.insertRule(".app-navigator { bottom: 50px !important; }", 0); // move navigation
-    styleOfficial.sheet.insertRule(".column-navigator-overflow { bottom: 192px !important; }", 0); // move column list
+    addRule(".column-nav-link .attribution { position: absolute; }"); // fix cut off account names
+    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(".column .column-header { height: 49px !important; }", 0); // fix one pixel space below column header
-    styleOfficial.sheet.insertRule(".column:not(.is-options-open) .column-header { border-bottom: none; }", 0); // fix one pixel space below column header
+    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, and media previews
+    addRule(".dropdown-menu, .list-item-last { border-radius: 0 !important; }"); // square-ify dropdowns
+    addRule(".prf-header { border-radius: 0; }"); // fix user account header border
     
-    styleOfficial.sheet.insertRule(".activity-header { align-items: center !important; margin-bottom: 4px; }", 0); // tweak alignment of avatar and text in notifications
-    styleOfficial.sheet.insertRule(".activity-header .tweet-timestamp { line-height: unset }", 0); // fix timestamp position in notifications
+    addRule(".scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb, .antiscroll-scrollbar { border-radius: 0; }"); // square-ify scroll bars
+    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
     
-    styleOfficial.sheet.insertRule(".app-columns-container::-webkit-scrollbar-track { border-left: 0; }", 0); // remove weird border in the column container scrollbar
-    styleOfficial.sheet.insertRule(".app-columns-container { bottom: 0 !important; }", 0); // move column container scrollbar to bottom to fit updated style
+    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
     
-    styleOfficial.sheet.insertRule(".js-column-header .column-header-link { padding: 0; }", 0); // fix column header tooltip hover box
-    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(".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
     
-    styleOfficial.sheet.insertRule(".is-video a:not([href*='youtu']), .is-gif .js-media-gif-container { cursor: alias; }", 0); // change cursor on unsupported videos
-    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(".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(".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();
@@ -717,7 +777,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);
@@ -736,8 +796,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();
-      var link = (parent.hasClass("tweet-detail") ? parent.find("a[rel='url']") : parent.find("time").first().children("a")).first();
+      let parent = $(e.target).closest(".js-tweet").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();
@@ -748,7 +808,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") ||
@@ -784,6 +844,40 @@
     };
   }
   
+  //
+  // Block: Memory cleanup check and execution.
+  //
+  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.gc && window.gc();
+    window.location.reload();
+    return true;
+  };
+  
   //
   // Block: Disable TweetDeck metrics.
   //
@@ -806,9 +900,7 @@
   //
   $(document).one("TD.ready", function(){
     onAppReady.forEach(func => func());
-    
-    $TD.loadFontSizeClass(TD.settings.getFontSize());
-    $TD.loadNotificationHeadContents(getNotificationHeadContents());
+    onAppReady = null;
     
     if (window.TD_PLUGINS){
       window.TD_PLUGINS.onReady();

Resources/Scripts/twitter.js

@@ -11,22 +11,30 @@
     var style = document.createElement("style");
     document.head.appendChild(style);
     
-    style.sheet.insertRule("body { overflow: hidden !important; }", 0); // remove scrollbar
-    style.sheet.insertRule(".topbar { display: none !important; }", 0); // hide top bar
-    style.sheet.insertRule(".page-canvas, .buttons, .btn, input { border-radius: 0 !important; }", 0); // sharpen borders
-    style.sheet.insertRule("input { padding: 5px 8px 4px !important; }", 0); // tweak input padding
+    let addRule = (rule) => {
+      style.sheet.insertRule(rule, 0);
+    };
     
-    style.sheet.insertRule("#doc { width: 100%; height: 100%; margin: 0; position: absolute; display: table; }", 0); // center everything
-    style.sheet.insertRule("#page-outer { display: table-cell; vertical-align: middle; }", 0); // center everything
-    style.sheet.insertRule("#page-container { padding: 0 20px !important; width: 100% !important; box-sizing: border-box !important; }", 0); // center everything
-    style.sheet.insertRule(".page-canvas { margin: 0 auto !important; }", 0); // center everything
+    addRule("body { overflow: hidden !important; background-color: #1c6399 !important; }"); // remove scrollbar and change background
+    addRule(".page-canvas { box-shadow: 0 0 150px rgba(255, 255, 255, 0.3) !important; }"); // change page box shadow
+    addRule(".topbar { display: none !important; }"); // hide top bar
+    
+    addRule(".page-canvas, .buttons, .btn, input { border-radius: 0 !important; }"); // sharpen borders
+    addRule("input { padding: 5px 8px 4px !important; }"); // tweak input padding
+    addRule("button[type='submit'] { border: 1px solid rgba(0, 0, 0, 0.3) !important; border-radius: 0 !important; }"); // style buttons
+    
+    addRule("#doc { width: 100%; height: 100%; margin: 0; position: absolute; display: table; }"); // center everything
+    addRule("#page-outer { display: table-cell; vertical-align: middle; }"); // center everything
+    addRule("#page-container { padding: 0 20px !important; width: 100% !important; box-sizing: border-box !important; }"); // center everything
+    addRule(".page-canvas { margin: 0 auto !important; }"); // center everything
     
     if (location.pathname === "/logout"){
-      style.sheet.insertRule(".page-canvas { width: auto !important; max-width: 888px; }", 0); // fix min width
-      style.sheet.insertRule(".signout-wrapper { width: auto !important; }", 0); // fix min width
-      style.sheet.insertRule(".btn { margin: 0 4px !important; }", 0); // add margin around buttons
-      style.sheet.insertRule(".btn.cancel { border: 1px solid #bbc1c5 !important; }", 0); // add border to cancel button
-      style.sheet.insertRule(".aside p { display: none; }", 0); // hide text below the logout dialog
+      addRule(".page-canvas { width: auto !important; max-width: 888px; }"); // fix min width
+      addRule(".signout-wrapper { width: auto !important; margin: 0 auto !important; }"); // fix min width and margins
+      addRule(".signout { margin: 60px 0 54px !important; }"); // fix dialog margins
+      addRule(".buttons { padding-bottom: 0 !important; }"); // fix dialog margins
+      addRule(".aside { display: none; }"); // hide elements around logout dialog
+      addRule(".buttons button, .buttons a { display: inline-block; margin: 0 4px !important; border: 1px solid rgba(0, 0, 0, 0.3) !important; border-radius: 0 !important; }"); // style buttons
     }
   };
   

Resources/Scripts/update.js

@@ -27,9 +27,10 @@
   //
   // Function: Creates the update notification element. Removes the old one if already exists.
   //
-  var displayNotification = function(version, download){
+  var displayNotification = function(version, download, changelog){
     var outdated = version === "unsupported";
     
+    // styles
     var css = $("#tweetduck-update-css");
     
     if (!css.length){
@@ -39,25 +40,30 @@
   position: absolute;
   bottom: 0;
   width: 200px;
-  height: 170px;
+  height: 178px;
   z-index: 9999;
   color: #fff;
   background-color: rgb(32, 94, 138);
+  text-align: center;
   text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
 .tdu-title {
-  font-size: 17px;
+  font-size: 15px;
   font-weight: bold;
-  text-align: center;
-  letter-spacing: 0.2px;
-  margin: 8px auto 2px;
+  margin: 8px 0 2px;
+  cursor: default;
 }
 
 .tdu-info {
-  font-size: 12px;
-  text-align: center;
-  margin: 3px auto 0;
+  display: inline-block;
+  font-size: 14px;
+  margin: 3px 0;
+}
+
+.tdu-showlog {
+  text-decoration: underline;
+  cursor: pointer;
 }
 
 .tdu-buttons button {
@@ -86,10 +92,82 @@
   background-color: #607a8e;
   color: #dfdfdf;
 }
+
+#tweetduck-changelog {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 9998;
+}
+
+#tweetduck-changelog-box {
+  position: absolute;
+  width: 60%;
+  height: 75%;
+  max-width: calc(90% - 200px);
+  max-height: 90%;
+  left: calc(50% + 100px);
+  top: 50%;
+  padding: 12px;
+  overflow-y: auto;
+  transform: translateX(-50%) translateY(-50%);
+  font-size: 14px;
+  color: #000;
+  background-color: #fff;
+  box-sizing: border-box;
+}
+
+#tweetduck-changelog h2 {
+  margin: 0 0 7px;
+  font-size: 23px;
+}
+
+#tweetduck-changelog h3 {
+  margin: 0 0 5px 7px;
+  font-size: 18px;
+}
+
+#tweetduck-changelog p {
+  margin: 0 0 2px 30px;
+  display: list-item;
+}
+
+#tweetduck-changelog p.l2 {
+  margin-left: 50px;
+}
+
+#tweetduck-changelog a {
+  color: #247fbb;
+}
+
+#tweetduck-changelog code {
+  padding: 0 4px;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  color: #24292e;
+  background-color: rgba(27, 31, 35, 0.05);
+}
 </style>
 `).appendTo(document.head);
     }
     
+    // changelog
+    var log = $("#tweetduck-changelog");
+    
+    if (!log.length){
+      var log = $(`
+<div id='tweetduck-changelog'>
+  <div id='tweetduck-changelog-box'>
+    <h2>TweetDuck Update ${version}</h2>
+    ${changelog}
+  </div>
+</div>
+`).appendTo(document.body).css("display", "none");
+    }
+    
+    // notification
     var ele = $("#tweetduck-update");
     var existed = ele.length > 0;
     
@@ -100,7 +178,7 @@
     ele = $(outdated ? `
 <div id='tweetduck-update'>
   <p class='tdu-title'>Unsupported System</p>
-  <p class='tdu-info'>You will not receive updates.</p>
+  <p class='tdu-info'>You will not receive updates</p>
   <div class='tdu-buttons'>
     <button class='tdu-btn-unsupported'>Read more</button>
     <button class='tdu-btn-ignore'>Dismiss</button>
@@ -108,8 +186,8 @@
 </div>
 ` : `
 <div id='tweetduck-update'>
-  <p class='tdu-title'>TweetDuck Update</p>
-  <p class='tdu-info'>Version ${version} is now available.</p>
+  <p class='tdu-title'>T&#8202;weetDuck Update ${version}</p>
+  <p class='tdu-info tdu-showlog'>View update information</p>
   <div class='tdu-buttons'>
     <button class='tdu-btn-download'>Update now</button>
     <button class='tdu-btn-later'>Remind me later</button>
@@ -118,11 +196,28 @@
 </div>
 `).appendTo(document.body).css("display", existed ? "block" : "none");
     
+    // ui logic
     var hide = function(){
       ele.remove();
+      log.remove();
       css.remove();
     };
     
+    var slide = function(){
+      log.hide();
+      ele.slideUp(hide);
+    };
+    
+    ele.children(".tdu-showlog").click(function(){
+      log.toggle();
+    });
+    
+    log.click(function(){
+      log.hide();
+    }).children().first().click(function(e){
+      e.stopPropagation();
+    });
+    
     var buttonDiv = ele.children(".tdu-buttons").first();
 
     buttonDiv.children(".tdu-btn-download").click(function(){
@@ -138,7 +233,7 @@
     
     buttonDiv.children(".tdu-btn-later").click(function(){
       clearTimeout(updateCheckTimeoutID);
-      ele.slideUp(hide);
+      slide();
     });
 
     buttonDiv.children(".tdu-btn-unsupported").click(function(){
@@ -147,7 +242,7 @@
 
     buttonDiv.children(".tdu-btn-ignore,.tdu-btn-unsupported").click(function(){
       $TDU.onUpdateDismissed();
-      ele.slideUp(hide);
+      slide();
     });
     
     if (!existed){
@@ -166,6 +261,23 @@
     return new Date(offset.getFullYear(), offset.getMonth(), offset.getDate(), offset.getHours()+1, 0, 0)-now;
   };
   
+  //
+  // Function: Ghetto-converts markdown to HTML.
+  //
+  var markdown = function(md){
+    return md.replace(/&/g, "&amp;")
+             .replace(/</g, "&lt;")
+             .replace(/>/g, "&gt;")
+             .replace(/^### (.*?)$/gm, "<h3>$1</h3>")
+             .replace(/^- (.*?)$/gm, "<p>$1</p>")
+             .replace(/^  - (.*?)$/gm, "<p class='l2'>$1</p>")
+             .replace(/\*\*(.*?)\*\*/g, "<strong>$1</strong>")
+             .replace(/\*(.*?)\*/g, "<em>$1</em>")
+             .replace(/`(.*?)`/g, "<code>$1</code>")
+             .replace(/\[(.*?)\]\((.*?)\)/g, "<a href='$2'>$1</a>")
+             .replace(/\n\r?\n/g, "<br>");
+  };
+  
   //
   // Function: Runs an update check and updates all DOM elements appropriately.
   //
@@ -181,7 +293,7 @@
       
       if (hasUpdate){
         var obj = release.assets.find(asset => asset.name === updateFileName) || { browser_download_url: "" };
-        displayNotification(tagName, obj.browser_download_url);
+        displayNotification(tagName, obj.browser_download_url, markdown(release.body));
         
         if (eventID){ // ignore undefined and 0
           $TDU.onUpdateCheckFinished(eventID, tagName, obj.browser_download_url);

TweetDuck.csproj

@@ -65,6 +65,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
@@ -72,6 +73,7 @@
     <Compile Include="Configuration\LockManager.cs" />
     <Compile Include="Configuration\SystemConfig.cs" />
     <Compile Include="Configuration\UserConfig.cs" />
+    <Compile Include="Configuration\UserConfigLegacy.cs" />
     <Compile Include="Core\Bridge\PropertyBridge.cs" />
     <Compile Include="Core\Controls\ControlExtensions.cs" />
     <Compile Include="Core\Controls\FlatButton.cs">
@@ -83,7 +85,10 @@
     <Compile Include="Core\Controls\LabelVertical.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Core\Handling\BrowserProcessHandler.cs" />
+    <Compile Include="Core\Controls\NumericUpDownEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Core\Handling\General\BrowserProcessHandler.cs" />
     <Compile Include="Core\Handling\ContextMenuBase.cs" />
     <Compile Include="Core\Handling\ContextMenuBrowser.cs" />
     <Compile Include="Core\FormBrowser.cs">
@@ -92,8 +97,9 @@
     <Compile Include="Core\FormBrowser.Designer.cs">
       <DependentUpon>FormBrowser.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Handling\KeyboardHandlerNotification.cs" />
     <Compile Include="Core\Handling\RequestHandlerBrowser.cs" />
-    <Compile Include="Core\Handling\RequestHandler.cs" />
+    <Compile Include="Core\Handling\General\RequestHandlerBase.cs" />
     <Compile Include="Core\Handling\ResourceHandlerNotification.cs" />
     <Compile Include="Core\Notification\FormNotificationMain.cs">
       <SubType>Form</SubType>
@@ -108,8 +114,8 @@
       <DependentUpon>FormNotificationBase.cs</DependentUpon>
     </Compile>
     <Compile Include="Core\Handling\ContextMenuNotification.cs" />
-    <Compile Include="Core\Handling\JavaScriptDialogHandler.cs" />
-    <Compile Include="Core\Handling\LifeSpanHandler.cs" />
+    <Compile Include="Core\Handling\General\JavaScriptDialogHandler.cs" />
+    <Compile Include="Core\Handling\General\LifeSpanHandler.cs" />
     <Compile Include="Core\Notification\FormNotificationTweet.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -160,7 +166,10 @@
     <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsRestart.Designer.cs">
       <DependentUpon>DialogSettingsRestart.cs</DependentUpon>
     </Compile>
-    <Compile Include="Core\Other\Settings\Export\CombinedFileStream.cs" />
+    <Compile Include="Core\Utils\BrowserProcesses.cs" />
+    <Compile Include="Core\Utils\StringUtils.cs" />
+    <Compile Include="Core\Utils\TwitterUtils.cs" />
+    <Compile Include="Data\CombinedFileStream.cs" />
     <Compile Include="Core\Other\Settings\Export\ExportFileFlags.cs" />
     <Compile Include="Core\Other\Settings\Export\ExportManager.cs" />
     <Compile Include="Core\Other\Settings\TabSettingsAdvanced.cs">
@@ -191,15 +200,18 @@
       <DependentUpon>TabSettingsNotifications.cs</DependentUpon>
     </Compile>
     <Compile Include="Core\Bridge\CallbackBridge.cs" />
-    <Compile Include="Core\Utils\CommandLineArgs.cs" />
-    <Compile Include="Core\Utils\CommandLineArgsParser.cs" />
+    <Compile Include="Data\CommandLineArgs.cs" />
     <Compile Include="Core\Notification\Screenshot\FormNotificationScreenshotable.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Core\Notification\Screenshot\TweetScreenshotManager.cs" />
-    <Compile Include="Core\Utils\InjectedHTML.cs" />
-    <Compile Include="Core\Utils\TwoKeyDictionary.cs" />
-    <Compile Include="Core\Utils\WindowState.cs" />
+    <Compile Include="Data\Serialization\FileSerializer.cs" />
+    <Compile Include="Data\InjectedHTML.cs" />
+    <Compile Include="Data\Serialization\ITypeConverter.cs" />
+    <Compile Include="Data\Serialization\SingleTypeConverter.cs" />
+    <Compile Include="Data\TwoKeyDictionary.cs" />
+    <Compile Include="Data\WindowState.cs" />
+    <Compile Include="Core\Utils\MemoryUsageTracker.cs" />
     <Compile Include="Core\Utils\WindowsUtils.cs" />
     <Compile Include="Core\Bridge\TweetDeckBridge.cs" />
     <Compile Include="Core\Other\FormSettings.cs">

Updates/FormUpdateDownload.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Updates{
@@ -29,7 +30,7 @@ namespace TweetDuck.Updates{
             else if (updateInfo.DownloadStatus == UpdateDownloadStatus.Failed){
                 timerDownloadCheck.Stop();
 
-                if (MessageBox.Show("Could not download the update: "+(updateInfo.DownloadError?.Message ?? "unknown error")+"\r\n\r\nDo you want to open the website and try downloading the update manually?", "Update Has Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1) == DialogResult.Yes){
+                if (FormMessage.Error("Update Has Failed", "Could not download the update: "+(updateInfo.DownloadError?.Message ?? "unknown error")+"\n\nDo you want to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
                     BrowserUtils.OpenExternalBrowserUnsafe(Program.Website);
                     DialogResult = DialogResult.OK;
                 }

Updates/UpdateHandler.cs

@@ -30,7 +30,7 @@ namespace TweetDuck.Updates{
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
+            if (e.Frame.IsMain && TwitterUtils.IsTweetDeckWebsite(e.Frame)){
                 ScriptLoader.ExecuteFile(e.Frame, "update.js");
                 Check(false);
             }

Updates/UpdateInfo.cs

@@ -4,7 +4,7 @@ using System.Net;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Updates{
-    class UpdateInfo{
+    sealed class UpdateInfo{
         public string VersionTag { get; }
         public string InstallerPath { get; }
 

Updates/UpdaterSettings.cs

@@ -1,5 +1,5 @@
 namespace TweetDuck.Updates{
-    class UpdaterSettings{
+    sealed class UpdaterSettings{
         public bool AllowPreReleases { get; set; }
         public string DismissedUpdate { get; set; }
         public string InstallerDownloadFolder { get; set; }

lib/TweetLib.Audio/AudioPlayer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
 using TweetLib.Audio.Impl;
-using TweetLib.Audio.Utils;
 
 namespace TweetLib.Audio{
     public abstract class AudioPlayer : IDisposable{
@@ -32,6 +31,11 @@ namespace TweetLib.Audio{
 
         public abstract void Play(string file);
         public abstract void Stop();
-        public abstract void Dispose();
+        protected abstract void Dispose(bool disposing);
+
+        public void Dispose(){
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

lib/TweetLib.Audio/Impl/SoundPlayerImplFallback.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Media;
-using TweetLib.Audio.Utils;
 
 namespace TweetLib.Audio.Impl{
     sealed class SoundPlayerImplFallback : AudioPlayer{
@@ -39,7 +38,7 @@ namespace TweetLib.Audio.Impl{
             player.Stop();
         }
 
-        public override void Dispose(){
+        protected override void Dispose(bool disposing){
             player.Dispose();
         }
 

lib/TweetLib.Audio/Impl/SoundPlayerImplWMP.cs

@@ -56,7 +56,7 @@ namespace TweetLib.Audio.Impl{
             }
         }
 
-        public override void Dispose(){
+        protected override void Dispose(bool disposing){
             player.close();
             Marshal.ReleaseComObject(player);
         }

lib/TweetLib.Audio/PlaybackErrorEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TweetLib.Audio.Utils{
+namespace TweetLib.Audio{
     public sealed class PlaybackErrorEventArgs : EventArgs{
         public string Message { get; }
         public bool Ignore { get; set; }

lib/TweetLib.Audio/TweetLib.Audio.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -30,7 +30,7 @@
   <ItemGroup>
     <Compile Include="AudioPlayer.cs" />
     <Compile Include="Utils\NativeCoreAudio.cs" />
-    <Compile Include="Utils\PlaybackErrorEventArgs.cs" />
+    <Compile Include="PlaybackErrorEventArgs.cs" />
     <Compile Include="Impl\SoundPlayerImplFallback.cs" />
     <Compile Include="Impl\SoundPlayerImplWMP.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

lib/TweetLib.Audio/Utils/NativeCoreAudio.cs

@@ -82,9 +82,7 @@ namespace TweetLib.Audio.Utils{
             ISimpleAudioVolume volumeObj = null;
 
             for(int index = sessions.GetCount()-1; index >= 0; index--){
-                IAudioSessionControl2 ctl = sessions.GetSession(index) as IAudioSessionControl2;
-
-                if (ctl != null){
+                if (sessions.GetSession(index) is IAudioSessionControl2 ctl){
                     string identifier = ctl.GetSessionIdentifier();
 
                     if (identifier != null && identifier.Contains(name)){

subprocess/NativeMethods.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace TweetDuck.Browser{
+    static class NativeMethods{
+        public static readonly IntPtr HWND_BROADCAST = new IntPtr(0xFFFF);
+        
+        [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);
+    }
+}

subprocess/Program.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Diagnostics;
+using CefSharp;
 using CefSharp.BrowserSubprocess;
 
 namespace TweetDuck.Browser{
@@ -10,11 +12,23 @@ namespace TweetDuck.Browser{
             string type = Array.Find(args, arg => arg.StartsWith(typePrefix, StringComparison.OrdinalIgnoreCase)).Substring(typePrefix.Length);
 
             if (type == "renderer"){
-                using(SubProcess subProcess = new SubProcess(args)){
+                using(RendererProcess subProcess = new RendererProcess(args)){
                     return subProcess.Run();
                 }
             }
             else return SubProcess.ExecuteProcess();
         }
+
+        private class RendererProcess : SubProcess{
+            public RendererProcess(string[] args) : base(args){}
+
+            public override void OnBrowserCreated(CefBrowserWrapper wrapper){
+                base.OnBrowserCreated(wrapper);
+                
+                using(Process me = Process.GetCurrentProcess()){
+                    NativeMethods.PostMessage(NativeMethods.HWND_BROADCAST, NativeMethods.RegisterWindowMessage("TweetDuckSubProcess"), new UIntPtr((uint)me.Id), new IntPtr(wrapper.BrowserId));
+                }
+            }
+        }
     }
 }

subprocess/TweetDuck.Browser.csproj

@@ -24,12 +24,14 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CefSharp, Version=57.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138" />
     <Reference Include="CefSharp.BrowserSubprocess.Core">
       <HintPath>..\packages\CefSharp.Common.57.0.0\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="NativeMethods.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

tests/Core/TestBrowserUtils.cs

@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TweetDuck.Core.Utils;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Core{
     [TestClass]
     public class TestBrowserUtils{
         [TestMethod]
@@ -46,15 +46,5 @@ namespace UnitTests.Core.Utils{
 
             Assert.IsNull(BrowserUtils.GetFileNameFromUrl("http://test.com/"));
         }
-
-        [TestMethod]
-        public void TestConvertPascalCaseToScreamingSnakeCase(){
-            Assert.AreEqual("HELP", BrowserUtils.ConvertPascalCaseToScreamingSnakeCase("Help"));
-            Assert.AreEqual("HELP_ME", BrowserUtils.ConvertPascalCaseToScreamingSnakeCase("HelpMe"));
-            Assert.AreEqual("HELP_ME_PLEASE", BrowserUtils.ConvertPascalCaseToScreamingSnakeCase("HelpMePlease"));
-
-            Assert.AreEqual("HTML_CODE", BrowserUtils.ConvertPascalCaseToScreamingSnakeCase("HTMLCode"));
-            Assert.AreEqual("CHECK_OUT_MY_HTML_CODE", BrowserUtils.ConvertPascalCaseToScreamingSnakeCase("CheckOutMyHTMLCode"));
-        }
     }
 }

tests/Core/TestStringUtils.cs

@@ -0,0 +1,36 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TweetDuck.Core.Utils;
+
+namespace UnitTests.Core{
+    [TestClass]
+    public class TestStringUtils{
+        [TestMethod]
+        public void TestExtractBefore(){
+            Assert.AreEqual("missing", StringUtils.ExtractBefore("missing", '_'));
+            Assert.AreEqual("", StringUtils.ExtractBefore("_empty", '_'));
+            Assert.AreEqual("some", StringUtils.ExtractBefore("some_text", '_'));
+            Assert.AreEqual("first", StringUtils.ExtractBefore("first_separator_only", '_'));
+            Assert.AreEqual("start_index", StringUtils.ExtractBefore("start_index_test", '_', 8));
+        }
+
+        [TestMethod]
+        public void TestParseInts(){
+            CollectionAssert.AreEqual(new int[0], StringUtils.ParseInts("", ','));
+            CollectionAssert.AreEqual(new int[]{ 1 }, StringUtils.ParseInts("1", ','));
+            CollectionAssert.AreEqual(new int[]{ 1, 2, 3 }, StringUtils.ParseInts("1,2,3", ','));
+            CollectionAssert.AreEqual(new int[]{ 1, 2, 3 }, StringUtils.ParseInts("1,2,3,", ','));
+            CollectionAssert.AreEqual(new int[]{ 1, 2, 3 }, StringUtils.ParseInts(",1,2,,3,", ','));
+            CollectionAssert.AreEqual(new int[]{ -50, 50 }, StringUtils.ParseInts("-50,50", ','));
+        }
+
+        [TestMethod]
+        public void TestConvertPascalCaseToScreamingSnakeCase(){
+            Assert.AreEqual("HELP", StringUtils.ConvertPascalCaseToScreamingSnakeCase("Help"));
+            Assert.AreEqual("HELP_ME", StringUtils.ConvertPascalCaseToScreamingSnakeCase("HelpMe"));
+            Assert.AreEqual("HELP_ME_PLEASE", StringUtils.ConvertPascalCaseToScreamingSnakeCase("HelpMePlease"));
+
+            Assert.AreEqual("HTML_CODE", StringUtils.ConvertPascalCaseToScreamingSnakeCase("HTMLCode"));
+            Assert.AreEqual("CHECK_OUT_MY_HTML_CODE", StringUtils.ConvertPascalCaseToScreamingSnakeCase("CheckOutMyHTMLCode"));
+        }
+    }
+}

tests/Core/TestTwitterUtils.cs

@@ -0,0 +1,39 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TweetDuck.Core.Utils;
+
+namespace UnitTests.Core{
+    [TestClass]
+    public class TestTwitterUtils{
+        [TestMethod]
+        public void TestAccountRegex(){
+            Assert.IsTrue(TwitterUtils.RegexAccount.IsMatch("http://twitter.com/chylexmc"));
+            Assert.IsTrue(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/chylexmc"));
+            Assert.IsTrue(TwitterUtils.RegexAccount.IsMatch("http://twitter.com/chylexmc/"));
+            Assert.IsTrue(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/chylexmc/"));
+
+            Assert.AreEqual("chylexmc", TwitterUtils.RegexAccount.Match("http://twitter.com/chylexmc").Groups[1].Value);
+            Assert.AreEqual("123", TwitterUtils.RegexAccount.Match("http://twitter.com/123").Groups[1].Value);
+            Assert.AreEqual("_", TwitterUtils.RegexAccount.Match("http://twitter.com/_").Groups[1].Value);
+
+            Assert.AreEqual("Abc_123", TwitterUtils.RegexAccount.Match("http://twitter.com/Abc_123").Groups[1].Value);
+            Assert.AreEqual("Abc_123", TwitterUtils.RegexAccount.Match("https://twitter.com/Abc_123/").Groups[1].Value);
+
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("http://twitter.com/"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("http://twitter.com/chylexmc/status"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("http://nottwitter.com/chylexmc"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("www.twitter.com/chylexmc"));
+        }
+
+        [TestMethod]
+        public void TestImageQualityLink(){
+            Assert.AreEqual("https://pbs.twimg.com/profile_images/123.jpg", TwitterUtils.GetImageLink("https://pbs.twimg.com/profile_images/123.jpg", TwitterUtils.ImageQuality.Default));
+            Assert.AreEqual("https://pbs.twimg.com/profile_images/123.jpg", TwitterUtils.GetImageLink("https://pbs.twimg.com/profile_images/123.jpg", TwitterUtils.ImageQuality.Orig));
+
+            Assert.AreEqual("https://pbs.twimg.com/media/123.jpg:small", TwitterUtils.GetImageLink("https://pbs.twimg.com/media/123.jpg:small", TwitterUtils.ImageQuality.Default));
+            Assert.AreEqual("https://pbs.twimg.com/media/123.jpg:orig", TwitterUtils.GetImageLink("https://pbs.twimg.com/media/123.jpg:small", TwitterUtils.ImageQuality.Orig));
+
+            Assert.AreEqual("https://pbs.twimg.com/media/123.jpg:large", TwitterUtils.GetImageLink("https://pbs.twimg.com/media/123.jpg:large", TwitterUtils.ImageQuality.Default));
+            Assert.AreEqual("https://pbs.twimg.com/media/123.jpg:orig", TwitterUtils.GetImageLink("https://pbs.twimg.com/media/123.jpg:large", TwitterUtils.ImageQuality.Orig));
+        }
+    }
+}

tests/Core/Utils/TestCommandLineArgsParser.cs

@@ -1,32 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TweetDuck.Core.Utils;
-
-namespace UnitTests.Core.Utils{
-    [TestClass]
-    public class TestCommandLineArgsParser{
-        [TestMethod]
-        public void TestEmptyString(){
-            Assert.AreEqual(0, CommandLineArgsParser.ReadCefArguments("").Count);
-            Assert.AreEqual(0, CommandLineArgsParser.ReadCefArguments("     ").Count);
-        }
-
-        [TestMethod]
-        public void TestValidString(){
-            CommandLineArgs args = CommandLineArgsParser.ReadCefArguments("--aaa --bbb --first-value=123 --SECOND-VALUE=\"a b c d e\"\r\n--ccc");
-            // cef has no flags, flag arguments have a value of 1
-            // the processing removes all dashes in front of each key
-
-            Assert.AreEqual(5, args.Count);
-            Assert.IsTrue(args.HasValue("aaa"));
-            Assert.IsTrue(args.HasValue("bbb"));
-            Assert.IsTrue(args.HasValue("ccc"));
-            Assert.IsTrue(args.HasValue("first-value"));
-            Assert.IsTrue(args.HasValue("second-value"));
-            Assert.AreEqual("1", args.GetValue("aaa", string.Empty));
-            Assert.AreEqual("1", args.GetValue("bbb", string.Empty));
-            Assert.AreEqual("1", args.GetValue("ccc", string.Empty));
-            Assert.AreEqual("123", args.GetValue("first-value", string.Empty));
-            Assert.AreEqual("a b c d e", args.GetValue("second-value", string.Empty));
-        }
-    }
-}

tests/Data/TestCombinedFileStream.cs

@@ -1,9 +1,10 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
+using System;
 using System.IO;
-using TweetDuck.Core.Other.Settings.Export;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Settings{
+namespace UnitTests.Data{
     [TestClass]
     public class TestCombinedFileStream{
         [TestMethod]
@@ -139,5 +140,31 @@ namespace UnitTests.Core.Settings{
 
             Directory.Delete("cfs_directory", true);
         }
+
+        [TestMethod]
+        public void TestLongIdentifierSuccess(){
+            TestUtils.WriteText("cfs_long_identifier_fail_in", "test");
+
+            string identifier = string.Join("", Enumerable.Repeat("x", 255));
+
+            using(CombinedFileStream cfs = new CombinedFileStream(TestUtils.WriteFile("cfs_long_identifier_success"))){
+                cfs.WriteFile(identifier, "cfs_long_identifier_fail_in");
+                cfs.Flush();
+            }
+
+            using(CombinedFileStream cfs = new CombinedFileStream(TestUtils.ReadFile("cfs_long_identifier_success"))){
+                Assert.AreEqual(identifier, cfs.ReadFile().Identifier);
+            }
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void TestLongIdentifierFail(){
+            TestUtils.WriteText("cfs_long_identifier_fail_in", "test");
+
+            using(CombinedFileStream cfs = new CombinedFileStream(TestUtils.WriteFile("cfs_long_identifier_fail"))){
+                cfs.WriteFile(string.Join("", Enumerable.Repeat("x", 256)), "cfs_long_identifier_fail_in");
+            }
+        }
     }
 }

tests/Data/TestCommandLineArgs.cs

@@ -1,8 +1,8 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using TweetDuck.Core.Utils;
+using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Data{
     [TestClass]
     public class TestCommandLineArgs{
         [TestMethod]
@@ -153,5 +153,30 @@ namespace UnitTests.Core.Utils{
             Assert.IsTrue(args.HasValue("-value"));
             Assert.AreEqual("Here is some text!", args.GetValue("-value", string.Empty));
         }
+
+        [TestMethod]
+        public void TestCefEmptyString(){
+            Assert.AreEqual(0, CommandLineArgs.ReadCefArguments("").Count);
+            Assert.AreEqual(0, CommandLineArgs.ReadCefArguments("     ").Count);
+        }
+
+        [TestMethod]
+        public void TestCefValidString(){
+            CommandLineArgs args = CommandLineArgs.ReadCefArguments("--aaa --bbb --first-value=123 --SECOND-VALUE=\"a b c d e\"\r\n--ccc");
+            // cef has no flags, flag arguments have a value of 1
+            // the processing removes all dashes in front of each key
+
+            Assert.AreEqual(5, args.Count);
+            Assert.IsTrue(args.HasValue("aaa"));
+            Assert.IsTrue(args.HasValue("bbb"));
+            Assert.IsTrue(args.HasValue("ccc"));
+            Assert.IsTrue(args.HasValue("first-value"));
+            Assert.IsTrue(args.HasValue("second-value"));
+            Assert.AreEqual("1", args.GetValue("aaa", string.Empty));
+            Assert.AreEqual("1", args.GetValue("bbb", string.Empty));
+            Assert.AreEqual("1", args.GetValue("ccc", string.Empty));
+            Assert.AreEqual("123", args.GetValue("first-value", string.Empty));
+            Assert.AreEqual("a b c d e", args.GetValue("second-value", string.Empty));
+        }
     }
 }

tests/Data/TestFileSerializer.cs

@@ -0,0 +1,50 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TweetDuck.Data.Serialization;
+
+namespace UnitTests.Data{
+    [TestClass]
+    public class TestFileSerializer{
+        private enum TestEnum{
+            A, B, C, D, E
+        }
+
+        private class SerializationTestBasic{
+            public bool TestBool { get; set; }
+            public int TestInt { get; set; }
+            public string TestString { get; set; }
+            public string TestStringNull { get; set; }
+            public TestEnum TestEnum { get; set; }
+        }
+
+        [TestMethod]
+        public void TestBasicWriteRead(){
+            FileSerializer<SerializationTestBasic> serializer = new FileSerializer<SerializationTestBasic>();
+            
+            SerializationTestBasic write = new SerializationTestBasic{
+                TestBool = true,
+                TestInt = -100,
+                TestString = "abc"+Environment.NewLine+"def",
+                TestStringNull = null,
+                TestEnum = TestEnum.D
+            };
+
+            serializer.Write("serialized_basic", write);
+
+            Assert.IsTrue(File.Exists("serialized_basic"));
+            TestUtils.DeleteFileOnExit("serialized_basic");
+
+            SerializationTestBasic read = new SerializationTestBasic();
+            serializer.Read("serialized_basic", read);
+
+            Assert.IsTrue(read.TestBool);
+            Assert.AreEqual(-100, read.TestInt);
+            Assert.AreEqual("abc"+Environment.NewLine+"def", read.TestString);
+            Assert.IsNull(read.TestStringNull);
+            Assert.AreEqual(TestEnum.D, read.TestEnum);
+        }
+
+        // TODO more complex tests
+    }
+}

tests/Data/TestInjectedHTML.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Data{
     [TestClass]
     public class TestInjectedHTML{
         private static IEnumerable<InjectedHTML.Position> Positions => Enum.GetValues(typeof(InjectedHTML.Position)).Cast<InjectedHTML.Position>();

tests/Data/TestTwoKeyDictionary.cs

@@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TweetDuck.Core.Utils;
-using System.Collections.Generic;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Data{
     [TestClass]
     public class TestTwoKeyDictionary{
         private static TwoKeyDictionary<string, int, string> CreateDict(){