Release 1.18.5

Closes #294

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: chylex
+ko_fi: chylex

Application/LockHandler.cs

@@ -0,0 +1,58 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using TweetDuck.Utils;
+using TweetLib.Core.Application;
+
+namespace TweetDuck.Application{
+    class LockHandler : IAppLockHandler{
+        private const int WaitRetryDelay = 250;
+        private const int RestoreFailTimeout = 2000;
+        private const int CloseNaturallyTimeout = 10000;
+        private const int CloseKillTimeout = 5000;
+
+        bool IAppLockHandler.RestoreProcess(Process process){
+            if (process.MainWindowHandle == IntPtr.Zero){ // restore if the original process is in tray
+                NativeMethods.BroadcastMessage(Program.WindowRestoreMessage, (uint)process.Id, 0);
+
+                if (WindowsUtils.TrySleepUntil(() => CheckProcessExited(process) || (process.MainWindowHandle != IntPtr.Zero && process.Responding), RestoreFailTimeout, WaitRetryDelay)){
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool IAppLockHandler.CloseProcess(Process process){
+            try{
+                if (process.CloseMainWindow()){
+                    // ReSharper disable once AccessToDisposedClosure
+                    WindowsUtils.TrySleepUntil(() => CheckProcessExited(process), CloseNaturallyTimeout, WaitRetryDelay);
+                }
+
+                if (!process.HasExited){
+                    process.Kill();
+                    // ReSharper disable once AccessToDisposedClosure
+                    WindowsUtils.TrySleepUntil(() => CheckProcessExited(process), CloseKillTimeout, WaitRetryDelay);
+                }
+
+                if (process.HasExited){
+                    process.Dispose();
+                    return true;
+                }
+                else{
+                    return false;
+                }
+            }catch(Exception ex) when (ex is InvalidOperationException || ex is Win32Exception){
+                bool hasExited = CheckProcessExited(process);
+                process.Dispose();
+                return hasExited;
+            }
+        }
+
+        private static bool CheckProcessExited(Process process){
+            process.Refresh();
+            return process.HasExited;
+        }
+    }
+}

Application/SystemHandler.cs

@@ -0,0 +1,16 @@
+using System.Diagnostics;
+using System.IO;
+using TweetLib.Core.Application;
+
+namespace TweetDuck.Application{
+    class SystemHandler : IAppSystemHandler{
+        void IAppSystemHandler.OpenFileExplorer(string path){
+            if (File.Exists(path)){
+                using(Process.Start("explorer.exe", "/select,\"" + path.Replace('/', '\\') + "\"")){}
+            }
+            else if (Directory.Exists(path)){
+                using(Process.Start("explorer.exe", '"' + path.Replace('/', '\\') + '"')){}
+            }
+        }
+    }
+}

Browser/Adapters/CefScriptExecutor.cs

@@ -0,0 +1,41 @@
+using System.IO;
+using CefSharp;
+using TweetLib.Core.Browser;
+
+namespace TweetDuck.Browser.Adapters{
+    sealed class CefScriptExecutor : IScriptExecutor{
+        private readonly IWebBrowser browser;
+
+        public CefScriptExecutor(IWebBrowser browser){
+            this.browser = browser;
+        }
+
+        public void RunFunction(string name, params object[] args){
+            browser.ExecuteScriptAsync(name, args);
+        }
+
+        public void RunScript(string identifier, string script){
+            using IFrame frame = browser.GetMainFrame();
+            RunScript(frame, script, identifier);
+        }
+
+        public bool RunFile(string file){
+            using IFrame frame = browser.GetMainFrame();
+            return RunFile(frame, file);
+        }
+
+        // Helpers
+
+        public static void RunScript(IFrame frame, string script, string identifier){
+            if (script != null){
+                frame.ExecuteJavaScriptAsync(script, identifier, 1);
+            }
+        }
+
+        public static bool RunFile(IFrame frame, string file){
+            string script = Program.Resources.Load(file);
+            RunScript(frame, script, "root:" + Path.GetFileNameWithoutExtension(file));
+            return script != null;
+        }
+    }
+}

Browser/Bridge/PropertyBridge.cs

@@ -0,0 +1,38 @@
+using System.Text;
+using TweetDuck.Configuration;
+using TweetLib.Core;
+using TweetLib.Core.Utils;
+
+namespace TweetDuck.Browser.Bridge{
+    static class PropertyBridge{
+        public enum Environment{
+            Browser, Notification
+        }
+
+        public static string GenerateScript(Environment environment){
+            static string Bool(bool value) => value ? "true;" : "false;";
+            static string Str(string value) => $"\"{value}\";";
+
+            UserConfig config = Program.Config.User;
+            StringBuilder build = new StringBuilder(384).Append("(function(x){");
+
+            build.Append("x.expandLinksOnHover=").Append(Bool(config.ExpandLinksOnHover));
+            
+            if (environment == Environment.Browser){
+                build.Append("x.focusDmInput=").Append(Bool(config.FocusDmInput));
+                build.Append("x.openSearchInFirstColumn=").Append(Bool(config.OpenSearchInFirstColumn));
+                build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(config.KeepLikeFollowDialogsOpen));
+                build.Append("x.muteNotifications=").Append(Bool(config.MuteNotifications));
+                build.Append("x.notificationMediaPreviews=").Append(Bool(config.NotificationMediaPreviews));
+                build.Append("x.translationTarget=").Append(Str(config.TranslationTarget));
+                build.Append("x.firstDayOfWeek=").Append(config.CalendarFirstDay == -1 ? LocaleUtils.GetJQueryDayOfWeek(Lib.Culture.DateTimeFormat.FirstDayOfWeek) : config.CalendarFirstDay);
+            }
+
+            if (environment == Environment.Notification){
+                build.Append("x.skipOnLinkClick=").Append(Bool(config.NotificationSkipOnLinkClick));
+            }
+            
+            return build.Append("})(window.$TDX=window.$TDX||{});if(window.TDGF_onPropertiesUpdated)window.TDGF_onPropertiesUpdated()").ToString();
+        }
+    }
+}

Browser/Bridge/TweetDeckBridge.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Management;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Utils;
+
+namespace TweetDuck.Browser.Bridge{
+    [SuppressMessage("ReSharper", "UnusedMember.Global")]
+    class TweetDeckBridge{
+        public static void ResetStaticProperties(){
+            FormNotificationBase.FontSize = null;
+            FormNotificationBase.HeadLayout = null;
+        }
+
+        private readonly FormBrowser form;
+        private readonly FormNotificationMain notification;
+
+        protected TweetDeckBridge(FormBrowser form, FormNotificationMain notification){
+            this.form = form;
+            this.notification = notification;
+        }
+
+        // Browser only
+
+        public sealed class Browser : TweetDeckBridge{
+            public Browser(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
+
+            public void OpenContextMenu(){
+                form.InvokeAsyncSafe(form.OpenContextMenu);
+            }
+
+            public void OpenProfileImport(){
+                form.InvokeAsyncSafe(form.OpenProfileImport);
+            }
+            
+            public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
+                form.InvokeAsyncSafe(() => form.OnIntroductionClosed(showGuide, allowDataCollection));
+            }
+
+            public void LoadNotificationLayout(string fontSize, string headLayout){
+                form.InvokeAsyncSafe(() => {
+                    FormNotificationBase.FontSize = fontSize;
+                    FormNotificationBase.HeadLayout = headLayout;
+                });
+            }
+
+            public void SetRightClickedLink(string type, string url){
+                ContextMenuBase.CurrentInfo.SetLink(type, url);
+            }
+
+            public void SetRightClickedChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
+                ContextMenuBase.CurrentInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+            }
+
+            public void DisplayTooltip(string text){
+                form.InvokeAsyncSafe(() => form.DisplayTooltip(text));
+            }
+        }
+
+        // Notification only
+        
+        public sealed class Notification : TweetDeckBridge{
+            public Notification(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
+
+            public void DisplayTooltip(string text){
+                notification.InvokeAsyncSafe(() => notification.DisplayTooltip(text));
+            }
+
+            public void LoadNextNotification(){
+                notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
+            }
+
+            public void ShowTweetDetail(){
+                notification.InvokeAsyncSafe(notification.ShowTweetDetail);
+            }
+        }
+
+        // Global
+
+        public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
+            notification.InvokeAsyncSafe(() => {
+                form.OnTweetNotification();
+                notification.ShowNotification(new DesktopNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
+            });
+        }
+
+        public void OnTweetSound(){
+            form.InvokeAsyncSafe(() => {
+                form.OnTweetNotification();
+                form.OnTweetSound();
+            });
+        }
+
+        public void ScreenshotTweet(string html, int width){
+            form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width));
+        }
+
+        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
+            form.InvokeAsyncSafe(() => form.PlayVideo(videoUrl, tweetUrl, username, callShowOverlay));
+        }
+        
+        public void StopVideo(){
+            form.InvokeAsyncSafe(form.StopVideo);
+        }
+
+        public void FixClipboard(){
+            form.InvokeAsyncSafe(ClipboardManager.StripHtmlStyles);
+        }
+
+        public void OpenBrowser(string url){
+            form.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
+        }
+
+        public void MakeGetRequest(string url, IJavascriptCallback onSuccess, IJavascriptCallback onError){
+            Task.Run(async () => {
+                var client = WebUtils.NewClient(BrowserUtils.UserAgentVanilla);
+
+                try{
+                    var result = await client.DownloadStringTaskAsync(url);
+                    await onSuccess.ExecuteAsync(result);
+                }catch(Exception e){
+                    await onError.ExecuteAsync(e.Message);
+                }finally{
+                    onSuccess.Dispose();
+                    onError.Dispose();
+                    client.Dispose();
+                }
+            });
+        }
+
+        public int GetIdleSeconds(){
+            return NativeMethods.GetIdleSeconds();
+        }
+
+        public void Alert(string type, string contents){
+            MessageBoxIcon icon = type switch{
+                "error"   => MessageBoxIcon.Error,
+                "warning" => MessageBoxIcon.Warning,
+                "info"    => MessageBoxIcon.Information,
+                _         => MessageBoxIcon.None
+            };
+
+            FormMessage.Show("TweetDuck Browser Message", contents, icon, FormMessage.OK);
+        }
+
+        public void CrashDebug(string message){
+            #if DEBUG
+            System.Diagnostics.Debug.WriteLine(message);
+            System.Diagnostics.Debugger.Break();
+            #endif
+        }
+    }
+}

Browser/Bridge/UpdateBridge.cs

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

Browser/Data/ContextInfo.cs

@@ -0,0 +1,161 @@
+using System;
+using CefSharp;
+using TweetLib.Core.Utils;
+
+namespace TweetDuck.Browser.Data{
+    sealed class ContextInfo{
+        private LinkInfo link;
+        private ChirpInfo? chirp;
+        
+        public ContextInfo(){
+            Reset();
+        }
+        
+        public void SetLink(string type, string url){
+            link = string.IsNullOrEmpty(url) ? null : new LinkInfo(type, url);
+        }
+
+        public void SetChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
+            chirp = string.IsNullOrEmpty(tweetUrl) ? (ChirpInfo?)null : new ChirpInfo(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+        }
+
+        public ContextData Reset(){
+            link = null;
+            chirp = null;
+            return ContextData.Empty;
+        }
+
+        public ContextData Create(IContextMenuParams parameters){
+            ContextData.Builder builder = new ContextData.Builder();
+            builder.AddContext(parameters);
+
+            if (link != null){
+                builder.AddOverride(link.Type, link.Url);
+            }
+            
+            if (chirp.HasValue){
+                builder.AddChirp(chirp.Value);
+            }
+
+            return builder.Build();
+        }
+
+        // Data structures
+
+        private sealed class LinkInfo{
+            public string Type { get; }
+            public string Url { get; }
+
+            public LinkInfo(string type, string url){
+                this.Type = type;
+                this.Url = url;
+            }
+        }
+
+        public struct ChirpInfo{
+            public string TweetUrl { get; }
+            public string QuoteUrl { get; }
+
+            public string[] Authors => chirpAuthors?.Split(';') ?? StringUtils.EmptyArray;
+            public string[] Images => chirpImages?.Split(';') ?? StringUtils.EmptyArray;
+            
+            private readonly string chirpAuthors;
+            private readonly string chirpImages;
+
+            public ChirpInfo(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
+                this.TweetUrl = tweetUrl;
+                this.QuoteUrl = quoteUrl;
+                this.chirpAuthors = chirpAuthors;
+                this.chirpImages = chirpImages;
+            }
+        }
+
+        // Constructed context
+
+        [Flags]
+        public enum ContextType{
+            Unknown = 0,
+            Link    = 0b0001,
+            Image   = 0b0010,
+            Video   = 0b0100,
+            Chirp   = 0b1000
+        }
+
+        public sealed class ContextData{
+            public static readonly ContextData Empty = new Builder().Build();
+
+            public ContextType Types { get; }
+
+            public string LinkUrl { get; }
+            public string UnsafeLinkUrl { get; }
+            public string MediaUrl { get; }
+
+            public ChirpInfo Chirp { get; }
+
+            public ContextData(ContextType types, string linkUrl, string unsafeLinkUrl, string mediaUrl, ChirpInfo chirp){
+                Types = types;
+                LinkUrl = linkUrl;
+                UnsafeLinkUrl = unsafeLinkUrl;
+                MediaUrl = mediaUrl;
+                Chirp = chirp;
+            }
+
+            public sealed class Builder{
+                private ContextType types = ContextType.Unknown;
+
+                private string linkUrl = string.Empty;
+                private string unsafeLinkUrl = string.Empty;
+                private string mediaUrl = string.Empty;
+
+                private ChirpInfo chirp = default;
+
+                public void AddContext(IContextMenuParams parameters){
+                    ContextMenuType flags = parameters.TypeFlags;
+
+                    if (flags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents){
+                        types |= ContextType.Image;
+                        types &= ~ContextType.Video;
+                        mediaUrl = parameters.SourceUrl;
+                    }
+
+                    if (flags.HasFlag(ContextMenuType.Link)){
+                        types |= ContextType.Link;
+                        linkUrl = parameters.LinkUrl;
+                        unsafeLinkUrl = parameters.UnfilteredLinkUrl;
+                    }
+                }
+
+                public void AddOverride(string type, string url){
+                    switch(type){
+                        case "link":
+                            types |= ContextType.Link;
+                            linkUrl = url;
+                            unsafeLinkUrl = url;
+                            break;
+
+                        case "image":
+                            types |= ContextType.Image;
+                            types &= ~(ContextType.Video | ContextType.Link);
+                            mediaUrl = url;
+                            break;
+
+                        case "video":
+                            types |= ContextType.Video;
+                            types &= ~(ContextType.Image | ContextType.Link);
+                            mediaUrl = url;
+                            break;
+                    }
+                }
+
+                public void AddChirp(ChirpInfo chirp){
+                    this.types |= ContextType.Chirp;
+                    this.chirp = chirp;
+                }
+
+                public ContextData Build(){
+                    return new ContextData(types, linkUrl, unsafeLinkUrl, mediaUrl, chirp);
+                }
+            }
+        }
+    }
+}

Browser/Data/ResourceLink.cs

@@ -0,0 +1,13 @@
+using CefSharp;
+
+namespace TweetDuck.Browser.Data{
+    sealed class ResourceLink{
+        public string Url { get; }
+        public IResourceHandler Handler { get; }
+
+        public ResourceLink(string url, IResourceHandler handler){
+            this.Url = url;
+            this.Handler = handler;
+        }
+    }
+}

Browser/Data/WindowState.cs

@@ -1,10 +1,10 @@
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data.Serialization;
+using TweetDuck.Controls;
+using TweetLib.Core.Serialization.Converters;
+using TweetLib.Core.Utils;
 
-namespace TweetDuck.Data{
+namespace TweetDuck.Browser.Data{
     sealed class WindowState{
         private Rectangle rect;
         private bool isMaximized;

Browser/FormBrowser.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core {
+namespace TweetDuck.Browser {
     sealed partial class FormBrowser {
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Windows Form Designer generated code
 
         /// <summary>
@@ -24,7 +13,7 @@
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.trayIcon = new TweetDuck.Core.Other.TrayIcon(this.components);
+            this.trayIcon = new TrayIcon(this.components);
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.timerResize = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
@@ -38,18 +27,18 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = TweetDuck.Core.Utils.TwitterUtils.BackgroundColor;
-            this.ClientSize = new System.Drawing.Size(400, 386);
+            this.BackColor = TweetDuck.Utils.TwitterUtils.BackgroundColor;
+            this.ClientSize = new System.Drawing.Size(1008, 730);
             this.Icon = Properties.Resources.icon;
-            this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
-            this.MinimumSize = new System.Drawing.Size(416, 424);
+            this.Location = TweetDuck.Controls.ControlExtensions.InvisibleLocation;
+            this.MinimumSize = new System.Drawing.Size(348, 424);
             this.Name = "FormBrowser";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.Activated += new System.EventHandler(this.FormBrowser_Activated);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormBrowser_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormBrowser_FormClosed);
-            this.LocationChanged += new System.EventHandler(this.FormBrowser_LocationChanged);
             this.ResizeEnd += new System.EventHandler(this.FormBrowser_ResizeEnd);
+            this.LocationChanged += new System.EventHandler(this.FormBrowser_LocationChanged);
             this.Resize += new System.EventHandler(this.FormBrowser_Resize);
             this.ResumeLayout(false);
 
@@ -57,7 +46,7 @@
 
         #endregion
 
-        private TweetDuck.Core.Other.TrayIcon trayIcon;
+        private TrayIcon trayIcon;
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Timer timerResize;
     }

Browser/FormBrowser.cs

@@ -1,24 +1,30 @@
 using System;
+using System.Diagnostics;
 using System.Drawing;
+using System.IO;
+using System.Threading.Tasks;
 using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Bridge;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Browser.Notification.Screenshot;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Management;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Notification.Screenshot;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Other.Settings;
-using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Plugins.Events;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Dialogs.Settings;
+using TweetDuck.Management;
+using TweetDuck.Management.Analytics;
 using TweetDuck.Updates;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Events;
+using TweetLib.Core.Features.Updates;
 
-namespace TweetDuck.Core{
-    sealed partial class FormBrowser : Form{
-        private static UserConfig Config => Program.UserConfig;
+namespace TweetDuck.Browser{
+    sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
+        private static UserConfig Config => Program.Config.User;
 
         public bool IsWaiting{
             set{
@@ -38,12 +44,19 @@ namespace TweetDuck.Core{
         }
 
         public string UpdateInstallerPath { get; private set; }
+        private bool ignoreUpdateCheckError;
+        
+        public AnalyticsFile AnalyticsFile => analytics?.File ?? AnalyticsFile.Dummy;
 
+        #pragma warning disable IDE0069 // Disposable fields should be disposed
         private readonly TweetDeckBrowser browser;
+        private readonly FormNotificationTweet notification;
+        #pragma warning restore IDE0069 // Disposable fields should be disposed
+
         private readonly PluginManager plugins;
         private readonly UpdateHandler updates;
-        private readonly FormNotificationTweet notification;
         private readonly ContextMenu contextMenu;
+        private readonly UpdateBridge updateBridge;
 
         private bool isLoaded;
         private FormWindowState prevState;
@@ -52,12 +65,12 @@ namespace TweetDuck.Core{
         private VideoPlayer videoPlayer;
         private AnalyticsManager analytics;
 
-        public FormBrowser(UpdaterSettings updaterSettings){
+        public FormBrowser(){
             InitializeComponent();
 
             Text = Program.BrandName;
-
-            this.plugins = new PluginManager(Program.PluginPath, Program.PluginConfigFilePath);
+            
+            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath, Program.PluginDataPath);
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.Executed += plugins_Executed;
             this.plugins.Reload();
@@ -65,9 +78,14 @@ namespace TweetDuck.Core{
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
             
-            this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification));
-            this.browser.PageLoaded += browser_PageLoaded;
+            this.updates = new UpdateHandler(new UpdateCheckClient(Program.InstallerPath), TaskScheduler.FromCurrentSynchronizationContext());
+            this.updates.CheckFinished += updates_CheckFinished;
 
+            this.updateBridge = new UpdateBridge(updates, this);
+            this.updateBridge.UpdateAccepted += updateBridge_UpdateAccepted;
+            this.updateBridge.UpdateDismissed += updateBridge_UpdateDismissed;
+
+            this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification), updateBridge);
             this.contextMenu = ContextMenuBrowser.CreateMenu(this);
 
             Controls.Add(new MenuStrip{ Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
@@ -75,13 +93,7 @@ namespace TweetDuck.Core{
             Disposed += (sender, args) => {
                 Config.MuteToggled -= Config_MuteToggled;
                 Config.TrayBehaviorChanged -= Config_TrayBehaviorChanged;
-
                 browser.Dispose();
-                contextMenu.Dispose();
-
-                notificationScreenshotManager?.Dispose();
-                videoPlayer?.Dispose();
-                analytics?.Dispose();
             };
 
             Config.MuteToggled += Config_MuteToggled;
@@ -90,11 +102,11 @@ namespace TweetDuck.Core{
             this.trayIcon.ClickClose += trayIcon_ClickClose;
             Config.TrayBehaviorChanged += Config_TrayBehaviorChanged;
 
-            UpdateTrayIcon();
+            UpdateTray();
 
-            this.updates = browser.CreateUpdateHandler(updaterSettings);
-            this.updates.UpdateAccepted += updates_UpdateAccepted;
-            this.updates.UpdateDismissed += updates_UpdateDismissed;
+            if (Config.MuteNotifications){
+                UpdateFormIcon();
+            }
 
             if (Config.AllowDataCollection){
                 analytics = new AnalyticsManager(this, plugins, Program.AnalyticsFilePath);
@@ -103,6 +115,21 @@ namespace TweetDuck.Core{
             RestoreWindow();
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+
+                updates.Dispose();
+                contextMenu.Dispose();
+
+                notificationScreenshotManager?.Dispose();
+                videoPlayer?.Dispose();
+                analytics?.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         private void ShowChildForm(Form form){
             form.VisibleChanged += (sender, args) => form.MoveToCenter(this);
             form.Show(this);
@@ -121,7 +148,11 @@ namespace TweetDuck.Core{
             isLoaded = true;
         }
 
-        private void UpdateTrayIcon(){
+        private void UpdateFormIcon(){ // TODO fix to show icon in taskbar too
+            Icon = Config.MuteNotifications ? Properties.Resources.icon_muted : Properties.Resources.icon;
+        }
+
+        private void UpdateTray(){
             trayIcon.Visible = Config.TrayBehavior.ShouldDisplayIcon();
         }
 
@@ -132,7 +163,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_Activated(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             trayIcon.HasNotifications = false;
 
@@ -142,14 +175,18 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_LocationChanged(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
             
             timerResize.Stop();
             timerResize.Start();
         }
 
         private void FormBrowser_Resize(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             if (WindowState != prevState){
                 prevState = WindowState;
@@ -170,7 +207,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_ResizeEnd(object sender, EventArgs e){ // also triggers when the window moves
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             timerResize.Stop();
             
@@ -181,7 +220,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_FormClosing(object sender, FormClosingEventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             if (Config.TrayBehavior.ShouldHideOnClose() && trayIcon.Visible && e.CloseReason == CloseReason.UserClosing){
                 Hide(); // hides taskbar too?! welp that works I guess
@@ -191,106 +232,129 @@ namespace TweetDuck.Core{
 
         private void FormBrowser_FormClosed(object sender, FormClosedEventArgs e){
             if (isLoaded && UpdateInstallerPath == null){
-                updates.CleanupDownload();
+                updateBridge.Cleanup();
             }
         }
 
         private void Config_MuteToggled(object sender, EventArgs e){
-            TriggerAnalyticsEvent(AnalyticsFile.Event.MuteNotification);
+            UpdateFormIcon();
+            AnalyticsFile.NotificationMutes.Trigger();
         }
 
         private void Config_TrayBehaviorChanged(object sender, EventArgs e){
-            UpdateTrayIcon();
+            UpdateTray();
         }
 
         private void trayIcon_ClickRestore(object sender, EventArgs e){
             Show();
             RestoreWindow();
             Activate();
-            UpdateTrayIcon();
+            UpdateTray();
         }
 
         private void trayIcon_ClickClose(object sender, EventArgs e){
             ForceClose();
         }
-
-        private void browser_PageLoaded(object sender, EventArgs e){
-            if (Config.ShowDataCollectionNotification){
-                this.InvokeAsyncSafe(() => {
-                    if (!Config.FirstRun && Config.AllowDataCollection){
-                        FormMessage form = new FormMessage("Anonymous Data Update", "Hi! You can now review your anonymous data report, and opt-out if you've changed your mind. Collected data will be used to focus development on most commonly used features. If you want to opt-out but still support the project, any feedback and donations are appreciated.", MessageBoxIcon.Information);
-                        form.AddButton("OK", ControlType.Accept | ControlType.Focused);
-
-                        Button btnReviewSettings = new Button{
-                            Anchor = AnchorStyles.Bottom | AnchorStyles.Left,
-                            Font = SystemFonts.MessageBoxFont,
-                            Location = new Point(9, 12),
-                            Margin = new Padding(0, 0, 48, 0),
-                            Size = new Size(160, 26),
-                            Text = "Review Feedback Options",
-                            UseVisualStyleBackColor = true
-                        };
-
-                        btnReviewSettings.Click += (sender2, args2) => {
-                            form.Close();
-                            OpenSettings(typeof(TabSettingsFeedback));
-                        };
-
-                        form.AddActionControl(btnReviewSettings);
-                        ShowChildForm(form);
-                    }
-
-                    Config.ShowDataCollectionNotification = false;
-                    Config.Save();
-                });
-            }
-        }
         
         private void plugins_Reloaded(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                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);
+                this.InvokeAsyncSafe(() => { // TODO not needed but makes code consistent...
+                    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);
+                });
             }
 
             if (isLoaded){
-                ReloadToTweetDeck();
+                browser.ReloadToTweetDeck();
             }
         }
         
-        private static void plugins_Executed(object sender, PluginErrorEventArgs e){
+        private void plugins_Executed(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n"+string.Join("\n\n", e.Errors), FormMessage.OK);
+                this.InvokeAsyncSafe(() => {
+                    FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
+                });
             }
         }
 
-        private void updates_UpdateAccepted(object sender, UpdateEventArgs e){
-            this.InvokeAsyncSafe(() => {
-                FormManager.CloseAllDialogs();
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+            e.Result.Handle(update => {
+                string tag = update.VersionTag;
 
-                if (!string.IsNullOrEmpty(Config.DismissedUpdate)){
-                    Config.DismissedUpdate = null;
-                    Config.Save();
+                if (tag != Program.VersionTag && tag != Config.DismissedUpdate){
+                    update.BeginSilentDownload();
+                    browser.ShowUpdateNotification(tag, update.ReleaseNotes);
+                }
+                else{
+                    updates.StartTimer();
+                }
+            }, ex => {
+                if (!ignoreUpdateCheckError){
+                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
+                    updates.StartTimer();
                 }
-            
-                updates.BeginUpdateDownload(this, e.UpdateInfo, update => {
-                    if (update.DownloadStatus == UpdateDownloadStatus.Done){
-                        UpdateInstallerPath = update.InstallerPath;
-                    }
-
-                    ForceClose();
-                });
             });
+
+            ignoreUpdateCheckError = true;
         }
 
-        private void updates_UpdateDismissed(object sender, UpdateEventArgs e){
-            this.InvokeAsyncSafe(() => {
-                Config.DismissedUpdate = e.UpdateInfo.VersionTag;
+        private void updateBridge_UpdateAccepted(object sender, UpdateInfo update){
+            FormManager.CloseAllDialogs();
+
+            if (!string.IsNullOrEmpty(Config.DismissedUpdate)){
+                Config.DismissedUpdate = null;
                 Config.Save();
-            });
+            }
+
+            void OnFinished(){
+                UpdateDownloadStatus status = update.DownloadStatus;
+
+                if (status == UpdateDownloadStatus.Done){
+                    UpdateInstallerPath = update.InstallerPath;
+                    ForceClose();
+                }
+                else if (status != UpdateDownloadStatus.Canceled && FormMessage.Error("Update Has Failed", "Could not automatically download the update: " + (update.DownloadError?.Message ?? "unknown error") + "\n\nWould you like to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
+                    BrowserUtils.OpenExternalBrowser(Program.Website);
+                    ForceClose();
+                }
+                else{
+                    Show();
+                }
+            }
+            
+            if (update.DownloadStatus.IsFinished(true)){
+                OnFinished();
+            }
+            else{
+                FormUpdateDownload downloadForm = new FormUpdateDownload(update);
+
+                downloadForm.VisibleChanged += (sender2, args2) => {
+                    downloadForm.MoveToCenter(this);
+                    Hide();
+                };
+
+                downloadForm.FormClosed += (sender2, args2) => {
+                    if (downloadForm.DialogResult != DialogResult.OK){
+                        update.CancelDownload();
+                    }
+
+                    downloadForm.Dispose();
+                    OnFinished();
+                };
+
+                downloadForm.Show();
+            }
+        }
+
+        private void updateBridge_UpdateDismissed(object sender, UpdateInfo update){
+            Config.DismissedUpdate = update.VersionTag;
+            Config.Save();
         }
 
         protected override void WndProc(ref Message m){
             if (isLoaded && m.Msg == Program.WindowRestoreMessage){
-                if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
+                using Process me = Process.GetCurrentProcess();
+
+                if (me.Id == m.WParam.ToInt32()){
                     trayIcon_ClickRestore(trayIcon, EventArgs.Empty);
                 }
 
@@ -303,7 +367,7 @@ namespace TweetDuck.Core{
                 }
                 else{
                     browser.OnMouseClickExtra(m.WParam);
-                    TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserExtraMouseButton);
+                    AnalyticsFile.BrowserExtraMouseButtons.Trigger();
                 }
 
                 return;
@@ -327,7 +391,14 @@ namespace TweetDuck.Core{
         }
 
         public void ReloadToTweetDeck(){
+            Program.Resources.OnReloadTriggered();
+            ignoreUpdateCheckError = false;
             browser.ReloadToTweetDeck();
+            AnalyticsFile.BrowserReloads.Trigger();
+        }
+
+        public void AddSearchColumn(string query){
+            browser.AddSearchColumn(query);
         }
 
         public void TriggerTweetScreenshot(){
@@ -344,10 +415,11 @@ namespace TweetDuck.Core{
 
         public void ApplyROT13(){
             browser.ApplyROT13();
+            AnalyticsFile.UsedROT13.Trigger();
         }
 
-        public void TriggerAnalyticsEvent(AnalyticsFile.Event e){
-            analytics?.TriggerEvent(e);
+        public void OpenDevTools(){
+            browser.OpenDevTools();
         }
 
         // callback handlers
@@ -356,7 +428,6 @@ namespace TweetDuck.Core{
             if (Config.FirstRun){
                 Config.FirstRun = false;
                 Config.AllowDataCollection = allowDataCollection;
-                Config.ShowDataCollectionNotification = false;
                 Config.Save();
 
                 if (allowDataCollection && analytics == null){
@@ -376,13 +447,13 @@ namespace TweetDuck.Core{
         public void OpenSettings(){
             OpenSettings(null);
         }
-
+        
         public void OpenSettings(Type startTab){
             if (!FormManager.TryBringToFront<FormSettings>()){
                 bool prevEnableUpdateCheck = Config.EnableUpdateCheck;
 
                 FormSettings form = new FormSettings(this, plugins, updates, analytics, startTab);
-
+                
                 form.FormClosed += (sender, args) => {
                     if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){
                         Config.DismissedUpdate = null;
@@ -419,25 +490,37 @@ namespace TweetDuck.Core{
                     form.Dispose();
                 };
                 
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenOptions);
+                AnalyticsFile.OpenOptions.Trigger();
                 ShowChildForm(form);
             }
         }
 
         public void OpenAbout(){
             if (!FormManager.TryBringToFront<FormAbout>()){
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenAbout);
+                AnalyticsFile.OpenAbout.Trigger();
                 ShowChildForm(new FormAbout());
             }
         }
 
         public void OpenPlugins(){
             if (!FormManager.TryBringToFront<FormPlugins>()){
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenPlugins);
+                AnalyticsFile.OpenPlugins.Trigger();
                 ShowChildForm(new FormPlugins(plugins));
             }
         }
 
+        public void OpenProfileImport(){
+            FormManager.TryFind<FormSettings>()?.Close();
+
+            using DialogSettingsManage dialog = new DialogSettingsManage(plugins, true);
+
+            if (!dialog.IsDisposed && dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){ // needs disposal check because the dialog may be closed in constructor
+                BrowserProcessHandler.UpdatePrefs();
+                FormManager.TryFind<FormPlugins>()?.Close();
+                plugins.Reload(); // also reloads the browser
+            }
+        }
+
         public void OnTweetNotification(){ // may be called multiple times, once for each type of notification
             if (Config.EnableTrayHighlight && !ContainsFocus){
                 trayIcon.HasNotifications = true;
@@ -445,25 +528,41 @@ namespace TweetDuck.Core{
         }
 
         public void OnTweetSound(){
-            TriggerAnalyticsEvent(AnalyticsFile.Event.SoundNotification);
+            AnalyticsFile.SoundNotifications.Trigger();
         }
 
-        public void PlayVideo(string url, string username){
-            if (string.IsNullOrEmpty(url)){
-                videoPlayer?.Close();
-                return;
+        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
+            string playerPath = Config.VideoPlayerPath;
+
+            if (playerPath == null || !File.Exists(playerPath)){
+                if (videoPlayer == null){
+                    videoPlayer = new VideoPlayer(this);
+                    videoPlayer.ProcessExited += (sender, args) => browser.HideVideoOverlay(true);
+                }
+                
+                callShowOverlay.ExecuteAsync();
+                callShowOverlay.Dispose();
+
+                videoPlayer.Launch(videoUrl, tweetUrl, username);
             }
+            else{
+                callShowOverlay.Dispose();
 
-            if (videoPlayer == null){
-                videoPlayer = new VideoPlayer(this);
-
-                videoPlayer.ProcessExited += (sender, args) => {
-                    browser.HideVideoOverlay(true);
-                };
+                string quotedUrl = '"' + videoUrl + '"';
+                string playerArgs = Config.VideoPlayerPathArgs == null ? quotedUrl : Config.VideoPlayerPathArgs + ' ' + quotedUrl;
+                
+                try{
+                    using(Process.Start(playerPath, playerArgs)){}
+                }catch(Exception e){
+                    Program.Reporter.HandleException("Error Opening Video Player", "Could not open the video player.", true, e);
+                }
             }
             
-            videoPlayer.Launch(url, username);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.VideoPlay);
+            AnalyticsFile.VideoPlays.Trigger();
+        }
+
+        public void StopVideo(){
+            videoPlayer?.Close();
         }
 
         public bool ProcessBrowserKey(Keys key){
@@ -485,16 +584,16 @@ namespace TweetDuck.Core{
 
             notification.FinishCurrentNotification();
             browser.ShowTweetDetail(columnId, chirpId, fallbackUrl);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.TweetDetail);
+            AnalyticsFile.TweetDetails.Trigger();
         }
 
-        public void OnTweetScreenshotReady(string html, int width, int height){
+        public void OnTweetScreenshotReady(string html, int width){
             if (notificationScreenshotManager == null){
                 notificationScreenshotManager = new TweetScreenshotManager(this, plugins);
             }
 
-            notificationScreenshotManager.Trigger(html, width, height);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.TweetScreenshot);
+            notificationScreenshotManager.Trigger(html, width);
+            AnalyticsFile.TweetScreenshots.Trigger();
         }
 
         public void DisplayTooltip(string text){

Browser/Handling/ContextMenuBase.cs

@@ -0,0 +1,244 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Adapters;
+using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Configuration;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Management;
+using TweetDuck.Management.Analytics;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Utils;
+
+namespace TweetDuck.Browser.Handling{
+    abstract class ContextMenuBase : IContextMenuHandler{
+        public static ContextInfo CurrentInfo { get; } = new ContextInfo();
+
+        protected static UserConfig Config => Program.Config.User;
+        private static ImageQuality ImageQuality => Config.TwitterImageQuality;
+        
+        private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
+        private const CefMenuCommand MenuCopyLinkUrl     = (CefMenuCommand)26501;
+        private const CefMenuCommand MenuCopyUsername    = (CefMenuCommand)26502;
+        private const CefMenuCommand MenuViewImage       = (CefMenuCommand)26503;
+        private const CefMenuCommand MenuOpenMediaUrl    = (CefMenuCommand)26504;
+        private const CefMenuCommand MenuCopyMediaUrl    = (CefMenuCommand)26505;
+        private const CefMenuCommand MenuCopyImage       = (CefMenuCommand)26506;
+        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26507;
+        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26508;
+        private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26509;
+        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26510;
+        private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
+        
+        protected ContextInfo.ContextData Context { get; private set; }
+
+        private readonly AnalyticsFile.IProvider analytics;
+
+        protected ContextMenuBase(AnalyticsFile.IProvider analytics){
+            this.analytics = analytics;
+        }
+
+        public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
+            if (!TwitterUrls.IsTweetDeck(frame.Url) || browser.IsLoading){
+                Context = CurrentInfo.Reset();
+            }
+            else{
+                Context = CurrentInfo.Create(parameters);
+            }
+            
+            if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && !parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
+                model.AddItem(MenuSearchInBrowser, "Search in browser");
+                model.AddSeparator();
+                model.AddItem(MenuReadApplyROT13, "Apply ROT13");
+                model.AddSeparator();
+            }
+
+            static string TextOpen(string name) => "Open " + name + " in browser";
+            static string TextCopy(string name) => "Copy " + name + " address";
+            static string TextSave(string name) => "Save " + name + " as...";
+            
+            if (Context.Types.HasFlag(ContextInfo.ContextType.Link) && !Context.UnsafeLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal)){
+                if (TwitterUrls.RegexAccount.IsMatch(Context.UnsafeLinkUrl)){
+                    model.AddItem(MenuOpenLinkUrl, TextOpen("account"));
+                    model.AddItem(MenuCopyLinkUrl, TextCopy("account"));
+                    model.AddItem(MenuCopyUsername, "Copy account username");
+                }
+                else{
+                    model.AddItem(MenuOpenLinkUrl, TextOpen("link"));
+                    model.AddItem(MenuCopyLinkUrl, TextCopy("link"));
+                }
+
+                model.AddSeparator();
+            }
+
+            if (Context.Types.HasFlag(ContextInfo.ContextType.Video)){
+                model.AddItem(MenuOpenMediaUrl, TextOpen("video"));
+                model.AddItem(MenuCopyMediaUrl, TextCopy("video"));
+                model.AddItem(MenuSaveMedia, TextSave("video"));
+                model.AddSeparator();
+            }
+            else if (Context.Types.HasFlag(ContextInfo.ContextType.Image) && Context.MediaUrl != FormNotificationBase.AppLogo.Url){
+                model.AddItem(MenuViewImage, "View image in photo viewer");
+                model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
+                model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
+                model.AddItem(MenuCopyImage, "Copy image");
+                model.AddItem(MenuSaveMedia, TextSave("image"));
+
+                if (Context.Chirp.Images.Length > 1){
+                    model.AddItem(MenuSaveTweetImages, TextSave("all images"));
+                }
+
+                model.AddSeparator();
+            }
+        }
+
+        public virtual bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
+            Control control = browserControl.AsControl();
+
+            switch(commandId){
+                case MenuOpenLinkUrl:
+                    OpenBrowser(control, Context.LinkUrl);
+                    break;
+
+                case MenuCopyLinkUrl:
+                    SetClipboardText(control, Context.UnsafeLinkUrl);
+                    break;
+
+                case MenuCopyUsername: {
+                    string url = Context.UnsafeLinkUrl;
+                    Match match = TwitterUrls.RegexAccount.Match(url);
+
+                    SetClipboardText(control, match.Success ? match.Groups[1].Value : url);
+                    control.InvokeAsyncSafe(analytics.AnalyticsFile.CopiedUsernames.Trigger);
+                    break;
+                }
+
+                case MenuOpenMediaUrl:
+                    OpenBrowser(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
+                    break;
+
+                case MenuCopyMediaUrl:
+                    SetClipboardText(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
+                    break;
+
+                case MenuCopyImage: {
+                    string url = Context.MediaUrl;
+
+                    control.InvokeAsyncSafe(() => {
+                        TwitterUtils.CopyImage(url, ImageQuality);
+                    });
+                    
+                    break;
+                }
+
+                case MenuViewImage: {
+                    string url = Context.MediaUrl;
+
+                    control.InvokeAsyncSafe(() => {
+                        TwitterUtils.ViewImage(url, ImageQuality);
+                        analytics.AnalyticsFile.ViewedImages.Trigger();
+                    });
+                    
+                    break;
+                }
+
+                case MenuSaveMedia: {
+                    bool isVideo = Context.Types.HasFlag(ContextInfo.ContextType.Video);
+                    string url = Context.MediaUrl;
+                    string username = Context.Chirp.Authors.LastOrDefault();
+                    
+                    control.InvokeAsyncSafe(() => {
+                        if (isVideo){
+                            TwitterUtils.DownloadVideo(url, username);
+                            analytics.AnalyticsFile.DownloadedVideos.Trigger();
+                        }
+                        else{
+                            TwitterUtils.DownloadImage(url, username, ImageQuality);
+                            analytics.AnalyticsFile.DownloadedImages.Trigger();
+                        }
+                    });
+
+                    break;
+                }
+
+                case MenuSaveTweetImages: {
+                    string[] urls = Context.Chirp.Images;
+                    string username = Context.Chirp.Authors.LastOrDefault();
+                    
+                    control.InvokeAsyncSafe(() => {
+                        TwitterUtils.DownloadImages(urls, username, ImageQuality);
+                        analytics.AnalyticsFile.DownloadedImages.Trigger();
+                    });
+
+                    break;
+                }
+
+                case MenuReadApplyROT13:
+                    string selection = parameters.SelectionText;
+                    control.InvokeAsyncSafe(() => FormMessage.Information("ROT13", StringUtils.ConvertRot13(selection), FormMessage.OK));
+                    control.InvokeAsyncSafe(analytics.AnalyticsFile.UsedROT13.Trigger);
+                    return true;
+
+                case MenuSearchInBrowser:
+                    string query = parameters.SelectionText;
+                    control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalSearch(query));
+                    DeselectAll(frame);
+                    break;
+                    
+                case MenuOpenDevTools:
+                    browserControl.OpenDevToolsCustom();
+                    break;
+            }
+
+            return false;
+        }
+
+        public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
+            Context = CurrentInfo.Reset();
+        }
+
+        public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){
+            return false;
+        }
+
+        protected static void DeselectAll(IFrame frame){
+            CefScriptExecutor.RunScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
+        }
+
+        protected static void OpenBrowser(Control control, string url){
+            control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
+        }
+
+        protected static void SetClipboardText(Control control, string text){
+            control.InvokeAsyncSafe(() => ClipboardManager.SetText(text, TextDataFormat.UnicodeText));
+        }
+
+        protected static void InsertSelectionSearchItem(IMenuModel model, CefMenuCommand insertCommand, string insertLabel){
+            model.InsertItemAt(model.GetIndexOf(MenuSearchInBrowser) + 1, insertCommand, insertLabel);
+        }
+        
+        protected static void AddDebugMenuItems(IMenuModel model){
+            if (BrowserUtils.HasDevTools){
+                AddSeparator(model);
+                model.AddItem(MenuOpenDevTools, "Open dev tools");
+            }
+        }
+
+        protected static void RemoveSeparatorIfLast(IMenuModel model){
+            if (model.Count > 0 && model.GetTypeAt(model.Count - 1) == MenuItemType.Separator){
+                model.RemoveAt(model.Count - 1);
+            }
+        }
+
+        protected static void AddSeparator(IMenuModel model){
+            if (model.Count > 0 && model.GetTypeAt(model.Count - 1) != MenuItemType.Separator){ // do not add separators if there is nothing to separate
+                model.AddSeparator();
+            }
+        }
+    }
+}

Browser/Handling/ContextMenuBrowser.cs

@@ -1,11 +1,10 @@
-using CefSharp;
-using System.Windows.Forms;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Data;
+using TweetDuck.Controls;
+using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuBrowser : ContextMenuBase{
         private const CefMenuCommand MenuGlobal   = (CefMenuCommand)26600;
         private const CefMenuCommand MenuMute     = (CefMenuCommand)26601;
@@ -18,34 +17,35 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuOpenQuotedTweetUrl = (CefMenuCommand)26612;
         private const CefMenuCommand MenuCopyQuotedTweetUrl = (CefMenuCommand)26613;
         private const CefMenuCommand MenuScreenshotTweet    = (CefMenuCommand)26614;
-        private const CefMenuCommand MenuInputApplyROT13    = (CefMenuCommand)26615;
+        private const CefMenuCommand MenuWriteApplyROT13    = (CefMenuCommand)26615;
+        private const CefMenuCommand MenuSearchInColumn     = (CefMenuCommand)26616;
 
         private const string TitleReloadBrowser = "Reload browser";
         private const string TitleMuteNotifications = "Mute notifications";
         private const string TitleSettings = "Options";
         private const string TitlePlugins = "Plugins";
-        private const string TitleAboutProgram = "About "+Program.BrandName;
+        private const string TitleAboutProgram = "About " + Program.BrandName;
 
         private readonly FormBrowser form;
-
-        private string lastHighlightedTweetUrl;
-        private string lastHighlightedQuoteUrl;
-
-        public ContextMenuBrowser(FormBrowser form){
+        
+        public ContextMenuBrowser(FormBrowser form) : base(form){
             this.form = form;
         }
 
         public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
+            bool isSelecting = parameters.TypeFlags.HasFlag(ContextMenuType.Selection);
+            bool isEditing = parameters.TypeFlags.HasFlag(ContextMenuType.Editable);
+
             model.Remove(CefMenuCommand.Back);
             model.Remove(CefMenuCommand.Forward);
             model.Remove(CefMenuCommand.Print);
             model.Remove(CefMenuCommand.ViewSource);
             RemoveSeparatorIfLast(model);
 
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection)){
-                if (parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
+            if (isSelecting){
+                if (isEditing){
                     model.AddSeparator();
-                    model.AddItem(MenuInputApplyROT13, "Apply ROT13");
+                    model.AddItem(MenuWriteApplyROT13, "Apply ROT13");
                 }
 
                 model.AddSeparator();
@@ -53,20 +53,16 @@ namespace TweetDuck.Core.Handling{
 
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
-            lastHighlightedTweetUrl = TweetDeckBridge.LastHighlightedTweetUrl;
-            lastHighlightedQuoteUrl = TweetDeckBridge.LastHighlightedQuoteUrl;
-
-            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                lastHighlightedTweetUrl = string.Empty;
-                lastHighlightedQuoteUrl = string.Empty;
+            if (isSelecting && !isEditing && TwitterUrls.IsTweetDeck(frame.Url)){
+                InsertSelectionSearchItem(model, MenuSearchInColumn, "Search in a column");
             }
 
-            if (!string.IsNullOrEmpty(lastHighlightedTweetUrl) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
+            if (Context.Types.HasFlag(ContextInfo.ContextType.Chirp) && !isSelecting && !isEditing){
                 model.AddItem(MenuOpenTweetUrl, "Open tweet in browser");
                 model.AddItem(MenuCopyTweetUrl, "Copy tweet address");
                 model.AddItem(MenuScreenshotTweet, "Screenshot tweet to clipboard");
 
-                if (!string.IsNullOrEmpty(lastHighlightedQuoteUrl)){
+                if (!string.IsNullOrEmpty(Context.Chirp.QuoteUrl)){
                     model.AddSeparator();
                     model.AddItem(MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
                     model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
@@ -75,29 +71,26 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
 
-            if ((parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
+            if (!isSelecting && !isEditing){
                 AddSeparator(model);
 
                 IMenuModel globalMenu = model.Count == 0 ? model : model.AddSubMenu(MenuGlobal, Program.BrandName);
             
                 globalMenu.AddItem(CefMenuCommand.Reload, TitleReloadBrowser);
                 globalMenu.AddCheckItem(MenuMute, TitleMuteNotifications);
-                globalMenu.SetChecked(MenuMute, Program.UserConfig.MuteNotifications);
+                globalMenu.SetChecked(MenuMute, Config.MuteNotifications);
                 globalMenu.AddSeparator();
 
                 globalMenu.AddItem(MenuSettings, TitleSettings);
                 globalMenu.AddItem(MenuPlugins, TitlePlugins);
                 globalMenu.AddItem(MenuAbout, TitleAboutProgram);
-
-                if (HasDevTools){
-                    globalMenu.AddSeparator();
-                    AddDebugMenuItems(globalMenu);
-                }
+                
+                AddDebugMenuItems(globalMenu);
             }
 
             RemoveSeparatorIfLast(model);
             
-            form.InvokeAsyncSafe(() => form.TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserContextMenu));
+            form.InvokeAsyncSafe(form.AnalyticsFile.BrowserContextMenus.Trigger);
         }
 
         public override bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
@@ -127,11 +120,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenTweetUrl:
-                    OpenBrowser(form, lastHighlightedTweetUrl);
+                    OpenBrowser(form, Context.Chirp.TweetUrl);
                     return true;
 
                 case MenuCopyTweetUrl:
-                    SetClipboardText(form, lastHighlightedTweetUrl);
+                    SetClipboardText(form, Context.Chirp.TweetUrl);
                     return true;
 
                 case MenuScreenshotTweet:
@@ -139,16 +132,22 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenQuotedTweetUrl:
-                    OpenBrowser(form, lastHighlightedQuoteUrl);
+                    OpenBrowser(form, Context.Chirp.QuoteUrl);
                     return true;
 
                 case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(form, lastHighlightedQuoteUrl);
+                    SetClipboardText(form, Context.Chirp.QuoteUrl);
                     return true;
 
-                case MenuInputApplyROT13:
+                case MenuWriteApplyROT13:
                     form.InvokeAsyncSafe(form.ApplyROT13);
                     return true;
+
+                case MenuSearchInColumn:
+                    string query = parameters.SelectionText;
+                    form.InvokeAsyncSafe(() => form.AddSearchColumn(query));
+                    DeselectAll(frame);
+                    break;
             }
 
             return false;
@@ -165,16 +164,16 @@ namespace TweetDuck.Core.Handling{
             menu.MenuItems.Add(TitleAboutProgram,  (sender, args) => form.OpenAbout());
 
             menu.Popup += (sender, args) => {
-                menu.MenuItems[1].Checked = Program.UserConfig.MuteNotifications;
-                form.TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserContextMenu);
+                menu.MenuItems[1].Checked = Config.MuteNotifications;
+                form.AnalyticsFile.BrowserContextMenus.Trigger();
             };
 
             return menu;
         }
 
         private static void ToggleMuteNotifications(){
-            Program.UserConfig.MuteNotifications = !Program.UserConfig.MuteNotifications;
-            Program.UserConfig.Save();
+            Config.MuteNotifications = !Config.MuteNotifications;
+            Config.Save();
         }
     }
 }

Browser/Handling/ContextMenuGuide.cs

@@ -1,15 +1,14 @@
 using CefSharp;
+using TweetDuck.Management.Analytics;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuGuide : ContextMenuBase{
+        public ContextMenuGuide(AnalyticsFile.IProvider analytics) : base(analytics){}
+
         public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
             model.Clear();
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
-
-            if (HasDevTools){
-                AddSeparator(model);
-                AddDebugMenuItems(model);
-            }
+            AddDebugMenuItems(model);
         }
     }
 }

Browser/Handling/ContextMenuNotification.cs

@@ -1,9 +1,8 @@
 using CefSharp;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuNotification : ContextMenuBase{
         private const CefMenuCommand MenuViewDetail         = (CefMenuCommand)26600;
         private const CefMenuCommand MenuSkipTweet          = (CefMenuCommand)26601;
@@ -14,7 +13,7 @@ namespace TweetDuck.Core.Handling{
         private readonly FormNotificationBase form;
         private readonly bool enableCustomMenu;
 
-        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu){
+        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu) : base(form){
             this.form = form;
             this.enableCustomMenu = enableCustomMenu;
         }
@@ -48,16 +47,12 @@ namespace TweetDuck.Core.Handling{
                 }
             }
             
-            if (HasDevTools){
-                AddSeparator(model);
-                AddDebugMenuItems(model);
-            }
-
+            AddDebugMenuItems(model);
             RemoveSeparatorIfLast(model);
 
             form.InvokeAsyncSafe(() => {
                 form.ContextMenuOpen = true;
-                form.TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationContextMenu);
+                form.AnalyticsFile.NotificationContextMenus.Trigger();
             });
         }
 

Browser/Handling/DragHandlerBrowser.cs

@@ -1,12 +1,21 @@
 using System.Collections.Generic;
 using CefSharp;
+using CefSharp.Enums;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class DragHandlerBrowser : IDragHandler{
+        private readonly RequestHandlerBrowser requestHandler;
+
+        public DragHandlerBrowser(RequestHandlerBrowser requestHandler){
+            this.requestHandler = requestHandler;
+        }
+        
         public bool OnDragEnter(IWebBrowser browserControl, IBrowser browser, IDragData dragData, DragOperationsMask mask){
             void TriggerDragStart(string type, string data = null){
                 browserControl.ExecuteScriptAsync("window.TDGF_onGlobalDragStart", type, data);
             }
+            
+            requestHandler.BlockNextUserNavUrl = dragData.LinkUrl; // empty if not a link
 
             if (dragData.IsLink){
                 TriggerDragStart("link", dragData.LinkUrl);

Browser/Handling/Filters/ResponseFilterBase.cs

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

Browser/Handling/Filters/ResponseFilterVendor.cs

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

Browser/Handling/General/BrowserProcessHandler.cs

@@ -1,19 +1,21 @@
 using System;
 using System.Threading.Tasks;
 using CefSharp;
+using TweetDuck.Configuration;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class BrowserProcessHandler : IBrowserProcessHandler{
         public static Task UpdatePrefs(){
             return Cef.UIThreadTaskFactory.StartNew(UpdatePrefsInternal);
         }
 
         private static void UpdatePrefsInternal(){
-            using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
-                ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out string _);
-                ctx.SetPreference("spellcheck.dictionary", Program.UserConfig.SpellCheckLanguage, out string _);
-                ctx.SetPreference("settings.a11y.animation_policy", Program.UserConfig.EnableAnimatedImages ? "allowed" : "none", out string _);
-            }
+            UserConfig config = Program.Config.User;
+            using IRequestContext ctx = Cef.GetGlobalRequestContext();
+
+            ctx.SetPreference("browser.enable_spellchecking", config.EnableSpellCheck, out string _);
+            ctx.SetPreference("spellcheck.dictionary", config.SpellCheckLanguage, out string _);
+            ctx.SetPreference("settings.a11y.animation_policy", config.EnableAnimatedImages ? "allowed" : "none", out string _);
         }
 
         void IBrowserProcessHandler.OnContextInitialized(){

Browser/Handling/General/FileDialogHandler.cs

@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using CefSharp;
+
+namespace TweetDuck.Browser.Handling.General{
+    sealed class FileDialogHandler : IDialogHandler{
+        public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
+            if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple){
+                string allFilters = string.Join(";", acceptFilters.SelectMany(ParseFileType).Where(filter => !string.IsNullOrEmpty(filter)).Select(filter => "*" + filter));
+
+                using(OpenFileDialog dialog = new OpenFileDialog{
+                    AutoUpgradeEnabled = true,
+                    DereferenceLinks = true,
+                    Multiselect = mode == CefFileDialogMode.OpenMultiple,
+                    Title = "Open Files",
+                    Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
+                }){
+                    if (dialog.ShowDialog() == DialogResult.OK){
+                        string ext = Path.GetExtension(dialog.FileName)?.ToLower();
+                        callback.Continue(acceptFilters.FindIndex(filter => ParseFileType(filter).Contains(ext)), dialog.FileNames.ToList());
+                    }
+                    else{
+                        callback.Cancel();
+                    }
+
+                    callback.Dispose();
+                }
+
+                return true;
+            }
+            else{
+                callback.Dispose();
+                return false;
+            }
+        }
+
+        private static IEnumerable<string> ParseFileType(string type){
+            if (string.IsNullOrEmpty(type)){
+                return new string[0];
+            }
+            
+            if (type[0] == '.'){
+                return new string[]{ type };
+            }
+
+            switch(type){
+                case "image/jpeg": return new string[]{ ".jpg", ".jpeg" };
+                case "image/png": return new string[]{ ".png" };
+                case "image/gif": return new string[]{ ".gif" };
+                case "image/webp": return new string[]{ ".webp" };
+                case "video/mp4": return new string[]{ ".mp4" };
+                case "video/quicktime": return new string[]{ ".mov", ".qt" };
+            }
+
+            System.Diagnostics.Debugger.Break();
+            return new string[0];
+        }
+    }
+}

Browser/Handling/General/JavaScriptDialogHandler.cs

@@ -1,34 +1,35 @@
 using System.Drawing;
 using System.Windows.Forms;
 using CefSharp;
-using CefSharp.WinForms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Utils;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class JavaScriptDialogHandler : IJsDialogHandler{
         private static FormMessage CreateMessageForm(string caption, string text){
             MessageBoxIcon icon = MessageBoxIcon.None;
             int pipe = text.IndexOf('|');
 
             if (pipe != -1){
-                switch(text.Substring(0, pipe)){
-                    case "error": icon = MessageBoxIcon.Error; break;
-                    case "warning": icon = MessageBoxIcon.Warning; break;
-                    case "info": icon = MessageBoxIcon.Information; break;
-                    case "question": icon = MessageBoxIcon.Question; break;
-                    default: return new FormMessage(caption, text, icon);
-                }
+                icon = text.Substring(0, pipe) switch{
+                    "error"    => MessageBoxIcon.Error,
+                    "warning"  => MessageBoxIcon.Warning,
+                    "info"     => MessageBoxIcon.Information,
+                    "question" => MessageBoxIcon.Question,
+                    _          => MessageBoxIcon.None
+                };
 
-                text = text.Substring(pipe+1);
+                if (icon != MessageBoxIcon.None){
+                    text = text.Substring(pipe + 1);
+                }
             }
 
             return new FormMessage(caption, text, icon);
         }
 
         bool IJsDialogHandler.OnJSDialog(IWebBrowser browserControl, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage){
-            ((ChromiumWebBrowser)browserControl).InvokeSafe(() => {
+            browserControl.AsControl().InvokeSafe(() => {
                 FormMessage form;
                 TextBox input = null;
 
@@ -51,13 +52,14 @@ namespace TweetDuck.Core.Handling.General{
 
                     input = new TextBox{
                         Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
-                        Location = new Point(BrowserUtils.Scale(22+inputPad, dpiScale), form.ActionPanelY-BrowserUtils.Scale(46, dpiScale)),
-                        Size = new Size(form.ClientSize.Width-BrowserUtils.Scale(44+inputPad, dpiScale), 20)
+                        Font = SystemFonts.MessageBoxFont,
+                        Location = new Point(BrowserUtils.Scale(22 + inputPad, dpiScale), form.ActionPanelY - BrowserUtils.Scale(46, dpiScale)),
+                        Size = new Size(form.ClientSize.Width - BrowserUtils.Scale(44 + inputPad, dpiScale), BrowserUtils.Scale(23, dpiScale))
                     };
 
                     form.Controls.Add(input);
                     form.ActiveControl = input;
-                    form.Height += input.Size.Height+input.Margin.Vertical;
+                    form.Height += input.Size.Height + input.Margin.Vertical;
                 }
                 else{
                     callback.Continue(false);

Browser/Handling/General/LifeSpanHandler.cs

@@ -1,14 +1,18 @@
 using CefSharp;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Controls;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class LifeSpanHandler : ILifeSpanHandler{
+        private static bool IsPopupAllowed(string url){
+            return url.StartsWith("https://twitter.com/teams/authorize?");
+        }
+
         public static bool HandleLinkClick(IWebBrowser browserControl, WindowOpenDisposition targetDisposition, string targetUrl){
             switch(targetDisposition){
                 case WindowOpenDisposition.NewBackgroundTab:
                 case WindowOpenDisposition.NewForegroundTab:
-                case WindowOpenDisposition.NewPopup:
+                case WindowOpenDisposition.NewPopup when !IsPopupAllowed(targetUrl):
                 case WindowOpenDisposition.NewWindow:
                     browserControl.AsControl().InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(targetUrl));
                     return true;

Browser/Handling/KeyboardHandlerBase.cs

@@ -0,0 +1,47 @@
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Utils;
+
+namespace TweetDuck.Browser.Handling{
+    class KeyboardHandlerBase : IKeyboardHandler{
+        protected virtual bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (modifiers == (CefEventFlags.ControlDown | CefEventFlags.ShiftDown) && key == Keys.I){
+                if (BrowserUtils.HasDevTools){
+                    browserControl.OpenDevToolsCustom();
+                }
+                else{
+                    browserControl.AsControl().InvokeSafe(() => {
+                        string extraMessage;
+                        
+                        if (Program.IsPortable){
+                            extraMessage = "Please download the portable installer, select the folder with your current installation of TweetDuck Portable, and tick 'Install dev tools' during the installation process.";
+                        }
+                        else{
+                            extraMessage = "Please download the installer, and tick 'Install dev tools' during the installation process. The installer will automatically find and update your current installation of TweetDuck.";
+                        }
+
+                        FormMessage.Information("Dev Tools", "You do not have dev tools installed. " + extraMessage, FormMessage.OK);
+                    });
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        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://")){
+                return HandleRawKey(browserControl, browser, (Keys)windowsKeyCode, modifiers);
+            }
+
+            return false;
+        }
+
+        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
+            return false;
+        }
+    }
+}

Browser/Handling/KeyboardHandlerBrowser.cs

@@ -0,0 +1,20 @@
+using System.Windows.Forms;
+using CefSharp;
+
+namespace TweetDuck.Browser.Handling{
+    sealed class KeyboardHandlerBrowser : KeyboardHandlerBase{
+        private readonly FormBrowser form;
+
+        public KeyboardHandlerBrowser(FormBrowser form){
+            this.form = form;
+        }
+
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
+                return true;
+            }
+
+            return form.ProcessBrowserKey(key);
+        }
+    }
+}

Browser/Handling/KeyboardHandlerNotification.cs

@@ -0,0 +1,44 @@
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Controls;
+
+namespace TweetDuck.Browser.Handling{
+    sealed class KeyboardHandlerNotification : KeyboardHandlerBase{
+        private readonly FormNotificationBase notification;
+
+        public KeyboardHandlerNotification(FormNotificationBase notification){
+            this.notification = notification;
+        }
+
+        private void TriggerKeyboardShortcutAnalytics(){
+            notification.InvokeAsyncSafe(notification.AnalyticsFile.NotificationKeyboardShortcuts.Trigger);
+        }
+
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
+                return true;
+            }
+
+            switch(key){
+                case Keys.Enter:
+                    notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
+                    TriggerKeyboardShortcutAnalytics();
+                    return true;
+
+                case Keys.Escape:
+                    notification.InvokeAsyncSafe(notification.HideNotification);
+                    TriggerKeyboardShortcutAnalytics();
+                    return true;
+
+                case Keys.Space:
+                    notification.InvokeAsyncSafe(() => notification.FreezeTimer = !notification.FreezeTimer);
+                    TriggerKeyboardShortcutAnalytics();
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+    }
+}

Browser/Handling/RequestHandlerBase.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text.RegularExpressions;
+using CefSharp;
+using CefSharp.Handler;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Utils;
+using TweetLib.Core.Utils;
+
+namespace TweetDuck.Browser.Handling{
+    class RequestHandlerBase : DefaultRequestHandler{
+        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$");
+        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);
+
+        public static void LoadResourceRewriteRules(string rules){
+            if (string.IsNullOrEmpty(rules)){
+                return;
+            }
+
+            TweetDeckHashes.Clear();
+
+            foreach(string rule in rules.Replace(" ", "").ToLower().Split(',')){
+                var (key, hash) = StringUtils.SplitInTwo(rule, '=') ?? throw new ArgumentException("A rule must have one '=' character: " + rule);
+
+                if (hash.All(chr => char.IsDigit(chr) || (chr >= 'a' && chr <= 'f'))){
+                    TweetDeckHashes.Add(key, hash);
+                }
+                else{
+                    throw new ArgumentException("Invalid hash characters: " + rule);
+                }
+            }
+        }
+
+        private readonly bool autoReload;
+
+        public RequestHandlerBase(bool autoReload){
+            this.autoReload = autoReload;
+        }
+
+        public override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
+            return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
+        }
+
+        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (BrowserUtils.HasDevTools){
+                NameValueCollection headers = request.Headers;
+                headers.Remove("x-devtools-emulate-network-conditions-client-id");
+                request.Headers = headers;
+            }
+
+            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
+        }
+
+        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if ((request.ResourceType == ResourceType.Script || request.ResourceType == ResourceType.Stylesheet) && TweetDeckHashes.Count > 0){
+                string url = request.Url;
+                Match match = TweetDeckResourceUrl.Match(url);
+
+                if (match.Success && TweetDeckHashes.TryGetValue($"{match.Groups[1]}.{match.Groups[3]}", out string hash)){
+                    if (match.Groups[2].Value == hash){
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Accepting " + url);
+                    }
+                    else{
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Replacing " + url + " hash with " + hash);
+                        request.Url = TweetDeckResourceUrl.Replace(url, $"/dist/$1.{hash}.$3");
+                        return true;
+                    }
+                }
+            }
+
+            return base.OnResourceResponse(browserControl, browser, frame, request, response);
+        }
+        
+        public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
+            if (autoReload){
+                browser.Reload();
+            }
+        }
+    }
+}

Browser/Handling/RequestHandlerBrowser.cs

@@ -0,0 +1,69 @@
+using System.Collections.Specialized;
+using CefSharp;
+using TweetDuck.Browser.Handling.Filters;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Twitter;
+
+namespace TweetDuck.Browser.Handling{
+    sealed class RequestHandlerBrowser : RequestHandlerBase{
+        private const string UrlVendorResource = "/dist/vendor";
+        private const string UrlLoadingSpinner = "/backgrounds/spinner_blue";
+
+        public string BlockNextUserNavUrl { get; set; }
+
+        public RequestHandlerBrowser() : base(true){}
+
+        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (request.ResourceType == ResourceType.MainFrame){
+                if (request.Url.EndsWith("//twitter.com/")){
+                    request.Url = TwitterUrls.TweetDeck; // redirect plain twitter.com requests, fixes bugs with login 2FA
+                }
+            }
+            else if (request.ResourceType == ResourceType.Script){
+                string url = request.Url;
+
+                if (url.Contains("analytics.")){
+                    callback.Dispose();
+                    return CefReturnValue.Cancel;
+                }
+                else if (url.Contains(UrlVendorResource)){
+                    NameValueCollection headers = request.Headers;
+                    headers["Accept-Encoding"] = "identity";
+                    request.Headers = headers;
+                }
+            }
+
+            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
+        }
+
+        public override bool OnBeforeBrowse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect){
+            if (userGesture && request.TransitionType == TransitionType.LinkClicked){
+                bool block = request.Url == BlockNextUserNavUrl;
+                BlockNextUserNavUrl = string.Empty;
+                return block;
+            }
+            else if (request.TransitionType.HasFlag(TransitionType.ForwardBack) && TwitterUrls.IsTweetDeck(frame.Url)){
+                return true;
+            }
+
+            return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
+        }
+
+        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if (request.ResourceType == ResourceType.Image && request.Url.Contains(UrlLoadingSpinner)){
+                request.Url = TwitterUtils.LoadingSpinner.Url;
+                return true;
+            }
+
+            return base.OnResourceResponse(browserControl, browser, frame, request, response);
+        }
+
+        public override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if (request.ResourceType == ResourceType.Script && request.Url.Contains(UrlVendorResource) && int.TryParse(response.ResponseHeaders["Content-Length"], out int totalBytes)){
+                return new ResponseFilterVendor(totalBytes);
+            }
+
+            return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
+        }
+    }
+}

Browser/Handling/ResourceHandlerFactory.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Concurrent;
+using CefSharp;
+using TweetDuck.Browser.Data;
+
+namespace TweetDuck.Browser.Handling{
+    sealed class ResourceHandlerFactory : IResourceHandlerFactory{
+        public bool HasHandlers => !handlers.IsEmpty;
+
+        private readonly ConcurrentDictionary<string, IResourceHandler> handlers = new ConcurrentDictionary<string, IResourceHandler>(StringComparer.OrdinalIgnoreCase);
+
+        public IResourceHandler GetResourceHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request){
+            try{
+                return handlers.TryGetValue(request.Url, out IResourceHandler handler) ? handler : null;
+            }finally{
+                request.Dispose();
+            }
+        }
+
+        // registration
+
+        public bool RegisterHandler(string url, IResourceHandler handler){
+            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
+                handlers.AddOrUpdate(uri.AbsoluteUri, handler, (key, prev) => handler);
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool RegisterHandler(ResourceLink link){
+            return RegisterHandler(link.Url, link.Handler);
+        }
+
+        public bool UnregisterHandler(string url){
+            return handlers.TryRemove(url, out IResourceHandler _);
+        }
+
+        public bool UnregisterHandler(ResourceLink link){
+            return UnregisterHandler(link.Url);
+        }
+    }
+}

Browser/Handling/ResourceHandlerNotification.cs

@@ -1,9 +1,9 @@
-using CefSharp;
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 using System.IO;
 using System.Text;
+using CefSharp;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ResourceHandlerNotification : IResourceHandler{
         private readonly NameValueCollection headers = new NameValueCollection(0);
         private MemoryStream dataIn;

Browser/Notification/Example/FormNotificationExample.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Controls;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
+
+namespace TweetDuck.Browser.Notification.Example{
+    sealed class FormNotificationExample : FormNotificationMain{
+        public override bool RequiresResize => true;
+        protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;
+
+        protected override FormBorderStyle NotificationBorderStyle{
+            get{
+                if (Config.NotificationSize == DesktopNotification.Size.Custom){
+                    switch(base.NotificationBorderStyle){
+                        case FormBorderStyle.FixedSingle: return FormBorderStyle.Sizable;
+                        case FormBorderStyle.FixedToolWindow: return FormBorderStyle.SizableToolWindow;
+                    }
+                }
+
+                return base.NotificationBorderStyle;
+            }
+        }
+
+        protected override string BodyClasses => base.BodyClasses + " td-example";
+
+        public event EventHandler Ready;
+
+        private readonly DesktopNotification exampleNotification;
+
+        public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
+            browser.LoadingStateChanged += browser_LoadingStateChanged;
+
+            string exampleTweetHTML = Program.Resources.LoadSilent("pages/example.html")?.Replace("{avatar}", AppLogo.Url) ?? string.Empty;
+
+            #if DEBUG
+            exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
+            #endif
+
+            exampleNotification = new DesktopNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
+        }
+
+        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
+            if (!e.IsLoading){
+                Ready?.Invoke(this, EventArgs.Empty);
+                browser.LoadingStateChanged -= browser_LoadingStateChanged;
+            }
+        }
+
+        public override void HideNotification(){
+            Location = ControlExtensions.InvisibleLocation;
+        }
+
+        public override void FinishCurrentNotification(){}
+
+        public void ShowExampleNotification(bool reset){
+            if (reset){
+                LoadTweet(exampleNotification);
+            }
+            else{
+                PrepareAndDisplayWindow();
+            }
+
+            UpdateTitle();
+        }
+    }
+}

Browser/Notification/FormNotificationBase.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core.Notification {
+namespace TweetDuck.Browser.Notification {
     partial class FormNotificationBase {
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Windows Form Designer generated code
 
         /// <summary>
@@ -34,7 +23,7 @@
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(284, 122);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
+            this.Location = TweetDuck.Controls.ControlExtensions.InvisibleLocation;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormNotification";

Browser/Notification/FormNotificationBase.cs

@@ -1,71 +1,76 @@
-using CefSharp;
-using CefSharp.WinForms;
-using System;
-using System.Drawing;
+using System.Drawing;
 using System.Windows.Forms;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
+using TweetDuck.Controls;
+using TweetDuck.Management.Analytics;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Notification{
-    partial class FormNotificationBase : Form{
+namespace TweetDuck.Browser.Notification{
+    abstract partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
+        public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
+
+        public static string FontSize = null;
+        public static string HeadLayout = null;
+
+        protected static UserConfig Config => Program.Config.User;
+        
         protected static int FontSizeLevel{
-            get{
-                switch(TweetDeckBridge.FontSize){
-                    case "largest": return 4;
-                    case "large": return 3;
-                    case "small": return 1;
-                    case "smallest": return 0;
-                    default: return 2;
-                }
-            }
+            get => FontSize switch{
+                "largest"  => 4,
+                "large"    => 3,
+                "small"    => 1,
+                "smallest" => 0,
+                _          => 2
+            };
         }
 
         protected virtual Point PrimaryLocation{
             get{
-                UserConfig config = Program.UserConfig;
                 Screen screen;
 
-                if (config.NotificationDisplay > 0 && config.NotificationDisplay <= Screen.AllScreens.Length){
-                    screen = Screen.AllScreens[config.NotificationDisplay-1];
+                if (Config.NotificationDisplay > 0 && Config.NotificationDisplay <= Screen.AllScreens.Length){
+                    screen = Screen.AllScreens[Config.NotificationDisplay - 1];
                 }
                 else{
                     screen = Screen.FromControl(owner);
                 }
             
-                int edgeDist = config.NotificationEdgeDistance;
+                int edgeDist = Config.NotificationEdgeDistance;
 
-                switch(config.NotificationPosition){
-                    case TweetNotification.Position.TopLeft:
-                        return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+edgeDist);
+                switch(Config.NotificationPosition){
+                    case DesktopNotification.Position.TopLeft:
+                        return new Point(screen.WorkingArea.X + edgeDist, screen.WorkingArea.Y + edgeDist);
 
-                    case TweetNotification.Position.TopRight:
-                        return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
+                    case DesktopNotification.Position.TopRight:
+                        return new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + edgeDist);
 
-                    case TweetNotification.Position.BottomLeft:
-                        return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
+                    case DesktopNotification.Position.BottomLeft:
+                        return new Point(screen.WorkingArea.X + edgeDist, screen.WorkingArea.Y + screen.WorkingArea.Height - edgeDist - Height);
 
-                    case TweetNotification.Position.BottomRight:
-                        return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
+                    case DesktopNotification.Position.BottomRight:
+                        return new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + screen.WorkingArea.Height - edgeDist - Height);
 
-                    case TweetNotification.Position.Custom:
-                        if (!config.IsCustomNotificationPositionSet){
-                            config.CustomNotificationPosition = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
-                            config.Save();
+                    case DesktopNotification.Position.Custom:
+                        if (!Config.IsCustomNotificationPositionSet){
+                            Config.CustomNotificationPosition = new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + edgeDist);
+                            Config.Save();
                         }
 
-                        return config.CustomNotificationPosition;
+                        return Config.CustomNotificationPosition;
                 }
 
                 return Location;
             }
         }
 
-        public bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
+        protected bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
         protected virtual bool CanDragWindow => true;
 
         public new Point Location{
@@ -89,69 +94,80 @@ namespace TweetDuck.Core.Notification{
                 }
             }
         }
+
+        public AnalyticsFile AnalyticsFile => owner.AnalyticsFile;
         
         protected override bool ShowWithoutActivation => true;
         
         protected float DpiScale { get; }
-        protected double SizeScale => DpiScale*Program.UserConfig.ZoomLevel/100.0;
+        protected double SizeScale => DpiScale * Config.ZoomLevel / 100.0;
 
         protected readonly FormBrowser owner;
+
+        #pragma warning disable IDE0069 // Disposable fields should be disposed
         protected readonly ChromiumWebBrowser browser;
-        
+        #pragma warning restore IDE0069 // Disposable fields should be disposed
+
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
 
-        private TweetNotification currentNotification;
+        private DesktopNotification currentNotification;
         private int pauseCounter;
         
         public string CurrentTweetUrl => currentNotification?.TweetUrl;
         public string CurrentQuoteUrl => currentNotification?.QuoteUrl;
 
         public bool CanViewDetail => currentNotification != null && !string.IsNullOrEmpty(currentNotification.ColumnId) && !string.IsNullOrEmpty(currentNotification.ChirpId);
-        public bool IsPaused => pauseCounter > 0;
 
+        protected bool IsPaused => pauseCounter > 0;
         protected bool IsCursorOverBrowser => browser.Bounds.Contains(PointToClient(Cursor.Position));
         
         public bool FreezeTimer { get; set; }
         public bool ContextMenuOpen { get; set; }
 
-        public event EventHandler Initialized;
-
         protected FormNotificationBase(FormBrowser owner, bool enableContextMenu){
             InitializeComponent();
 
             this.owner = owner;
             this.owner.FormClosed += owner_FormClosed;
 
+            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            resourceHandlerFactory.RegisterHandler(TwitterUrls.TweetDeck, this.resourceHandler);
+            resourceHandlerFactory.RegisterHandler(AppLogo);
+
             this.browser = new ChromiumWebBrowser("about:blank"){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBase()
+                RequestHandler = new RequestHandlerBase(false),
+                ResourceHandlerFactory = resourceHandlerFactory
             };
 
             this.browser.Dock = DockStyle.None;
             this.browser.ClientSize = ClientSize;
-            this.browser.IsBrowserInitializedChanged += browser_IsBrowserInitializedChanged;
-
-            #if DEBUG
-            this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
-            #endif
-
-            DpiScale = this.GetDPIScale();
-
-            browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
+            this.browser.SetupZoomEvents();
 
             Controls.Add(browser);
 
             Disposed += (sender, args) => {
-                this.browser.Dispose();
                 this.owner.FormClosed -= owner_FormClosed;
+                this.browser.Dispose();
             };
 
+            DpiScale = this.GetDPIScale();
+
             // ReSharper disable once VirtualMemberCallInContructor
             UpdateTitle();
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+                resourceHandler.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         protected override void WndProc(ref Message m){
             if (m.Msg == 0x0112 && (m.WParam.ToInt32() & 0xFFF0) == 0xF010 && !CanDragWindow){ // WM_SYSCOMMAND, SC_MOVE
                 return;
@@ -160,22 +176,12 @@ namespace TweetDuck.Core.Notification{
             base.WndProc(ref m);
         }
 
-        public void TriggerAnalyticsEvent(AnalyticsFile.Event e){
-            owner.TriggerAnalyticsEvent(e);
-        }
-
         // event handlers
 
         private void owner_FormClosed(object sender, FormClosedEventArgs e){
             Close();
         }
 
-        private void browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
-            if (e.IsBrowserInitialized){
-                Initialized?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
         // notification methods
 
         public virtual void HideNotification(){
@@ -200,15 +206,13 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected virtual string GetTweetHTML(TweetNotification tweet){
-            return tweet.GenerateHtml(IsCursorOverBrowser ? "td-hover" : string.Empty);
-        }
+        protected abstract string GetTweetHTML(DesktopNotification tweet);
 
-        protected virtual void LoadTweet(TweetNotification tweet){
+        protected virtual void LoadTweet(DesktopNotification tweet){
             currentNotification = tweet;
             resourceHandler.SetHTML(GetTweetHTML(tweet));
 
-            browser.Load(TwitterUtils.TweetDeckURL);
+            browser.Load(TwitterUrls.TweetDeck);
             DisplayTooltip(null);
         }
 
@@ -218,11 +222,13 @@ namespace TweetDuck.Core.Notification{
 
         protected virtual void UpdateTitle(){
             string title = currentNotification?.ColumnTitle;
-            Text = string.IsNullOrEmpty(title) || !Program.UserConfig.DisplayNotificationColumn ? Program.BrandName : Program.BrandName+" - "+title;
+            Text = string.IsNullOrEmpty(title) || !Config.DisplayNotificationColumn ? Program.BrandName : $"{Program.BrandName} - {title}";
         }
 
         public void ShowTweetDetail(){
-            owner.ShowTweetDetail(currentNotification.ColumnId, currentNotification.ChirpId, currentNotification.TweetUrl);
+            if (currentNotification != null){
+                owner.ShowTweetDetail(currentNotification.ColumnId, currentNotification.ChirpId, currentNotification.TweetUrl);
+            }
         }
 
         public void MoveToVisibleLocation(){

Browser/Notification/FormNotificationMain.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Notification {
+namespace TweetDuck.Browser.Notification {
     partial class FormNotificationMain {
         /// <summary>
         /// Required designer variable.
@@ -26,7 +26,7 @@
             this.components = new System.ComponentModel.Container();
             this.timerDisplayDelay = new System.Windows.Forms.Timer(this.components);
             this.timerProgress = new System.Windows.Forms.Timer(this.components);
-            this.progressBarTimer = new TweetDuck.Core.Controls.FlatProgressBar();
+            this.progressBarTimer = new TweetDuck.Controls.FlatProgressBar();
             this.SuspendLayout();
             // 
             // timerDisplayDelay

Browser/Notification/FormNotificationMain.cs

@@ -1,24 +1,20 @@
-using CefSharp;
-using System;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data;
+using CefSharp;
+using TweetDuck.Browser.Adapters;
+using TweetDuck.Browser.Bridge;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Controls;
 using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Resources;
+using TweetDuck.Utils;
+using TweetLib.Core.Data;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     abstract partial class FormNotificationMain : FormNotificationBase{
-        private const string NotificationScriptFile = "notification.js";
-
-        private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
-        private static readonly string NotificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
-        
         private readonly PluginManager plugins;
         private readonly int timerBarHeight;
 
@@ -29,12 +25,14 @@ namespace TweetDuck.Core.Notification{
         private IntPtr mouseHook;
         private bool blockXButtonUp;
 
+        private int currentOpacity;
+
         private bool? prevDisplayTimer;
         private int? prevFontSize;
 
         public virtual bool RequiresResize{
             get{
-                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != FontSizeLevel;
+                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Config.DisplayNotificationTimer || prevFontSize != FontSizeLevel;
             }
 
             set{
@@ -43,37 +41,29 @@ namespace TweetDuck.Core.Notification{
                     prevFontSize = null;
                 }
                 else{
-                    prevDisplayTimer = Program.UserConfig.DisplayNotificationTimer;
+                    prevDisplayTimer = Config.DisplayNotificationTimer;
                     prevFontSize = FontSizeLevel;
                 }
             }
         }
 
         private int BaseClientWidth{
-            get{
-                switch(Program.UserConfig.NotificationSize){
-                    default:
-                        return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*FontSizeLevel));
-
-                    case TweetNotification.Size.Custom:
-                        return Program.UserConfig.CustomNotificationSize.Width;
-                }
-            }
+            get => Config.NotificationSize switch{
+                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Width,
+                _ => BrowserUtils.Scale(284, SizeScale * (1.0 + 0.05 * FontSizeLevel))
+            };
         }
 
         private int BaseClientHeight{
-            get{
-                switch(Program.UserConfig.NotificationSize){
-                    default:
-                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.075*FontSizeLevel));
-
-                    case TweetNotification.Size.Custom:
-                        return Program.UserConfig.CustomNotificationSize.Height;
-                }
-            }
+            get => Config.NotificationSize switch{
+                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Height,
+                _ => BrowserUtils.Scale(122, SizeScale * (1.0 + 0.08 * FontSizeLevel))
+            };
         }
+
+        protected virtual string BodyClasses => IsCursorOverBrowser ? "td-notification td-hover" : "td-notification";
         
-        public Size BrowserSize => Program.UserConfig.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height-timerBarHeight) : ClientSize;
+        public Size BrowserSize => Config.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height - timerBarHeight) : ClientSize;
 
         protected FormNotificationMain(FormBrowser owner, PluginManager pluginManager, bool enableContextMenu) : base(owner, enableContextMenu){
             InitializeComponent();
@@ -82,17 +72,26 @@ namespace TweetDuck.Core.Notification{
             this.timerBarHeight = BrowserUtils.Scale(4, DpiScale);
             
             browser.KeyboardHandler = new KeyboardHandlerNotification(this);
-            
             browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge.Notification(owner, this));
-            browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
 
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
+            plugins.Register(PluginEnvironment.Notification, new PluginDispatcher(browser));
+
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
         }
 
+        // helpers
+
+        private void SetOpacity(int opacity){
+            if (currentOpacity != opacity){
+                currentOpacity = opacity;
+                Opacity = opacity / 100.0;
+            }
+        }
+
         // mouse wheel hook
 
         private void StartMouseHook(){
@@ -114,7 +113,7 @@ namespace TweetDuck.Core.Notification{
                 int eventType = wParam.ToInt32();
 
                 if (eventType == NativeMethods.WM_MOUSEWHEEL && IsCursorOverBrowser){
-                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Program.UserConfig.NotificationScrollSpeed*0.01), CefEventFlags.None);
+                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Config.NotificationScrollSpeed * 0.01), CefEventFlags.None);
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONDOWN && DesktopBounds.Contains(Cursor.Position)){
@@ -128,7 +127,7 @@ namespace TweetDuck.Core.Notification{
                     }
                     
                     blockXButtonUp = true;
-                    this.InvokeAsyncSafe(() => TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationExtraMouseButton));
+                    this.InvokeAsyncSafe(AnalyticsFile.NotificationExtraMouseButtons.Trigger);
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONUP && blockXButtonUp){
@@ -164,10 +163,11 @@ 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.Environment.Notification));
-                ScriptLoader.ExecuteScript(e.Frame, NotificationJS, NotificationScriptIdentifier);
-                plugins.ExecutePlugins(e.Frame, PluginEnvironment.Notification);
+            IFrame frame = e.Frame;
+
+            if (frame.IsMain && browser.Address != "about:blank"){
+                frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
+                CefScriptExecutor.RunFile(frame, "notification.js");
             }
         }
 
@@ -177,14 +177,25 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void timerHideProgress_Tick(object sender, EventArgs e){
-            if (Bounds.Contains(Cursor.Position) || FreezeTimer || ContextMenuOpen){
+            bool isCursorInside = Bounds.Contains(Cursor.Position);
+
+            if (isCursorInside){
+                StartMouseHook();
+                SetOpacity(100);
+            }
+            else{
+                StopMouseHook(false);
+                SetOpacity(Config.NotificationWindowOpacity);
+            }
+
+            if (isCursorInside || FreezeTimer || ContextMenuOpen){
                 return;
             }
 
             timeLeft -= timerProgress.Interval;
 
-            int value = BrowserUtils.Scale(progressBarTimer.Maximum+25, (totalTime-timeLeft)/(double)totalTime);
-            progressBarTimer.SetValueInstant(Program.UserConfig.NotificationTimerCountDown ? progressBarTimer.Maximum-value : value);
+            int value = BrowserUtils.Scale(progressBarTimer.Maximum + 25, (totalTime - timeLeft) / (double)totalTime);
+            progressBarTimer.SetValueInstant(Config.NotificationTimerCountDown ? progressBarTimer.Maximum - value : value);
 
             if (timeLeft <= 0){
                 FinishCurrentNotification();
@@ -193,14 +204,14 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public virtual void ShowNotification(TweetNotification notification){
+        public virtual void ShowNotification(DesktopNotification notification){
             LoadTweet(notification);
         }
 
         public override void HideNotification(){
             base.HideNotification();
             
-            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
+            progressBarTimer.Value = Config.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
             timerProgress.Stop();
             totalTime = 0;
 
@@ -230,27 +241,27 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected override string GetTweetHTML(TweetNotification tweet){
-            string html = base.GetTweetHTML(tweet);
+        protected override string GetTweetHTML(DesktopNotification tweet){
+            string html = tweet.GenerateHtml(BodyClasses, HeadLayout, Config.CustomNotificationCSS);
 
-            foreach(InjectedHTML injection in plugins.Bridge.NotificationInjections){
-                html = injection.Inject(html);
+            foreach(InjectedHTML injection in plugins.NotificationInjections){
+                html = injection.InjectInto(html);
             }
 
             return html;
         }
 
-        protected override void LoadTweet(TweetNotification tweet){
+        protected override void LoadTweet(DesktopNotification tweet){
             timerProgress.Stop();
-            totalTime = timeLeft = tweet.GetDisplayDuration(Program.UserConfig.NotificationDurationValue);
-            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
+            totalTime = timeLeft = tweet.GetDisplayDuration(Config.NotificationDurationValue);
+            progressBarTimer.Value = Config.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
 
             base.LoadTweet(tweet);
         }
 
         protected override void SetNotificationSize(int width, int height){
-            if (Program.UserConfig.DisplayNotificationTimer){
-                ClientSize = new Size(width, height+timerBarHeight);
+            if (Config.DisplayNotificationTimer){
+                ClientSize = new Size(width, height + timerBarHeight);
                 progressBarTimer.Visible = true;
             }
             else{
@@ -266,9 +277,9 @@ namespace TweetDuck.Core.Notification{
                 RequiresResize = false;
                 SetNotificationSize(BaseClientWidth, BaseClientHeight);
             }
-            
+
+            SetOpacity(IsCursorOverBrowser ? 100 : Config.NotificationWindowOpacity);
             MoveToVisibleLocation();
-            StartMouseHook();
         }
 
         protected virtual void OnNotificationReady(){

Browser/Notification/FormNotificationTweet.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Notification {
+namespace TweetDuck.Browser.Notification {
     partial class FormNotificationTweet {
         /// <summary>
         /// Required designer variable.

Browser/Notification/FormNotificationTweet.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using TweetDuck.Plugins;
 using System.Windows.Forms;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     sealed partial class FormNotificationTweet : FormNotificationMain{
         private const int NonIntrusiveIdleLimit = 30;
         private const int TrimMinimum = 32;
@@ -26,17 +26,17 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
+        private readonly Queue<DesktopNotification> tweetQueue = new Queue<DesktopNotification>(4);
         private bool needsTrim;
         private bool hasTemporarilyMoved;
 
         public FormNotificationTweet(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, true){
             InitializeComponent();
 
-            Program.UserConfig.MuteToggled += Config_MuteToggled;
-            Disposed += (sender, args) => Program.UserConfig.MuteToggled -= Config_MuteToggled;
+            Config.MuteToggled += Config_MuteToggled;
+            Disposed += (sender, args) => Config.MuteToggled -= Config_MuteToggled;
 
-            if (Program.UserConfig.MuteNotifications){
+            if (Config.MuteNotifications){
                 PauseNotification();
             }
         }
@@ -58,7 +58,7 @@ namespace TweetDuck.Core.Notification{
         // event handlers
 
         private void Config_MuteToggled(object sender, EventArgs e){
-            if (Program.UserConfig.MuteNotifications){
+            if (Config.MuteNotifications){
                 PauseNotification();
             }
             else{
@@ -74,7 +74,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void timerIdlePauseCheck_Tick(object sender, EventArgs e){
-            if (NativeMethods.GetIdleSeconds() < Program.UserConfig.NotificationIdlePauseSeconds){
+            if (NativeMethods.GetIdleSeconds() < Config.NotificationIdlePauseSeconds){
                 ResumeNotification();
                 timerIdlePauseCheck.Stop();
             }
@@ -82,7 +82,7 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public override void ShowNotification(TweetNotification notification){
+        public override void ShowNotification(DesktopNotification notification){
             tweetQueue.Enqueue(notification);
             
             if (!IsPaused){
@@ -94,7 +94,7 @@ namespace TweetDuck.Core.Notification{
             }
 
             needsTrim |= tweetQueue.Count >= TrimMinimum;
-            TriggerAnalyticsEvent(AnalyticsFile.Event.DesktopNotification);
+            AnalyticsFile.DesktopNotifications.Trigger();
         }
 
         public override void HideNotification(){
@@ -129,7 +129,7 @@ namespace TweetDuck.Core.Notification{
 
         private void LoadNextNotification(){
             if (!IsNotificationVisible){
-                if (Program.UserConfig.NotificationNonIntrusiveMode && IsCursorOverNotificationArea && NativeMethods.GetIdleSeconds() < NonIntrusiveIdleLimit){
+                if (Config.NotificationNonIntrusiveMode && IsCursorOverNotificationArea && NativeMethods.GetIdleSeconds() < NonIntrusiveIdleLimit){
                     if (!timerCursorCheck.Enabled){
                         PauseNotification();
                         timerCursorCheck.Start();
@@ -137,7 +137,7 @@ namespace TweetDuck.Core.Notification{
 
                     return;
                 }
-                else if (Program.UserConfig.NotificationIdlePauseSeconds > 0 && NativeMethods.GetIdleSeconds() >= Program.UserConfig.NotificationIdlePauseSeconds){
+                else if (Config.NotificationIdlePauseSeconds > 0 && NativeMethods.GetIdleSeconds() >= Config.NotificationIdlePauseSeconds){
                     if (!timerIdlePauseCheck.Enabled){
                         PauseNotification();
                         timerIdlePauseCheck.Start();
@@ -154,7 +154,7 @@ namespace TweetDuck.Core.Notification{
             base.UpdateTitle();
 
             if (tweetQueue.Count > 0){
-                Text = Text+" ("+tweetQueue.Count+" more left)";
+                Text = Text + " (" + tweetQueue.Count + " more left)";
             }
         }
 

Browser/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Adapters;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Utils;
+using TweetLib.Core.Data;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
+
+namespace TweetDuck.Browser.Notification.Screenshot{
+    sealed class FormNotificationScreenshotable : FormNotificationBase{
+        protected override bool CanDragWindow => false;
+
+        private readonly PluginManager plugins;
+        private int height;
+
+        public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager, string html, int width) : base(owner, false){
+            this.plugins = pluginManager;
+
+            int realWidth = BrowserUtils.Scale(width, DpiScale);
+
+            browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, callback));
+
+            browser.LoadingStateChanged += (sender, args) => {
+                if (args.IsLoading){
+                    return;
+                }
+
+                string script = Program.Resources.LoadSilent("screenshot.js");
+                
+                if (script == null){
+                    this.InvokeAsyncSafe(callback);
+                    return;
+                }
+
+                using IFrame frame = args.Browser.MainFrame;
+                CefScriptExecutor.RunScript(frame, script.Replace("{width}", realWidth.ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
+            };
+            
+            SetNotificationSize(realWidth, 1024);
+            LoadTweet(new DesktopNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
+        }
+
+        protected override string GetTweetHTML(DesktopNotification tweet){
+            string html = tweet.GenerateHtml("td-screenshot", HeadLayout, Config.CustomNotificationCSS);
+
+            foreach(InjectedHTML injection in plugins.NotificationInjections){
+                html = injection.InjectInto(html);
+            }
+
+            return html;
+        }
+
+        private void SetScreenshotHeight(int browserHeight){
+            this.height = BrowserUtils.Scale(browserHeight, SizeScale);
+        }
+
+        public bool TakeScreenshot(bool ignoreHeightError = false){
+            if (!ignoreHeightError){
+                if (height == 0){
+                    FormMessage.Error("Screenshot Failed", "Could not detect screenshot size.", FormMessage.OK);
+                    return false;
+                }
+                else if (height > ClientSize.Height){
+                    FormMessage.Error("Screenshot Failed", $"Screenshot is too large: {height}px > {ClientSize.Height}px", FormMessage.OK);
+                    return false;
+                }
+            }
+
+            if (!WindowsUtils.IsAeroEnabled){
+                MoveToVisibleLocation(); // TODO make this look nicer I guess
+            }
+            
+            IntPtr context = NativeMethods.GetDC(this.Handle);
+
+            if (context == IntPtr.Zero){
+                FormMessage.Error("Screenshot Failed", "Could not retrieve a graphics context handle for the notification window to take the screenshot.", FormMessage.OK);
+                return false;
+            }
+            else{
+                using Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb);
+
+                try{
+                    NativeMethods.RenderSourceIntoBitmap(context, bmp);
+                }finally{
+                    NativeMethods.ReleaseDC(this.Handle, context);
+                }
+
+                Clipboard.SetImage(bmp);
+                return true;
+            }
+        }
+    }
+}

Browser/Notification/Screenshot/ScreenshotBridge.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Windows.Forms;
+using TweetDuck.Controls;
+
+namespace TweetDuck.Browser.Notification.Screenshot{
+    [SuppressMessage("ReSharper", "UnusedMember.Global")]
+    sealed class ScreenshotBridge{
+        private readonly Control owner;
+
+        private readonly Action<int> safeSetHeight;
+        private readonly Action safeTriggerScreenshot;
+
+        public ScreenshotBridge(Control owner, Action<int> safeSetHeight, Action safeTriggerScreenshot){
+            this.owner = owner;
+            this.safeSetHeight = safeSetHeight;
+            this.safeTriggerScreenshot = safeTriggerScreenshot;
+        }
+
+        public void SetHeight(int tweetHeight){
+            owner.InvokeSafe(() => safeSetHeight(tweetHeight));
+        }
+
+        public void TriggerScreenshot(){
+            owner.InvokeSafe(safeTriggerScreenshot);
+        }
+    }
+}

Browser/Notification/Screenshot/TweetScreenshotManager.cs

@@ -0,0 +1,148 @@
+#if DEBUG
+// Uncomment to keep screenshot windows visible for debugging
+// #define NO_HIDE_SCREENSHOTS
+
+// Uncomment to generate screenshots of individual frames for at most 1 second
+// #define GEN_SCREENSHOT_FRAMES
+#endif
+
+using System;
+using System.Windows.Forms;
+using TweetDuck.Controls;
+using TweetLib.Core.Features.Plugins;
+
+#if GEN_SCREENSHOT_FRAMES
+using System.Drawing.Imaging;
+using System.IO;
+using TweetDuck.Core.Utils;
+#endif
+
+namespace TweetDuck.Browser.Notification.Screenshot{
+    sealed class TweetScreenshotManager : IDisposable{
+        private readonly FormBrowser owner;
+        private readonly PluginManager plugins;
+        private readonly Timer timeout;
+        private readonly Timer disposer;
+
+        #if GEN_SCREENSHOT_FRAMES
+        private readonly Timer debugger;
+        private int frameCounter;
+
+        public const int WaitFrames = 60;
+        #else
+        public const int WaitFrames = 5;
+        #endif
+        
+        private FormNotificationScreenshotable screenshot;
+
+        public TweetScreenshotManager(FormBrowser owner, PluginManager pluginManager){
+            this.owner = owner;
+            this.plugins = pluginManager;
+
+            this.timeout = new Timer{ Interval = 8000 };
+            this.timeout.Tick += timeout_Tick;
+
+            this.disposer = new Timer{ Interval = 1 };
+            this.disposer.Tick += disposer_Tick;
+
+            #if GEN_SCREENSHOT_FRAMES
+            this.debugger = new Timer{ Interval = 16 };
+            this.debugger.Tick += debugger_Tick;
+            #endif
+        }
+
+        private void timeout_Tick(object sender, EventArgs e){
+            timeout.Stop();
+            OnFinished();
+        }
+
+        private void disposer_Tick(object sender, EventArgs e){
+            disposer.Stop();
+            screenshot.Dispose();
+            screenshot = null;
+        }
+
+        public void Trigger(string html, int width){
+            if (screenshot != null){
+                return;
+            }
+
+            screenshot = new FormNotificationScreenshotable(Callback, owner, plugins, html, width);
+            screenshot.Show();
+            timeout.Start();
+
+            #if GEN_SCREENSHOT_FRAMES
+            StartDebugger();
+            #endif
+
+            #if !NO_HIDE_SCREENSHOTS
+            owner.IsWaiting = true;
+            #endif
+        }
+
+        private void Callback(){
+            if (!timeout.Enabled){
+                return;
+            }
+
+            timeout.Stop();
+            screenshot.TakeScreenshot();
+            
+            #if !NO_HIDE_SCREENSHOTS
+            OnFinished();
+            #else
+            screenshot.MoveToVisibleLocation();
+            screenshot.FormClosed += (sender, args) => disposer.Start();
+            #endif
+        }
+
+        private void OnFinished(){
+            #if GEN_SCREENSHOT_FRAMES
+            debugger.Stop();
+            #endif
+
+            screenshot.Location = ControlExtensions.InvisibleLocation;
+            owner.IsWaiting = false;
+            disposer.Start();
+        }
+
+        public void Dispose(){
+            #if GEN_SCREENSHOT_FRAMES
+            debugger.Dispose();
+            #endif
+
+            timeout.Dispose();
+            disposer.Dispose();
+            screenshot?.Dispose();
+        }
+
+        #if GEN_SCREENSHOT_FRAMES
+        private static readonly string DebugScreenshotPath = Path.Combine(Program.StoragePath, "TD_Screenshots");
+
+        private void StartDebugger(){
+            frameCounter = 0;
+
+            try{
+                Directory.Delete(DebugScreenshotPath, true);
+                WindowsUtils.TrySleepUntil(() => !Directory.Exists(DebugScreenshotPath), 1000, 10);
+            }catch(DirectoryNotFoundException){}
+            
+            Directory.CreateDirectory(DebugScreenshotPath);
+            debugger.Start();
+        }
+
+        private void debugger_Tick(object sender, EventArgs e){
+            if (frameCounter < 63 && screenshot.TakeScreenshot(true)){
+                try{
+                    Clipboard.GetImage()?.Save(Path.Combine(DebugScreenshotPath, "frame_" + (++frameCounter) + ".png"), ImageFormat.Png);
+                }catch{
+                    System.Diagnostics.Debug.WriteLine("Failed generating frame " + frameCounter);
+                }
+            }
+            else{
+                debugger.Stop();
+            }
+        }
+        #endif
+    }
+}

Browser/Notification/SoundNotification.cs

@@ -0,0 +1,48 @@
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Dialogs.Settings;
+using TweetDuck.Management;
+
+namespace TweetDuck.Browser.Notification{
+    static class SoundNotification{
+        public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
+        
+        public static IResourceHandler CreateFileHandler(string path){
+            string mimeType = Path.GetExtension(path) switch{
+                ".weba" => "audio/webm",
+                ".webm" => "audio/webm",
+                ".wav"  => "audio/wav",
+                ".ogg"  => "audio/ogg",
+                ".mp3"  => "audio/mp3",
+                ".flac" => "audio/flac",
+                ".opus" => "audio/ogg; codecs=opus",
+                _       => null
+            };
+
+            try{
+                return ResourceHandler.FromFilePath(path, mimeType);
+            }catch{
+                FormBrowser browser = FormManager.TryFind<FormBrowser>();
+
+                browser?.InvokeAsyncSafe(() => {
+                    using FormMessage form = new FormMessage("Sound Notification Error", "Could not find custom notification sound file:\n" + path, MessageBoxIcon.Error);
+                    form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
+                        
+                    Button btnViewOptions = form.AddButton("View Options");
+                    btnViewOptions.Width += 16;
+                    btnViewOptions.Location = new Point(btnViewOptions.Location.X - 16, btnViewOptions.Location.Y);
+
+                    if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnViewOptions){
+                        browser.OpenSettings(typeof(TabSettingsSounds));
+                    }
+                });
+                
+                return null;
+            }
+        }
+    }
+}

Browser/TrayIcon.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Browser {
     partial class TrayIcon {
         /// <summary> 
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Component Designer generated code
 
         /// <summary> 

Browser/TrayIcon.cs

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

Browser/TweetDeckBrowser.cs

@@ -0,0 +1,279 @@
+using System;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Browser.Adapters;
+using TweetDuck.Browser.Bridge;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Configuration;
+using TweetDuck.Controls;
+using TweetDuck.Plugins;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Utils;
+
+namespace TweetDuck.Browser{
+    sealed class TweetDeckBrowser : IDisposable{
+        private static UserConfig Config => Program.Config.User;
+
+        private const string ErrorUrl = "http://td/error";
+        private const string TwitterStyleUrl = "https://abs.twimg.com/tduck/css";
+
+        public bool Ready { get; private set; }
+
+        public bool Enabled{
+            get => browser.Enabled;
+            set => browser.Enabled = value;
+        }
+
+        public bool IsTweetDeckWebsite{
+            get{
+                if (!Ready){
+                    return false;
+                }
+
+                using IFrame frame = browser.GetBrowser().MainFrame;
+                return TwitterUrls.IsTweetDeck(frame.Url);
+            }
+        }
+        
+        private readonly ChromiumWebBrowser browser;
+        private readonly ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+
+        private string prevSoundNotificationPath = null;
+
+        public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
+            resourceHandlerFactory.RegisterHandler(FormNotificationBase.AppLogo);
+            resourceHandlerFactory.RegisterHandler(TwitterUtils.LoadingSpinner);
+
+            RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
+            
+            this.browser = new ChromiumWebBrowser(TwitterUrls.TweetDeck){
+                DialogHandler = new FileDialogHandler(),
+                DragHandler = new DragHandlerBrowser(requestHandler),
+                MenuHandler = new ContextMenuBrowser(owner),
+                JsDialogHandler = new JavaScriptDialogHandler(),
+                KeyboardHandler = new KeyboardHandlerBrowser(owner),
+                LifeSpanHandler = new LifeSpanHandler(),
+                RequestHandler = requestHandler,
+                ResourceHandlerFactory = resourceHandlerFactory
+            };
+
+            this.browser.LoadingStateChanged += browser_LoadingStateChanged;
+            this.browser.FrameLoadStart += browser_FrameLoadStart;
+            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
+            this.browser.LoadError += browser_LoadError;
+
+            this.browser.RegisterAsyncJsObject("$TD", tdBridge);
+            this.browser.RegisterAsyncJsObject("$TDU", updateBridge);
+            
+            this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
+            this.browser.Dock = DockStyle.None;
+            this.browser.Location = ControlExtensions.InvisibleLocation;
+            this.browser.SetupZoomEvents();
+            
+            owner.Controls.Add(browser);
+            plugins.Register(PluginEnvironment.Browser, new PluginDispatcher(browser));
+            
+            Config.MuteToggled += Config_MuteToggled;
+            Config.SoundNotificationChanged += Config_SoundNotificationInfoChanged;
+        }
+
+        // setup and management
+
+        private void OnBrowserReady(){
+            if (!Ready){
+                browser.Location = Point.Empty;
+                browser.Dock = DockStyle.Fill;
+                Ready = true;
+            }
+        }
+
+        public void Focus(){
+            browser.Focus();
+        }
+
+        public void Dispose(){
+            Config.MuteToggled -= Config_MuteToggled;
+            Config.SoundNotificationChanged -= Config_SoundNotificationInfoChanged;
+            
+            browser.Dispose();
+        }
+
+        // event handlers
+
+        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
+            if (!e.IsLoading){
+                foreach(string word in TwitterUtils.DictionaryWords){
+                    browser.AddWordToDictionary(word);
+                }
+
+                browser.BeginInvoke(new Action(OnBrowserReady));
+                browser.LoadingStateChanged -= browser_LoadingStateChanged;
+            }
+        }
+
+        private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
+            IFrame frame = e.Frame;
+
+            if (frame.IsMain){
+                string url = frame.Url;
+
+                if (TwitterUrls.IsTwitter(url)){
+                    string css = Program.Resources.Load("styles/twitter.css");
+                    resourceHandlerFactory.RegisterHandler(TwitterStyleUrl, ResourceHandler.FromString(css, mimeType: "text/css"));
+
+                    CefScriptExecutor.RunFile(frame, "twitter.js");
+                }
+                
+                if (!TwitterUrls.IsTwitterLogin2Factor(url)){
+                    frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
+                }
+            }
+        }
+
+        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
+            IFrame frame = e.Frame;
+            string url = frame.Url;
+
+            if (frame.IsMain){
+                if (TwitterUrls.IsTweetDeck(url)){
+                    UpdateProperties();
+                    CefScriptExecutor.RunFile(frame, "code.js");
+
+                    InjectBrowserCSS();
+                    ReinjectCustomCSS(Config.CustomBrowserCSS);
+                    Config_SoundNotificationInfoChanged(null, EventArgs.Empty);
+
+                    TweetDeckBridge.ResetStaticProperties();
+
+                    if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)){
+                        CefScriptExecutor.RunScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
+                    }
+
+                    if (Config.FirstRun){
+                        CefScriptExecutor.RunFile(frame, "introduction.js");
+                    }
+                }
+
+                CefScriptExecutor.RunFile(frame, "update.js");
+            }
+
+            if (url == ErrorUrl){
+                resourceHandlerFactory.UnregisterHandler(ErrorUrl);
+            }
+        }
+
+        private void browser_LoadError(object sender, LoadErrorEventArgs e){
+            if (e.ErrorCode == CefErrorCode.Aborted){
+                return;
+            }
+
+            if (!e.FailedUrl.StartsWith("http://td/", StringComparison.Ordinal)){
+                string errorPage = Program.Resources.LoadSilent("pages/error.html");
+
+                if (errorPage != null){
+                    string errorName = Enum.GetName(typeof(CefErrorCode), e.ErrorCode);
+                    string errorTitle = StringUtils.ConvertPascalCaseToScreamingSnakeCase(errorName ?? string.Empty);
+
+                    resourceHandlerFactory.RegisterHandler(ErrorUrl, ResourceHandler.FromString(errorPage.Replace("{err}", errorTitle)));
+                    browser.Load(ErrorUrl);
+                }
+            }
+        }
+
+        private void Config_MuteToggled(object sender, EventArgs e){
+            UpdateProperties();
+        }
+
+        private void Config_SoundNotificationInfoChanged(object sender, EventArgs e){
+            const string soundUrl = "https://ton.twimg.com/tduck/updatesnd";
+
+            bool hasCustomSound = Config.IsCustomSoundNotificationSet;
+            string newNotificationPath = Config.NotificationSoundPath;
+            
+            if (prevSoundNotificationPath != newNotificationPath){
+                prevSoundNotificationPath = newNotificationPath;
+
+                if (hasCustomSound){
+                    resourceHandlerFactory.RegisterHandler(soundUrl, SoundNotification.CreateFileHandler(newNotificationPath));
+                }
+                else{
+                    resourceHandlerFactory.UnregisterHandler(soundUrl);
+                }
+            }
+
+            browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Config.NotificationSoundVolume);
+        }
+
+        // external handling
+
+        public void HideVideoOverlay(bool focus){
+            if (focus){
+                browser.GetBrowser().GetHost().SendFocusEvent(true);
+            }
+
+            browser.ExecuteScriptAsync("$('#td-video-player-overlay').remove()");
+        }
+
+        // javascript calls
+
+        public void ReloadToTweetDeck(){
+            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUrls.TweetDeck}'");
+        }
+
+        public void UpdateProperties(){
+            browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Browser));
+        }
+
+        public void InjectBrowserCSS(){
+            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", Program.Resources.Load("styles/browser.css")?.TrimEnd() ?? string.Empty);
+        }
+
+        public void ReinjectCustomCSS(string css){
+            browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
+        }
+
+        public void OnMouseClickExtra(IntPtr param){
+            browser.ExecuteScriptAsync("TDGF_onMouseClickExtra", (param.ToInt32() >> 16) & 0xFFFF);
+        }
+
+        public void ShowTweetDetail(string columnId, string chirpId, string fallbackUrl){
+            browser.ExecuteScriptAsync("TDGF_showTweetDetail", columnId, chirpId, fallbackUrl);
+        }
+
+        public void AddSearchColumn(string query){
+            browser.ExecuteScriptAsync("TDGF_performSearch", query);
+        }
+
+        public void TriggerTweetScreenshot(){
+            browser.ExecuteScriptAsync("TDGF_triggerScreenshot()");
+        }
+
+        public void ReloadColumns(){
+            browser.ExecuteScriptAsync("TDGF_reloadColumns()");
+        }
+
+        public void PlaySoundNotification(){
+            browser.ExecuteScriptAsync("TDGF_playSoundNotification()");
+        }
+
+        public void ApplyROT13(){
+            browser.ExecuteScriptAsync("TDGF_applyROT13()");
+        }
+
+        public void ShowUpdateNotification(string versionTag, string releaseNotes){
+            browser.ExecuteScriptAsync("TDUF_displayNotification", versionTag, Convert.ToBase64String(Encoding.GetEncoding("iso-8859-1").GetBytes(releaseNotes)));
+        }
+
+        public void OpenDevTools(){
+            browser.OpenDevToolsCustom();
+        }
+    }
+}

Configuration/Arguments.cs

@@ -1,12 +1,13 @@
 using System;
-using TweetDuck.Data;
+using TweetLib.Core.Collections;
 
 namespace TweetDuck.Configuration{
     static class Arguments{
         // public args
         public const string ArgDataFolder = "-datafolder";
         public const string ArgLogging = "-log";
-        public const string ArgDebugUpdates = "-debugupdates";
+        public const string ArgIgnoreGDPR = "-nogdpr";
+        public const string ArgFreeze = "-freeze";
 
         // internal args
         public const string ArgRestart = "-restart";
@@ -21,8 +22,8 @@ namespace TweetDuck.Configuration{
             return Current.HasFlag(flag);
         }
 
-        public static string GetValue(string key, string defaultValue){
-            return Current.GetValue(key, defaultValue);
+        public static string GetValue(string key){
+            return Current.GetValue(key);
         }
 
         public static CommandLineArgs GetCurrentClean(){

Configuration/ConfigManager.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Drawing;
+using TweetDuck.Browser.Data;
+using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Features.Plugins.Config;
+using TweetLib.Core.Serialization.Converters;
+using TweetLib.Core.Utils;
+
+namespace TweetDuck.Configuration{
+    sealed class ConfigManager : IConfigManager{
+        public UserConfig User { get; }
+        public SystemConfig System { get; }
+        public PluginConfig Plugins { get; }
+        
+        public event EventHandler ProgramRestartRequested;
+
+        private readonly FileConfigInstance<UserConfig> infoUser;
+        private readonly FileConfigInstance<SystemConfig> infoSystem;
+        private readonly PluginConfigInstance<PluginConfig> infoPlugins;
+
+        private readonly IConfigInstance<BaseConfig>[] infoList;
+
+        public ConfigManager(){
+            User = new UserConfig(this);
+            System = new SystemConfig(this);
+            Plugins = new PluginConfig(this);
+            
+            infoList = new IConfigInstance<BaseConfig>[]{
+                infoUser = new FileConfigInstance<UserConfig>(Program.UserConfigFilePath, User, "program options"),
+                infoSystem = new FileConfigInstance<SystemConfig>(Program.SystemConfigFilePath, System, "system options"),
+                infoPlugins = new PluginConfigInstance<PluginConfig>(Program.PluginConfigFilePath, Plugins)
+            };
+
+            // TODO refactor further
+
+            infoUser.Serializer.RegisterTypeConverter(typeof(WindowState), WindowState.Converter);
+
+            infoUser.Serializer.RegisterTypeConverter(typeof(Point), new SingleTypeConverter<Point>{
+                ConvertToString = value => $"{value.X} {value.Y}",
+                ConvertToObject = value => {
+                    int[] elements = StringUtils.ParseInts(value, ' ');
+                    return new Point(elements[0], elements[1]);
+                }
+            });
+            
+            infoUser.Serializer.RegisterTypeConverter(typeof(Size), new SingleTypeConverter<Size>{
+                ConvertToString = value => $"{value.Width} {value.Height}",
+                ConvertToObject = value => {
+                    int[] elements = StringUtils.ParseInts(value, ' ');
+                    return new Size(elements[0], elements[1]);
+                }
+            });
+        }
+
+        public void LoadAll(){
+            infoUser.Load();
+            infoSystem.Load();
+            infoPlugins.Load();
+        }
+
+        public void SaveAll(){
+            infoUser.Save();
+            infoSystem.Save();
+            infoPlugins.Save();
+        }
+
+        public void ReloadAll(){
+            infoUser.Reload();
+            infoSystem.Reload();
+            infoPlugins.Reload();
+        }
+
+        void IConfigManager.TriggerProgramRestartRequested(){
+            ProgramRestartRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        IConfigInstance<BaseConfig> IConfigManager.GetInstanceInfo(BaseConfig instance){
+            Type instanceType = instance.GetType();
+            return Array.Find(infoList, info => info.Instance.GetType() == instanceType); // TODO handle null
+        }
+    }
+}

Configuration/PluginConfig.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Config;
+using TweetLib.Core.Features.Plugins.Events;
+
+namespace TweetDuck.Configuration{
+    sealed class PluginConfig : BaseConfig, IPluginConfig{
+        private static readonly string[] DefaultDisabled = {
+            "official/clear-columns",
+            "official/reply-account"
+        };
+
+        // CONFIGURATION DATA
+
+        private readonly HashSet<string> disabled = new HashSet<string>(DefaultDisabled);
+
+        // EVENTS
+        
+        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
+        
+        // END OF CONFIG
+
+        public PluginConfig(IConfigManager configManager) : base(configManager){}
+
+        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
+            return new PluginConfig(configManager);
+        }
+
+        // INTERFACE IMPLEMENTATION
+
+        IEnumerable<string> IPluginConfig.DisabledPlugins => disabled;
+
+        void IPluginConfig.Reset(IEnumerable<string> newDisabledPlugins){
+            disabled.Clear();
+            disabled.UnionWith(newDisabledPlugins);
+        }
+
+        public void SetEnabled(Plugin plugin, bool enabled){
+            if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
+                PluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
+                Save();
+            }
+        }
+
+        public bool IsEnabled(Plugin plugin){
+            return !disabled.Contains(plugin.Identifier);
+        }
+    }
+}

Configuration/SystemConfig.cs

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

Configuration/UserConfig.cs

@@ -1,66 +1,49 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data;
-using TweetDuck.Data.Serialization;
+using TweetDuck.Browser;
+using TweetDuck.Browser.Data;
+using TweetDuck.Controls;
+using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Configuration{
-    sealed class UserConfig{
-        private static readonly FileSerializer<UserConfig> Serializer = new FileSerializer<UserConfig>{
-            HandleUnknownProperties = FileSerializer<UserConfig>.IgnoreProperties("AppLocale")
-        };
-
-        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]);
-                }
-            });
-        }
+    sealed class UserConfig : BaseConfig{
         
         // CONFIGURATION DATA
 
-        public bool FirstRun                       { get; set; } = true;
-        public bool AllowDataCollection            { get; set; } = false;
-        public bool ShowDataCollectionNotification { get; set; } = true;
+        public bool FirstRun            { get; set; } = true;
+        public bool AllowDataCollection { get; set; } = false;
 
         public WindowState BrowserWindow { get; set; } = new WindowState();
-        public WindowState PluginsWindow { get; set; } = new WindowState();
+        public Size PluginsWindowSize    { get; set; } = Size.Empty;
 
         public bool ExpandLinksOnHover        { get; set; } = true;
-        public bool SwitchAccountSelectors    { get; set; } = true;
+        public bool FocusDmInput              { get; set; } = true;
         public bool OpenSearchInFirstColumn   { get; set; } = true;
         public bool KeepLikeFollowDialogsOpen { get; set; } = true;
         public bool BestImageQuality          { get; set; } = true;
         public bool EnableAnimatedImages      { get; set; } = true;
 
-        public bool EnableSmoothScrolling { get; set; } = true;
-        public string BrowserPath         { get; set; } = null;
-        private int _zoomLevel                          = 100;
-        private bool _muteNotifications;
+        private bool _enableSmoothScrolling = true;
+        private bool _enableTouchAdjustment = false;
+        private string _customCefArgs       = null;
 
-        public int VideoPlayerVolume { get; set; } = 50;
+        public string BrowserPath            { get; set; } = null;
+        public string BrowserPathArgs        { get; set; } = null;
+        public bool IgnoreTrackingUrlWarning { get; set; } = false;
+        public string SearchEngineUrl        { get; set; } = null;
+        private int _zoomLevel                             = 100;
         
-        public bool EnableSpellCheck     { get; set; } = false;
-        public string SpellCheckLanguage { get; set; } = "en-US";
-        public string TranslationTarget  { get; set; } = "en";
+        public string VideoPlayerPath     { get; set; } = null;
+        public string VideoPlayerPathArgs { get; set; } = null;
+        public int VideoPlayerVolume      { get; set; } = 50;
+        
+        public bool EnableSpellCheck { get; set; } = false;
+        private string _spellCheckLanguage         = "en-US";
+
+        public string TranslationTarget { get; set; } = "en";
+        public int  CalendarFirstDay    { get; set; } = -1;
         
         private TrayIcon.Behavior _trayBehavior       = TrayIcon.Behavior.Disabled;
         public bool EnableTrayHighlight { get; set; } = true;
@@ -74,25 +57,29 @@ namespace TweetDuck.Configuration{
         public bool NotificationNonIntrusiveMode { get; set; } = true;
         public int NotificationIdlePauseSeconds  { get; set; } = 0;
 
-        public bool DisplayNotificationTimer     { get; set; } = true;
-        public bool NotificationTimerCountDown   { get; set; } = false;
-        public int NotificationDurationValue     { get; set; } = 25;
+        public bool DisplayNotificationTimer   { get; set; } = true;
+        public bool NotificationTimerCountDown { get; set; } = false;
+        public int NotificationDurationValue   { get; set; } = 25;
 
-        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 TweetNotification.Size NotificationSize { get; set; } = TweetNotification.Size.Auto;
-        public Size CustomNotificationSize             { get; set; } = Size.Empty;
-        public int NotificationScrollSpeed             { get; set; } = 100;
+        public DesktopNotification.Position NotificationPosition { get; set; } = DesktopNotification.Position.TopRight;
+        public Point CustomNotificationPosition                  { get; set; } = ControlExtensions.InvisibleLocation;
+        public int NotificationDisplay                           { get; set; } = 0;
+        public int NotificationEdgeDistance                      { get; set; } = 8;
+        public int NotificationWindowOpacity                     { get; set; } = 100;
 
+        public DesktopNotification.Size NotificationSize { get; set; } = DesktopNotification.Size.Auto;
+        public Size CustomNotificationSize               { get; set; } = Size.Empty;
+        public int NotificationScrollSpeed               { get; set; } = 100;
+        
         private string _notificationSoundPath;
         private int _notificationSoundVolume = 100;
 
-        public string CustomCefArgs         { get; set; } = null;
+        private bool _muteNotifications;
+
         public string CustomBrowserCSS      { get; set; } = null;
         public string CustomNotificationCSS { get; set; } = null;
+
+        public bool DevToolsWindowOnTop     { get; set; } = true;
         
         // SPECIAL PROPERTIES
 
@@ -100,7 +87,7 @@ namespace TweetDuck.Configuration{
         public bool IsCustomNotificationSizeSet => CustomNotificationSize != Size.Empty;
         public bool IsCustomSoundNotificationSet => NotificationSoundPath != string.Empty;
 
-        public TwitterUtils.ImageQuality TwitterImageQuality => BestImageQuality ? TwitterUtils.ImageQuality.Orig : TwitterUtils.ImageQuality.Default;
+        public ImageQuality TwitterImageQuality => BestImageQuality ? ImageQuality.Best : ImageQuality.Default;
         
         public string NotificationSoundPath{
             get => _notificationSoundPath ?? string.Empty;
@@ -126,6 +113,26 @@ namespace TweetDuck.Configuration{
             get => _trayBehavior;
             set => UpdatePropertyWithEvent(ref _trayBehavior, value, TrayBehaviorChanged);
         }
+        
+        public bool EnableSmoothScrolling{
+            get => _enableSmoothScrolling;
+            set => UpdatePropertyWithRestartRequest(ref _enableSmoothScrolling, value);
+        }
+
+        public bool EnableTouchAdjustment{
+            get => _enableTouchAdjustment;
+            set => UpdatePropertyWithRestartRequest(ref _enableTouchAdjustment, value);
+        }
+
+        public string CustomCefArgs{
+            get => _customCefArgs;
+            set => UpdatePropertyWithRestartRequest(ref _customCefArgs, value);
+        }
+
+        public string SpellCheckLanguage{
+            get => _spellCheckLanguage;
+            set => UpdatePropertyWithRestartRequest(ref _spellCheckLanguage, value);
+        }
 
         // EVENTS
         
@@ -136,105 +143,10 @@ namespace TweetDuck.Configuration{
 
         // END OF CONFIG
         
-        private readonly string file;
+        public UserConfig(IConfigManager configManager) : base(configManager){}
 
-        private UserConfig(string file){
-            this.file = file;
-        }
-
-        private void UpdatePropertyWithEvent<T>(ref T field, T value, EventHandler eventHandler){
-            if (!EqualityComparer<T>.Default.Equals(field, value)){
-                field = value;
-                eventHandler?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        public void Save(){
-            try{
-                if (File.Exists(file)){
-                    string backupFile = GetBackupFile(file);
-                    File.Delete(backupFile);
-                    File.Move(file, backupFile);
-                }
-
-                Serializer.Write(file, this);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not save the configuration file.", true, e);
-            }
-        }
-
-        public void Reload(){
-            try{
-                LoadInternal(false);
-            }catch(FileNotFoundException){
-                try{
-                    Serializer.Write(file, new UserConfig(file));
-                    LoadInternal(false);
-                }catch(Exception e){
-                    Program.Reporter.HandleException("Configuration Error", "Could not regenerate configuration file.", true, e);
-                }
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not reload configuration file.", true, e);
-            }
-        }
-
-        public void Reset(){
-            try{
-                File.Delete(file);
-                File.Delete(GetBackupFile(file));
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not delete configuration files to reset the options.", true, e);
-                return;
-            }
-            
-            Reload();
-        }
-
-        private void LoadInternal(bool backup){
-            Serializer.Read(backup ? GetBackupFile(file) : file, this);
-
-            if (NotificationScrollSpeed == 10){ // incorrect initial value
-                NotificationScrollSpeed = 100;
-                Save();
-            }
-        }
-        
-        public static UserConfig Load(string file){
-            Exception firstException = null;
-
-            for(int attempt = 0; attempt < 2; attempt++){
-                try{
-                    UserConfig config = new UserConfig(file);
-                    config.LoadInternal(attempt > 0);
-                    return config;
-                }catch(FileNotFoundException){
-                }catch(DirectoryNotFoundException){
-                    break;
-                }catch(Exception e){
-                    if (attempt == 0){
-                        firstException = e;
-                        Program.Reporter.Log(e.ToString());
-                    }
-                    else if (firstException is FormatException){
-                        Program.Reporter.HandleException("Configuration Error", "The configuration file is outdated or corrupted. If you continue, your program options will be reset.", true, e);
-                        return new UserConfig(file);
-                    }
-                    else if (firstException != null){
-                        Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, your program options will be reset.", true, e);
-                        return new UserConfig(file);
-                    }
-                }
-            }
-
-            if (firstException != null){
-                Program.Reporter.HandleException("Configuration Error", "Could not open the configuration file.", true, firstException);
-            }
-
-            return new UserConfig(file);
-        }
-
-        public static string GetBackupFile(string file){
-            return file+".bak";
+        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
+            return new UserConfig(configManager);
         }
     }
 }

Controls/ControlExtensions.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     static class ControlExtensions{
         public static readonly Point InvisibleLocation = new Point(-32000, -32000);
 
@@ -21,9 +21,8 @@ namespace TweetDuck.Core.Controls{
         }
 
         public static float GetDPIScale(this Control control){
-            using(Graphics graphics = control.CreateGraphics()){
-                return graphics.DpiY/96F;
-            }
+            using Graphics graphics = control.CreateGraphics();
+            return graphics.DpiY / 96F;
         }
 
         public static bool IsFullyOutsideView(this Form form){
@@ -31,17 +30,17 @@ namespace TweetDuck.Core.Controls{
         }
 
         public static void MoveToCenter(this Form targetForm, Form parentForm){
-            targetForm.Location = new Point(parentForm.Location.X+parentForm.Width/2-targetForm.Width/2, parentForm.Location.Y+parentForm.Height/2-targetForm.Height/2);
+            targetForm.Location = new Point(parentForm.Location.X + (parentForm.Width / 2) - (targetForm.Width / 2), parentForm.Location.Y + (parentForm.Height / 2) - (targetForm.Height / 2));
         }
 
         public static void SetValueInstant(this ProgressBar bar, int value){
             if (value == bar.Maximum){
                 bar.Value = value;
-                bar.Value = value-1;
+                bar.Value = value - 1;
                 bar.Value = value;
             }
             else{
-                bar.Value = value+1;
+                bar.Value = value + 1;
                 bar.Value = value;
             }
         }
@@ -60,10 +59,11 @@ namespace TweetDuck.Core.Controls{
 
         public static bool AlignValueToTick(this TrackBar trackBar){
             if (trackBar.Value % trackBar.SmallChange != 0){
-                trackBar.Value = trackBar.SmallChange*(int)Math.Floor(((double)trackBar.Value/trackBar.SmallChange)+0.5);
+                trackBar.Value = trackBar.SmallChange * (int)Math.Floor(((double)trackBar.Value / trackBar.SmallChange) + 0.5);
                 return false;
             }
-            else return true;
+
+            return true;
         }
 
         public static void EnableMultilineShortcuts(this TextBox textBox){

Controls/FlatButton.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class FlatButton : Button{
         protected override bool ShowFocusCues => false;
 

Controls/FlatProgressBar.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class FlatProgressBar : ProgressBar{
         private readonly SolidBrush brush;
 
@@ -23,7 +23,7 @@ namespace TweetDuck.Core.Controls{
             }
 
             Rectangle rect = e.ClipRectangle;
-            rect.Width = (int)(rect.Width*((double)Value/Maximum));
+            rect.Width = (int)(rect.Width * ((double)Value / Maximum));
             e.Graphics.FillRectangle(brush, rect);
         }
 

Controls/FlowLayoutPanelNoHScroll.cs

@@ -0,0 +1,14 @@
+using System.Windows.Forms;
+using TweetDuck.Utils;
+
+namespace TweetDuck.Controls{
+    sealed class FlowLayoutPanelNoHScroll : FlowLayoutPanel{
+        protected override void WndProc(ref Message m){
+            if (m.Msg == 0x85){ // WM_NCPAINT
+                NativeMethods.ShowScrollBar(Handle, NativeMethods.SB_HORZ, false); // basically fuck the horizontal scrollbar very much
+            }
+
+            base.WndProc(ref m);
+        }
+    }
+}

Controls/LabelVertical.cs

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

Controls/NumericUpDownEx.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class NumericUpDownEx : NumericUpDown{
         public string TextSuffix { get; set ; }
 

Core/Bridge/CallbackBridge.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-
-namespace TweetDuck.Core.Bridge{
-    sealed class CallbackBridge{
-        private readonly Control owner;
-        private readonly Action safeCallback;
-
-        public CallbackBridge(Control owner, Action safeCallback){
-            this.owner = owner;
-            this.safeCallback = safeCallback;
-        }
-
-        public void Trigger(){
-            owner.InvokeSafe(safeCallback);
-        }
-    }
-}

Core/Bridge/PropertyBridge.cs

@@ -1,33 +0,0 @@
-using System.Text;
-
-namespace TweetDuck.Core.Bridge{
-    static class PropertyBridge{
-        public enum Environment{
-            Browser, Notification
-        }
-
-        public static string GenerateScript(Environment environment){
-            string Bool(bool value) => value ? "true;" : "false;";
-            string Str(string value) => '"'+value+"\";";
-
-            StringBuilder build = new StringBuilder().Append("(function(x){");
-
-            build.Append("x.expandLinksOnHover=").Append(Bool(Program.UserConfig.ExpandLinksOnHover));
-            
-            if (environment == Environment.Browser){
-                build.Append("x.switchAccountSelectors=").Append(Bool(Program.UserConfig.SwitchAccountSelectors));
-                build.Append("x.openSearchInFirstColumn=").Append(Bool(Program.UserConfig.OpenSearchInFirstColumn));
-                build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(Program.UserConfig.KeepLikeFollowDialogsOpen));
-                build.Append("x.muteNotifications=").Append(Bool(Program.UserConfig.MuteNotifications));
-                build.Append("x.notificationMediaPreviews=").Append(Bool(Program.UserConfig.NotificationMediaPreviews));
-                build.Append("x.translationTarget=").Append(Str(Program.UserConfig.TranslationTarget));
-            }
-
-            if (environment == Environment.Notification){
-                build.Append("x.skipOnLinkClick=").Append(Bool(Program.UserConfig.NotificationSkipOnLinkClick));
-            }
-            
-            return build.Append("})(window.$TDX=window.$TDX||{})").ToString();
-        }
-    }
-}

Core/Bridge/TweetDeckBridge.cs

@@ -1,173 +0,0 @@
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Utils;
-using TweetDuck.Resources;
-
-namespace TweetDuck.Core.Bridge{
-    class TweetDeckBridge{
-        public static string FontSize { get; private set; }
-        public static string NotificationHeadLayout { get; private set; }
-
-        public static string LastHighlightedTweetUrl = string.Empty;
-        public static string LastHighlightedQuoteUrl = string.Empty;
-        private static string LastHighlightedTweetAuthors = string.Empty;
-        private static string LastHighlightedTweetImages = string.Empty;
-
-        public static string[] LastHighlightedTweetAuthorsArray => LastHighlightedTweetAuthors.Split(';');
-        public static string[] LastHighlightedTweetImagesArray => LastHighlightedTweetImages.Split(';');
-
-        private static readonly Dictionary<string, string> SessionData = new Dictionary<string, string>(2);
-
-        public static void ResetStaticProperties(){
-            FontSize = NotificationHeadLayout = null;
-            LastHighlightedTweetUrl = LastHighlightedQuoteUrl = LastHighlightedTweetAuthors = LastHighlightedTweetImages = string.Empty;
-        }
-
-        public static void RestoreSessionData(IFrame frame){
-            if (SessionData.Count > 0){
-                StringBuilder build = new StringBuilder().Append("window.TD_SESSION={");
-                
-                foreach(KeyValuePair<string, string> kvp in SessionData){
-                    build.Append(kvp.Key).Append(":'").Append(kvp.Value.Replace("'", "\\'")).Append("',");
-                }
-
-                ScriptLoader.ExecuteScript(frame, build.Append("}").ToString(), "gen:session");
-                SessionData.Clear();
-            }
-        }
-
-        private readonly FormBrowser form;
-        private readonly FormNotificationMain notification;
-
-        protected TweetDeckBridge(FormBrowser form, FormNotificationMain notification){
-            this.form = form;
-            this.notification = notification;
-        }
-
-        // Browser only
-
-        public sealed class Browser : TweetDeckBridge{
-            public Browser(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
-
-            public void OpenContextMenu(){
-                form.InvokeAsyncSafe(form.OpenContextMenu);
-            }
-            
-            public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
-                form.InvokeAsyncSafe(() => {
-                    form.OnIntroductionClosed(showGuide, allowDataCollection);
-                });
-            }
-
-            public void LoadNotificationLayout(string fontSize, string headLayout){
-                form.InvokeAsyncSafe(() => {
-                    FontSize = fontSize;
-                    NotificationHeadLayout = headLayout;
-                });
-            }
-
-            public void SetLastHighlightedTweet(string tweetUrl, string quoteUrl, string authors, string imageList){
-                form.InvokeAsyncSafe(() => {
-                    LastHighlightedTweetUrl = tweetUrl;
-                    LastHighlightedQuoteUrl = quoteUrl;
-                    LastHighlightedTweetAuthors = authors;
-                    LastHighlightedTweetImages = imageList;
-                });
-            }
-
-            public void DisplayTooltip(string text){
-                form.InvokeAsyncSafe(() => form.DisplayTooltip(text));
-            }
-
-            public void SetSessionData(string key, string value){
-                form.InvokeSafe(() => { // do not use InvokeAsyncSafe, return only after invocation
-                    SessionData.Add(key, value);
-                });
-            }
-        }
-
-        // Notification only
-
-        public sealed class Notification : TweetDeckBridge{
-            public Notification(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
-
-            public void DisplayTooltip(string text){
-                notification.InvokeAsyncSafe(() => notification.DisplayTooltip(text));
-            }
-
-            public void LoadNextNotification(){
-                notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
-            }
-
-            public void ShowTweetDetail(){
-                notification.InvokeAsyncSafe(notification.ShowTweetDetail);
-            }
-        }
-
-        // Global
-
-        public void SetLastRightClickInfo(string type, string link){
-            form.InvokeAsyncSafe(() => ContextMenuBase.SetContextInfo(type, link));
-        }
-
-        public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
-            notification.InvokeAsyncSafe(() => {
-                form.OnTweetNotification();
-                notification.ShowNotification(new TweetNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
-            });
-        }
-
-        public void OnTweetSound(){
-            form.InvokeAsyncSafe(() => {
-                form.OnTweetNotification();
-                form.OnTweetSound();
-            });
-        }
-
-        public void ScreenshotTweet(string html, int width, int height){
-            form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width, height));
-        }
-
-        public void PlayVideo(string url, string username){
-            form.InvokeAsyncSafe(() => form.PlayVideo(url, username));
-        }
-
-        public void FixClipboard(){
-            form.InvokeAsyncSafe(WindowsUtils.ClipboardStripHtmlStyles);
-        }
-
-        public void OpenBrowser(string url){
-            form.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
-        }
-
-        public int GetIdleSeconds(){
-            return NativeMethods.GetIdleSeconds();
-        }
-
-        public void Alert(string type, string contents){
-            MessageBoxIcon icon;
-
-            switch(type){
-                case "error": icon = MessageBoxIcon.Error; break;
-                case "warning": icon = MessageBoxIcon.Warning; break;
-                case "info": icon = MessageBoxIcon.Information; break;
-                default: icon = MessageBoxIcon.None; break;
-            }
-
-            FormMessage.Show("TweetDuck Browser Message", contents, icon, FormMessage.OK);
-        }
-
-        public void CrashDebug(string message){
-            #if DEBUG
-            System.Diagnostics.Debug.WriteLine(message);
-            System.Diagnostics.Debugger.Break();
-            #endif
-        }
-    }
-}

Core/Controls/LabelVertical.cs

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

Core/Handling/ContextMenuBase.cs

@@ -1,201 +0,0 @@
-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;
-using System.Collections.Generic;
-using System.Linq;
-using TweetDuck.Core.Management;
-using TweetDuck.Core.Other;
-
-namespace TweetDuck.Core.Handling{
-    abstract class ContextMenuBase : IContextMenuHandler{
-        public static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
-
-        private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality;
-        
-        private static KeyValuePair<string, string> ContextInfo;
-        private static bool IsLink => ContextInfo.Key == "link";
-        private static bool IsImage => ContextInfo.Key == "image";
-        private static bool IsVideo => ContextInfo.Key == "video";
-
-        public static void SetContextInfo(string type, string link){
-            ContextInfo = new KeyValuePair<string, string>(string.IsNullOrEmpty(link) ? null : type, link);
-        }
-
-        private static string GetMediaLink(IContextMenuParams parameters){
-            return IsImage || IsVideo ? ContextInfo.Value : parameters.SourceUrl;
-        }
-
-        private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
-        private const CefMenuCommand MenuCopyLinkUrl     = (CefMenuCommand)26501;
-        private const CefMenuCommand MenuCopyUsername    = (CefMenuCommand)26502;
-        private const CefMenuCommand MenuViewImage       = (CefMenuCommand)26503;
-        private const CefMenuCommand MenuOpenMediaUrl    = (CefMenuCommand)26504;
-        private const CefMenuCommand MenuCopyMediaUrl    = (CefMenuCommand)26505;
-        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26506;
-        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26507;
-        private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
-        
-        private string[] lastHighlightedTweetAuthors;
-        private string[] lastHighlightedTweetImageList;
-
-        public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
-            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                lastHighlightedTweetAuthors = StringUtils.EmptyArray;
-                lastHighlightedTweetImageList = StringUtils.EmptyArray;
-                ContextInfo = default(KeyValuePair<string, string>);
-            }
-            else{
-                lastHighlightedTweetAuthors = TweetDeckBridge.LastHighlightedTweetAuthorsArray;
-                lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImagesArray;
-            }
-
-            bool hasTweetImage = IsImage;
-            bool hasTweetVideo = IsVideo;
-
-            string TextOpen(string name) => "Open "+name+" in browser";
-            string TextCopy(string name) => "Copy "+name+" address";
-            string TextSave(string name) => "Save "+name+" as...";
-            
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal) && !hasTweetImage && !hasTweetVideo){
-                if (TwitterUtils.RegexAccount.IsMatch(parameters.UnfilteredLinkUrl)){
-                    model.AddItem(MenuOpenLinkUrl, TextOpen("account"));
-                    model.AddItem(MenuCopyLinkUrl, TextCopy("account"));
-                    model.AddItem(MenuCopyUsername, "Copy account username");
-                }
-                else{
-                    model.AddItem(MenuOpenLinkUrl, TextOpen("link"));
-                    model.AddItem(MenuCopyLinkUrl, TextCopy("link"));
-                }
-
-                model.AddSeparator();
-            }
-
-            if (hasTweetVideo){
-                model.AddItem(MenuOpenMediaUrl, TextOpen("video"));
-                model.AddItem(MenuCopyMediaUrl, TextCopy("video"));
-                model.AddItem(MenuSaveMedia, TextSave("video"));
-                model.AddSeparator();
-            }
-            else if ((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage){
-                model.AddItem(MenuViewImage, "View image in photo viewer");
-                model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
-                model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
-                model.AddItem(MenuSaveMedia, TextSave("image"));
-
-                if (lastHighlightedTweetImageList.Length > 1){
-                    model.AddItem(MenuSaveTweetImages, TextSave("all images"));
-                }
-
-                model.AddSeparator();
-            }
-        }
-
-        public virtual bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
-            switch(commandId){
-                case MenuOpenLinkUrl:
-                    OpenBrowser(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.LinkUrl);
-                    break;
-
-                case MenuCopyLinkUrl:
-                    SetClipboardText(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.UnfilteredLinkUrl);
-                    break;
-
-                case MenuCopyUsername:
-                    Match match = TwitterUtils.RegexAccount.Match(parameters.UnfilteredLinkUrl);
-                    SetClipboardText(browserControl.AsControl(), match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
-                    break;
-
-                case MenuOpenMediaUrl:
-                    OpenBrowser(browserControl.AsControl(), TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
-                    break;
-
-                case MenuCopyMediaUrl:
-                    SetClipboardText(browserControl.AsControl(), TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
-                    break;
-
-                case MenuViewImage:
-                    string url = GetMediaLink(parameters);
-                    string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url));
-
-                    void ViewFile(){
-                        string ext = Path.GetExtension(file);
-
-                        if (TwitterUtils.ValidImageExtensions.Contains(ext)){
-                            WindowsUtils.OpenAssociatedProgram(file);
-                        }
-                        else{
-                            FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
-                        }
-                    }
-
-                    if (File.Exists(file)){
-                        ViewFile();
-                    }
-                    else{
-                        BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, ViewFile, ex => {
-                            FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
-                        });
-                    }
-
-                    break;
-
-                case MenuSaveMedia:
-                    if (IsVideo){
-                        TwitterUtils.DownloadVideo(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault());
-                    }
-                    else{
-                        TwitterUtils.DownloadImage(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
-                    }
-
-                    break;
-
-                case MenuSaveTweetImages:
-                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
-                    break;
-                    
-                case MenuOpenDevTools:
-                    browserControl.ShowDevTools();
-                    break;
-            }
-
-            return false;
-        }
-
-        public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
-            ContextInfo = default(KeyValuePair<string, string>);
-        }
-
-        public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){
-            return false;
-        }
-
-        protected void OpenBrowser(Control control, string url){
-            control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
-        }
-
-        protected void SetClipboardText(Control control, string text){
-            control.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
-        }
-        
-        protected static void AddDebugMenuItems(IMenuModel model){
-            model.AddItem(MenuOpenDevTools, "Open dev tools");
-        }
-
-        protected static void RemoveSeparatorIfLast(IMenuModel model){
-            if (model.Count > 0 && model.GetTypeAt(model.Count-1) == MenuItemType.Separator){
-                model.RemoveAt(model.Count-1);
-            }
-        }
-
-        protected static void AddSeparator(IMenuModel model){
-            if (model.Count > 0 && model.GetTypeAt(model.Count-1) != MenuItemType.Separator){ // do not add separators if there is nothing to separate
-                model.AddSeparator();
-            }
-        }
-    }
-}

Core/Handling/General/FileDialogHandler.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using CefSharp;
-
-namespace TweetDuck.Core.Handling.General{
-    sealed class FileDialogHandler : IDialogHandler{
-        public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
-            CefFileDialogMode dialogType = mode & CefFileDialogMode.TypeMask;
-
-            if (dialogType == CefFileDialogMode.Open || dialogType == CefFileDialogMode.OpenMultiple){
-                string allFilters = string.Join(";", acceptFilters.Select(filter => "*"+filter));
-
-                using(OpenFileDialog dialog = new OpenFileDialog{
-                    AutoUpgradeEnabled = true,
-                    DereferenceLinks = true,
-                    Multiselect = dialogType == CefFileDialogMode.OpenMultiple,
-                    Title = "Open Files",
-                    Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
-                }){
-                    if (dialog.ShowDialog() == DialogResult.OK){
-                        string ext = Path.GetExtension(dialog.FileName);
-                        callback.Continue(acceptFilters.FindIndex(filter => filter.Equals(ext, StringComparison.OrdinalIgnoreCase)), dialog.FileNames.ToList());
-                    }
-                    else{
-                        callback.Cancel();
-                    }
-
-                    callback.Dispose();
-                }
-
-                return true;
-            }
-            else{
-                callback.Dispose();
-                return false;
-            }
-        }
-    }
-}

Core/Handling/KeyboardHandlerBrowser.cs

@@ -1,20 +0,0 @@
-using System.Windows.Forms;
-using CefSharp;
-
-namespace TweetDuck.Core.Handling{
-    sealed class KeyboardHandlerBrowser : IKeyboardHandler{
-        private readonly FormBrowser form;
-
-        public KeyboardHandlerBrowser(FormBrowser form){
-            this.form = form;
-        }
-
-        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            return type == KeyType.RawKeyDown && form.ProcessBrowserKey((Keys)windowsKeyCode);
-        }
-
-        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
-            return false;
-        }
-    }
-}

Core/Handling/KeyboardHandlerNotification.cs

@@ -1,46 +0,0 @@
-using CefSharp;
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other.Analytics;
-
-namespace TweetDuck.Core.Handling {
-    sealed class KeyboardHandlerNotification : IKeyboardHandler{
-        private readonly FormNotificationBase notification;
-
-        public KeyboardHandlerNotification(FormNotificationBase notification){
-            this.notification = notification;
-        }
-
-        private void TriggerKeyboardShortcutAnalytics(){
-            notification.InvokeAsyncSafe(() => notification.TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationKeyboardShortcut));
-        }
-
-        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);
-                        TriggerKeyboardShortcutAnalytics();
-                        return true;
-
-                    case Keys.Escape:
-                        notification.InvokeAsyncSafe(notification.HideNotification);
-                        TriggerKeyboardShortcutAnalytics();
-                        return true;
-
-                    case Keys.Space:
-                        notification.InvokeAsyncSafe(() => notification.FreezeTimer = !notification.FreezeTimer);
-                        TriggerKeyboardShortcutAnalytics();
-                        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/RequestHandlerBase.cs

@@ -1,11 +0,0 @@
-using CefSharp;
-using CefSharp.Handler;
-using TweetDuck.Core.Handling.General;
-
-namespace TweetDuck.Core.Handling{
-    class RequestHandlerBase : DefaultRequestHandler{
-        public override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
-            return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
-        }
-    }
-}

Core/Handling/RequestHandlerBrowser.cs

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

Core/Management/VideoPlayer.cs

@@ -1,186 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Utils;
-using TweetLib.Communication;
-
-namespace TweetDuck.Core.Management{
-    sealed class VideoPlayer : IDisposable{
-        public bool Running{
-            get{
-                if (currentProcess == null){
-                    return false;
-                }
-
-                currentProcess.Refresh();
-                return !currentProcess.HasExited;
-            }
-        }
-
-        public event EventHandler ProcessExited;
-
-        private readonly Form owner;
-        private string lastUrl;
-        private string lastUsername;
-
-        private Process currentProcess;
-        private DuplexPipe.Server currentPipe;
-        private bool isClosing;
-
-        public VideoPlayer(Form owner){
-            this.owner = owner;
-            this.owner.FormClosing += owner_FormClosing;
-        }
-
-        public void Launch(string url, string username){
-            if (Running){
-                Destroy();
-                isClosing = false;
-            }
-
-            lastUrl = url;
-            lastUsername = username;
-            
-            try{
-                currentPipe = DuplexPipe.CreateServer();
-                currentPipe.DataIn += currentPipe_DataIn;
-
-                if ((currentProcess = Process.Start(new ProcessStartInfo{
-                    FileName = Path.Combine(Program.ProgramPath, "TweetDuck.Video.exe"),
-                    Arguments = $"{owner.Handle} {Program.UserConfig.VideoPlayerVolume} \"{url}\" \"{currentPipe.GenerateToken()}\"",
-                    UseShellExecute = false,
-                    RedirectStandardOutput = true
-                })) != null){
-                    currentProcess.EnableRaisingEvents = true;
-                    currentProcess.Exited += process_Exited;
-                    
-                    currentProcess.BeginOutputReadLine();
-                    currentProcess.OutputDataReceived += process_OutputDataReceived;
-                }
-
-                currentPipe.DisposeToken();
-            }catch(Exception e){
-                Program.Reporter.HandleException("Video Playback Error", "Error launching video player.", true, e);
-            }
-        }
-
-        public void SendKeyEvent(Keys key){
-            currentPipe?.Write("key", ((int)key).ToString());
-        }
-
-        private void currentPipe_DataIn(object sender, DuplexPipe.PipeReadEventArgs e){
-            owner.InvokeSafe(() => {
-                switch(e.Key){
-                    case "vol":
-                        if (int.TryParse(e.Data, out int volume) && volume != Program.UserConfig.VideoPlayerVolume){
-                            Program.UserConfig.VideoPlayerVolume = volume;
-                            Program.UserConfig.Save();
-                        }
-
-                        break;
-
-                    case "download":
-                        TwitterUtils.DownloadVideo(lastUrl, lastUsername);
-                        break;
-
-                    case "rip":
-                        currentPipe.Dispose();
-                        currentPipe = null;
-                    
-                        currentProcess.Dispose();
-                        currentProcess = null;
-
-                        isClosing = false;
-                        TriggerProcessExitEventUnsafe();
-                        break;
-                }
-            });
-        }
-
-        public void Close(){
-            if (currentProcess != null){
-                if (isClosing){
-                    Destroy();
-                    isClosing = false;
-                }
-                else{
-                    isClosing = true;
-                    currentProcess.Exited -= process_Exited;
-                    currentPipe.Write("die");
-                }
-            }
-        }
-
-        public void Dispose(){
-            ProcessExited = null;
-
-            isClosing = true;
-            Destroy();
-        }
-
-        private void Destroy(){
-            if (currentProcess != null){
-                try{
-                    currentProcess.Kill();
-                }catch{
-                    // kill me instead then
-                }
-
-                currentProcess.Dispose();
-                currentProcess = null;
-                
-                currentPipe.Dispose();
-                currentPipe = null;
-
-                TriggerProcessExitEventUnsafe();
-            }
-        }
-
-        private void owner_FormClosing(object sender, FormClosingEventArgs e){
-            if (currentProcess != null){
-                currentProcess.Exited -= process_Exited;
-            }
-        }
-
-        private void process_OutputDataReceived(object sender, DataReceivedEventArgs e){
-            if (!string.IsNullOrEmpty(e.Data)){
-                Program.Reporter.Log("[VideoPlayer] "+e.Data);
-            }
-        }
-
-        private void process_Exited(object sender, EventArgs e){
-            int exitCode = currentProcess.ExitCode;
-
-            currentProcess.Dispose();
-            currentProcess = null;
-
-            currentPipe.Dispose();
-            currentPipe = null;
-
-            switch(exitCode){
-                case 3: // CODE_LAUNCH_FAIL
-                    if (FormMessage.Error("Video Playback Error", "Error launching video player, this may be caused by missing Windows Media Player. Do you want to open the video in your browser?", FormMessage.Yes, FormMessage.No)){
-                        BrowserUtils.OpenExternalBrowser(lastUrl);
-                    }
-
-                    break;
-
-                case 4: // CODE_MEDIA_ERROR
-                    if (FormMessage.Error("Video Playback Error", "The video could not be loaded, most likely due to unknown format. Do you want to open the video in your browser?", FormMessage.Yes, FormMessage.No)){
-                        BrowserUtils.OpenExternalBrowser(lastUrl);
-                    }
-
-                    break;
-            }
-            
-            owner.InvokeAsyncSafe(TriggerProcessExitEventUnsafe);
-        }
-
-        private void TriggerProcessExitEventUnsafe(){
-            ProcessExited?.Invoke(this, EventArgs.Empty);
-        }
-    }
-}

Core/Notification/Example/FormNotificationExample.cs

@@ -1,51 +0,0 @@
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Plugins;
-using TweetDuck.Resources;
-
-namespace TweetDuck.Core.Notification.Example{
-    sealed class FormNotificationExample : FormNotificationMain{
-        public override bool RequiresResize => true;
-        protected override bool CanDragWindow => Program.UserConfig.NotificationPosition == TweetNotification.Position.Custom;
-        
-        protected override FormBorderStyle NotificationBorderStyle{
-            get{
-                if (Program.UserConfig.NotificationSize == TweetNotification.Size.Custom){
-                    switch(base.NotificationBorderStyle){
-                        case FormBorderStyle.FixedSingle: return FormBorderStyle.Sizable;
-                        case FormBorderStyle.FixedToolWindow: return FormBorderStyle.SizableToolWindow;
-                    }
-                }
-
-                return base.NotificationBorderStyle;
-            }
-        }
-
-        private readonly TweetNotification exampleNotification;
-
-        public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
-            string exampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true);
-
-            #if DEBUG
-            exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
-            #endif
-
-            exampleNotification = TweetNotification.Example(exampleTweetHTML, 95);
-        }
-
-        public override void HideNotification(){
-            Location = ControlExtensions.InvisibleLocation;
-        }
-
-        public void ShowExampleNotification(bool reset){
-            if (reset){
-                LoadTweet(exampleNotification);
-            }
-            else{
-                PrepareAndDisplayWindow();
-            }
-
-            UpdateTitle();
-        }
-    }
-}

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -1,67 +0,0 @@
-using System;
-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{
-        protected override bool CanDragWindow => false;
-
-        private readonly PluginManager plugins;
-
-        public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager) : base(owner, false){
-            this.plugins = pluginManager;
-
-            browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback));
-
-            browser.LoadingStateChanged += (sender, args) => {
-                if (!args.IsLoading){
-                    using(IFrame frame = args.Browser.MainFrame){
-                        ScriptLoader.ExecuteScript(frame, "window.setTimeout($TD_NotificationScreenshot.trigger, document.getElementsByTagName('iframe').length ? 267 : 67)", "gen:screenshot");
-                    }
-                }
-            };
-        }
-        
-        protected override string GetTweetHTML(TweetNotification tweet){
-            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){
-            LoadTweet(tweet);
-            SetNotificationSize(width, height);
-        }
-
-        public void TakeScreenshot(){
-            IntPtr context = NativeMethods.GetDC(this.Handle);
-
-            if (context == IntPtr.Zero){
-                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)){
-                    try{
-                        NativeMethods.RenderSourceIntoBitmap(context, bmp);
-                    }finally{
-                        NativeMethods.ReleaseDC(this.Handle, context);
-                    }
-
-                    Clipboard.SetImage(bmp);
-                }
-            }
-        }
-    }
-}

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -1,83 +0,0 @@
-// Uncomment to keep screenshot windows visible for debugging
-// #define NO_HIDE_SCREENSHOTS
-
-using System;
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Plugins;
-
-namespace TweetDuck.Core.Notification.Screenshot{
-    sealed class TweetScreenshotManager : IDisposable{
-        private readonly FormBrowser owner;
-        private readonly PluginManager plugins;
-        private readonly Timer timeout;
-        private readonly Timer disposer;
-        
-        private FormNotificationScreenshotable screenshot;
-
-        public TweetScreenshotManager(FormBrowser owner, PluginManager pluginManager){
-            this.owner = owner;
-            this.plugins = pluginManager;
-
-            this.timeout = new Timer{ Interval = 8000 };
-            this.timeout.Tick += timeout_Tick;
-
-            this.disposer = new Timer{ Interval = 1 };
-            this.disposer.Tick += disposer_Tick;
-        }
-
-        private void timeout_Tick(object sender, EventArgs e){
-            timeout.Stop();
-            OnFinished();
-        }
-
-        private void disposer_Tick(object sender, EventArgs e){
-            disposer.Stop();
-            screenshot.Dispose();
-            screenshot = null;
-        }
-
-        public void Trigger(string html, int width, int height){
-            if (screenshot != null){
-                return;
-            }
-
-            screenshot = new FormNotificationScreenshotable(Callback, owner, plugins);
-            screenshot.LoadNotificationForScreenshot(new TweetNotification(string.Empty, string.Empty, 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(){
-            if (!timeout.Enabled){
-                return;
-            }
-
-            timeout.Stop();
-            screenshot.TakeScreenshot();
-
-            #if !(DEBUG && NO_HIDE_SCREENSHOTS)
-            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();
-            screenshot?.Dispose();
-        }
-    }
-}

Core/Notification/SoundNotification.cs

@@ -1,53 +0,0 @@
-using System.Drawing;
-using System.IO;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Other.Settings;
-
-namespace TweetDuck.Core.Notification{
-    static class SoundNotification{
-        public const string SupportedFormats = "*.wav;*.ogg;*.flac;*.opus;*.weba;*.webm"; // TODO add mp3 when supported
-        
-        public static IResourceHandler CreateFileHandler(string path){
-            string mimeType;
-
-            switch(Path.GetExtension(path)){
-                case ".weba":
-                case ".webm": mimeType = "audio/webm"; break;
-                case ".wav": mimeType = "audio/wav"; break;
-                case ".ogg": mimeType = "audio/ogg"; break;
-                case ".flac": mimeType = "audio/flac"; break;
-                case ".opus": mimeType = "audio/ogg; codecs=opus"; break;
-                case ".mp3": TryShowError("MP3 sound notifications are temporarily unsupported, please convert the file to another format, such as .ogg, .wav, or .flac."); return null;
-                default: mimeType = null; break;
-            }
-
-            try{
-                return ResourceHandler.FromFilePath(path, mimeType);
-            }catch{
-                TryShowError("Could not find custom notification sound file:\n"+path);
-                return null;
-            }
-        }
-
-        private static void TryShowError(string message){
-            FormBrowser browser = FormManager.TryFind<FormBrowser>();
-
-            browser?.InvokeAsyncSafe(() => {
-                using(FormMessage form = new FormMessage("Sound Notification Error", message, MessageBoxIcon.Error)){
-                    form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
-                        
-                    Button btnViewOptions = form.AddButton("View Options");
-                    btnViewOptions.Width += 16;
-                    btnViewOptions.Location = new Point(btnViewOptions.Location.X-16, btnViewOptions.Location.Y);
-
-                    if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnViewOptions){
-                        browser.OpenSettings(typeof(TabSettingsSounds));
-                    }
-                }
-            });
-        }
-    }
-}

Core/Notification/TweetNotification.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Text;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Resources;
-
-namespace TweetDuck.Core.Notification{
-    sealed class TweetNotification{
-        private const string DefaultHeadLayout = @"<html id='tduck' class='os-windows txt-size--14' data-td-font='medium' data-td-theme='dark'><head><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 static readonly string CustomCSS = ScriptLoader.LoadResource("styles/notification.css");
-
-        public static TweetNotification Example(string html, int characters){
-            return new TweetNotification(string.Empty, string.Empty, "Home", html, characters, string.Empty, string.Empty, true);
-        }
-
-        public enum Position{
-            TopLeft, TopRight, BottomLeft, BottomRight, Custom
-        }
-
-        public enum Size{
-            Auto, Custom
-        }
-
-        public string ColumnId { get; }
-        public string ChirpId { get; }
-
-        public string ColumnTitle { get; }
-        public string TweetUrl { get; }
-        public string QuoteUrl { get; }
-        
-        private readonly string html;
-        private readonly int characters;
-        private readonly bool isExample;
-
-        public TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl) : this(columnId, chirpId, title, html, characters, tweetUrl, quoteUrl, false){}
-
-        private TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl, bool isExample){
-            this.ColumnId = columnId;
-            this.ChirpId = chirpId;
-
-            this.ColumnTitle = title;
-            this.TweetUrl = tweetUrl;
-            this.QuoteUrl = quoteUrl;
-
-            this.html = html;
-            this.characters = characters;
-            this.isExample = isExample;
-        }
-
-        public int GetDisplayDuration(int value){
-            return 2000+Math.Max(1000, value*characters);
-        }
-
-        public string GenerateHtml(string bodyClasses = null, bool enableCustomCSS = true){
-            StringBuilder build = new StringBuilder();
-            build.Append("<!DOCTYPE html>");
-            build.Append(TweetDeckBridge.NotificationHeadLayout ?? DefaultHeadLayout);
-            
-            if (enableCustomCSS){
-                build.Append("<style type='text/css'>").Append(CustomCSS).Append("</style>");
-
-                if (!string.IsNullOrEmpty(Program.UserConfig.CustomNotificationCSS)){
-                    build.Append("<style type='text/css'>").Append(Program.UserConfig.CustomNotificationCSS).Append("</style>");
-                }
-            }
-            
-            build.Append("</head>");
-            build.Append("<body class='scroll-styled-v");
-
-            if (!string.IsNullOrEmpty(bodyClasses)){
-                build.Append(' ').Append(bodyClasses);
-            }
-
-            build.Append('\'').Append(isExample ? " td-example-notification" : "").Append("><div class='column' style='width:100%!important;height:auto!important;overflow:initial!important;'>");
-            build.Append(html);
-            build.Append("</div></body>");
-            build.Append("</html>");
-            return build.ToString();
-        }
-    }
-}

Core/Other/Analytics/AnalyticsFile.cs

@@ -1,103 +0,0 @@
-using System;
-using TweetDuck.Data.Serialization;
-
-namespace TweetDuck.Core.Other.Analytics{
-    sealed class AnalyticsFile{
-        private static readonly FileSerializer<AnalyticsFile> Serializer = new FileSerializer<AnalyticsFile>{
-            HandleUnknownProperties = FileSerializer<AnalyticsFile>.IgnoreProperties("CountGCReloads")
-        };
-
-        static AnalyticsFile(){
-            Serializer.RegisterTypeConverter(typeof(DateTime), new SingleTypeConverter<DateTime>{
-                ConvertToString = value => value.ToBinary().ToString(),
-                ConvertToObject = value => DateTime.FromBinary(long.Parse(value))
-            });
-        }
-
-        public enum Event{
-            OpenOptions, OpenPlugins, OpenAbout, OpenGuide,
-            DesktopNotification, SoundNotification, MuteNotification,
-            BrowserContextMenu, BrowserExtraMouseButton,
-            NotificationContextMenu, NotificationExtraMouseButton, NotificationKeyboardShortcut,
-            TweetScreenshot, TweetDetail, VideoPlay
-        }
-
-        // STATE PROPERTIES
-        
-        public DateTime LastDataCollection  { get; set; } = DateTime.MinValue;
-        public string LastCollectionVersion { get; set; } = null;
-        public string LastCollectionMessage { get; set; } = null;
-
-        // USAGE DATA
-
-        public int CountOpenOptions { get; private set; } = 0;
-        public int CountOpenPlugins { get; private set; } = 0;
-        public int CountOpenAbout   { get; private set; } = 0;
-        public int CountOpenGuide   { get; private set; } = 0;
-
-        public int CountDesktopNotifications { get; private set; } = 0;
-        public int CountSoundNotifications   { get; private set; } = 0;
-        public int CountMuteNotifications    { get; private set; } = 0;
-        
-        public int CountBrowserContextMenus           { get; private set; } = 0;
-        public int CountBrowserExtraMouseButtons      { get; private set; } = 0;
-        public int CountNotificationContextMenus      { get; private set; } = 0;
-        public int CountNotificationExtraMouseButtons { get; private set; } = 0;
-        public int CountNotificationKeyboardShortcuts { get; private set; } = 0;
-
-        public int CountTweetScreenshots { get; private set; } = 0;
-        public int CountTweetDetails     { get; private set; } = 0;
-        public int CountVideoPlays       { get; private set; } = 0;
-
-        // END OF DATA
-        
-        private readonly string file;
-        
-        private AnalyticsFile(string file){
-            this.file = file;
-        }
-
-        public void TriggerEvent(Event e){
-            switch(e){
-                case Event.OpenOptions: ++CountOpenOptions; break;
-                case Event.OpenPlugins: ++CountOpenPlugins; break;
-                case Event.OpenAbout: ++CountOpenAbout; break;
-                case Event.OpenGuide: ++CountOpenGuide; break;
-
-                case Event.DesktopNotification: ++CountDesktopNotifications; break;
-                case Event.SoundNotification: ++CountSoundNotifications; break;
-                case Event.MuteNotification: ++CountMuteNotifications; break;
-
-                case Event.BrowserContextMenu: ++CountBrowserContextMenus; break;
-                case Event.BrowserExtraMouseButton: ++CountBrowserExtraMouseButtons; break;
-                case Event.NotificationContextMenu: ++CountNotificationContextMenus; break;
-                case Event.NotificationExtraMouseButton: ++CountNotificationExtraMouseButtons; break;
-                case Event.NotificationKeyboardShortcut: ++CountNotificationKeyboardShortcuts; break;
-
-                case Event.TweetScreenshot: ++CountTweetScreenshots; break;
-                case Event.TweetDetail: ++CountTweetDetails; break;
-                case Event.VideoPlay: ++CountVideoPlays; break;
-            }
-        }
-
-        public void Save(){
-            try{
-                Serializer.Write(file, this);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Analytics File Error", "Could not save the analytics file.", true, e);
-            }
-        }
-        
-        public static AnalyticsFile Load(string file){
-            AnalyticsFile config = new AnalyticsFile(file);
-            
-            try{
-                Serializer.ReadIfExists(file, config);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Analytics File Error", "Could not open the analytics file.", true, e);
-            }
-
-            return config;
-        }
-    }
-}

Core/Other/FormAbout.resx

@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureLogo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
-        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
-        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
-        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
-        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
-        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
-        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
-        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
-        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
-        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
-        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
-        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
-        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
-        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
-        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
-        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
-        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
-        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
-        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
-        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
-        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
-        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
-        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
-        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
-        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
-        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
-        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
-        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
-        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
-        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
-        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
-        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
-        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
-        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
-        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
-        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
-        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
-        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
-        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
-        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
-        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
-        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
-        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
-        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
-        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAuIgAALiIBquLdkgAAEVpJREFUeF7tXQl0VNd5
-        Thq3Tk7tc+qmiZMm7YmdJj1OT3Gd0kTMG3mJnZQEJzaSjXETx0lqNwt2jWscQGixBAJLSMhgA8YYbIyQ
-        hHYJI4lFGMwioQWxyewgMdoXtKFd4u/337lPjDRv9pk3g+A75zsMWv577/fd+9/l3Rl9johu0Y/U/OIt
-        6sfrLwIYT2de+SJ4F/j34LfB+8Ap4L9J8uvvgfy9b4DfBO8EPy9DBBwC3gCI93fgDHAuuA7cDVaDzWAX
-        OAAOgcNgP9gN8vc+A4vB9eBr4M/Be8GAMiPgDIBAXwVDwbXgEbAPJC+RDToGvgfOBr8mi/UbAsIACMFp
-        ZRaYC7aBWuL5gh3gdvBZ8C5ZHV3hVwPQaM7hS0ETqCWQnqwDE8Apsnq6wC8GoJEPgFtAzt9aYviTPJ9k
-        gkGyuj6FrgagUd8CeVIcBLUaH0gcATeD35XV9wl0MQCN4OXjn8EroFZjA5m8qooE/1o2x6vwuQGouAEs
-        A7UadyPxOPgj2SyvwacGoMILwRsh3ThLTksx4BdkEz2GTwxABb8C8pJSqxGTgTvAb8jmegSvG4CK/QvI
-        O1Wtik8mXgSnyma7Da8agAo9Auq5kfI3+Shkhmy+W/CaAajI42CvrNjNRJ7jZksZXIZXDEAFWPxA3FTp
-        xVHQLRM8NgAFPwTejD1/InkH/biUxWl4ZAAK5LP3mynnO+JV0KWJ2W0DUNCXwVOy4Fu8zhrQ6SWqJwbk
-        WxQa2Mxop6fSWyk0rYlCUhspZEs9zdxSJ8iv+WuhW5vpqYw27d93nXvB26RUduGWAQg+36KwwCULv7VF
-        iDx3Wx1tPNxCBy92UU17P7VdHaLWniE619JLu8900Nv7m+jFLBgCM9gs/l3NmCqlqU+nt+D/msYtk3LZ
-        hcsGIPB/gPaPF7jyKrW+rwNZnJCUBoraUU9H63po9No1NM8++odGac/ZDno5r45C2QitESGF59gv5dVT
-        clUHzc5gEyb8XOaVa6DDsyMU67wBCHg7WCULsEkezi9/jEptbfKLCdzrn0s30b5znWiS6xgeuUaby1so
-        NKVubDSwGZzCOG3NzTdRQXW7+NnM4+b2atUDPAPeIeXTBEK4ZMA8i+Ca5Ir+LrOOOvtHKGkfcit6kp4m
-        sBh/zDGRqaMfzfEMh5CuZiXXUOgWE72Ua6L1Jc10qqmXRkbNo4nT2PMw2sHcESvl0wTCOGcAAv0DyFtv
-        rULGyAKsO9SMUERD6EnRO+t1M4F76++zTNTUNSjK9wYutvVhzujTTGGrMG/wqNCqiwX5IsA/SxmtgDBO
-        G7DBIqhN8oR3suEqQpnRh7watcOcU31pAvfCWUgZ1Y3Xy/YlCk+Z28rlqrTTvkwpoxUQyrEBCPCvoONz
-        fVTg1xkm6hkYQajr4Mktdpd5uecrE9jg5IpWWaJvwRN1SHKtaA/PCfMLmyiq2DxPaNUN5KMKg5RzHBDO
-        KQNSLYLZJFfgVSz3tMBDeM0BrMNlr9H6fXfJ8V7AErK7f1iW5hsMjYxSSnkjPbnxLP1vbq2YE04399KV
-        vmGak9/kqF0FUs5xQFj7BuAXvwM6ddDGOfiNnQ0IYxvbTrYjVWDiwkrFW6OB83DaEd/3/obOfiq71Ekt
-        3YOkzgg8NUTxPOdgLpiV1TE6K7vzASnrGBDCoQF8b0cz6ESyqDG77BvAOI2VxJycy7bX2q4QJoYgDVxo
-        7ZPR9QVv4OzNb7OyOll8mpnWTNPXnlwnZR0DQtg2AAHuAPnCkmbwieQREFZQjzCOwfPChlJs/3mt7cFo
-        YAPn5NTRsFwa6on3kII05zUIjt4uXv9icx099u5pCn7rKBkSynoMC1K/LuUVQBi7BswcF9gBWYzfZ5vE
-        RsZZnG/powjsVsXc4IYR/DtLix2POm+C9wGrPjWfK1nWl3v6MxA+FB1xxgeX6OF3TpKSdASsIiMMMK48
-        TkpM4RwprwDC2TUgTw3uFFEZXgo2dA4glPNgu8pruyms0HxAJnaWThrBP7v2oHnfoQd48xWBelqmHe7t
-        Is2kNNJ/rj9HD648RsoKC+FVwgBj/MGDUl4BhNQ2AIH/FuTLq1aNtkfuFYWfXUEo18FGHKvrofg9DfRs
-        mknEcjQq2ABejeiFyEKTWXyUbU4z7fSLj0z06NpTELnKLLyl6BOZVDVgDM+8R8ps14AQy4Y6S1fmAXvg
-        npZ/oo0iiuro2VSYkdIgVhocX0zc0hQ2YDWWt3phIdrGp5+hW1vpZxsv0SOcZrR6uy1iFAQvLvqDlNmu
-        Ae9aCus0IQzn8/LL3QjnHbAZpZe6RE9fsL2O/jvTJFIdlzMz2URRhZflT/oer+fX0E/ePUXBttKMI3Ia
-        enNfhpRZ2wAI+XnQ4amnLXLamPdxHQ1i4+IL8AqqHvMMp6vdZ65Q8en2sXW5r/HbjZVYzVRoi+sMYZwx
-        saxWWbj1Swhn04B/BPkQSVNgu+TUAHKefB/LzMkE3s3PXgfxsbLRFNd5XlMWZT6AkDYN+JmVsE5QLEPz
-        WujXGY0iZ3N60GOHqheuDgzT4++U80SqJarz5DQUXfAcQlobACE5/fAb4jRFtkdOPatLWqmrf4RSKlvo
-        1fzL9MSGM7TuQJ04R7nR0dDRSw8mlGqL6gpXniDjkp2xyoKULyCslQH81MutCZgNWLz7+qaI83Jz9yAm
-        0A5q6/HeGb2/cPxyBxnivWEAT8T7c4Mjc+5EWCsD/gbkt4JqimyP6rGA+sRosqHgWD0Zlh/WFtUVsgHL
-        S44aI3O/hrBWBvCboN273cwTMJaHvEKZjEgsOkNKogcrIJViJVTeaIzefi/CWhnA7zJvGiesC+TVT85x
-        8wPryYYXNpl3upqiukQYsKKyR1my63sIa2UAv3WU3xelKbAj8k71lXz/nE76Em09A/Tjt5B+PF0BqUw6
-        MogN2RSEtjKAHz+6twdg8k6Yz4NOuXceFKgorm7yTv5XmXRkVIk78H2EtjLgfpBv+moL7AR5Mv5NRp1X
-        byf4GzH5n3kn/6vkkbS8dCpCWxnAnzrikQFMPiRbWFAnbkXc6OAN2BNreAPmjfwvyQbEH9I0gD/yxfM3
-        W/BxRFqTuBrYOzj+lsSNht0nG72bfphJVddgwL8jvJUBHk3C4yhNeCXfRJfaPL+p5i+8ln4Cq59KbSHd
-        ZVLloLJs7/0Ib2UAL0NbxgnpCWEC75Bnp5rog7IW6ujz7dURb+NsYxdvmswpQ0tItyiWod1KTJHmMpQ3
-        YvxhR9qCukiekGenN4tHjU9+VENPbzpLcbtq6GS9954X+BLLtp/y7uTLNG/EmozRBd9GEVYG8Gf37LEU
-        0RNy7/+o8gqdae6jQxc76eCFTqqo7aTGzsBPSRdbeuihRG/3fpANiC85qkTkaB5F8Adr8CeaaArqKsUj
-        yiJ9by14C2/keXnpqXIV5pTYPblB8zZ9BcVYGcDH0f9nKaJH5I1ZSgMduNCF8DcOjtS0k+L13C/JBize
-        EWeYn3wbihpvgHwgw+/71RbUDfIo+FNuvdWl3UAFn+a+KM59vLzyUWl+IPMbFHVd97EXZgPuAb3yKSfq
-        ZSUeBbFFNSgi8PHRwRrzut8Xvd/Ma8FR+XYfSf4FyJ+PoymqM1TvRIakNtP098/TQ5h4psWXUnzBaRQT
-        uDhZ1yknXi/uei0JHZTlpbVBr6z7IoqzNkAlRHR9Ira4E/lEcv31O5Hq9Q2Qe9bCrJPU3T+EYgILPajT
-        r96v8F3qYSL/G5bszuKOjiLHeP2FBETkj5G0FlmDapp5amsrzfiwhh5ZPeFOpCXxNSWxnGauKaed2OI7
-        8eZF3RCejXqjbj5MPWYDInJfZo1RpF0D+EOX7L4nbOzqdWqTSDN8J3Kst2sVbkF+sMGj4fmNlZR2uFas
-        uYflg3t/mLJy11lf530Q6/+3qoaw+vkOa4xibRvAgMj8oaYTRLe+eu3UnUgt8mhgIxLKKBhLvsdXltDc
-        zRV0qUXfXfKHBy7pID4ongUfKpfyOmXAf00U3ubVa0+IOCzAM+vKqOxCG6qhHzbziodvOvhq0rUk0k9Q
-        WPpLUl4BVMG2AbOyu+4CW1j8Jx1dvXaHLDx6/09XHabU0loaHNb32cG7n1zQT3w+fkgs75r6Pwl3S3kF
-        UA3bBjB+vvH8CnH1WqYLzeCukEcNVhnc459YXSaGf0evvk/O2OjovGqZdnQQn/l2NQVF5G2Qso4B1bFv
-        gCEs/X6kmhHNoCp5NHBDBPm1ShYbTKwQPZ1723T09tfTT4hnrL2D+h9N17Zdpd9uNI88UUet9viCGAFB
-        r29WpKxjQJXsG8AwLtv3sbhOpxUYjZi+5hg9s+E4zVpfRT9ZeZh+nFRKP11ZRqFry+mFD6soKreakg/V
-        iPzuz/V/TqVJ1E2s83UVX9yE2294baPV3y5AtRwboIRnT0OgUavAko++fZR++cFxKj7VQgPDI9Q3OCKE
-        HhgKjLOfc03d9ErqcX1TjiVhADLJdCnnOKB6jg1gGOP2pwsntQpAbxLzw/JSCsuqprNocCCgoaOPEgrP
-        0MOJJeZjZT17vUo++Vz6yU4poxVQTScNWJT5XfSefvNmQqMgJhuBhirxJTQ/4wRVXGqnUT9c0Drf3E3L
-        IfyPON2Ina0fer0gVoxJVcNBr31g9QZtFaiucwYwjEt2xdqcCywpRgRWOph0f7m+QuT/y+1XfbrD5Ztr
-        24/V05wtR8Wmzr/CS7JWscWrpHyaQNWdN0AJS7vDmFh2zmYqmkiZmnjF8WBCibhbuWbPeTqMyZiXnp4Y
-        wgdnfF2cl7Gc3x9Db+ccr/sEa4u87l9R3hAcnvllKZ8m0BTnDWAo4VmPGldyIXZSkRalGdwzeWTwaonP
-        gRZlV9O6vRcoq8JEu7E0LTnXSidMHSKNHK29Qofwf76Xw99/Dz8XiRXV7z48QjPeLkOqg+gwN2BEtyRv
-        WCNyQqRsNuGyAQxlya44p1KRPaqGQDxhCnrvGFlYlRZf558TcwxP+IEmuCXFI8eda6RcduGWAcaFaX9p
-        jD/0qdOp6GYia7K8pCp4UfqXpFx24ZYBDGVB6jeNKypMt0ywoPm8p9UYkW3zI8omwm0DGIbXN//AuKKy
-        VxSsVaGbiWYNhrBpdenPnHhkAAMTzUwUPnxTm6C2PWrbc1IWp+GxAQxDePavxlXkpiLazO2OKfqjlMMl
-        eMUABruPCt1kI4HbiuVm9PY/SRlchtcMYBjCMkJQMcwJN8HEzB0tqWrIGF3wvGy+W/CqAQwlLH2aknDY
-        xGthzYpPBnIHW1HRYozMeUw222143QDGtD8n3yP2CcKESZaSeAOaUFpuDM+8TzbXI/jEAIZxYepfGaIL
-        48yVngQpiVMO2qHEFq81Lkr32p819JkBKgyLMmeYD/Bu4NHAdU8sr1Ui85+SzfIafG4Aw7go4y5jbPEy
-        8TzhRpobxMitGjYu3fOOMWzrV2VzvApdDFDxw3mbpyhL92aL09RATkuibhitb35agIn2h7L6PoGuBqgw
-        hOc8Zow7UCQayyMiIPYOnONlmow7sEeJzPPoL+Q5C78YoAI76KBpMTtXK4nlLcZV6HVqz9MUyEfkMpkr
-        KnuMSz/ZpETkPCyrpwv8aoCKH8zdcPe0yG0vYum6X8wTLIivRoZczQgmVQ2izBIluvBVZeHWb8nq6IqA
-        MMASWDX9k+GN7X8wxO5JU5aXnjeLxoKxIVI4YYzKCQKrX7cUWpiJf/n7CWW1yrJ9WcaYwpeU8Cynj419
-        hYAzwBJB8zbdHhyVd78xpuA5ZfHOWEzgWeixFVgSNiBldGG0DICj4uE7PyEzvx4Q6YQ/ECm+5Cgm0jxl
-        8Y5lyhsfPw9zpyrzU3zyp8ndRUAbwFDrZViQdlvQ/NQ7kKPvNkYX3GuIKbpPWfrJFP7IFyXu4FQYM1V5
-        c//3lWV7p/A70JWobfcq4dlfN4Zn3WmYn3y7GseSgYCxulhW7Bb1p+YXb1Ev0uf+H9A3E1Z4VJUaAAAA
-        AElFTkSuQmCC
-</value>
-  </data>
-</root>

Core/Other/FormGuide.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using CefSharp;
-using CefSharp.WinForms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
-using System.Text.RegularExpressions;
-using TweetDuck.Resources;
-
-namespace TweetDuck.Core.Other{
-    sealed partial class FormGuide : Form{
-        private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
-        private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
-
-        public static bool CheckGuideUrl(string url, out string hash){
-            if (!url.Contains("//tweetduck.chylex.com/guide")){
-                hash = null;
-                return false;
-            }
-
-            string path = url.Substring(url.IndexOf("/guide")+1);
-            Match match = Regex.Match(path, GuidePathRegex);
-
-            if (match.Success){
-                hash = match.Groups[1].Value;
-                return true;
-            }
-            else{
-                hash = null;
-                return false;
-            }
-        }
-
-        public static void Show(string hash = null){
-            string url = GuideUrl+(hash ?? string.Empty);
-            FormGuide guide = FormManager.TryFind<FormGuide>();
-            
-            if (guide == null){
-                FormBrowser owner = FormManager.TryFind<FormBrowser>();
-
-                if (owner != null){
-                    owner.TriggerAnalyticsEvent(AnalyticsFile.Event.OpenGuide);
-                    new FormGuide(url, owner).Show(owner);
-                }
-            }
-            else{
-                guide.Reload(url);
-                guide.Activate();
-            }
-        }
-
-        private readonly ChromiumWebBrowser browser;
-
-        private FormGuide(string url, Form owner){
-            InitializeComponent();
-
-            Text = Program.BrandName+" Guide";
-
-            if (owner != null){
-                Size = new Size(owner.Size.Width*3/4, owner.Size.Height*3/4);
-                VisibleChanged += (sender, args) => this.MoveToCenter(owner);
-            }
-            
-            this.browser = new ChromiumWebBrowser(url){
-                MenuHandler = new ContextMenuGuide(),
-                JsDialogHandler = new JavaScriptDialogHandler(),
-                LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBrowser()
-            };
-
-            browser.LoadingStateChanged += browser_LoadingStateChanged;
-            browser.FrameLoadStart += browser_FrameLoadStart;
-            browser.FrameLoadEnd += browser_FrameLoadEnd;
-            
-            browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
-            browser.Dock = DockStyle.None;
-            browser.Location = ControlExtensions.InvisibleLocation;
-            Controls.Add(browser);
-
-            Disposed += (sender, args) => {
-                Program.UserConfig.ZoomLevelChanged -= Config_ZoomLevelChanged;
-                browser.Dispose();
-            };
-
-            Program.UserConfig.ZoomLevelChanged += Config_ZoomLevelChanged;
-        }
-
-        private void Reload(string url){
-            browser.LoadingStateChanged += browser_LoadingStateChanged;
-            browser.Dock = DockStyle.None;
-            browser.Location = ControlExtensions.InvisibleLocation;
-            browser.Load("about:blank");
-            browser.Load(url);
-        }
-
-        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading && browser.Address != "about:blank"){
-                this.InvokeAsyncSafe(() => {
-                    browser.Location = Point.Empty;
-                    browser.Dock = DockStyle.Fill;
-                });
-
-                browser.LoadingStateChanged -= browser_LoadingStateChanged;
-            }
-        }
-
-        private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-        }
-
-        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            // idiot chromium
-            ScriptLoader.ExecuteScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
-        }
-
-        private void Config_ZoomLevelChanged(object sender, EventArgs e){
-            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-        }
-    }
-}

Core/Other/Settings/BaseTabSettings.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using System.Windows.Forms;
-using TweetDuck.Configuration;
-
-namespace TweetDuck.Core.Other.Settings{
-    class BaseTabSettings : UserControl{
-        protected static UserConfig Config => Program.UserConfig;
-
-        public IEnumerable<Control> InteractiveControls{
-            get{
-                IEnumerable<Control> FindInteractiveControls(Control parent){
-                    foreach(Control control in parent.Controls){
-                        if (control is Panel subPanel){
-                            foreach(Control subControl in FindInteractiveControls(subPanel)){
-                                yield return subControl;
-                            }
-                        }
-                        else{
-                            yield return control;
-                        }
-                    }
-                }
-
-                return FindInteractiveControls(this);
-            }
-        }
-
-        protected BaseTabSettings(){
-            Padding = new Padding(6);
-        }
-
-        public virtual void OnReady(){}
-        public virtual void OnClosing(){}
-
-        protected static void PromptRestart(){
-            if (FormMessage.Information("TweetDuck Options", "The application must restart for the option to take place. Do you want to restart now?", FormMessage.Yes, FormMessage.No)){
-                Program.Restart();
-            }
-        }
-    }
-}

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

@@ -1,203 +0,0 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
-    partial class DialogSettingsCSS {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
-            this.textBoxBrowserCSS = new System.Windows.Forms.TextBox();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.btnApply = new System.Windows.Forms.Button();
-            this.splitContainer = new System.Windows.Forms.SplitContainer();
-            this.labelBrowser = new System.Windows.Forms.Label();
-            this.labelNotification = new System.Windows.Forms.Label();
-            this.textBoxNotificationCSS = new System.Windows.Forms.TextBox();
-            this.labelWarning = new System.Windows.Forms.Label();
-            this.btnOpenWiki = new System.Windows.Forms.Button();
-            this.timerTestBrowser = new System.Windows.Forms.Timer(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
-            this.splitContainer.Panel1.SuspendLayout();
-            this.splitContainer.Panel2.SuspendLayout();
-            this.splitContainer.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // textBoxBrowserCSS
-            // 
-            this.textBoxBrowserCSS.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.textBoxBrowserCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxBrowserCSS.Location = new System.Drawing.Point(0, 16);
-            this.textBoxBrowserCSS.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
-            this.textBoxBrowserCSS.Multiline = true;
-            this.textBoxBrowserCSS.Name = "textBoxBrowserCSS";
-            this.textBoxBrowserCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxBrowserCSS.Size = new System.Drawing.Size(378, 253);
-            this.textBoxBrowserCSS.TabIndex = 1;
-            this.textBoxBrowserCSS.WordWrap = false;
-            this.textBoxBrowserCSS.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxBrowserCSS_KeyUp);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.Location = new System.Drawing.Point(654, 287);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 2;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // btnApply
-            // 
-            this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.Location = new System.Drawing.Point(716, 287);
-            this.btnApply.Name = "btnApply";
-            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnApply.Size = new System.Drawing.Size(56, 23);
-            this.btnApply.TabIndex = 1;
-            this.btnApply.Text = "Apply";
-            this.btnApply.UseVisualStyleBackColor = true;
-            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
-            // 
-            // splitContainer
-            // 
-            this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.splitContainer.Location = new System.Drawing.Point(12, 12);
-            this.splitContainer.Name = "splitContainer";
-            // 
-            // splitContainer.Panel1
-            // 
-            this.splitContainer.Panel1.Controls.Add(this.labelBrowser);
-            this.splitContainer.Panel1.Controls.Add(this.textBoxBrowserCSS);
-            this.splitContainer.Panel1MinSize = 64;
-            // 
-            // splitContainer.Panel2
-            // 
-            this.splitContainer.Panel2.Controls.Add(this.labelNotification);
-            this.splitContainer.Panel2.Controls.Add(this.textBoxNotificationCSS);
-            this.splitContainer.Panel2MinSize = 64;
-            this.splitContainer.Size = new System.Drawing.Size(760, 269);
-            this.splitContainer.SplitterDistance = 378;
-            this.splitContainer.SplitterWidth = 5;
-            this.splitContainer.TabIndex = 0;
-            // 
-            // labelBrowser
-            // 
-            this.labelBrowser.AutoSize = true;
-            this.labelBrowser.Location = new System.Drawing.Point(-3, 0);
-            this.labelBrowser.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.labelBrowser.Name = "labelBrowser";
-            this.labelBrowser.Size = new System.Drawing.Size(45, 13);
-            this.labelBrowser.TabIndex = 0;
-            this.labelBrowser.Text = "Browser";
-            // 
-            // labelNotification
-            // 
-            this.labelNotification.AutoSize = true;
-            this.labelNotification.Location = new System.Drawing.Point(-3, 0);
-            this.labelNotification.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.labelNotification.Name = "labelNotification";
-            this.labelNotification.Size = new System.Drawing.Size(60, 13);
-            this.labelNotification.TabIndex = 0;
-            this.labelNotification.Text = "Notification";
-            // 
-            // textBoxNotificationCSS
-            // 
-            this.textBoxNotificationCSS.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.textBoxNotificationCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxNotificationCSS.Location = new System.Drawing.Point(0, 16);
-            this.textBoxNotificationCSS.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
-            this.textBoxNotificationCSS.Multiline = true;
-            this.textBoxNotificationCSS.Name = "textBoxNotificationCSS";
-            this.textBoxNotificationCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxNotificationCSS.Size = new System.Drawing.Size(377, 253);
-            this.textBoxNotificationCSS.TabIndex = 1;
-            this.textBoxNotificationCSS.WordWrap = false;
-            // 
-            // labelWarning
-            // 
-            this.labelWarning.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.labelWarning.AutoSize = true;
-            this.labelWarning.Location = new System.Drawing.Point(91, 292);
-            this.labelWarning.Name = "labelWarning";
-            this.labelWarning.Size = new System.Drawing.Size(341, 13);
-            this.labelWarning.TabIndex = 3;
-            this.labelWarning.Text = "The code is not validated, please make sure there are no syntax errors.";
-            // 
-            // btnOpenWiki
-            // 
-            this.btnOpenWiki.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOpenWiki.Location = new System.Drawing.Point(12, 287);
-            this.btnOpenWiki.Name = "btnOpenWiki";
-            this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnOpenWiki.Size = new System.Drawing.Size(73, 23);
-            this.btnOpenWiki.TabIndex = 4;
-            this.btnOpenWiki.Text = "Open Wiki";
-            this.btnOpenWiki.UseVisualStyleBackColor = true;
-            this.btnOpenWiki.Click += new System.EventHandler(this.btnOpenWiki_Click);
-            // 
-            // timerTestBrowser
-            // 
-            this.timerTestBrowser.Interval = 500;
-            this.timerTestBrowser.Tick += new System.EventHandler(this.timerTestBrowser_Tick);
-            // 
-            // DialogSettingsCSS
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(784, 322);
-            this.Controls.Add(this.btnOpenWiki);
-            this.Controls.Add(this.labelWarning);
-            this.Controls.Add(this.splitContainer);
-            this.Controls.Add(this.btnApply);
-            this.Controls.Add(this.btnCancel);
-            this.MinimumSize = new System.Drawing.Size(600, 160);
-            this.Name = "DialogSettingsCSS";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.splitContainer.Panel1.ResumeLayout(false);
-            this.splitContainer.Panel1.PerformLayout();
-            this.splitContainer.Panel2.ResumeLayout(false);
-            this.splitContainer.Panel2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
-            this.splitContainer.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox textBoxBrowserCSS;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Button btnApply;
-        private System.Windows.Forms.SplitContainer splitContainer;
-        private System.Windows.Forms.TextBox textBoxNotificationCSS;
-        private System.Windows.Forms.Label labelBrowser;
-        private System.Windows.Forms.Label labelNotification;
-        private System.Windows.Forms.Label labelWarning;
-        private System.Windows.Forms.Button btnOpenWiki;
-        private System.Windows.Forms.Timer timerTestBrowser;
-    }
-}

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Utils;
-
-namespace TweetDuck.Core.Other.Settings.Dialogs{
-    sealed partial class DialogSettingsCSS : Form{
-        public string BrowserCSS => textBoxBrowserCSS.Text;
-        public string NotificationCSS => textBoxNotificationCSS.Text;
-
-        private readonly Action<string> reinjectBrowserCSS;
-
-        public DialogSettingsCSS(Action<string> reinjectBrowserCSS){
-            InitializeComponent();
-            
-            Text = Program.BrandName+" Options - CSS";
-
-            this.reinjectBrowserCSS = reinjectBrowserCSS;
-            
-            textBoxBrowserCSS.EnableMultilineShortcuts();
-            textBoxBrowserCSS.Text = Program.UserConfig.CustomBrowserCSS ?? "";
-
-            textBoxNotificationCSS.EnableMultilineShortcuts();
-            textBoxNotificationCSS.Text = Program.UserConfig.CustomNotificationCSS ?? "";
-        }
-
-        private void textBoxBrowserCSS_KeyUp(object sender, KeyEventArgs e){
-            timerTestBrowser.Stop();
-            timerTestBrowser.Start();
-        }
-
-        private void timerTestBrowser_Tick(object sender, EventArgs e){
-            reinjectBrowserCSS(textBoxBrowserCSS.Text);
-            timerTestBrowser.Stop();
-        }
-
-        private void btnOpenWiki_Click(object sender, EventArgs e){
-            BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/wiki");
-        }
-
-        private void btnApply_Click(object sender, EventArgs e){
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-
-        private void btnCancel_Click(object sender, EventArgs e){
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -1,323 +0,0 @@
-namespace TweetDuck.Core.Other.Settings {
-    partial class TabSettingsGeneral {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
-            this.checkExpandLinks = new System.Windows.Forms.CheckBox();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
-            this.btnCheckUpdates = new System.Windows.Forms.Button();
-            this.labelZoomValue = new System.Windows.Forms.Label();
-            this.checkSwitchAccountSelectors = new System.Windows.Forms.CheckBox();
-            this.checkBestImageQuality = new System.Windows.Forms.CheckBox();
-            this.checkOpenSearchInFirstColumn = new System.Windows.Forms.CheckBox();
-            this.trackBarZoom = new System.Windows.Forms.TrackBar();
-            this.labelZoom = new System.Windows.Forms.Label();
-            this.zoomUpdateTimer = new System.Windows.Forms.Timer(this.components);
-            this.labelUI = new System.Windows.Forms.Label();
-            this.panelZoom = new System.Windows.Forms.Panel();
-            this.checkAnimatedAvatars = new System.Windows.Forms.CheckBox();
-            this.labelUpdates = new System.Windows.Forms.Label();
-            this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
-            this.checkKeepLikeFollowDialogsOpen = new System.Windows.Forms.CheckBox();
-            this.labelBrowserSettings = new System.Windows.Forms.Label();
-            this.checkSmoothScrolling = new System.Windows.Forms.CheckBox();
-            this.labelBrowserPath = new System.Windows.Forms.Label();
-            this.comboBoxBrowserPath = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
-            this.panelZoom.SuspendLayout();
-            this.flowPanel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // checkExpandLinks
-            // 
-            this.checkExpandLinks.AutoSize = true;
-            this.checkExpandLinks.Location = new System.Drawing.Point(6, 26);
-            this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
-            this.checkExpandLinks.Name = "checkExpandLinks";
-            this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
-            this.checkExpandLinks.TabIndex = 1;
-            this.checkExpandLinks.Text = "Expand Links When Hovered";
-            this.checkExpandLinks.UseVisualStyleBackColor = true;
-            // 
-            // checkUpdateNotifications
-            // 
-            this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 386);
-            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
-            this.checkUpdateNotifications.Name = "checkUpdateNotifications";
-            this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
-            this.checkUpdateNotifications.TabIndex = 14;
-            this.checkUpdateNotifications.Text = "Check Updates Automatically";
-            this.checkUpdateNotifications.UseVisualStyleBackColor = true;
-            // 
-            // btnCheckUpdates
-            // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 409);
-            this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
-            this.btnCheckUpdates.Name = "btnCheckUpdates";
-            this.btnCheckUpdates.Size = new System.Drawing.Size(144, 23);
-            this.btnCheckUpdates.TabIndex = 15;
-            this.btnCheckUpdates.Text = "Check Updates Now";
-            this.btnCheckUpdates.UseVisualStyleBackColor = true;
-            // 
-            // labelZoomValue
-            // 
-            this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelZoomValue.Location = new System.Drawing.Point(147, 4);
-            this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.labelZoomValue.Name = "labelZoomValue";
-            this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
-            this.labelZoomValue.TabIndex = 1;
-            this.labelZoomValue.Text = "100%";
-            this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
-            // checkSwitchAccountSelectors
-            // 
-            this.checkSwitchAccountSelectors.AutoSize = true;
-            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(6, 49);
-            this.checkSwitchAccountSelectors.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkSwitchAccountSelectors.Name = "checkSwitchAccountSelectors";
-            this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
-            this.checkSwitchAccountSelectors.TabIndex = 2;
-            this.checkSwitchAccountSelectors.Text = "Shift Selects Multiple Accounts";
-            this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
-            // 
-            // checkBestImageQuality
-            // 
-            this.checkBestImageQuality.AutoSize = true;
-            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 118);
-            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 = 5;
-            this.checkBestImageQuality.Text = "Best Image Quality";
-            this.checkBestImageQuality.UseVisualStyleBackColor = true;
-            // 
-            // checkOpenSearchInFirstColumn
-            // 
-            this.checkOpenSearchInFirstColumn.AutoSize = true;
-            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 72);
-            this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
-            this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
-            this.checkOpenSearchInFirstColumn.TabIndex = 3;
-            this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
-            this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
-            // 
-            // trackBarZoom
-            // 
-            this.trackBarZoom.AutoSize = false;
-            this.trackBarZoom.BackColor = System.Drawing.SystemColors.Control;
-            this.trackBarZoom.LargeChange = 25;
-            this.trackBarZoom.Location = new System.Drawing.Point(3, 3);
-            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 = 0;
-            this.trackBarZoom.TickFrequency = 25;
-            this.trackBarZoom.Value = 100;
-            // 
-            // labelZoom
-            // 
-            this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(3, 291);
-            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 = 11;
-            this.labelZoom.Text = "Zoom";
-            // 
-            // zoomUpdateTimer
-            // 
-            this.zoomUpdateTimer.Interval = 250;
-            this.zoomUpdateTimer.Tick += new System.EventHandler(this.zoomUpdateTimer_Tick);
-            // 
-            // labelUI
-            // 
-            this.labelUI.AutoSize = true;
-            this.labelUI.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelUI.Location = new System.Drawing.Point(0, 0);
-            this.labelUI.Margin = new System.Windows.Forms.Padding(0);
-            this.labelUI.Name = "labelUI";
-            this.labelUI.Size = new System.Drawing.Size(111, 20);
-            this.labelUI.TabIndex = 0;
-            this.labelUI.Text = "User Interface";
-            // 
-            // panelZoom
-            // 
-            this.panelZoom.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.panelZoom.Controls.Add(this.trackBarZoom);
-            this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 304);
-            this.panelZoom.Margin = new System.Windows.Forms.Padding(0);
-            this.panelZoom.Name = "panelZoom";
-            this.panelZoom.Size = new System.Drawing.Size(322, 36);
-            this.panelZoom.TabIndex = 12;
-            // 
-            // checkAnimatedAvatars
-            // 
-            this.checkAnimatedAvatars.AutoSize = true;
-            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 141);
-            this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
-            this.checkAnimatedAvatars.Size = new System.Drawing.Size(145, 17);
-            this.checkAnimatedAvatars.TabIndex = 6;
-            this.checkAnimatedAvatars.Text = "Enable Animated Avatars";
-            this.checkAnimatedAvatars.UseVisualStyleBackColor = true;
-            // 
-            // labelUpdates
-            // 
-            this.labelUpdates.AutoSize = true;
-            this.labelUpdates.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelUpdates.Location = new System.Drawing.Point(0, 360);
-            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
-            this.labelUpdates.Name = "labelUpdates";
-            this.labelUpdates.Size = new System.Drawing.Size(70, 20);
-            this.labelUpdates.TabIndex = 13;
-            this.labelUpdates.Text = "Updates";
-            // 
-            // flowPanel
-            // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flowPanel.Controls.Add(this.labelUI);
-            this.flowPanel.Controls.Add(this.checkExpandLinks);
-            this.flowPanel.Controls.Add(this.checkSwitchAccountSelectors);
-            this.flowPanel.Controls.Add(this.checkOpenSearchInFirstColumn);
-            this.flowPanel.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
-            this.flowPanel.Controls.Add(this.checkBestImageQuality);
-            this.flowPanel.Controls.Add(this.checkAnimatedAvatars);
-            this.flowPanel.Controls.Add(this.labelBrowserSettings);
-            this.flowPanel.Controls.Add(this.checkSmoothScrolling);
-            this.flowPanel.Controls.Add(this.labelBrowserPath);
-            this.flowPanel.Controls.Add(this.comboBoxBrowserPath);
-            this.flowPanel.Controls.Add(this.labelZoom);
-            this.flowPanel.Controls.Add(this.panelZoom);
-            this.flowPanel.Controls.Add(this.labelUpdates);
-            this.flowPanel.Controls.Add(this.checkUpdateNotifications);
-            this.flowPanel.Controls.Add(this.btnCheckUpdates);
-            this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowPanel.Location = new System.Drawing.Point(9, 9);
-            this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 438);
-            this.flowPanel.TabIndex = 0;
-            this.flowPanel.WrapContents = false;
-            // 
-            // checkKeepLikeFollowDialogsOpen
-            // 
-            this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
-            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 95);
-            this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
-            this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(176, 17);
-            this.checkKeepLikeFollowDialogsOpen.TabIndex = 4;
-            this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
-            this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
-            // 
-            // labelBrowserSettings
-            // 
-            this.labelBrowserSettings.AutoSize = true;
-            this.labelBrowserSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 181);
-            this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
-            this.labelBrowserSettings.Name = "labelBrowserSettings";
-            this.labelBrowserSettings.Size = new System.Drawing.Size(130, 20);
-            this.labelBrowserSettings.TabIndex = 7;
-            this.labelBrowserSettings.Text = "Browser Settings";
-            // 
-            // checkSmoothScrolling
-            // 
-            this.checkSmoothScrolling.AutoSize = true;
-            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 207);
-            this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
-            this.checkSmoothScrolling.Name = "checkSmoothScrolling";
-            this.checkSmoothScrolling.Size = new System.Drawing.Size(105, 17);
-            this.checkSmoothScrolling.TabIndex = 8;
-            this.checkSmoothScrolling.Text = "Smooth Scrolling";
-            this.checkSmoothScrolling.UseVisualStyleBackColor = true;
-            // 
-            // labelBrowserPath
-            // 
-            this.labelBrowserPath.AutoSize = true;
-            this.labelBrowserPath.Location = new System.Drawing.Point(3, 239);
-            this.labelBrowserPath.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
-            this.labelBrowserPath.Name = "labelBrowserPath";
-            this.labelBrowserPath.Size = new System.Drawing.Size(95, 13);
-            this.labelBrowserPath.TabIndex = 9;
-            this.labelBrowserPath.Text = "Open Links With...";
-            // 
-            // comboBoxBrowserPath
-            // 
-            this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxBrowserPath.FormattingEnabled = true;
-            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 255);
-            this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
-            this.comboBoxBrowserPath.Name = "comboBoxBrowserPath";
-            this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 21);
-            this.comboBoxBrowserPath.TabIndex = 10;
-            // 
-            // TabSettingsGeneral
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.flowPanel);
-            this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(340, 456);
-            ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
-            this.panelZoom.ResumeLayout(false);
-            this.flowPanel.ResumeLayout(false);
-            this.flowPanel.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.CheckBox checkExpandLinks;
-        private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.CheckBox checkUpdateNotifications;
-        private System.Windows.Forms.Button btnCheckUpdates;
-        private System.Windows.Forms.Label labelZoom;
-        private System.Windows.Forms.Label labelZoomValue;
-        private System.Windows.Forms.TrackBar trackBarZoom;
-        private System.Windows.Forms.Timer zoomUpdateTimer;
-        private System.Windows.Forms.CheckBox checkSwitchAccountSelectors;
-        private System.Windows.Forms.Label labelUI;
-        private System.Windows.Forms.Panel panelZoom;
-        private System.Windows.Forms.Label labelUpdates;
-        private System.Windows.Forms.CheckBox checkBestImageQuality;
-        private System.Windows.Forms.CheckBox checkOpenSearchInFirstColumn;
-        private System.Windows.Forms.CheckBox checkAnimatedAvatars;
-        private System.Windows.Forms.FlowLayoutPanel flowPanel;
-        private System.Windows.Forms.CheckBox checkKeepLikeFollowDialogsOpen;
-        private System.Windows.Forms.Label labelBrowserPath;
-        private System.Windows.Forms.ComboBox comboBoxBrowserPath;
-        private System.Windows.Forms.Label labelBrowserSettings;
-        private System.Windows.Forms.CheckBox checkSmoothScrolling;
-    }
-}

Core/Other/Settings/TabSettingsGeneral.cs

@@ -1,192 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Utils;
-using TweetDuck.Updates;
-
-namespace TweetDuck.Core.Other.Settings{
-    sealed partial class TabSettingsGeneral : BaseTabSettings{
-        private readonly FormBrowser browser;
-        private readonly UpdateHandler updates;
-        private int updateCheckEventId = -1;
-
-        private readonly int browserListIndexDefault;
-        private readonly int browserListIndexCustom;
-
-        public TabSettingsGeneral(FormBrowser browser, UpdateHandler updates){
-            InitializeComponent();
-
-            this.browser = browser;
-
-            this.updates = updates;
-            this.updates.CheckFinished += updates_CheckFinished;
-            Disposed += (sender, args) => this.updates.CheckFinished -= updates_CheckFinished;
-            
-            toolTip.SetToolTip(checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
-            toolTip.SetToolTip(checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect multiple accounts, instead of TweetDeck\'s default behavior.");
-            toolTip.SetToolTip(checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
-            toolTip.SetToolTip(checkKeepLikeFollowDialogsOpen, "Allows liking and following from multiple accounts at once,\r\ninstead of automatically closing the dialog after taking an action.");
-            toolTip.SetToolTip(checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
-            toolTip.SetToolTip(checkAnimatedAvatars, "Some old Twitter avatars could be uploaded as animated GIFs.");
-
-            toolTip.SetToolTip(checkSmoothScrolling, "Toggles smooth mouse wheel scrolling.");
-            toolTip.SetToolTip(comboBoxBrowserPath, "Sets the default browser for opening links.");
-            toolTip.SetToolTip(labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
-            toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
-
-            toolTip.SetToolTip(checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
-            toolTip.SetToolTip(btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
-
-            checkExpandLinks.Checked = Config.ExpandLinksOnHover;
-            checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
-            checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
-            checkKeepLikeFollowDialogsOpen.Checked = Config.KeepLikeFollowDialogsOpen;
-            checkBestImageQuality.Checked = Config.BestImageQuality;
-            checkAnimatedAvatars.Checked = Config.EnableAnimatedImages;
-
-            checkSmoothScrolling.Checked = Config.EnableSmoothScrolling;
-
-            foreach(WindowsUtils.Browser browserInfo in WindowsUtils.FindInstalledBrowsers()){
-                comboBoxBrowserPath.Items.Add(browserInfo);
-            }
-            
-            browserListIndexDefault = comboBoxBrowserPath.Items.Add("(default browser)");
-            browserListIndexCustom = comboBoxBrowserPath.Items.Add("(custom program...)");
-            UpdateBrowserPathSelection();
-
-            trackBarZoom.SetValueSafe(Config.ZoomLevel);
-            labelZoomValue.Text = trackBarZoom.Value+"%";
-
-            checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
-        }
-
-        public override void OnReady(){
-            checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
-            checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
-            checkOpenSearchInFirstColumn.CheckedChanged += checkOpenSearchInFirstColumn_CheckedChanged;
-            checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
-            checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
-            checkAnimatedAvatars.CheckedChanged += checkAnimatedAvatars_CheckedChanged;
-
-            checkSmoothScrolling.CheckedChanged += checkSmoothScrolling_CheckedChanged;
-            comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
-            trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
-
-            checkUpdateNotifications.CheckedChanged += checkUpdateNotifications_CheckedChanged;
-            btnCheckUpdates.Click += btnCheckUpdates_Click;
-        }
-
-        public override void OnClosing(){
-            Config.ZoomLevel = trackBarZoom.Value;
-        }
-
-        private void checkExpandLinks_CheckedChanged(object sender, EventArgs e){
-            Config.ExpandLinksOnHover = checkExpandLinks.Checked;
-        }
-
-        private void checkSwitchAccountSelectors_CheckedChanged(object sender, EventArgs e){
-            Config.SwitchAccountSelectors = checkSwitchAccountSelectors.Checked;
-        }
-
-        private void checkOpenSearchInFirstColumn_CheckedChanged(object sender, EventArgs e){
-            Config.OpenSearchInFirstColumn = checkOpenSearchInFirstColumn.Checked;
-        }
-
-        private void checkKeepLikeFollowDialogsOpen_CheckedChanged(object sender, EventArgs e){
-            Config.KeepLikeFollowDialogsOpen = checkKeepLikeFollowDialogsOpen.Checked;
-        }
-
-        private void checkBestImageQuality_CheckedChanged(object sender, EventArgs e){
-            Config.BestImageQuality = checkBestImageQuality.Checked;
-        }
-
-        private void checkAnimatedAvatars_CheckedChanged(object sender, EventArgs e){
-            Config.EnableAnimatedImages = checkAnimatedAvatars.Checked;
-            BrowserProcessHandler.UpdatePrefs().ContinueWith(task => browser.ReloadColumns());
-        }
-
-        private void checkSmoothScrolling_CheckedChanged(object sender, EventArgs e){
-            Config.EnableSmoothScrolling = checkSmoothScrolling.Checked;
-            PromptRestart();
-        }
-
-        private void UpdateBrowserPathSelection(){
-            if (string.IsNullOrEmpty(Config.BrowserPath) || !File.Exists(Config.BrowserPath)){
-                comboBoxBrowserPath.SelectedIndex = browserListIndexDefault;
-            }
-            else{
-                WindowsUtils.Browser browserInfo = comboBoxBrowserPath.Items.OfType<WindowsUtils.Browser>().FirstOrDefault(browser => browser.Path == Config.BrowserPath);
-
-                if (browserInfo == null){
-                    comboBoxBrowserPath.SelectedIndex = browserListIndexCustom;
-                }
-                else{
-                    comboBoxBrowserPath.SelectedItem = browserInfo;
-                }
-            }
-        }
-
-        private void comboBoxBrowserPath_SelectedIndexChanged(object sender, EventArgs e){
-            if (comboBoxBrowserPath.SelectedIndex == browserListIndexCustom){
-                using(OpenFileDialog dialog = new OpenFileDialog{
-                    AutoUpgradeEnabled = true,
-                    DereferenceLinks = true,
-                    InitialDirectory = Path.GetDirectoryName(Config.BrowserPath), // returns null if argument is null
-                    Title = "Open Links With...",
-                    Filter = "Executables (*.exe;*.bat;*.cmd)|*.exe;*.bat;*.cmd|All Files (*.*)|*.*"
-                }){
-                    if (dialog.ShowDialog() == DialogResult.OK){
-                        Config.BrowserPath = dialog.FileName;
-                    }
-                    else{
-                        comboBoxBrowserPath.SelectedIndexChanged -= comboBoxBrowserPath_SelectedIndexChanged;
-                        UpdateBrowserPathSelection();
-                        comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
-                    }
-                }
-            }
-            else{
-                Config.BrowserPath = (comboBoxBrowserPath.SelectedItem as WindowsUtils.Browser)?.Path; // default browser item is a string and casts to null
-            }
-        }
-
-        private void trackBarZoom_ValueChanged(object sender, EventArgs e){
-            if (trackBarZoom.AlignValueToTick()){
-                zoomUpdateTimer.Stop();
-                zoomUpdateTimer.Start();
-                labelZoomValue.Text = trackBarZoom.Value+"%";
-            }
-        }
-
-        private void checkUpdateNotifications_CheckedChanged(object sender, EventArgs e){
-            Config.EnableUpdateCheck = checkUpdateNotifications.Checked;
-        }
-
-        private void btnCheckUpdates_Click(object sender, EventArgs e){
-            Config.DismissedUpdate = null;
-
-            btnCheckUpdates.Enabled = false;
-            updateCheckEventId = updates.Check(true);
-        }
-
-        private void updates_CheckFinished(object sender, UpdateEventArgs e){
-            this.InvokeAsyncSafe(() => {
-                if (e.EventId == updateCheckEventId){
-                    btnCheckUpdates.Enabled = true;
-
-                    if (!e.IsUpdateAvailable){
-                        FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
-                    }
-                }
-            });
-        }
-
-        private void zoomUpdateTimer_Tick(object sender, EventArgs e){
-            Config.ZoomLevel = trackBarZoom.Value;
-            zoomUpdateTimer.Stop();
-        }
-    }
-}

Core/Other/Settings/TabSettingsLocales.Designer.cs

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

Core/Other/Settings/TabSettingsLocales.cs

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

Core/TweetDeckBrowser.cs

@@ -1,244 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using CefSharp;
-using CefSharp.WinForms;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Plugins.Events;
-using TweetDuck.Resources;
-using TweetDuck.Updates;
-
-namespace TweetDuck.Core{
-    sealed class TweetDeckBrowser : IDisposable{
-        public bool Ready { get; private set; }
-
-        public bool Enabled{
-            get => browser.Enabled;
-            set => browser.Enabled = value;
-        }
-
-        public bool IsTweetDeckWebsite{
-            get{
-                using(IFrame frame = browser.GetBrowser().MainFrame){
-                    return TwitterUtils.IsTweetDeckWebsite(frame);
-                }
-            }
-        }
-
-        public event EventHandler PageLoaded;
-
-        private readonly ChromiumWebBrowser browser;
-        private readonly PluginManager plugins;
-
-        private string prevSoundNotificationPath = null;
-
-        public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge bridge){
-            this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
-                DialogHandler = new FileDialogHandler(),
-                DragHandler = new DragHandlerBrowser(),
-                MenuHandler = new ContextMenuBrowser(owner),
-                JsDialogHandler = new JavaScriptDialogHandler(),
-                KeyboardHandler = new KeyboardHandlerBrowser(owner),
-                LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBrowser()
-            };
-
-            #if DEBUG
-            this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
-            #endif
-
-            this.browser.LoadingStateChanged += browser_LoadingStateChanged;
-            this.browser.FrameLoadStart += browser_FrameLoadStart;
-            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
-            this.browser.LoadError += browser_LoadError;
-
-            this.browser.RegisterAsyncJsObject("$TD", bridge);
-            this.browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
-            
-            this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
-            this.browser.Dock = DockStyle.None;
-            this.browser.Location = ControlExtensions.InvisibleLocation;
-
-            owner.Controls.Add(browser);
-
-            this.plugins = plugins;
-            this.plugins.PluginChangedState += plugins_PluginChangedState;
-            
-            Program.UserConfig.MuteToggled += UserConfig_MuteToggled;
-            Program.UserConfig.ZoomLevelChanged += UserConfig_ZoomLevelChanged;
-            Program.UserConfig.SoundNotificationChanged += UserConfig_SoundNotificationInfoChanged;
-        }
-
-        // setup and management
-
-        private void OnBrowserReady(){
-            if (!Ready){
-                browser.Location = Point.Empty;
-                browser.Dock = DockStyle.Fill;
-                Ready = true;
-            }
-        }
-
-        public void Focus(){
-            browser.Focus();
-        }
-
-        public void Dispose(){
-            plugins.PluginChangedState -= plugins_PluginChangedState;
-
-            Program.UserConfig.MuteToggled -= UserConfig_MuteToggled;
-            Program.UserConfig.ZoomLevelChanged -= UserConfig_ZoomLevelChanged;
-            Program.UserConfig.SoundNotificationChanged -= UserConfig_SoundNotificationInfoChanged;
-            
-            browser.Dispose();
-        }
-
-        // event handlers
-
-        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading){
-                foreach(string word in TwitterUtils.DictionaryWords){
-                    browser.AddWordToDictionary(word);
-                }
-
-                browser.BeginInvoke(new Action(OnBrowserReady));
-                browser.LoadingStateChanged -= browser_LoadingStateChanged;
-            }
-        }
-
-        private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            if (e.Frame.IsMain){
-                if (Program.UserConfig.ZoomLevel != 100){
-                    BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-                }
-
-                if (TwitterUtils.IsTwitterWebsite(e.Frame)){
-                    ScriptLoader.ExecuteFile(e.Frame, "twitter.js");
-                }
-            }
-        }
-
-        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && TwitterUtils.IsTweetDeckWebsite(e.Frame)){
-                e.Frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorFix);
-
-                UpdateProperties();
-                TweetDeckBridge.RestoreSessionData(e.Frame);
-                ScriptLoader.ExecuteFile(e.Frame, "code.js");
-                InjectBrowserCSS();
-                ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
-                UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
-                plugins.ExecutePlugins(e.Frame, PluginEnvironment.Browser);
-
-                TweetDeckBridge.ResetStaticProperties();
-
-                if (Program.UserConfig.FirstRun){
-                    ScriptLoader.ExecuteFile(e.Frame, "introduction.js");
-                }
-
-                PageLoaded?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        private void browser_LoadError(object sender, LoadErrorEventArgs e){
-            if (e.ErrorCode == CefErrorCode.Aborted){
-                return;
-            }
-
-            if (!e.FailedUrl.StartsWith("http://td/", StringComparison.Ordinal)){
-                string errorPage = ScriptLoader.LoadResource("pages/error.html", true);
-
-                if (errorPage != null){
-                    browser.LoadHtml(errorPage.Replace("{err}", BrowserUtils.GetErrorName(e.ErrorCode)), "http://td/error");
-                }
-            }
-        }
-
-        private void plugins_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            browser.ExecuteScriptAsync("TDPF_setPluginState", e.Plugin, e.IsEnabled);
-        }
-
-        private void UserConfig_MuteToggled(object sender, EventArgs e){
-            UpdateProperties();
-        }
-
-        private void UserConfig_ZoomLevelChanged(object sender, EventArgs e){
-            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-        }
-
-        private void UserConfig_SoundNotificationInfoChanged(object sender, EventArgs e){
-            const string soundUrl = "https://ton.twimg.com/tduck/updatesnd";
-            bool hasCustomSound = Program.UserConfig.IsCustomSoundNotificationSet;
-
-            if (prevSoundNotificationPath != Program.UserConfig.NotificationSoundPath){
-                browser.SetupResourceHandler(soundUrl, hasCustomSound ? SoundNotification.CreateFileHandler(Program.UserConfig.NotificationSoundPath) : null);
-                prevSoundNotificationPath = Program.UserConfig.NotificationSoundPath;
-            }
-
-            browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Program.UserConfig.NotificationSoundVolume);
-        }
-
-        // external handling
-
-        public UpdateHandler CreateUpdateHandler(UpdaterSettings settings){
-            return new UpdateHandler(browser, settings);
-        }
-
-        public void HideVideoOverlay(bool focus){
-            if (focus){
-                browser.GetBrowser().GetHost().SendFocusEvent(true);
-            }
-
-            browser.ExecuteScriptAsync("$('#td-video-player-overlay').remove()");
-        }
-
-        // javascript calls
-
-        public void ReloadToTweetDeck(){
-            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUtils.TweetDeckURL}'");
-        }
-
-        public void UpdateProperties(){
-            browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Browser));
-        }
-
-        public void InjectBrowserCSS(){
-            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css").TrimEnd());
-        }
-
-        public void ReinjectCustomCSS(string css){
-            browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
-        }
-
-        public void OnMouseClickExtra(IntPtr param){
-            browser.ExecuteScriptAsync("TDGF_onMouseClickExtra", (param.ToInt32() >> 16) & 0xFFFF);
-        }
-
-        public void ShowTweetDetail(string columnId, string chirpId, string fallbackUrl){
-            browser.ExecuteScriptAsync("TDGF_showTweetDetail", columnId, chirpId, fallbackUrl);
-        }
-
-        public void TriggerTweetScreenshot(){
-            browser.ExecuteScriptAsync("TDGF_triggerScreenshot()");
-        }
-
-        public void ReloadColumns(){
-            browser.ExecuteScriptAsync("TDGF_reloadColumns()");
-        }
-
-        public void PlaySoundNotification(){
-            browser.ExecuteScriptAsync("TDGF_playSoundNotification()");
-        }
-
-        public void ApplyROT13(){
-            browser.ExecuteScriptAsync("TDGF_applyROT13()");
-        }
-    }
-}

Core/Utils/BrowserUtils.cs

@@ -1,160 +0,0 @@
-using CefSharp;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Net;
-using System.Windows.Forms;
-using CefSharp.WinForms;
-using TweetDuck.Core.Other;
-
-namespace TweetDuck.Core.Utils{
-    static class BrowserUtils{
-        public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
-
-        public static void SetupCefArgs(IDictionary<string, string> args){
-            if (!Program.SystemConfig.HardwareAcceleration){
-                args["disable-gpu"] = "1";
-                args["disable-gpu-vsync"] = "1";
-            }
-
-            if (!Program.UserConfig.EnableSmoothScrolling){
-                args["disable-smooth-scrolling"] = "1";
-            }
-            
-            args["disable-pdf-extension"] = "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 ChromiumWebBrowser AsControl(this IWebBrowser browserControl){
-            return (ChromiumWebBrowser)browserControl;
-        }
-
-        public static void SetupResourceHandler(this ChromiumWebBrowser browser, string url, IResourceHandler handler){
-            DefaultResourceHandlerFactory factory = (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
-
-            if (handler == null){
-                factory.UnregisterHandler(url);
-            }
-            else{
-                factory.RegisterHandler(url, handler);
-            }
-        }
-
-        private const string TwitterTrackingUrl = "t.co";
-
-        public enum UrlCheckResult{
-            Invalid, Tracking, Fine
-        }
-
-        public static UrlCheckResult CheckUrl(string url){
-            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
-                string scheme = uri.Scheme;
-
-                if (scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto){
-                    return uri.Host == TwitterTrackingUrl ? UrlCheckResult.Tracking : UrlCheckResult.Fine;
-                }
-            }
-
-            return UrlCheckResult.Invalid;
-        }
-
-        public static void OpenExternalBrowser(string url){
-            if (string.IsNullOrWhiteSpace(url))return;
-
-            switch(CheckUrl(url)){
-                case UrlCheckResult.Fine:
-                    if (FormGuide.CheckGuideUrl(url, out string hash)){
-                        FormGuide.Show(hash);
-                    }
-                    else{
-                        string browserPath = Program.UserConfig.BrowserPath;
-
-                        if (browserPath == null || !File.Exists(browserPath)){
-                            WindowsUtils.OpenAssociatedProgram(url);
-                        }
-                        else{
-                            try{
-                                using(Process.Start(browserPath, url)){}
-                            }catch(Exception e){
-                                Program.Reporter.HandleException("Error Opening Browser", "Could not open the browser.", true, e);
-                            }
-                        }
-                    }
-
-                    break;
-
-                case UrlCheckResult.Tracking:
-                    if (FormMessage.Warning("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n"+url, FormMessage.Yes, FormMessage.No)){
-                        goto case UrlCheckResult.Fine;
-                    }
-
-                    break;
-
-                case UrlCheckResult.Invalid:
-                    FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n"+url, FormMessage.OK);
-                    break;
-            }
-        }
-
-        public static string GetFileNameFromUrl(string url){
-            string file = Path.GetFileName(new Uri(url).AbsolutePath);
-            return string.IsNullOrEmpty(file) ? null : file;
-        }
-
-        public static string GetErrorName(CefErrorCode code){
-            return StringUtils.ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
-        }
-
-        public static WebClient CreateWebClient(){
-            WebClient client = new WebClient{ Proxy = null };
-            client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;
-            return client;
-        }
-
-        public static WebClient DownloadFileAsync(string url, string target, Action onSuccess, Action<Exception> onFailure){
-            WebClient client = CreateWebClient();
-
-            client.DownloadFileCompleted += (sender, args) => {
-                if (args.Cancelled){
-                    try{
-                        File.Delete(target);
-                    }catch{
-                        // didn't want it deleted anyways
-                    }
-                }
-                else if (args.Error != null){
-                    onFailure?.Invoke(args.Error);
-                }
-                else{
-                    onSuccess?.Invoke();
-                }
-            };
-
-            client.DownloadFileAsync(new Uri(url), target);
-            return client;
-        }
-
-        public static int Scale(int baseValue, double scaleFactor){
-            return (int)Math.Round(baseValue*scaleFactor);
-        }
-
-        public static void SetZoomLevel(IBrowser browser, int percentage){
-            browser.GetHost().SetZoomLevel(Math.Log(percentage/100.0, 1.2));
-        }
-
-        #if DEBUG
-        public static void HandleConsoleMessage(object sender, ConsoleMessageEventArgs e){
-            Debug.WriteLine("[Console] {0} ({1}:{2})", e.Message, e.Source, e.Line);
-        }
-        #endif
-    }
-}

Core/Utils/StringUtils.cs

@@ -1,33 +0,0 @@
-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();
-        }
-
-        public static int CountOccurrences(string source, string substring){
-            int count = 0, index = 0;
-
-            while((index = source.IndexOf(substring, index)) != -1){
-                index += substring.Length;
-                ++count;
-            }
-
-            return count;
-        }
-    }
-}

Core/Utils/TwitterUtils.cs

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

Core/Utils/WindowsUtils.cs

@@ -1,194 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Windows.Forms;
-using Microsoft.Win32;
-
-namespace TweetDuck.Core.Utils{
-    static class WindowsUtils{
-        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");
-
-            try{
-                Directory.CreateDirectory(path);
-
-                using(File.Create(testFile)){}
-                File.Delete(testFile);
-                return true;
-            }catch{
-                return false;
-            }
-        }
-
-        public static bool OpenAssociatedProgram(string file, string arguments = "", bool runElevated = false){
-            try{
-                using(Process.Start(new ProcessStartInfo{
-                    FileName = file,
-                    Arguments = arguments,
-                    Verb = runElevated ? "runas" : string.Empty,
-                    ErrorDialog = true
-                })){
-                    return true;
-                }
-            }catch(Win32Exception e) when (e.NativeErrorCode == 0x000004C7){ // operation canceled by the user
-                return false;
-            }catch(Exception e){
-                Program.Reporter.HandleException("Error Opening Program", "Could not open the associated program for "+file, true, e);
-                return false;
-            }
-        }
-
-        public static bool TrySleepUntil(Func<bool> test, int timeoutMillis, int timeStepMillis){
-            for(int waited = 0; waited < timeoutMillis; waited += timeStepMillis){
-                if (test()){
-                    return true;
-                }
-
-                Thread.Sleep(timeStepMillis);
-            }
-
-            return false;
-        }
-
-        public static void TryDeleteFolderWhenAble(string path, int timeout){
-            new Thread(() => {
-                TrySleepUntil(() => {
-                    try{
-                        Directory.Delete(path, true);
-                        return true;
-                    }catch(DirectoryNotFoundException){
-                        return true;
-                    }catch{
-                        return false;
-                    }
-                }, timeout, 500);
-            }).Start();
-        }
-
-        public static void ClipboardStripHtmlStyles(){
-            if (!Clipboard.ContainsText(TextDataFormat.Html) || !Clipboard.ContainsText(TextDataFormat.UnicodeText)){
-                return;
-            }
-
-            string originalText = Clipboard.GetText(TextDataFormat.UnicodeText);
-            string originalHtml = Clipboard.GetText(TextDataFormat.Html);
-
-            string updatedHtml = RegexStripHtmlStyles.Value.Replace(originalHtml, string.Empty);
-
-            int removed = originalHtml.Length-updatedHtml.Length;
-            updatedHtml = RegexOffsetClipboardHtml.Value.Replace(updatedHtml, match => (int.Parse(match.Value)-removed).ToString().PadLeft(match.Value.Length, '0'));
-            
-            DataObject obj = new DataObject();
-            obj.SetText(originalText, TextDataFormat.UnicodeText);
-            obj.SetText(updatedHtml, TextDataFormat.Html);
-            SetClipboardData(obj);
-        }
-
-        public static void SetClipboard(string text, TextDataFormat format){
-            if (string.IsNullOrEmpty(text)){
-                return;
-            }
-
-            DataObject obj = new DataObject();
-            obj.SetText(text, format);
-            SetClipboardData(obj);
-        }
-
-        private static void SetClipboardData(DataObject obj){
-            try{
-                Clipboard.SetDataObject(obj);
-            }catch(ExternalException e){
-                Program.Reporter.HandleException("Clipboard Error", "TweetDuck could not access the clipboard as it is currently used by another process.", true, e);
-            }
-        }
-
-        public static IEnumerable<Browser> FindInstalledBrowsers(){
-            IEnumerable<Browser> ReadBrowsersFromKey(RegistryHive hive){
-                using(RegistryKey root = RegistryKey.OpenBaseKey(hive, RegistryView.Default))
-                using(RegistryKey browserList = root.OpenSubKey(@"SOFTWARE\Clients\StartMenuInternet", false)){
-                    if (browserList == null){
-                        yield break;
-                    }
-
-                    foreach(string sub in browserList.GetSubKeyNames()){
-                        using(RegistryKey browserKey = browserList.OpenSubKey(sub, false))
-                        using(RegistryKey shellKey = browserKey?.OpenSubKey(@"shell\open\command")){
-                            if (shellKey == null){
-                                continue;
-                            }
-
-                            string browserName = browserKey.GetValue(null) as string;
-                            string browserPath = shellKey.GetValue(null) as string;
-
-                            if (string.IsNullOrEmpty(browserName) || string.IsNullOrEmpty(browserPath)){
-                                continue;
-                            }
-
-                            if (browserPath[0] == '"' && browserPath[browserPath.Length-1] == '"'){
-                                browserPath = browserPath.Substring(1, browserPath.Length-2);
-                            }
-
-                            yield return new Browser(browserName, browserPath);
-                        }
-                    }
-                }
-            }
-
-            HashSet<Browser> browsers = new HashSet<Browser>();
-            
-            try{
-                browsers.UnionWith(ReadBrowsersFromKey(RegistryHive.CurrentUser));
-                browsers.UnionWith(ReadBrowsersFromKey(RegistryHive.LocalMachine));
-            }catch{
-                // oops I guess
-            }
-
-            return browsers;
-        }
-
-        public sealed class Browser{
-            public string Name { get; }
-            public string Path { get; }
-
-            public Browser(string name, string path){
-                this.Name = name;
-                this.Path = path;
-            }
-
-            public override int GetHashCode() => Name.GetHashCode();
-            public override bool Equals(object obj) => obj is Browser other && Name == other.Name;
-            public override string ToString() => Name;
-        }
-    }
-}

Data/Serialization/FileSerializer.cs

@@ -1,207 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization;
-using System.Text;
-using TweetDuck.Core.Utils;
-
-namespace TweetDuck.Data.Serialization{
-    sealed class FileSerializer<T>{
-        private const string NewLineReal = "\r\n";
-        private const string NewLineCustom = "\r~\n";
-
-        private static string EscapeLine(string input) => input.Replace("\\", "\\\\").Replace(Environment.NewLine, "\\\r\n");
-        private static string UnescapeLine(string input) => input.Replace(NewLineCustom, Environment.NewLine);
-
-        private static string UnescapeStream(StreamReader reader){
-            string data = reader.ReadToEnd();
-
-            StringBuilder build = new StringBuilder(data.Length);
-            int index = 0;
-
-            while(true){
-                int nextIndex = data.IndexOf('\\', index);
-
-                if (nextIndex == -1 || nextIndex+1 >= data.Length){
-                    break;
-                }
-                else{
-                    build.Append(data.Substring(index, nextIndex-index));
-
-                    char next = data[nextIndex+1];
-
-                    if (next == '\\'){ // convert double backslash to single backslash
-                        build.Append('\\');
-                        index = nextIndex+2;
-                    }
-                    else if (next == '\r' && nextIndex+2 < data.Length && data[nextIndex+2] == '\n'){ // convert backslash followed by CRLF to custom new line
-                        build.Append(NewLineCustom);
-                        index = nextIndex+3;
-                    }
-                    else{ // single backslash
-                        build.Append('\\');
-                        index = nextIndex+1;
-                    }
-                }
-            }
-            
-            return build.Append(data.Substring(index)).ToString();
-        }
-
-        private static readonly ITypeConverter BasicSerializerObj = new BasicTypeConverter();
-        
-        public delegate void HandleUnknownPropertiesHandler(T obj, Dictionary<string, string> data);
-        public HandleUnknownPropertiesHandler HandleUnknownProperties { get; set; }
-        
-        private readonly Dictionary<string, PropertyInfo> props;
-        private readonly Dictionary<Type, ITypeConverter> converters;
-
-        public FileSerializer(){
-            this.props = typeof(T).GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(prop => prop.CanWrite).ToDictionary(prop => prop.Name);
-            this.converters = new Dictionary<Type, ITypeConverter>();
-        }
-
-        public void RegisterTypeConverter(Type type, ITypeConverter converter){
-            converters[type] = converter;
-        }
-
-        public void Write(string file, T obj){
-            WindowsUtils.CreateDirectoryForFile(file);
-
-            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} {EscapeLine(converted)}");
-                            writer.Write(NewLineReal);
-                        }
-                    }
-                    else{
-                        throw new SerializationException($"Invalid serialization type, conversion failed for: {type}");
-                    }
-                }
-            }
-        }
-
-        public void Read(string file, T obj){
-            Dictionary<string, string> unknownProperties = new Dictionary<string, string>(4);
-
-            using(StreamReader reader = new StreamReader(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read))){
-                switch(reader.Peek()){
-                    case -1:
-                        throw new FormatException("File is empty.");
-                    case 0:
-                    case 1:
-                        throw new FormatException("Input appears to be a binary file.");
-                }
-
-                foreach(string line in UnescapeStream(reader).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 = UnescapeLine(line.Substring(space+1));
-
-                    if (props.TryGetValue(property, out PropertyInfo info)){
-                        if (!converters.TryGetValue(info.PropertyType, out ITypeConverter serializer)) {
-                            serializer = BasicSerializerObj;
-                        }
-
-                        if (serializer.TryReadType(info.PropertyType, value, out object converted)){
-                            info.SetValue(obj, converted);
-                        }
-                        else{
-                            throw new SerializationException($"Invalid file format, cannot convert value: {value} (property: {property})");
-                        }
-                    }
-                    else{
-                        unknownProperties[property] = value;
-                    }
-                }
-            }
-
-            if (unknownProperties.Count > 0){
-                HandleUnknownProperties?.Invoke(obj, unknownProperties);
-
-                if (unknownProperties.Count > 0){
-                    throw new SerializationException($"Invalid file format, unknown properties: {string.Join(", ", unknownProperties.Keys)}");
-                }
-            }
-        }
-
-        public void ReadIfExists(string file, T obj){
-            try{
-                Read(file, obj);
-            }catch(FileNotFoundException){
-            }catch(DirectoryNotFoundException){}
-        }
-
-        public static HandleUnknownPropertiesHandler IgnoreProperties(params string[] properties){
-            return (obj, data) => {
-                foreach(string property in properties){
-                    data.Remove(property);
-                }
-            };
-        }
-
-        private sealed 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

@@ -1,8 +0,0 @@
-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);
-    }
-}

Dialogs/FormAbout.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     sealed partial class FormAbout {
         /// <summary>
         /// Required designer variable.
@@ -23,7 +23,6 @@ namespace TweetDuck.Core.Other {
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAbout));
             this.pictureLogo = new System.Windows.Forms.PictureBox();
             this.labelDescription = new System.Windows.Forms.Label();
             this.labelTips = new System.Windows.Forms.LinkLabel();
@@ -38,11 +37,11 @@ namespace TweetDuck.Core.Other {
             // 
             this.pictureLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.pictureLogo.ErrorImage = null;
-            this.pictureLogo.Image = ((System.Drawing.Image)(resources.GetObject("pictureLogo.Image")));
             this.pictureLogo.InitialImage = null;
             this.pictureLogo.Location = new System.Drawing.Point(12, 12);
             this.pictureLogo.Name = "pictureLogo";
             this.pictureLogo.Size = new System.Drawing.Size(96, 96);
+            this.pictureLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureLogo.TabIndex = 0;
             this.pictureLogo.TabStop = false;
             // 
@@ -51,23 +50,22 @@ namespace TweetDuck.Core.Other {
             this.labelDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDescription.Font = new System.Drawing.Font("Segoe UI", 9.75F);
             this.labelDescription.Location = new System.Drawing.Point(114, 12);
             this.labelDescription.Name = "labelDescription";
-            this.labelDescription.Size = new System.Drawing.Size(232, 109);
+            this.labelDescription.Size = new System.Drawing.Size(232, 113);
             this.labelDescription.TabIndex = 0;
             // 
             // labelTips
             // 
             this.labelTips.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelTips.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTips.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular);
             this.labelTips.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelTips.Location = new System.Drawing.Point(117, 0);
             this.labelTips.Margin = new System.Windows.Forms.Padding(0);
             this.labelTips.Name = "labelTips";
-            this.labelTips.Size = new System.Drawing.Size(99, 16);
+            this.labelTips.Size = new System.Drawing.Size(99, 18);
             this.labelTips.TabIndex = 1;
-            this.labelTips.TabStop = true;
             this.labelTips.Text = "Tips && Tricks";
             this.labelTips.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labelTips.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -76,14 +74,13 @@ namespace TweetDuck.Core.Other {
             // 
             this.labelWebsite.AutoSize = true;
             this.labelWebsite.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelWebsite.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular);
             this.labelWebsite.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelWebsite.Location = new System.Drawing.Point(0, 0);
             this.labelWebsite.Margin = new System.Windows.Forms.Padding(0);
             this.labelWebsite.Name = "labelWebsite";
-            this.labelWebsite.Size = new System.Drawing.Size(117, 16);
+            this.labelWebsite.Size = new System.Drawing.Size(117, 18);
             this.labelWebsite.TabIndex = 0;
-            this.labelWebsite.TabStop = true;
             this.labelWebsite.Text = "Official Website";
             this.labelWebsite.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.labelWebsite.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -99,24 +96,23 @@ namespace TweetDuck.Core.Other {
             this.tablePanelLinks.Controls.Add(this.labelIssues, 2, 0);
             this.tablePanelLinks.Controls.Add(this.labelWebsite, 0, 0);
             this.tablePanelLinks.Controls.Add(this.labelTips, 1, 0);
-            this.tablePanelLinks.Location = new System.Drawing.Point(12, 124);
+            this.tablePanelLinks.Location = new System.Drawing.Point(12, 128);
             this.tablePanelLinks.Name = "tablePanelLinks";
             this.tablePanelLinks.RowCount = 1;
             this.tablePanelLinks.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tablePanelLinks.Size = new System.Drawing.Size(334, 16);
+            this.tablePanelLinks.Size = new System.Drawing.Size(334, 18);
             this.tablePanelLinks.TabIndex = 1;
             // 
             // labelIssues
             // 
             this.labelIssues.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelIssues.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelIssues.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular);
             this.labelIssues.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelIssues.Location = new System.Drawing.Point(216, 0);
             this.labelIssues.Margin = new System.Windows.Forms.Padding(0);
             this.labelIssues.Name = "labelIssues";
-            this.labelIssues.Size = new System.Drawing.Size(118, 16);
+            this.labelIssues.Size = new System.Drawing.Size(118, 18);
             this.labelIssues.TabIndex = 2;
-            this.labelIssues.TabStop = true;
             this.labelIssues.Text = "Report an Issue";
             this.labelIssues.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.labelIssues.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -126,7 +122,7 @@ namespace TweetDuck.Core.Other {
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(358, 152);
+            this.ClientSize = new System.Drawing.Size(358, 156);
             this.Controls.Add(this.tablePanelLinks);
             this.Controls.Add(this.labelDescription);
             this.Controls.Add(this.pictureLogo);

Dialogs/FormAbout.cs

@@ -1,22 +1,29 @@
 using System.ComponentModel;
+using System.Drawing;
+using System.IO;
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
+using TweetDuck.Management;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
-    sealed partial class FormAbout : Form{
+namespace TweetDuck.Dialogs{
+    sealed partial class FormAbout : Form, FormManager.IAppDialog{
         private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki";
         private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues";
 
         public FormAbout(){
             InitializeComponent();
 
-            Text = "About "+Program.BrandName+" "+Program.VersionTag;
+            Text = "About " + Program.BrandName + " " + Program.VersionTag;
 
             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));
             labelIssues.Links.Add(new LinkLabel.Link(0, labelIssues.Text.Length, IssuesLink));
+
+            MemoryStream logoStream = new MemoryStream(Properties.Resources.avatar);
+            pictureLogo.Image = Image.FromStream(logoStream);
+            Disposed += (sender, args) => logoStream.Dispose();
         }
 
         private void OnLinkClicked(object sender, LinkLabelLinkClickedEventArgs e){

Dialogs/FormGuide.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     partial class FormGuide {
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Windows Form Designer generated code
 
         /// <summary>

Dialogs/FormGuide.cs

@@ -0,0 +1,132 @@
+using System.Drawing;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Browser;
+using TweetDuck.Browser.Adapters;
+using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Controls;
+using TweetDuck.Management;
+using TweetDuck.Utils;
+
+namespace TweetDuck.Dialogs{
+    sealed partial class FormGuide : Form, FormManager.IAppDialog{
+        private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
+        private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
+        
+        private static readonly ResourceLink DummyPage = new ResourceLink("http://td/dummy", ResourceHandler.FromString(""));
+
+        public static bool CheckGuideUrl(string url, out string hash){
+            if (!url.Contains("//tweetduck.chylex.com/guide")){
+                hash = null;
+                return false;
+            }
+
+            string path = url.Substring(url.IndexOf("/guide")+1);
+            Match match = Regex.Match(path, GuidePathRegex);
+
+            if (match.Success){
+                hash = match.Groups[1].Value;
+                return true;
+            }
+            else{
+                hash = null;
+                return false;
+            }
+        }
+
+        public static void Show(string hash = null){
+            string url = GuideUrl + (hash ?? string.Empty);
+            FormGuide guide = FormManager.TryFind<FormGuide>();
+            
+            if (guide == null){
+                FormBrowser owner = FormManager.TryFind<FormBrowser>();
+
+                if (owner != null){
+                    owner.AnalyticsFile.OpenGuide.Trigger();
+                    new FormGuide(url, owner).Show(owner);
+                }
+            }
+            else{
+                guide.Reload(url);
+                guide.Activate();
+            }
+        }
+
+        #pragma warning disable IDE0069 // Disposable fields should be disposed
+        private readonly ChromiumWebBrowser browser;
+        #pragma warning restore IDE0069 // Disposable fields should be disposed
+
+        private string nextUrl;
+
+        private FormGuide(string url, FormBrowser owner){
+            InitializeComponent();
+
+            Text = Program.BrandName + " Guide";
+            Size = new Size(owner.Size.Width * 3 / 4, owner.Size.Height * 3 / 4);
+            VisibleChanged += (sender, args) => this.MoveToCenter(owner);
+
+            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            resourceHandlerFactory.RegisterHandler(DummyPage);
+            
+            this.browser = new ChromiumWebBrowser(url){
+                MenuHandler = new ContextMenuGuide(owner),
+                JsDialogHandler = new JavaScriptDialogHandler(),
+                KeyboardHandler = new KeyboardHandlerBase(),
+                LifeSpanHandler = new LifeSpanHandler(),
+                RequestHandler = new RequestHandlerBase(true),
+                ResourceHandlerFactory = resourceHandlerFactory
+            };
+
+            browser.LoadingStateChanged += browser_LoadingStateChanged;
+            browser.FrameLoadEnd += browser_FrameLoadEnd;
+            
+            browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
+            browser.Dock = DockStyle.None;
+            browser.Location = ControlExtensions.InvisibleLocation;
+            browser.SetupZoomEvents();
+
+            Controls.Add(browser);
+            Disposed += (sender, args) => browser.Dispose();
+        }
+
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void Reload(string url){
+            nextUrl = url;
+            browser.LoadingStateChanged += browser_LoadingStateChanged;
+            browser.Dock = DockStyle.None;
+            browser.Location = ControlExtensions.InvisibleLocation;
+            browser.Load(DummyPage.Url);
+        }
+
+        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
+            if (!e.IsLoading){
+                if (browser.Address == DummyPage.Url){
+                    browser.Load(nextUrl);
+                }
+                else{
+                    this.InvokeAsyncSafe(() => {
+                        browser.Location = Point.Empty;
+                        browser.Dock = DockStyle.Fill;
+                    });
+
+                    browser.LoadingStateChanged -= browser_LoadingStateChanged;
+                }
+            }
+        }
+
+        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
+            CefScriptExecutor.RunScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
+        }
+    }
+}

Dialogs/FormMessage.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     partial class FormMessage {
         /// <summary>
         /// Required designer variable.

Dialogs/FormMessage.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Controls;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     [Flags]
     enum ControlType{
         None = 0,
@@ -43,17 +43,17 @@ namespace TweetDuck.Core.Other{
         }
 
         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);
-                }
+            using FormMessage message = new FormMessage(caption, text, icon);
 
-                return message.ShowDialog() == DialogResult.OK;
+            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
@@ -133,7 +133,7 @@ namespace TweetDuck.Core.Other{
                 Font = SystemFonts.MessageBoxFont,
                 Location = new Point(0, 12),
                 Size = new Size(BrowserUtils.Scale(88, dpiScale), BrowserUtils.Scale(26, dpiScale)),
-                TabIndex = buttonCount,
+                TabIndex = 256 - buttonCount,
                 Text = title,
                 UseVisualStyleBackColor = true
             };
@@ -171,17 +171,17 @@ namespace TweetDuck.Core.Other{
             
             control.Size = new Size(BrowserUtils.Scale(control.Width, dpiScale), BrowserUtils.Scale(control.Height, dpiScale));
 
-            minFormWidth += control.Width+control.Margin.Horizontal;
+            minFormWidth += control.Width + control.Margin.Horizontal;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
         }
         
         private void RecalculateButtonLocation(){
             int dist = ButtonDistance;
-            int start = ClientWidth-dist;
+            int start = ClientWidth - dist;
 
             for(int index = 0; index < buttonCount; index++){
                 Control control = panelActions.Controls[index];
-                control.Location = new Point(start-index*dist, control.Location.Y);
+                control.Location = new Point(start - index * dist, control.Location.Y);
             }
         }
 
@@ -194,17 +194,17 @@ namespace TweetDuck.Core.Other{
             int labelOffset = BrowserUtils.Scale(8, dpiScale);
 
             if (isMultiline && !wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y-labelOffset);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y - labelOffset);
                 prevLabelHeight += labelOffset;
             }
             else if (!isMultiline && wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y+labelOffset);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y + labelOffset);
                 prevLabelHeight -= labelOffset;
             }
 
-            realFormWidth = ClientWidth-(icon == null ? BrowserUtils.Scale(50, dpiScale) : 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;
+            Height += labelMessage.Height - prevLabelHeight;
 
             prevLabelWidth = labelMessage.Width;
             prevLabelHeight = labelMessage.Height;
@@ -213,7 +213,7 @@ namespace TweetDuck.Core.Other{
 
         protected override void OnPaint(PaintEventArgs e){
             if (icon != null){
-                e.Graphics.DrawIcon(icon, BrowserUtils.Scale(25, dpiScale), 1+BrowserUtils.Scale(25, dpiScale));
+                e.Graphics.DrawIcon(icon, BrowserUtils.Scale(25, dpiScale), 1 + BrowserUtils.Scale(25, dpiScale));
             }
 
             base.OnPaint(e);

Dialogs/FormPlugins.Designer.cs

@@ -1,4 +1,6 @@
-namespace TweetDuck.Core.Other {
+using TweetDuck.Controls;
+
+namespace TweetDuck.Dialogs {
     partial class FormPlugins {
         /// <summary>
         /// Required designer variable.
@@ -23,20 +25,23 @@
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
             this.btnClose = new System.Windows.Forms.Button();
             this.btnReload = new System.Windows.Forms.Button();
             this.btnOpenFolder = new System.Windows.Forms.Button();
-            this.flowLayoutPlugins = new TweetDuck.Plugins.Controls.PluginListFlowLayout();
+            this.flowLayoutPlugins = new FlowLayoutPanelNoHScroll();
+            this.timerLayout = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
             // btnClose
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Location = new System.Drawing.Point(643, 439);
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
+            this.btnClose.Location = new System.Drawing.Point(642, 433);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnClose.Size = new System.Drawing.Size(49, 23);
+            this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnClose.Size = new System.Drawing.Size(50, 25);
             this.btnClose.TabIndex = 1;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -46,10 +51,11 @@
             // 
             this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnReload.AutoSize = true;
-            this.btnReload.Location = new System.Drawing.Point(131, 439);
+            this.btnReload.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
+            this.btnReload.Location = new System.Drawing.Point(141, 433);
             this.btnReload.Name = "btnReload";
-            this.btnReload.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnReload.Size = new System.Drawing.Size(71, 23);
+            this.btnReload.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnReload.Size = new System.Drawing.Size(74, 25);
             this.btnReload.TabIndex = 2;
             this.btnReload.Text = "Reload All";
             this.btnReload.UseVisualStyleBackColor = true;
@@ -59,10 +65,11 @@
             // 
             this.btnOpenFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnOpenFolder.AutoSize = true;
-            this.btnOpenFolder.Location = new System.Drawing.Point(12, 439);
+            this.btnOpenFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
+            this.btnOpenFolder.Location = new System.Drawing.Point(12, 433);
             this.btnOpenFolder.Name = "btnOpenFolder";
-            this.btnOpenFolder.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnOpenFolder.Size = new System.Drawing.Size(113, 23);
+            this.btnOpenFolder.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnOpenFolder.Size = new System.Drawing.Size(123, 25);
             this.btnOpenFolder.TabIndex = 3;
             this.btnOpenFolder.Text = "Open Plugin Folder";
             this.btnOpenFolder.UseVisualStyleBackColor = true;
@@ -77,22 +84,29 @@
             this.flowLayoutPlugins.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowLayoutPlugins.Location = new System.Drawing.Point(12, 12);
             this.flowLayoutPlugins.Name = "flowLayoutPlugins";
-            this.flowLayoutPlugins.Size = new System.Drawing.Size(680, 421);
+            this.flowLayoutPlugins.Size = new System.Drawing.Size(680, 415);
             this.flowLayoutPlugins.TabIndex = 0;
             this.flowLayoutPlugins.WrapContents = false;
             this.flowLayoutPlugins.Resize += new System.EventHandler(this.flowLayoutPlugins_Resize);
             // 
+            // timerLayout
+            // 
+            this.timerLayout.Interval = 99;
+            this.timerLayout.Tick += new System.EventHandler(this.timerLayout_Tick);
+            // 
             // FormPlugins
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(704, 474);
+            this.ClientSize = new System.Drawing.Size(704, 470);
             this.Controls.Add(this.flowLayoutPlugins);
             this.Controls.Add(this.btnOpenFolder);
             this.Controls.Add(this.btnReload);
             this.Controls.Add(this.btnClose);
             this.Icon = global::TweetDuck.Properties.Resources.icon;
-            this.MinimumSize = new System.Drawing.Size(480, 320);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(640, 360);
             this.Name = "FormPlugins";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.ResumeLayout(false);
@@ -105,6 +119,7 @@
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
-        private Plugins.Controls.PluginListFlowLayout flowLayoutPlugins;
+        private FlowLayoutPanelNoHScroll flowLayoutPlugins;
+        private System.Windows.Forms.Timer timerLayout;
     }
 }

Dialogs/FormPlugins.cs

@@ -1,32 +1,44 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using TweetDuck.Configuration;
+using TweetDuck.Management;
 using TweetDuck.Plugins;
-using TweetDuck.Plugins.Controls;
+using TweetLib.Core;
+using TweetLib.Core.Features.Plugins;
+
+namespace TweetDuck.Dialogs{
+    sealed partial class FormPlugins : Form, FormManager.IAppDialog{
+        private static UserConfig Config => Program.Config.User;
 
-namespace TweetDuck.Core.Other{
-    sealed partial class FormPlugins : Form{
         private readonly PluginManager pluginManager;
         
         public FormPlugins(){
             InitializeComponent();
 
-            Text = Program.BrandName+" Plugins";
+            Text = Program.BrandName + " Plugins";
         }
 
         public FormPlugins(PluginManager pluginManager) : this(){
             this.pluginManager = pluginManager;
 
+            if (!Config.PluginsWindowSize.IsEmpty){
+                Size targetSize = Config.PluginsWindowSize;
+                Size = new Size(Math.Max(MinimumSize.Width, targetSize.Width), Math.Max(MinimumSize.Height, targetSize.Height));
+            }
+            
             Shown += (sender, args) => {
-                Program.UserConfig.PluginsWindow.Restore(this, false);
                 ReloadPluginList();
             };
 
             FormClosed += (sender, args) => {
-                Program.UserConfig.PluginsWindow.Save(this);
-                Program.UserConfig.Save();
+                Config.PluginsWindowSize = Size;
+                Config.Save();
+            };
+
+            ResizeEnd += (sender, args) => {
+                timerLayout.Start();
             };
         }
 
@@ -50,33 +62,41 @@ namespace TweetDuck.Core.Other{
 
             flowLayoutPlugins.ResumeLayout(true);
             
-            // sorry, I guess...
-            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right+1, Padding.Bottom);
-            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right-1, Padding.Bottom);
+            timerLayout_Tick(null, EventArgs.Empty);
+            timerLayout.Start();
         }
 
-        private void flowLayoutPlugins_Resize(object sender, EventArgs e){
-            if (flowLayoutPlugins.Controls.Count == 0){
+        private void timerLayout_Tick(object sender, EventArgs e){
+            timerLayout.Stop();
+            
+            // stupid WinForms scrollbars and panels
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right + 1, Padding.Bottom + 1);
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right - 1, Padding.Bottom - 1);
+        }
+
+        public void flowLayoutPlugins_Resize(object sender, EventArgs e){
+            Control lastPlugin = flowLayoutPlugins.Controls.OfType<PluginControl>().LastOrDefault();
+            
+            if (lastPlugin == null){
                 return;
             }
 
-            Control lastControl = flowLayoutPlugins.Controls[flowLayoutPlugins.Controls.Count-1];
-            bool showScrollBar = lastControl.Location.Y+lastControl.Height >= flowLayoutPlugins.Height;
+            bool showScrollBar = lastPlugin.Location.Y + lastPlugin.Height + 1 >= flowLayoutPlugins.Height;
             int horizontalOffset = showScrollBar ? SystemInformation.VerticalScrollBarWidth : 0;
             
             flowLayoutPlugins.AutoScroll = showScrollBar;
             flowLayoutPlugins.VerticalScroll.Visible = showScrollBar;
 
             foreach(Control control in flowLayoutPlugins.Controls){
-                control.Width = flowLayoutPlugins.Width-control.Margin.Horizontal-horizontalOffset;
+                control.Width = flowLayoutPlugins.Width - control.Margin.Horizontal - horizontalOffset;
             }
             
-            lastControl.Visible = !showScrollBar;
+            flowLayoutPlugins.Controls[flowLayoutPlugins.Controls.Count - 1].Visible = !showScrollBar;
             flowLayoutPlugins.Focus();
         }
 
         private void btnOpenFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "\""+pluginManager.PathCustomPlugins+"\"")){}
+            App.SystemHandler.OpenFileExplorer(pluginManager.PathCustomPlugins);
         }
 
         private void btnReload_Click(object sender, EventArgs e){

Dialogs/FormSettings.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     sealed partial class FormSettings {
         /// <summary>
         /// Required designer variable.
@@ -33,10 +33,11 @@
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Location = new System.Drawing.Point(449, 483);
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.btnClose.Location = new System.Drawing.Point(747, 500);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnClose.Size = new System.Drawing.Size(49, 23);
+            this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnClose.Size = new System.Drawing.Size(50, 25);
             this.btnClose.TabIndex = 3;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -52,7 +53,7 @@
             this.panelContents.Location = new System.Drawing.Point(135, 12);
             this.panelContents.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.panelContents.Name = "panelContents";
-            this.panelContents.Size = new System.Drawing.Size(363, 465);
+            this.panelContents.Size = new System.Drawing.Size(662, 482);
             this.panelContents.TabIndex = 1;
             // 
             // panelButtons
@@ -63,17 +64,18 @@
             this.panelButtons.Location = new System.Drawing.Point(12, 12);
             this.panelButtons.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
             this.panelButtons.Name = "panelButtons";
-            this.panelButtons.Size = new System.Drawing.Size(124, 465);
+            this.panelButtons.Size = new System.Drawing.Size(124, 482);
             this.panelButtons.TabIndex = 0;
             // 
             // btnManageOptions
             // 
             this.btnManageOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnManageOptions.AutoSize = true;
-            this.btnManageOptions.Location = new System.Drawing.Point(12, 483);
+            this.btnManageOptions.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.btnManageOptions.Location = new System.Drawing.Point(12, 500);
             this.btnManageOptions.Name = "btnManageOptions";
-            this.btnManageOptions.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnManageOptions.Size = new System.Drawing.Size(101, 23);
+            this.btnManageOptions.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnManageOptions.Size = new System.Drawing.Size(109, 25);
             this.btnManageOptions.TabIndex = 4;
             this.btnManageOptions.Text = "Manage Options";
             this.btnManageOptions.UseVisualStyleBackColor = true;
@@ -83,7 +85,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(510, 518);
+            this.ClientSize = new System.Drawing.Size(809, 537);
             this.Controls.Add(this.btnManageOptions);
             this.Controls.Add(this.panelContents);
             this.Controls.Add(this.panelButtons);

Dialogs/FormSettings.cs

@@ -2,32 +2,34 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Notification.Example;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Other.Settings;
-using TweetDuck.Core.Other.Settings.Dialogs;
-using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Updates;
+using TweetDuck.Browser;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Notification.Example;
+using TweetDuck.Configuration;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs.Settings;
+using TweetDuck.Management;
+using TweetDuck.Management.Analytics;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Updates;
+
+namespace TweetDuck.Dialogs{
+    sealed partial class FormSettings : Form, FormManager.IAppDialog{
+        public bool ShouldReloadBrowser { get; private set; }
 
-namespace TweetDuck.Core.Other{
-    sealed partial class FormSettings : Form{
         private readonly FormBrowser browser;
         private readonly PluginManager plugins;
 
         private readonly int buttonHeight;
 
-        private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(4);
+        private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(8);
         private SettingsTab currentTab;
 
-        public bool ShouldReloadBrowser { get; private set; }
-
         public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, AnalyticsManager analytics, Type startTab){
             InitializeComponent();
 
-            Text = Program.BrandName+" Options";
+            Text = Program.BrandName + " Options";
 
             this.browser = browser;
             this.browser.PauseNotification();
@@ -36,19 +38,37 @@ namespace TweetDuck.Core.Other{
             
             this.buttonHeight = BrowserUtils.Scale(39, this.GetDPIScale()) | 1;
 
-            AddButton("General", () => new TabSettingsGeneral(this.browser, updates));
-            AddButton("Locales", () => new TabSettingsLocales());
-            AddButton("System Tray", () => new TabSettingsTray());
+            PrepareLoad();
+
+            AddButton("General", () => new TabSettingsGeneral(this.browser.ReloadColumns, updates));
             AddButton("Notifications", () => new TabSettingsNotifications(new FormNotificationExample(this.browser, this.plugins)));
             AddButton("Sounds", () => new TabSettingsSounds(this.browser.PlaySoundNotification));
+            AddButton("Tray", () => new TabSettingsTray());
             AddButton("Feedback", () => new TabSettingsFeedback(analytics, AnalyticsReportGenerator.ExternalInfo.From(this.browser), this.plugins));
-            AddButton("Advanced", () => new TabSettingsAdvanced(this.browser.ReinjectCustomCSS));
+            AddButton("Advanced", () => new TabSettingsAdvanced(this.browser.ReinjectCustomCSS, this.browser.OpenDevTools));
 
             SelectTab(tabs[startTab ?? typeof(TabSettingsGeneral)]);
         }
 
-        private void FormSettings_FormClosing(object sender, FormClosingEventArgs e){
+        private void PrepareLoad(){
+            Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
+        }
+
+        private void PrepareUnload(){ // TODO refactor this further later
             currentTab.Control.OnClosing();
+            
+            Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
+            Program.Config.SaveAll();
+        }
+
+        private void Config_ProgramRestartRequested(object sender, EventArgs e){
+            if (FormMessage.Information("TweetDuck Options", "The application must restart for the option to take place. Do you want to restart now?", FormMessage.Yes, FormMessage.No)){
+                Program.Restart();
+            }
+        }
+
+        private void FormSettings_FormClosing(object sender, FormClosingEventArgs e){
+            PrepareUnload();
 
             foreach(SettingsTab tab in tabs.Values){
                 if (tab.IsInitialized){
@@ -56,26 +76,30 @@ namespace TweetDuck.Core.Other{
                 }
             }
             
-            Program.UserConfig.Save();
             browser.ResumeNotification();
         }
 
         private void btnManageOptions_Click(object sender, EventArgs e){
-            currentTab.Control.OnClosing();
+            PrepareUnload();
 
-            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
-                FormClosing -= FormSettings_FormClosing;
-
-                if (dialog.ShowDialog() == DialogResult.OK){
+            using DialogSettingsManage dialog = new DialogSettingsManage(plugins);
+            FormClosing -= FormSettings_FormClosing;
+            
+            if (dialog.ShowDialog() == DialogResult.OK){
+                if (!dialog.IsRestarting){
                     browser.ResumeNotification();
-                    
-                    BrowserProcessHandler.UpdatePrefs();
-                    ShouldReloadBrowser = dialog.ShouldReloadBrowser;
-                    Close();
-                }
-                else{
-                    FormClosing += FormSettings_FormClosing;
+
+                    if (dialog.ShouldReloadBrowser){
+                        BrowserProcessHandler.UpdatePrefs();
+                        ShouldReloadBrowser = true;
+                    }
                 }
+
+                Close();
+            }
+            else{
+                FormClosing += FormSettings_FormClosing;
+                PrepareLoad();
             }
         }
 
@@ -83,11 +107,12 @@ namespace TweetDuck.Core.Other{
             Close();
         }
 
-        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTabSettings{
+        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTab{
             FlatButton btn = new FlatButton{
                 BackColor = SystemColors.Control,
                 FlatStyle = FlatStyle.Flat,
-                Location = new Point(0, (buttonHeight+1)*(panelButtons.Controls.Count/2)),
+                Font = SystemFonts.MessageBoxFont,
+                Location = new Point(0, (buttonHeight + 1) * (panelButtons.Controls.Count / 2)),
                 Margin = new Padding(0),
                 Size = new Size(panelButtons.Width, buttonHeight),
                 Text = title,
@@ -102,7 +127,7 @@ namespace TweetDuck.Core.Other{
 
             panelButtons.Controls.Add(new Panel{
                 BackColor = Color.DimGray,
-                Location = new Point(0, panelButtons.Controls[panelButtons.Controls.Count-1].Location.Y+buttonHeight),
+                Location = new Point(0, panelButtons.Controls[panelButtons.Controls.Count - 1].Location.Y + buttonHeight),
                 Margin = new Padding(0),
                 Size = new Size(panelButtons.Width, 1)
             });
@@ -112,7 +137,7 @@ namespace TweetDuck.Core.Other{
             btn.Click += (sender, args) => SelectTab<T>();
         }
 
-        private void SelectTab<T>() where T : BaseTabSettings{
+        private void SelectTab<T>() where T : BaseTab{
             SelectTab(tabs[typeof(T)]);
         }
 
@@ -134,6 +159,10 @@ namespace TweetDuck.Core.Other{
                     }
                 }
 
+                if (tab.Control.Height < panelContents.Height - 2){
+                    tab.Control.Height = panelContents.Height - 2; // fixes off-by-pixel error on high DPI
+                }
+
                 tab.Control.OnReady();
             }
             
@@ -153,6 +182,10 @@ namespace TweetDuck.Core.Other{
         }
 
         private void control_MouseLeave(object sender, EventArgs e){
+            if (sender is ComboBox cb && cb.DroppedDown){
+                return; // prevents comboboxes from closing when MouseLeave event triggers during opening animation
+            }
+
             panelContents.Focus();
         }
 
@@ -164,16 +197,47 @@ namespace TweetDuck.Core.Other{
         private sealed class SettingsTab{
             public Button Button { get; }
 
-            public BaseTabSettings Control => control ?? (control = constructor());
+            public BaseTab Control => control ??= constructor();
             public bool IsInitialized => control != null;
 
-            private readonly Func<BaseTabSettings> constructor;
-            private BaseTabSettings control;
+            private readonly Func<BaseTab> constructor;
+            private BaseTab control;
 
-            public SettingsTab(Button button, Func<BaseTabSettings> constructor){
+            public SettingsTab(Button button, Func<BaseTab> constructor){
                 this.Button = button;
                 this.constructor = constructor;
             }
         }
+
+        internal abstract class BaseTab : UserControl{
+            protected static UserConfig Config => Program.Config.User;
+            protected static SystemConfig SysConfig => Program.Config.System;
+
+            public IEnumerable<Control> InteractiveControls{
+                get{
+                    static IEnumerable<Control> FindInteractiveControls(Control parent){
+                        foreach(Control control in parent.Controls){
+                            if (control is Panel subPanel){
+                                foreach(Control subControl in FindInteractiveControls(subPanel)){
+                                    yield return subControl;
+                                }
+                            }
+                            else{
+                                yield return control;
+                            }
+                        }
+                    }
+
+                    return FindInteractiveControls(this);
+                }
+            }
+
+            protected BaseTab(){
+                Padding = new Padding(6);
+            }
+
+            public virtual void OnReady(){}
+            public virtual void OnClosing(){}
+        }
     }
 }

Dialogs/Settings/DialogSettingsAnalytics.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Dialogs.Settings {
     partial class DialogSettingsAnalytics {
         /// <summary>
         /// Required designer variable.
@@ -33,22 +33,24 @@
             this.textBoxReport.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxReport.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxReport.Location = new System.Drawing.Point(12, 41);
+            this.textBoxReport.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular);
+            this.textBoxReport.Location = new System.Drawing.Point(12, 45);
             this.textBoxReport.Multiline = true;
             this.textBoxReport.Name = "textBoxReport";
             this.textBoxReport.ReadOnly = true;
             this.textBoxReport.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxReport.Size = new System.Drawing.Size(460, 480);
+            this.textBoxReport.Size = new System.Drawing.Size(435, 474);
             this.textBoxReport.TabIndex = 1;
             // 
             // btnClose
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClose.Location = new System.Drawing.Point(416, 527);
+            this.btnClose.AutoSize = true;
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
+            this.btnClose.Location = new System.Drawing.Point(397, 525);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnClose.Size = new System.Drawing.Size(56, 23);
+            this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnClose.Size = new System.Drawing.Size(50, 25);
             this.btnClose.TabIndex = 2;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -56,23 +58,25 @@
             // 
             // labelInfo
             // 
+            this.labelInfo.AutoSize = true;
+            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
             this.labelInfo.Location = new System.Drawing.Point(12, 9);
             this.labelInfo.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelInfo.Name = "labelInfo";
-            this.labelInfo.Size = new System.Drawing.Size(460, 26);
+            this.labelInfo.Size = new System.Drawing.Size(434, 30);
             this.labelInfo.TabIndex = 0;
-            this.labelInfo.Text = "When enabled, this data will be sent over a secure network roughly once every wee" +
-    "k.\r\nSome numbers in the report were made imprecise on purpose.";
+            this.labelInfo.Text = "When enabled, this data will be sent over a secure network roughly every 14 days." +
+    "\r\nSome numbers in the report were made imprecise on purpose.";
             // 
             // DialogSettingsAnalytics
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(484, 562);
+            this.ClientSize = new System.Drawing.Size(459, 562);
             this.Controls.Add(this.labelInfo);
             this.Controls.Add(this.btnClose);
             this.Controls.Add(this.textBoxReport);
-            this.MinimumSize = new System.Drawing.Size(450, 340);
+            this.MinimumSize = new System.Drawing.Size(475, 340);
             this.Name = "DialogSettingsAnalytics";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;