Release 1.14.1

This reverts commit 1029ea5840.

Configuration/Arguments.cs

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

Configuration/UserConfig.cs

@@ -39,10 +39,9 @@ namespace TweetDuck.Configuration{
         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 OpenSearchInFirstColumn   { get; set; } = true;
         public bool KeepLikeFollowDialogsOpen { get; set; } = true;
         public bool BestImageQuality          { get; set; } = true;
@@ -51,6 +50,7 @@ namespace TweetDuck.Configuration{
         public bool IgnoreTrackingUrlWarning { get; set; } = false;
         public bool EnableSmoothScrolling    { get; set; } = true;
         public string BrowserPath            { get; set; } = null;
+        public string SearchEngineUrl        { get; set; } = null;
         private int _zoomLevel                             = 100;
         private bool _muteNotifications;
 

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

@@ -15,7 +15,6 @@ namespace TweetDuck.Core.Bridge{
             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));

Core/Bridge/TweetDeckBridge.cs

@@ -3,7 +3,7 @@ using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
+using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
@@ -13,20 +13,12 @@ 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(';');
+        public static readonly ContextInfo ContextInfo = new ContextInfo();
 
         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){
@@ -72,13 +64,8 @@ namespace TweetDuck.Core.Bridge{
                 });
             }
 
-            public void SetLastHighlightedTweet(string tweetUrl, string quoteUrl, string authors, string imageList){
-                form.InvokeAsyncSafe(() => {
-                    LastHighlightedTweetUrl = tweetUrl;
-                    LastHighlightedQuoteUrl = quoteUrl;
-                    LastHighlightedTweetAuthors = authors;
-                    LastHighlightedTweetImages = imageList;
-                });
+            public void SetRightClickedChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
+                ContextInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
             }
 
             public void DisplayTooltip(string text){
@@ -112,8 +99,8 @@ namespace TweetDuck.Core.Bridge{
 
         // Global
 
-        public void SetLastRightClickInfo(string type, string link){
-            form.InvokeAsyncSafe(() => ContextMenuBase.SetContextInfo(type, link));
+        public void SetLastRightClickInfo(string type, string url){
+            ContextInfo.SetLink(type, url);
         }
 
         public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
@@ -130,8 +117,8 @@ namespace TweetDuck.Core.Bridge{
             });
         }
 
-        public void ScreenshotTweet(string html, int width, int height){
-            form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width, height));
+        public void ScreenshotTweet(string html, int width){
+            form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width));
         }
 
         public void PlayVideo(string url, string username){

Core/Controls/LabelVertical.cs

@@ -7,7 +7,7 @@ namespace TweetDuck.Core.Controls{
         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
+            int y = (int)Math.Floor((ClientRectangle.Height-Text.Length*LineHeight)/2F)-1;
 
             using(Brush brush = new SolidBrush(ForeColor)){
                 foreach(char chr in Text){

Core/FormBrowser.cs

@@ -12,8 +12,10 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
+using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Updates;
+using TweetDuck.Updates.Events;
 
 namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
@@ -37,6 +39,7 @@ namespace TweetDuck.Core{
         }
 
         public string UpdateInstallerPath { get; private set; }
+        private bool ignoreUpdateCheckError;
         
         public AnalyticsFile AnalyticsFile => analytics?.File ?? AnalyticsFile.Dummy;
 
@@ -53,15 +56,12 @@ namespace TweetDuck.Core{
         private VideoPlayer videoPlayer;
         private AnalyticsManager analytics;
 
-        public FormBrowser(UpdaterSettings updaterSettings){
+        public FormBrowser(){
             InitializeComponent();
 
             Text = Program.BrandName;
 
-            this.browser = new TweetDeckBrowser(this, new TweetDeckBridge.Browser(this, notification));
-            this.contextMenu = ContextMenuBrowser.CreateMenu(this);
-
-            this.plugins = new PluginManager(browser, Program.PluginPath, Program.PluginConfigFilePath);
+            this.plugins = new PluginManager(Program.PluginPath, Program.PluginConfigFilePath);
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.Executed += plugins_Executed;
             this.plugins.Reload();
@@ -69,6 +69,11 @@ namespace TweetDuck.Core{
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
             
+            this.browser = new TweetDeckBrowser(this, new TweetDeckBridge.Browser(this, notification));
+            this.contextMenu = ContextMenuBrowser.CreateMenu(this);
+
+            this.plugins.Register(browser, PluginEnvironment.Browser, true);
+
             Controls.Add(new MenuStrip{ Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
 
             Disposed += (sender, args) => {
@@ -76,6 +81,7 @@ namespace TweetDuck.Core{
                 Config.TrayBehaviorChanged -= Config_TrayBehaviorChanged;
                 
                 browser.Dispose();
+                updates.Dispose();
                 contextMenu.Dispose();
 
                 notificationScreenshotManager?.Dispose();
@@ -91,7 +97,8 @@ namespace TweetDuck.Core{
 
             UpdateTrayIcon();
 
-            this.updates = new UpdateHandler(browser, updaterSettings);
+            this.updates = new UpdateHandler(browser, Program.InstallerPath);
+            this.updates.CheckFinished += updates_CheckFinished;
             this.updates.UpdateAccepted += updates_UpdateAccepted;
             this.updates.UpdateDismissed += updates_UpdateDismissed;
 
@@ -229,6 +236,27 @@ namespace TweetDuck.Core{
             }
         }
 
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+            e.Result.Handle(update => {
+                string tag = update.VersionTag;
+
+                if (tag != Program.VersionTag && tag != Config.DismissedUpdate){
+                    updates.PrepareUpdate(update);
+                    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();
+                }
+            });
+
+            ignoreUpdateCheckError = true;
+        }
+
         private void updates_UpdateAccepted(object sender, UpdateEventArgs e){
             this.InvokeAsyncSafe(() => {
                 FormManager.CloseAllDialogs();
@@ -239,11 +267,19 @@ namespace TweetDuck.Core{
                 }
 
                 updates.BeginUpdateDownload(this, e.UpdateInfo, update => {
-                    if (update.DownloadStatus == UpdateDownloadStatus.Done){
-                        UpdateInstallerPath = update.InstallerPath;
-                    }
+                    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();
+                    }
                 });
             });
         }
@@ -294,10 +330,19 @@ namespace TweetDuck.Core{
         }
 
         public void ReloadToTweetDeck(){
+            #if DEBUG
+            Resources.ScriptLoader.HotSwap();
+            #endif
+
+            ignoreUpdateCheckError = false;
             browser.ReloadToTweetDeck();
             AnalyticsFile.BrowserReloads.Trigger();
         }
 
+        public void AddSearchColumn(string query){
+            browser.AddSearchColumn(query);
+        }
+
         public void TriggerTweetScreenshot(){
             browser.TriggerTweetScreenshot();
         }
@@ -452,12 +497,12 @@ namespace TweetDuck.Core{
             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);
+            notificationScreenshotManager.Trigger(html, width);
             AnalyticsFile.TweetScreenshots.Trigger();
         }
 

Core/Handling/ContextMenuBase.cs

@@ -3,15 +3,15 @@ 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.Bridge;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
@@ -19,19 +19,6 @@ namespace TweetDuck.Core.Handling{
 
         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;
@@ -40,10 +27,12 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuCopyMediaUrl    = (CefMenuCommand)26505;
         private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26506;
         private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26507;
+        private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26508;
+        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26509;
         private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
         
-        private string[] lastHighlightedTweetAuthors;
-        private string[] lastHighlightedTweetImageList;
+        protected ContextInfo.LinkInfo LastLink { get; private set; }
+        protected ContextInfo.ChirpInfo LastChirp { get; private set; }
 
         private readonly AnalyticsFile.IProvider analytics;
 
@@ -51,19 +40,30 @@ namespace TweetDuck.Core.Handling{
             this.analytics = analytics;
         }
 
-        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;
+        private void ResetContextInfo(){
+            LastLink = default(ContextInfo.LinkInfo);
+            LastChirp = default(ContextInfo.ChirpInfo);
+            TweetDeckBridge.ContextInfo.Reset();
         }
 
-            bool hasTweetImage = IsImage;
-            bool hasTweetVideo = IsVideo;
+        public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
+            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
+                ResetContextInfo();
+            }
+            else{
+                LastLink = TweetDeckBridge.ContextInfo.Link;
+                LastChirp = TweetDeckBridge.ContextInfo.Chirp;
+            }
+
+            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();
+            }
+
+            bool hasTweetImage = LastLink.IsImage;
+            bool hasTweetVideo = LastLink.IsVideo;
 
             string TextOpen(string name) => "Open "+name+" in browser";
             string TextCopy(string name) => "Copy "+name+" address";
@@ -95,7 +95,7 @@ namespace TweetDuck.Core.Handling{
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
                 model.AddItem(MenuSaveMedia, TextSave("image"));
 
-                if (lastHighlightedTweetImageList.Length > 1){
+                if (LastChirp.Images.Length > 1){
                     model.AddItem(MenuSaveTweetImages, TextSave("all images"));
                 }
 
@@ -108,11 +108,11 @@ namespace TweetDuck.Core.Handling{
 
             switch(commandId){
                 case MenuOpenLinkUrl:
-                    OpenBrowser(control, IsLink ? ContextInfo.Value : parameters.LinkUrl);
+                    OpenBrowser(control, LastLink.GetUrl(parameters, true));
                     break;
 
                 case MenuCopyLinkUrl:
-                    SetClipboardText(control, IsLink ? ContextInfo.Value : parameters.UnfilteredLinkUrl);
+                    SetClipboardText(control, LastLink.GetUrl(parameters, false));
                     break;
 
                 case MenuCopyUsername:
@@ -122,56 +122,86 @@ namespace TweetDuck.Core.Handling{
                     break;
 
                 case MenuOpenMediaUrl:
-                    OpenBrowser(control, TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
+                    OpenBrowser(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(parameters), ImageQuality));
                     break;
 
                 case MenuCopyMediaUrl:
-                    SetClipboardText(control, TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
+                    SetClipboardText(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(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);
+                case MenuViewImage: {
+                    void ViewImage(string path){
+                        string ext = Path.GetExtension(path);
 
                         if (TwitterUtils.ValidImageExtensions.Contains(ext)){
-                            WindowsUtils.OpenAssociatedProgram(file);
+                            WindowsUtils.OpenAssociatedProgram(path);
                         }
                         else{
                             FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
                         }
                     }
 
+                    string url = LastLink.GetMediaSource(parameters);
+                    string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url) ?? Path.GetRandomFileName());
+
+                    control.InvokeAsyncSafe(() => {
                         if (File.Exists(file)){
-                        ViewFile();
+                            ViewImage(file);
                         }
                         else{
-                        control.InvokeAsyncSafe(analytics.AnalyticsFile.ViewedImages.Trigger);
+                            analytics.AnalyticsFile.ViewedImages.Trigger();
 
-                        BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, ViewFile, ex => {
+                            BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, () => {
+                                ViewImage(file);
+                            }, ex => {
                                 FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
                             });
                         }
+                    });
                     
                     break;
+                }
 
-                case MenuSaveMedia:
-                    if (IsVideo){
-                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedVideos.Trigger);
-                        TwitterUtils.DownloadVideo(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault());
+                case MenuSaveMedia: {
+                    bool isVideo = LastLink.IsVideo;
+                    string url = LastLink.GetMediaSource(parameters);
+                    string username = LastChirp.Authors.LastOrDefault();
+                    
+                    control.InvokeAsyncSafe(() => {
+                        if (isVideo){
+                            TwitterUtils.DownloadVideo(url, username);
+                            analytics.AnalyticsFile.DownloadedVideos.Trigger();
                         }
                         else{
-                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
-                        TwitterUtils.DownloadImage(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
+                            TwitterUtils.DownloadImage(url, username, ImageQuality);
+                            analytics.AnalyticsFile.DownloadedImages.Trigger();
                         }
+                    });
 
                     break;
+                }
 
-                case MenuSaveTweetImages:
-                    control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
-                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
+                case MenuSaveTweetImages: {
+                    string[] urls = LastChirp.Images;
+                    string username = LastChirp.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));
+                    return true;
+
+                case MenuSearchInBrowser:
+                    string query = parameters.SelectionText;
+                    control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalSearch(query));
+                    DeselectAll(frame);
                     break;
                     
                 case MenuOpenDevTools:
@@ -183,21 +213,29 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
-            ContextInfo = default(KeyValuePair<string, string>);
+            ResetContextInfo();
         }
 
         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){
+        protected static void DeselectAll(IFrame frame){
+            ScriptLoader.ExecuteScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
+        }
+
+        protected static void OpenBrowser(Control control, string url){
             control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
         }
 
-        protected void SetClipboardText(Control control, string text){
+        protected static void SetClipboardText(Control control, string text){
             control.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(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){
             model.AddItem(MenuOpenDevTools, "Open dev tools");
         }

Core/Handling/ContextMenuBrowser.cs

@@ -1,6 +1,5 @@
 using CefSharp;
 using System.Windows.Forms;
-using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 
@@ -17,7 +16,8 @@ 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";
@@ -27,24 +27,24 @@ namespace TweetDuck.Core.Handling{
 
         private readonly FormBrowser form;
         
-        private string lastHighlightedTweetUrl;
-        private string lastHighlightedQuoteUrl;
-
         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();
@@ -52,20 +52,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 && TwitterUtils.IsTweetDeckWebsite(frame)){
+                InsertSelectionSearchItem(model, MenuSearchInColumn, "Search in a column");
             }
 
-            if (!string.IsNullOrEmpty(lastHighlightedTweetUrl) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
+            if (!string.IsNullOrEmpty(LastChirp.TweetUrl) && !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(LastChirp.QuoteUrl)){
                     model.AddSeparator();
                     model.AddItem(MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
                     model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
@@ -74,7 +70,7 @@ 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);
@@ -126,11 +122,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenTweetUrl:
-                    OpenBrowser(form, lastHighlightedTweetUrl);
+                    OpenBrowser(form, LastChirp.TweetUrl);
                     return true;
 
                 case MenuCopyTweetUrl:
-                    SetClipboardText(form, lastHighlightedTweetUrl);
+                    SetClipboardText(form, LastChirp.TweetUrl);
                     return true;
 
                 case MenuScreenshotTweet:
@@ -138,16 +134,22 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenQuotedTweetUrl:
-                    OpenBrowser(form, lastHighlightedQuoteUrl);
+                    OpenBrowser(form, LastChirp.QuoteUrl);
                     return true;
 
                 case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(form, lastHighlightedQuoteUrl);
+                    SetClipboardText(form, LastChirp.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;

Core/Handling/DragHandlerBrowser.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using CefSharp;
+using CefSharp.Enums;
 
 namespace TweetDuck.Core.Handling{
     sealed class DragHandlerBrowser : IDragHandler{

Core/Handling/General/JavaScriptDialogHandler.cs

@@ -1,7 +1,6 @@
 using System.Drawing;
 using System.Windows.Forms;
 using CefSharp;
-using CefSharp.WinForms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
@@ -28,7 +27,7 @@ namespace TweetDuck.Core.Handling.General{
         }
 
         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,8 +50,9 @@ namespace TweetDuck.Core.Handling.General{
 
                     input = new TextBox{
                         Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
+                        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), 20)
+                        Size = new Size(form.ClientSize.Width-BrowserUtils.Scale(44+inputPad, dpiScale), BrowserUtils.Scale(23, dpiScale))
                     };
 
                     form.Controls.Add(input);

Core/Management/ContextInfo.cs

@@ -0,0 +1,68 @@
+using CefSharp;
+using TweetDuck.Core.Utils;
+
+namespace TweetDuck.Core.Management{
+    sealed class ContextInfo{
+        public LinkInfo Link { get; private set; }
+        public ChirpInfo Chirp { get; private set; }
+        
+        public ContextInfo(){
+            Reset();
+        }
+        
+        public void SetLink(string type, string url){
+            Link = string.IsNullOrEmpty(url) ? new LinkInfo() : new LinkInfo(type, url);
+        }
+
+        public void SetChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
+            Chirp = new ChirpInfo(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+        }
+
+        public void Reset(){
+            Link = new LinkInfo();
+            Chirp = new ChirpInfo();
+        }
+
+        // Data structures
+
+        public struct LinkInfo{
+            public bool IsLink => type == "link";
+            public bool IsImage => type == "image";
+            public bool IsVideo => type == "video";
+
+            public string GetUrl(IContextMenuParams parameters, bool safe){
+                return IsLink ? url : (safe ? parameters.LinkUrl : parameters.UnfilteredLinkUrl);
+            }
+
+            public string GetMediaSource(IContextMenuParams parameters){
+                return IsImage || IsVideo ? url : parameters.SourceUrl;
+            }
+
+            private readonly string type;
+            private readonly string url;
+
+            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;
+            }
+        }
+    }
+}

Core/Management/ProfileManager.cs

@@ -23,7 +23,6 @@ namespace TweetDuck.Core.Management{
         }
 
         public bool IsRestarting { get; private set; }
-        public Exception LastException { get; private set; }
 
         private readonly string file;
         private readonly PluginManager plugins;
@@ -67,7 +66,7 @@ namespace TweetDuck.Core.Management{
 
                 return true;
             }catch(Exception e){
-                LastException = e;
+                Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting TweetDuck profile.", true, e);
                 return false;
             }
         }
@@ -100,8 +99,7 @@ namespace TweetDuck.Core.Management{
                         }
                     }
                 }
-            }catch(Exception e){
-                LastException = e;
+            }catch(Exception){
                 items = Items.None;
             }
 
@@ -164,12 +162,12 @@ namespace TweetDuck.Core.Management{
                 }
 
                 if (missingPlugins.Count > 0){
-                    FormMessage.Information("Importing TweetDuck Profile", "Detected missing plugins when importing plugin data:\n"+string.Join("\n", missingPlugins), FormMessage.OK);
+                    FormMessage.Information("Profile Import", "Detected missing plugins when importing plugin data:\n"+string.Join("\n", missingPlugins), FormMessage.OK);
                 }
 
                 return true;
             }catch(Exception e){
-                LastException = e;
+                Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing TweetDuck profile.", true, e);
                 return false;
             }
         }
@@ -199,15 +197,23 @@ namespace TweetDuck.Core.Management{
         }
 
         private static IEnumerable<PathInfo> EnumerateFilesRelative(string root){
-            return Directory.Exists(root) ? Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories).Select(fullPath => new PathInfo{
-                Full = fullPath,
-                Relative = fullPath.Substring(root.Length).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) // strip leading separator character
-            }) : Enumerable.Empty<PathInfo>();
+            if (Directory.Exists(root)){
+                int rootLength = root.Length;
+                return Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories).Select(fullPath => new PathInfo(fullPath, rootLength));
+            }
+            else{
+                return Enumerable.Empty<PathInfo>();
+            }
         }
 
         private sealed class PathInfo{
-            public string Full { get; set; }
-            public string Relative { get; set; }
+            public string Full { get; }
+            public string Relative { get; }
+
+            public PathInfo(string fullPath, int rootLength){
+                this.Full = fullPath;
+                this.Relative = fullPath.Substring(rootLength).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); // strip leading separator character
+            }
         }
     }
 

Core/Management/VideoPlayer.cs

@@ -9,25 +9,13 @@ 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 bool Running => currentInstance != null && currentInstance.Running;
 
         public event EventHandler ProcessExited;
 
         private readonly FormBrowser owner;
-        private string lastUrl;
-        private string lastUsername;
 
-        private Process currentProcess;
-        private DuplexPipe.Server currentPipe;
+        private Instance currentInstance;
         private bool isClosing;
 
         public VideoPlayer(FormBrowser owner){
@@ -41,37 +29,42 @@ namespace TweetDuck.Core.Management{
                 isClosing = false;
             }
             
-            lastUrl = url;
-            lastUsername = username;
-            
             try{
-                currentPipe = DuplexPipe.CreateServer();
-                currentPipe.DataIn += currentPipe_DataIn;
+                DuplexPipe.Server pipe = DuplexPipe.CreateServer();
+                pipe.DataIn += pipe_DataIn;
 
-                if ((currentProcess = Process.Start(new ProcessStartInfo{
+                Process process;
+
+                if ((process = Process.Start(new ProcessStartInfo{
                     FileName = Path.Combine(Program.ProgramPath, "TweetDuck.Video.exe"),
-                    Arguments = $"{owner.Handle} {Program.UserConfig.VideoPlayerVolume} \"{url}\" \"{currentPipe.GenerateToken()}\"",
+                    Arguments = $"{owner.Handle} {Program.UserConfig.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
                     UseShellExecute = false,
                     RedirectStandardOutput = true
                 })) != null){
-                    currentProcess.EnableRaisingEvents = true;
-                    currentProcess.Exited += process_Exited;
+                    currentInstance = new Instance(process, pipe, url, username);
 
-                    currentProcess.BeginOutputReadLine();
-                    currentProcess.OutputDataReceived += process_OutputDataReceived;
+                    process.EnableRaisingEvents = true;
+                    process.Exited += process_Exited;
+                    
+                    process.BeginOutputReadLine();
+                    process.OutputDataReceived += process_OutputDataReceived;
+
+                    pipe.DisposeToken();
+                }
+                else{
+                    pipe.DataIn -= pipe_DataIn;
+                    pipe.Dispose();
                 }
-
-                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());
+            currentInstance?.Pipe.Write("key", ((int)key).ToString());
         }
 
-        private void currentPipe_DataIn(object sender, DuplexPipe.PipeReadEventArgs e){
+        private void pipe_DataIn(object sender, DuplexPipe.PipeReadEventArgs e){
             owner.InvokeSafe(() => {
                 switch(e.Key){
                     case "vol":
@@ -83,16 +76,16 @@ namespace TweetDuck.Core.Management{
                         break;
 
                     case "download":
+                        if (currentInstance != null){
                             owner.AnalyticsFile.DownloadedVideos.Trigger();
-                        TwitterUtils.DownloadVideo(lastUrl, lastUsername);
+                            TwitterUtils.DownloadVideo(currentInstance.Url, currentInstance.Username);
+                        }
+
                         break;
 
                     case "rip":
-                        currentPipe.Dispose();
-                        currentPipe = null;
-                    
-                        currentProcess.Dispose();
-                        currentProcess = null;
+                        currentInstance?.Dispose();
+                        currentInstance = null;
 
                         isClosing = false;
                         TriggerProcessExitEventUnsafe();
@@ -102,15 +95,15 @@ namespace TweetDuck.Core.Management{
         }
 
         public void Close(){
-            if (currentProcess != null){
+            if (currentInstance != null){
                 if (isClosing){
                     Destroy();
                     isClosing = false;
                 }
                 else{
                     isClosing = true;
-                    currentProcess.Exited -= process_Exited;
-                    currentPipe.Write("die");
+                    currentInstance.Process.Exited -= process_Exited;
+                    currentInstance.Pipe.Write("die");
                 }
             }
         }
@@ -123,26 +116,17 @@ namespace TweetDuck.Core.Management{
         }
 
         private void Destroy(){
-            if (currentProcess != null){
-                try{
-                    currentProcess.Kill();
-                }catch{
-                    // kill me instead then
-                }
-
-                currentProcess.Dispose();
-                currentProcess = null;
-                
-                currentPipe.Dispose();
-                currentPipe = null;
+            if (currentInstance != null){
+                currentInstance.KillAndDispose();
+                currentInstance = null;
 
                 TriggerProcessExitEventUnsafe();
             }
         }
 
         private void owner_FormClosing(object sender, FormClosingEventArgs e){
-            if (currentProcess != null){
-                currentProcess.Exited -= process_Exited;
+            if (currentInstance != null){
+                currentInstance.Process.Exited -= process_Exited;
             }
         }
 
@@ -153,25 +137,27 @@ namespace TweetDuck.Core.Management{
         }
 
         private void process_Exited(object sender, EventArgs e){
-            int exitCode = currentProcess.ExitCode;
+            if (currentInstance == null){
+                return;
+            }
 
-            currentProcess.Dispose();
-            currentProcess = null;
+            int exitCode = currentInstance.Process.ExitCode;
+            string url = currentInstance.Url;
 
-            currentPipe.Dispose();
-            currentPipe = null;
+            currentInstance.Dispose();
+            currentInstance = 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);
+                        BrowserUtils.OpenExternalBrowser(url);
                     }
 
                     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);
+                        BrowserUtils.OpenExternalBrowser(url);
                     }
 
                     break;
@@ -183,5 +169,42 @@ namespace TweetDuck.Core.Management{
         private void TriggerProcessExitEventUnsafe(){
             ProcessExited?.Invoke(this, EventArgs.Empty);
         }
+
+        private sealed class Instance : IDisposable{
+            public bool Running{
+                get{
+                    Process.Refresh();
+                    return !Process.HasExited;
+                }
+            }
+
+            public Process Process { get; }
+            public DuplexPipe.Server Pipe { get; }
+
+            public string Url { get; }
+            public string Username { get; }
+
+            public Instance(Process process, DuplexPipe.Server pipe, string url, string username){
+                this.Process = process;
+                this.Pipe = pipe;
+                this.Url = url;
+                this.Username = username;
+            }
+
+            public void KillAndDispose(){
+                try{
+                    Process.Kill();
+                }catch{
+                    // kill me instead then
+                }
+
+                Dispose();
+            }
+
+            public void Dispose(){
+                Process.Dispose();
+                Pipe.Dispose();
+            }
+        }
     }
 }

Core/Notification/Example/FormNotificationExample.cs

@@ -1,4 +1,6 @@
-using System.Windows.Forms;
+using System;
+using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Core.Controls;
 using TweetDuck.Plugins;
 using TweetDuck.Resources;
@@ -21,10 +23,14 @@ namespace TweetDuck.Core.Notification.Example{
             }
         }
 
+        public event EventHandler Ready;
+
         private readonly TweetNotification exampleNotification;
 
         public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
-            string exampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true).Replace("{avatar}", TweetNotification.AppLogo.Url);
+            browser.LoadingStateChanged += browser_LoadingStateChanged;
+
+            string exampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true)?.Replace("{avatar}", TweetNotification.AppLogo.Url) ?? string.Empty;
 
             #if DEBUG
             exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
@@ -33,6 +39,13 @@ namespace TweetDuck.Core.Notification.Example{
             exampleNotification = TweetNotification.Example(exampleTweetHTML, 176);
         }
 
+        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;
         }

Core/Notification/FormNotificationBase.cs

@@ -1,6 +1,4 @@
-using CefSharp;
-using CefSharp.WinForms;
-using System;
+using CefSharp.WinForms;
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
@@ -65,7 +63,7 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        public bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
+        protected bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
         protected virtual bool CanDragWindow => true;
 
         public new Point Location{
@@ -109,15 +107,13 @@ namespace TweetDuck.Core.Notification{
         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();
 
@@ -133,13 +129,6 @@ namespace TweetDuck.Core.Notification{
 
             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);
             browser.SetupResourceHandler(TweetNotification.AppLogo);
@@ -151,6 +140,8 @@ namespace TweetDuck.Core.Notification{
                 this.owner.FormClosed -= owner_FormClosed;
             };
 
+            DpiScale = this.GetDPIScale();
+
             // ReSharper disable once VirtualMemberCallInContructor
             UpdateTitle();
         }
@@ -169,12 +160,6 @@ namespace TweetDuck.Core.Notification{
             Close();
         }
 
-        private void browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
-            if (e.IsBrowserInitialized){
-                Initialized?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
         // notification methods
 
         public virtual void HideNotification(){
@@ -200,7 +185,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         protected virtual string GetTweetHTML(TweetNotification tweet){
-            return tweet.GenerateHtml(IsCursorOverBrowser ? "td-hover" : string.Empty);
+            return tweet.GenerateHtml(IsCursorOverBrowser ? "td-notification td-hover" : "td-notification");
         }
 
         protected virtual void LoadTweet(TweetNotification tweet){
@@ -221,8 +206,10 @@ namespace TweetDuck.Core.Notification{
         }
 
         public void ShowTweetDetail(){
+            if (currentNotification != null){
                 owner.ShowTweetDetail(currentNotification.ColumnId, currentNotification.ChirpId, currentNotification.TweetUrl);
             }
+        }
 
         public void MoveToVisibleLocation(){
             bool needsReactivating = Location == ControlExtensions.InvisibleLocation;

Core/Notification/FormNotificationMain.cs

@@ -5,6 +5,7 @@ using System.Windows.Forms;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
+using TweetDuck.Core.Other.Interfaces;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
 using TweetDuck.Plugins;
@@ -12,7 +13,7 @@ using TweetDuck.Plugins.Enums;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification{
-    abstract partial class FormNotificationMain : FormNotificationBase{
+    abstract partial class FormNotificationMain : FormNotificationBase, ITweetDeckBrowser{
         private const string NotificationScriptFile = "notification.js";
 
         private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
@@ -81,17 +82,39 @@ 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(this, PluginEnvironment.Notification);
+
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
         }
 
+        // implementation of ITweetDeckBrowser
+
+        bool ITweetDeckBrowser.IsTweetDeckWebsite => IsNotificationVisible;
+
+        void ITweetDeckBrowser.RegisterBridge(string name, object obj){
+            browser.RegisterAsyncJsObject(name, obj);
+        }
+
+        void ITweetDeckBrowser.OnFrameLoaded(Action<IFrame> callback){
+            browser.FrameLoadEnd += (sender, args) => {
+                IFrame frame = args.Frame;
+
+                if (frame.IsMain && NotificationJS != null && browser.Address != "about:blank"){
+                    callback(frame);
+                }
+            };
+        }
+
+        void ITweetDeckBrowser.ExecuteFunction(string name, params object[] args){
+            browser.ExecuteScriptAsync(name, args);
+        }
+
         // mouse wheel hook
 
         private void StartMouseHook(){
@@ -166,7 +189,6 @@ namespace TweetDuck.Core.Notification{
             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);
             }
         }
 
@@ -232,7 +254,7 @@ namespace TweetDuck.Core.Notification{
         protected override string GetTweetHTML(TweetNotification tweet){
             string html = base.GetTweetHTML(tweet);
 
-            foreach(InjectedHTML injection in plugins.Bridge.NotificationInjections){
+            foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.Inject(html);
             }
 

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Bridge;
+using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
@@ -15,44 +15,68 @@ namespace TweetDuck.Core.Notification.Screenshot{
         protected override bool CanDragWindow => false;
 
         private readonly PluginManager plugins;
+        private int height;
 
-        public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager) : base(owner, false){
+        public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager, string html, int width) : base(owner, false){
             this.plugins = pluginManager;
 
-            browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback));
+            browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, 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");
+                if (args.IsLoading){
+                    return;
                 }
+
+                string script = ScriptLoader.LoadResource("screenshot.js", true);
+                        
+                if (script == null){
+                    this.InvokeAsyncSafe(callback);
+                    return;
+                }
+                
+                using(IFrame frame = args.Browser.MainFrame){
+                    ScriptLoader.ExecuteScript(frame, script.Replace("{width}", BrowserUtils.Scale(width, DpiScale).ToString()), "screenshot");
                 }
             };
+            
+            SetNotificationSize(width, 1024);
+            LoadTweet(new TweetNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
         }
 
         protected override string GetTweetHTML(TweetNotification tweet){
-            string html = tweet.GenerateHtml("td-screenshot", false);
+            string html = tweet.GenerateHtml("td-screenshot");
 
-            foreach(InjectedHTML injection in plugins.Bridge.NotificationInjections){
+            foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.Inject(html);
             }
 
             return html;
         }
 
-        public void LoadNotificationForScreenshot(TweetNotification tweet, int width, int height){
-            LoadTweet(tweet);
-            SetNotificationSize(width, height);
+        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;
+                }
             }
             
-        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);
+                return false;
             }
             else{
-                using(Bitmap bmp = new Bitmap(ClientSize.Width, ClientSize.Height, PixelFormat.Format32bppRgb)){
+                using(Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb)){
                     try{
                         NativeMethods.RenderSourceIntoBitmap(context, bmp);
                     }finally{
@@ -60,6 +84,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
                     }
 
                     Clipboard.SetImage(bmp);
+                    return true;
                 }
             }
         }

Core/Notification/Screenshot/ScreenshotBridge.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Windows.Forms;
+using TweetDuck.Core.Controls;
+
+namespace TweetDuck.Core.Notification.Screenshot{
+    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);
+        }
+    }
+}

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -1,11 +1,22 @@
-// Uncomment to keep screenshot windows visible for debugging
+#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.Core.Controls;
 using TweetDuck.Plugins;
 
+#if GEN_SCREENSHOT_FRAMES
+using System.Drawing.Imaging;
+using System.IO;
+using TweetDuck.Core.Utils;
+#endif
+
 namespace TweetDuck.Core.Notification.Screenshot{
     sealed class TweetScreenshotManager : IDisposable{
         private readonly FormBrowser owner;
@@ -13,6 +24,11 @@ namespace TweetDuck.Core.Notification.Screenshot{
         private readonly Timer timeout;
         private readonly Timer disposer;
 
+        #if GEN_SCREENSHOT_FRAMES
+        private readonly Timer debugger;
+        private int frameCounter;
+        #endif
+        
         private FormNotificationScreenshotable screenshot;
 
         public TweetScreenshotManager(FormBrowser owner, PluginManager pluginManager){
@@ -24,6 +40,11 @@ namespace TweetDuck.Core.Notification.Screenshot{
 
             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){
@@ -37,17 +58,20 @@ namespace TweetDuck.Core.Notification.Screenshot{
             screenshot = null;
         }
 
-        public void Trigger(string html, int width, int height){
+        public void Trigger(string html, int width){
             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 = new FormNotificationScreenshotable(Callback, owner, plugins, html, width);
             screenshot.Show();
             timeout.Start();
 
-            #if !(DEBUG && NO_HIDE_SCREENSHOTS)
+            #if GEN_SCREENSHOT_FRAMES
+            StartDebugger();
+            #endif
+
+            #if !NO_HIDE_SCREENSHOTS
             owner.IsWaiting = true;
             #endif
         }
@@ -60,7 +84,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
             timeout.Stop();
             screenshot.TakeScreenshot();
             
-            #if !(DEBUG && NO_HIDE_SCREENSHOTS)
+            #if !NO_HIDE_SCREENSHOTS
             OnFinished();
             #else
             screenshot.MoveToVisibleLocation();
@@ -69,15 +93,52 @@ namespace TweetDuck.Core.Notification.Screenshot{
         }
 
         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
     }
 }

Core/Notification/TweetNotification.cs

@@ -8,7 +8,7 @@ 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");
+        private static readonly string CustomCSS = ScriptLoader.LoadResource("styles/notification.css") ?? string.Empty;
         public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
 
         public static TweetNotification Example(string html, int characters){
@@ -53,18 +53,15 @@ namespace TweetDuck.Core.Notification{
             return 2000+Math.Max(1000, value*characters);
         }
 
-        public string GenerateHtml(string bodyClasses = null, bool enableCustomCSS = true){
+        public string GenerateHtml(string bodyClasses){
             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");
@@ -73,7 +70,7 @@ namespace TweetDuck.Core.Notification{
                 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('\'').Append(isExample ? " td-example-notification" : "").Append("><div class='column' style='width:100%!important;min-height:100vh!important;height:auto!important;overflow:initial!important;'>");
             build.Append(html);
             build.Append("</div></body>");
             build.Append("</html>");

Core/Other/Analytics/AnalyticsFile.cs

@@ -21,7 +21,7 @@ namespace TweetDuck.Core.Other.Analytics{
             });
         }
 
-        public static readonly AnalyticsFile Dummy = new AnalyticsFile(null);
+        public static readonly AnalyticsFile Dummy = new AnalyticsFile();
 
         // STATE PROPERTIES
         
@@ -67,6 +67,10 @@ namespace TweetDuck.Core.Other.Analytics{
             this.file = file;
         }
 
+        private AnalyticsFile(){
+            this.file = null;
+        }
+
         private void SetupProperties(){
             foreach(Counter counter in GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(prop => prop.PropertyType == typeof(Counter)).Select(prop => (Counter)prop.GetValue(this))){
                 counter.SetOwner(this);

Core/Other/Analytics/AnalyticsManager.cs

@@ -42,7 +42,7 @@ namespace TweetDuck.Core.Other.Analytics{
             this.saveTimer.Elapsed += saveTimer_Elapsed;
 
             if (this.File.LastCollectionVersion != Program.VersionTag){
-                ScheduleReportIn(TimeSpan.FromHours(12), string.Empty);
+                ScheduleReportIn(TimeSpan.FromHours(8), string.Empty);
             }
             else{
                 RestartTimer();
@@ -90,7 +90,7 @@ namespace TweetDuck.Core.Other.Analytics{
             TimeSpan diff = DateTime.Now.Subtract(File.LastDataCollection);
             int minutesTillNext = (int)(CollectionInterval.TotalMinutes-Math.Floor(diff.TotalMinutes));
             
-            currentTimer.Interval = Math.Max(minutesTillNext, 1)*60000;
+            currentTimer.Interval = Math.Max(minutesTillNext, 2)*60000;
             currentTimer.Start();
         }
 

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -42,7 +42,6 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Clear Cache Threshold"     , Exact(SysConfig.ClearCacheThreshold) },
                 0,
                 { "Expand Links"                  , Bool(UserConfig.ExpandLinksOnHover) },
-                { "Switch Account Selectors"      , Bool(UserConfig.SwitchAccountSelectors) },
                 { "Search In First Column"        , Bool(UserConfig.OpenSearchInFirstColumn) },
                 { "Keep Like Follow Dialogs Open" , Bool(UserConfig.KeepLikeFollowDialogsOpen) },
                 { "Best Image Quality"            , Bool(UserConfig.BestImageQuality) },

Core/Other/FormAbout.Designer.cs

@@ -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();
@@ -42,6 +41,7 @@ namespace TweetDuck.Core.Other {
             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;
             // 
@@ -50,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, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             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);
@@ -75,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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             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);
@@ -98,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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             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);
@@ -125,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);

Core/Other/FormGuide.cs

@@ -8,6 +8,7 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
 using System.Text.RegularExpressions;
+using TweetDuck.Data;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Other{
@@ -15,6 +16,8 @@ namespace TweetDuck.Core.Other{
         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;
@@ -53,16 +56,14 @@ namespace TweetDuck.Core.Other{
         }
 
         private readonly ChromiumWebBrowser browser;
+        private string nextUrl;
 
         private FormGuide(string url, FormBrowser 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(owner),
@@ -78,6 +79,9 @@ namespace TweetDuck.Core.Other{
             browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
+
+            browser.SetupResourceHandler(DummyPage);
+
             Controls.Add(browser);
 
             Disposed += (sender, args) => {
@@ -89,15 +93,19 @@ namespace TweetDuck.Core.Other{
         }
 
         private void Reload(string url){
+            nextUrl = url;
             browser.LoadingStateChanged += browser_LoadingStateChanged;
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
-            browser.Load("about:blank");
-            browser.Load(url);
+            browser.Load(DummyPage.Url);
         }
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading && browser.Address != "about:blank"){
+            if (!e.IsLoading){
+                if (browser.Address == DummyPage.Url){
+                    browser.Load(nextUrl);
+                }
+                else{
                     this.InvokeAsyncSafe(() => {
                         browser.Location = Point.Empty;
                         browser.Dock = DockStyle.Fill;
@@ -106,13 +114,13 @@ namespace TweetDuck.Core.Other{
                     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");
         }
 

Core/Other/FormPlugins.Designer.cs

@@ -23,20 +23,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.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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            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 +49,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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            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 +63,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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            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 +82,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);
@@ -106,5 +118,6 @@
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
         private Plugins.Controls.PluginListFlowLayout flowLayoutPlugins;
+        private System.Windows.Forms.Timer timerLayout;
     }
 }

Core/Other/FormPlugins.cs

@@ -19,15 +19,23 @@ namespace TweetDuck.Core.Other{
         public FormPlugins(PluginManager pluginManager) : this(){
             this.pluginManager = pluginManager;
 
+            if (!Program.UserConfig.PluginsWindowSize.IsEmpty){
+                Size targetSize = Program.UserConfig.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.PluginsWindowSize = Size;
                 Program.UserConfig.Save();
             };
+
+            ResizeEnd += (sender, args) => {
+                timerLayout.Start();
+            };
         }
 
         private int GetPluginOrderIndex(Plugin plugin){
@@ -50,18 +58,26 @@ 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;
@@ -71,7 +87,7 @@ namespace TweetDuck.Core.Other{
                 control.Width = flowLayoutPlugins.Width-control.Margin.Horizontal-horizontalOffset;
             }
             
-            lastControl.Visible = !showScrollBar;
+            flowLayoutPlugins.Controls[flowLayoutPlugins.Controls.Count-1].Visible = !showScrollBar;
             flowLayoutPlugins.Focus();
         }
 

Core/Other/FormSettings.Designer.cs

@@ -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, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClose.Location = new System.Drawing.Point(448, 525);
             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(363, 507);
             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, 507);
             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, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnManageOptions.Location = new System.Drawing.Point(12, 525);
             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(510, 562);
             this.Controls.Add(this.btnManageOptions);
             this.Controls.Add(this.panelContents);
             this.Controls.Add(this.panelButtons);

Core/Other/FormSettings.cs

@@ -36,7 +36,7 @@ namespace TweetDuck.Core.Other{
             
             this.buttonHeight = BrowserUtils.Scale(39, this.GetDPIScale()) | 1;
 
-            AddButton("General", () => new TabSettingsGeneral(this.browser, updates));
+            AddButton("General", () => new TabSettingsGeneral(this.browser.ReloadColumns, updates));
             AddButton("Locales", () => new TabSettingsLocales());
             AddButton("System Tray", () => new TabSettingsTray());
             AddButton("Notifications", () => new TabSettingsNotifications(new FormNotificationExample(this.browser, this.plugins)));
@@ -90,6 +90,7 @@ namespace TweetDuck.Core.Other{
             FlatButton btn = new FlatButton{
                 BackColor = SystemColors.Control,
                 FlatStyle = FlatStyle.Flat,
+                Font = SystemFonts.MessageBoxFont,
                 Location = new Point(0, (buttonHeight+1)*(panelButtons.Controls.Count/2)),
                 Margin = new Padding(0),
                 Size = new Size(panelButtons.Width, buttonHeight),
@@ -156,6 +157,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();
         }
 

Core/Other/Interfaces/ITweetDeckBrowser.cs

@@ -1,8 +1,10 @@
 using System;
 using CefSharp;
 
-namespace TweetDuck.Core{
+namespace TweetDuck.Core.Other.Interfaces{
     interface ITweetDeckBrowser{
+        bool IsTweetDeckWebsite { get; }
+
         void RegisterBridge(string name, object obj);
         void OnFrameLoaded(Action<IFrame> callback);
         void ExecuteFunction(string name, params object[] args);

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

@@ -34,21 +34,23 @@
             | 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.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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            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, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             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;

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

@@ -42,14 +42,16 @@
             // 
             // textBoxBrowserCSS
             // 
-            this.textBoxBrowserCSS.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.textBoxBrowserCSS.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.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.Size = new System.Drawing.Size(378, 251);
             this.textBoxBrowserCSS.TabIndex = 1;
             this.textBoxBrowserCSS.WordWrap = false;
             this.textBoxBrowserCSS.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxBrowserCSS_KeyUp);
@@ -57,10 +59,12 @@
             // 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.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnCancel.Location = new System.Drawing.Point(657, 285);
             this.btnCancel.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.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 2;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -69,10 +73,12 @@
             // 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.AutoSize = true;
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnApply.Location = new System.Drawing.Point(720, 285);
             this.btnApply.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.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnApply.Size = new System.Drawing.Size(52, 25);
             this.btnApply.TabIndex = 1;
             this.btnApply.Text = "Apply";
             this.btnApply.UseVisualStyleBackColor = true;
@@ -97,7 +103,7 @@
             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.Size = new System.Drawing.Size(760, 267);
             this.splitContainer.SplitterDistance = 378;
             this.splitContainer.SplitterWidth = 5;
             this.splitContainer.TabIndex = 0;
@@ -105,33 +111,37 @@
             // labelBrowser
             // 
             this.labelBrowser.AutoSize = true;
+            this.labelBrowser.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.labelBrowser.Location = new System.Drawing.Point(-3, 0);
             this.labelBrowser.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelBrowser.Name = "labelBrowser";
-            this.labelBrowser.Size = new System.Drawing.Size(45, 13);
+            this.labelBrowser.Size = new System.Drawing.Size(49, 15);
             this.labelBrowser.TabIndex = 0;
             this.labelBrowser.Text = "Browser";
             // 
             // labelNotification
             // 
             this.labelNotification.AutoSize = true;
+            this.labelNotification.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.labelNotification.Location = new System.Drawing.Point(-3, 0);
             this.labelNotification.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelNotification.Name = "labelNotification";
-            this.labelNotification.Size = new System.Drawing.Size(60, 13);
+            this.labelNotification.Size = new System.Drawing.Size(70, 15);
             this.labelNotification.TabIndex = 0;
             this.labelNotification.Text = "Notification";
             // 
             // textBoxNotificationCSS
             // 
-            this.textBoxNotificationCSS.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.textBoxNotificationCSS.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.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.Size = new System.Drawing.Size(372, 251);
             this.textBoxNotificationCSS.TabIndex = 1;
             this.textBoxNotificationCSS.WordWrap = false;
             // 
@@ -139,19 +149,22 @@
             // 
             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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWarning.Location = new System.Drawing.Point(94, 290);
             this.labelWarning.Name = "labelWarning";
-            this.labelWarning.Size = new System.Drawing.Size(341, 13);
+            this.labelWarning.Size = new System.Drawing.Size(373, 15);
             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.AutoSize = true;
+            this.btnOpenWiki.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnOpenWiki.Location = new System.Drawing.Point(12, 285);
             this.btnOpenWiki.Name = "btnOpenWiki";
-            this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnOpenWiki.Size = new System.Drawing.Size(73, 23);
+            this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnOpenWiki.Size = new System.Drawing.Size(76, 25);
             this.btnOpenWiki.TabIndex = 4;
             this.btnOpenWiki.Text = "Open Wiki";
             this.btnOpenWiki.UseVisualStyleBackColor = true;
@@ -172,7 +185,7 @@
             this.Controls.Add(this.splitContainer);
             this.Controls.Add(this.btnApply);
             this.Controls.Add(this.btnCancel);
-            this.MinimumSize = new System.Drawing.Size(600, 160);
+            this.MinimumSize = new System.Drawing.Size(620, 160);
             this.Name = "DialogSettingsCSS";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -10,7 +10,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
         private readonly Action<string> reinjectBrowserCSS;
 
-        public DialogSettingsCSS(Action<string> reinjectBrowserCSS){
+        public DialogSettingsCSS(Action<string> reinjectBrowserCSS){ // TODO high dpi breaks scaling of things inside the panel...
             InitializeComponent();
             
             Text = Program.BrandName+" Options - CSS";

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

@@ -36,19 +36,21 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBoxArgs.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxArgs.Location = new System.Drawing.Point(12, 28);
+            this.textBoxArgs.Location = new System.Drawing.Point(12, 30);
             this.textBoxArgs.Multiline = true;
             this.textBoxArgs.Name = "textBoxArgs";
-            this.textBoxArgs.Size = new System.Drawing.Size(460, 193);
+            this.textBoxArgs.Size = new System.Drawing.Size(480, 189);
             this.textBoxArgs.TabIndex = 1;
             // 
             // 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(354, 227);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(377, 225);
             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.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 3;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -57,10 +59,12 @@
             // 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(416, 227);
+            this.btnApply.AutoSize = true;
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnApply.Location = new System.Drawing.Point(440, 225);
             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.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnApply.Size = new System.Drawing.Size(52, 25);
             this.btnApply.TabIndex = 2;
             this.btnApply.Text = "Apply";
             this.btnApply.UseVisualStyleBackColor = true;
@@ -69,10 +73,12 @@
             // btnHelp
             // 
             this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnHelp.Location = new System.Drawing.Point(12, 227);
+            this.btnHelp.AutoSize = true;
+            this.btnHelp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnHelp.Location = new System.Drawing.Point(12, 225);
             this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnHelp.Size = new System.Drawing.Size(124, 23);
+            this.btnHelp.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnHelp.Size = new System.Drawing.Size(141, 25);
             this.btnHelp.TabIndex = 4;
             this.btnHelp.Text = "List of Chromium Args";
             this.btnHelp.UseVisualStyleBackColor = true;
@@ -81,10 +87,11 @@
             // labelWarning
             // 
             this.labelWarning.AutoSize = true;
+            this.labelWarning.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelWarning.Location = new System.Drawing.Point(12, 9);
             this.labelWarning.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelWarning.Name = "labelWarning";
-            this.labelWarning.Size = new System.Drawing.Size(423, 13);
+            this.labelWarning.Size = new System.Drawing.Size(478, 15);
             this.labelWarning.TabIndex = 0;
             this.labelWarning.Text = "Warning: Some arguments may cause the program to stop working, edit at your own r" +
     "isk.";
@@ -93,13 +100,13 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(484, 262);
+            this.ClientSize = new System.Drawing.Size(504, 262);
             this.Controls.Add(this.labelWarning);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.btnApply);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.textBoxArgs);
-            this.MinimumSize = new System.Drawing.Size(500, 160);
+            this.MinimumSize = new System.Drawing.Size(520, 160);
             this.Name = "DialogSettingsCefArgs";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

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

@@ -43,10 +43,12 @@
             // btnCancel
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.Location = new System.Drawing.Point(176, 97);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(165, 92);
             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.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 4;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -57,10 +59,11 @@
             this.btnContinue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnContinue.AutoSize = true;
             this.btnContinue.Enabled = false;
-            this.btnContinue.Location = new System.Drawing.Point(119, 97);
+            this.btnContinue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnContinue.Location = new System.Drawing.Point(114, 92);
             this.btnContinue.Name = "btnContinue";
-            this.btnContinue.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnContinue.Size = new System.Drawing.Size(51, 23);
+            this.btnContinue.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnContinue.Size = new System.Drawing.Size(45, 25);
             this.btnContinue.TabIndex = 3;
             this.btnContinue.Text = "Next";
             this.btnContinue.UseVisualStyleBackColor = true;
@@ -69,9 +72,11 @@
             // cbProgramConfig
             // 
             this.cbProgramConfig.AutoSize = true;
+            this.cbProgramConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.cbProgramConfig.Location = new System.Drawing.Point(3, 3);
+            this.cbProgramConfig.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbProgramConfig.Name = "cbProgramConfig";
-            this.cbProgramConfig.Size = new System.Drawing.Size(104, 17);
+            this.cbProgramConfig.Size = new System.Drawing.Size(117, 19);
             this.cbProgramConfig.TabIndex = 0;
             this.cbProgramConfig.Text = "Program Options";
             this.toolTip.SetToolTip(this.cbProgramConfig, "Interface, notification, and update options.");
@@ -81,9 +86,11 @@
             // cbSession
             // 
             this.cbSession.AutoSize = true;
-            this.cbSession.Location = new System.Drawing.Point(3, 49);
+            this.cbSession.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbSession.Location = new System.Drawing.Point(3, 51);
+            this.cbSession.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbSession.Name = "cbSession";
-            this.cbSession.Size = new System.Drawing.Size(92, 17);
+            this.cbSession.Size = new System.Drawing.Size(98, 19);
             this.cbSession.TabIndex = 2;
             this.cbSession.Text = "Login Session";
             this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
@@ -93,9 +100,11 @@
             // cbPluginData
             // 
             this.cbPluginData.AutoSize = true;
-            this.cbPluginData.Location = new System.Drawing.Point(3, 72);
+            this.cbPluginData.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbPluginData.Location = new System.Drawing.Point(3, 75);
+            this.cbPluginData.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbPluginData.Name = "cbPluginData";
-            this.cbPluginData.Size = new System.Drawing.Size(81, 17);
+            this.cbPluginData.Size = new System.Drawing.Size(87, 19);
             this.cbPluginData.TabIndex = 3;
             this.cbPluginData.Text = "Plugin Data";
             this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
@@ -105,9 +114,11 @@
             // cbSystemConfig
             // 
             this.cbSystemConfig.AutoSize = true;
-            this.cbSystemConfig.Location = new System.Drawing.Point(3, 26);
+            this.cbSystemConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbSystemConfig.Location = new System.Drawing.Point(3, 27);
+            this.cbSystemConfig.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbSystemConfig.Name = "cbSystemConfig";
-            this.cbSystemConfig.Size = new System.Drawing.Size(99, 17);
+            this.cbSystemConfig.Size = new System.Drawing.Size(109, 19);
             this.cbSystemConfig.TabIndex = 1;
             this.cbSystemConfig.Text = "System Options";
             this.toolTip.SetToolTip(this.cbSystemConfig, "Hardware acceleration and cache options.");
@@ -125,7 +136,7 @@
             this.panelSelection.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.panelSelection.Location = new System.Drawing.Point(12, 12);
             this.panelSelection.Name = "panelSelection";
-            this.panelSelection.Size = new System.Drawing.Size(220, 89);
+            this.panelSelection.Size = new System.Drawing.Size(210, 97);
             this.panelSelection.TabIndex = 2;
             this.panelSelection.Visible = false;
             this.panelSelection.WrapContents = false;
@@ -140,16 +151,18 @@
             this.panelDecision.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.panelDecision.Location = new System.Drawing.Point(12, 12);
             this.panelDecision.Name = "panelDecision";
-            this.panelDecision.Size = new System.Drawing.Size(220, 71);
+            this.panelDecision.Size = new System.Drawing.Size(210, 75);
             this.panelDecision.TabIndex = 0;
             this.panelDecision.WrapContents = false;
             // 
             // radioImport
             // 
             this.radioImport.AutoSize = true;
+            this.radioImport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioImport.Location = new System.Drawing.Point(3, 3);
+            this.radioImport.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioImport.Name = "radioImport";
-            this.radioImport.Size = new System.Drawing.Size(86, 17);
+            this.radioImport.Size = new System.Drawing.Size(98, 19);
             this.radioImport.TabIndex = 0;
             this.radioImport.TabStop = true;
             this.radioImport.Text = "Import Profile";
@@ -159,9 +172,11 @@
             // radioExport
             // 
             this.radioExport.AutoSize = true;
-            this.radioExport.Location = new System.Drawing.Point(3, 26);
+            this.radioExport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioExport.Location = new System.Drawing.Point(3, 27);
+            this.radioExport.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioExport.Name = "radioExport";
-            this.radioExport.Size = new System.Drawing.Size(87, 17);
+            this.radioExport.Size = new System.Drawing.Size(95, 19);
             this.radioExport.TabIndex = 1;
             this.radioExport.TabStop = true;
             this.radioExport.Text = "Export Profile";
@@ -171,9 +186,11 @@
             // radioReset
             // 
             this.radioReset.AutoSize = true;
-            this.radioReset.Location = new System.Drawing.Point(3, 49);
+            this.radioReset.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioReset.Location = new System.Drawing.Point(3, 51);
+            this.radioReset.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioReset.Name = "radioReset";
-            this.radioReset.Size = new System.Drawing.Size(104, 17);
+            this.radioReset.Size = new System.Drawing.Size(110, 19);
             this.radioReset.TabIndex = 2;
             this.radioReset.TabStop = true;
             this.radioReset.Text = "Restore Defaults";
@@ -184,7 +201,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(244, 132);
+            this.ClientSize = new System.Drawing.Size(234, 129);
             this.Controls.Add(this.btnContinue);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.panelDecision);
@@ -192,7 +209,7 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(260, 170);
+            this.MinimumSize = new System.Drawing.Size(250, 167);
             this.Name = "DialogSettingsManage";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -164,9 +164,6 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                             ShouldReloadBrowser = true;
                         }
                     }
-                    else{
-                        Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing TweetDuck profile.", true, importManager.LastException);
-                    }
                     
                     DialogResult = DialogResult.OK;
                     Close();
@@ -192,11 +189,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                     Program.UserConfig.Save();
                     Program.SystemConfig.Save();
                     
-                    ProfileManager manager = new ProfileManager(file, plugins);
-
-                    if (!manager.Export(SelectedItems)){
-                        Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting TweetDuck profile.", true, manager.LastException);
-                    }
+                    new ProfileManager(file, plugins).Export(SelectedItems);
 
                     DialogResult = DialogResult.OK;
                     Close();

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

@@ -28,21 +28,24 @@
             this.btnRestart = new System.Windows.Forms.Button();
             this.cbLogging = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.cbDebugUpdates = new System.Windows.Forms.CheckBox();
             this.tbDataFolder = new System.Windows.Forms.TextBox();
             this.tbShortcutTarget = new System.Windows.Forms.TextBox();
             this.labelDataFolder = new System.Windows.Forms.Label();
             this.labelShortcutTarget = new System.Windows.Forms.Label();
+            this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
+            this.flowPanel.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnCancel
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.Location = new System.Drawing.Point(215, 163);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(215, 146);
             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 = 9;
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
+            this.btnCancel.TabIndex = 2;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -50,11 +53,13 @@
             // btnRestart
             // 
             this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRestart.Location = new System.Drawing.Point(152, 163);
+            this.btnRestart.AutoSize = true;
+            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnRestart.Location = new System.Drawing.Point(152, 146);
             this.btnRestart.Name = "btnRestart";
-            this.btnRestart.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnRestart.Size = new System.Drawing.Size(57, 23);
-            this.btnRestart.TabIndex = 8;
+            this.btnRestart.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnRestart.Size = new System.Drawing.Size(57, 25);
+            this.btnRestart.TabIndex = 1;
             this.btnRestart.Text = "Restart";
             this.btnRestart.UseVisualStyleBackColor = true;
             this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
@@ -62,33 +67,23 @@
             // cbLogging
             // 
             this.cbLogging.AutoSize = true;
-            this.cbLogging.Location = new System.Drawing.Point(12, 12);
+            this.cbLogging.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbLogging.Location = new System.Drawing.Point(3, 3);
+            this.cbLogging.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbLogging.Name = "cbLogging";
-            this.cbLogging.Size = new System.Drawing.Size(64, 17);
+            this.cbLogging.Size = new System.Drawing.Size(70, 19);
             this.cbLogging.TabIndex = 0;
             this.cbLogging.Text = "Logging";
-            this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into TD_Console.txt file in the data folder.");
+            this.toolTip.SetToolTip(this.cbLogging, "Logs JavaScript output into TD_Console.txt file in the data folder.");
             this.cbLogging.UseVisualStyleBackColor = true;
             // 
-            // cbDebugUpdates
-            // 
-            this.cbDebugUpdates.AutoSize = true;
-            this.cbDebugUpdates.Location = new System.Drawing.Point(12, 35);
-            this.cbDebugUpdates.Name = "cbDebugUpdates";
-            this.cbDebugUpdates.Size = new System.Drawing.Size(127, 17);
-            this.cbDebugUpdates.TabIndex = 1;
-            this.cbDebugUpdates.Text = "Pre-Release Updates";
-            this.toolTip.SetToolTip(this.cbDebugUpdates, "Allows updating to pre-releases.");
-            this.cbDebugUpdates.UseVisualStyleBackColor = true;
-            // 
             // tbDataFolder
             // 
-            this.tbDataFolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbDataFolder.Location = new System.Drawing.Point(15, 83);
+            this.tbDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.tbDataFolder.Location = new System.Drawing.Point(3, 54);
             this.tbDataFolder.Name = "tbDataFolder";
-            this.tbDataFolder.Size = new System.Drawing.Size(257, 20);
-            this.tbDataFolder.TabIndex = 5;
+            this.tbDataFolder.Size = new System.Drawing.Size(260, 23);
+            this.tbDataFolder.TabIndex = 2;
             this.toolTip.SetToolTip(this.tbDataFolder, "Path to the data folder. Must be either an absolute path,\r\nor a simple folder nam" +
         "e that will be created in LocalAppData.");
             // 
@@ -97,44 +92,60 @@
             this.tbShortcutTarget.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tbShortcutTarget.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.tbShortcutTarget.Location = new System.Drawing.Point(15, 134);
+            this.tbShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.tbShortcutTarget.Location = new System.Drawing.Point(3, 110);
             this.tbShortcutTarget.Name = "tbShortcutTarget";
             this.tbShortcutTarget.ReadOnly = true;
-            this.tbShortcutTarget.Size = new System.Drawing.Size(257, 20);
-            this.tbShortcutTarget.TabIndex = 7;
+            this.tbShortcutTarget.Size = new System.Drawing.Size(260, 23);
+            this.tbShortcutTarget.TabIndex = 4;
             this.tbShortcutTarget.Click += new System.EventHandler(this.tbShortcutTarget_Click);
             // 
             // labelDataFolder
             // 
             this.labelDataFolder.AutoSize = true;
-            this.labelDataFolder.Location = new System.Drawing.Point(12, 67);
+            this.labelDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataFolder.Location = new System.Drawing.Point(3, 36);
             this.labelDataFolder.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDataFolder.Name = "labelDataFolder";
-            this.labelDataFolder.Size = new System.Drawing.Size(62, 13);
-            this.labelDataFolder.TabIndex = 4;
+            this.labelDataFolder.Size = new System.Drawing.Size(67, 15);
+            this.labelDataFolder.TabIndex = 1;
             this.labelDataFolder.Text = "Data Folder";
             // 
             // labelShortcutTarget
             // 
             this.labelShortcutTarget.AutoSize = true;
-            this.labelShortcutTarget.Location = new System.Drawing.Point(12, 118);
+            this.labelShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelShortcutTarget.Location = new System.Drawing.Point(3, 92);
             this.labelShortcutTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelShortcutTarget.Name = "labelShortcutTarget";
-            this.labelShortcutTarget.Size = new System.Drawing.Size(155, 13);
-            this.labelShortcutTarget.TabIndex = 6;
+            this.labelShortcutTarget.Size = new System.Drawing.Size(171, 15);
+            this.labelShortcutTarget.TabIndex = 3;
             this.labelShortcutTarget.Text = "Shortcut Target (click to select)";
             // 
+            // 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.cbLogging);
+            this.flowPanel.Controls.Add(this.labelDataFolder);
+            this.flowPanel.Controls.Add(this.tbDataFolder);
+            this.flowPanel.Controls.Add(this.labelShortcutTarget);
+            this.flowPanel.Controls.Add(this.tbShortcutTarget);
+            this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flowPanel.Location = new System.Drawing.Point(9, 9);
+            this.flowPanel.Margin = new System.Windows.Forms.Padding(0);
+            this.flowPanel.Name = "flowPanel";
+            this.flowPanel.Size = new System.Drawing.Size(266, 136);
+            this.flowPanel.TabIndex = 0;
+            this.flowPanel.WrapContents = false;
+            // 
             // DialogSettingsRestart
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(284, 198);
-            this.Controls.Add(this.tbShortcutTarget);
-            this.Controls.Add(this.labelShortcutTarget);
-            this.Controls.Add(this.tbDataFolder);
-            this.Controls.Add(this.labelDataFolder);
-            this.Controls.Add(this.cbDebugUpdates);
-            this.Controls.Add(this.cbLogging);
+            this.ClientSize = new System.Drawing.Size(284, 183);
+            this.Controls.Add(this.flowPanel);
             this.Controls.Add(this.btnRestart);
             this.Controls.Add(this.btnCancel);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -143,6 +154,8 @@
             this.Name = "DialogSettingsRestart";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.flowPanel.ResumeLayout(false);
+            this.flowPanel.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -154,10 +167,10 @@
         private System.Windows.Forms.Button btnRestart;
         private System.Windows.Forms.CheckBox cbLogging;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.CheckBox cbDebugUpdates;
         private System.Windows.Forms.Label labelDataFolder;
         private System.Windows.Forms.TextBox tbDataFolder;
         private System.Windows.Forms.TextBox tbShortcutTarget;
         private System.Windows.Forms.Label labelShortcutTarget;
+        private System.Windows.Forms.FlowLayoutPanel flowPanel;
     }
 }

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -11,10 +11,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             InitializeComponent();
 
             cbLogging.Checked = currentArgs.HasFlag(Arguments.ArgLogging);
-            cbDebugUpdates.Checked = currentArgs.HasFlag(Arguments.ArgDebugUpdates);
-
             cbLogging.CheckedChanged += control_Change;
-            cbDebugUpdates.CheckedChanged += control_Change;
             
             if (Program.IsPortable){
                 tbDataFolder.Text = "Not available in portable version";
@@ -37,10 +34,6 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 Args.AddFlag(Arguments.ArgLogging);
             }
             
-            if (cbDebugUpdates.Checked){
-                Args.AddFlag(Arguments.ArgDebugUpdates);
-            }
-
             if (!string.IsNullOrWhiteSpace(tbDataFolder.Text) && tbDataFolder.Enabled){
                 Args.SetValue(Arguments.ArgDataFolder, tbDataFolder.Text);
             }

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

@@ -0,0 +1,109 @@
+namespace TweetDuck.Core.Other.Settings.Dialogs {
+    partial class DialogSettingsSearchEngine {
+        /// <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.textBoxUrl = new System.Windows.Forms.TextBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnApply = new System.Windows.Forms.Button();
+            this.labelInfo = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // textBoxUrl
+            // 
+            this.textBoxUrl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBoxUrl.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.textBoxUrl.Location = new System.Drawing.Point(12, 30);
+            this.textBoxUrl.Name = "textBoxUrl";
+            this.textBoxUrl.Size = new System.Drawing.Size(310, 23);
+            this.textBoxUrl.TabIndex = 1;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(207, 59);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
+            this.btnCancel.TabIndex = 3;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnApply
+            // 
+            this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnApply.AutoSize = true;
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnApply.Location = new System.Drawing.Point(270, 59);
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnApply.Size = new System.Drawing.Size(52, 25);
+            this.btnApply.TabIndex = 2;
+            this.btnApply.Text = "Apply";
+            this.btnApply.UseVisualStyleBackColor = true;
+            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
+            // 
+            // labelInfo
+            // 
+            this.labelInfo.AutoSize = true;
+            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelInfo.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(287, 15);
+            this.labelInfo.TabIndex = 0;
+            this.labelInfo.Text = "The search query will be added at the end of the URL.";
+            // 
+            // DialogSettingsSearchEngine
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(334, 96);
+            this.Controls.Add(this.labelInfo);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.textBoxUrl);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "DialogSettingsSearchEngine";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBoxUrl;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnApply;
+        private System.Windows.Forms.Label labelInfo;
+    }
+}

Core/Other/Settings/Dialogs/DialogSettingsSearchEngine.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Windows.Forms;
+
+namespace TweetDuck.Core.Other.Settings.Dialogs{
+    sealed partial class DialogSettingsSearchEngine : Form{
+        public string Url => textBoxUrl.Text;
+
+        public DialogSettingsSearchEngine(){
+            InitializeComponent();
+            
+            Text = Program.BrandName+" Options - Custom Search Engine";
+            
+            textBoxUrl.Text = Program.UserConfig.SearchEngineUrl ?? "";
+            textBoxUrl.Select(textBoxUrl.Text.Length, 0);
+        }
+        
+        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/TabSettingsAdvanced.Designer.cs

@@ -52,101 +52,128 @@
             // 
             // btnClearCache
             // 
-            this.btnClearCache.Location = new System.Drawing.Point(5, 172);
+            this.btnClearCache.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClearCache.Location = new System.Drawing.Point(5, 179);
             this.btnClearCache.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnClearCache.Name = "btnClearCache";
-            this.btnClearCache.Size = new System.Drawing.Size(144, 23);
+            this.btnClearCache.Size = new System.Drawing.Size(144, 25);
             this.btnClearCache.TabIndex = 5;
-            this.btnClearCache.Text = "Clear Cache (calculating)";
+            this.btnClearCache.Text = "Clear Cache (...)";
             this.btnClearCache.UseVisualStyleBackColor = true;
             // 
             // checkHardwareAcceleration
             // 
             this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 124);
-            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkHardwareAcceleration.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 128);
+            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
-            this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
+            this.checkHardwareAcceleration.Size = new System.Drawing.Size(146, 19);
             this.checkHardwareAcceleration.TabIndex = 3;
             this.checkHardwareAcceleration.Text = "Hardware Acceleration";
             this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
             // 
             // btnEditCefArgs
             // 
+            this.btnEditCefArgs.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnEditCefArgs.Location = new System.Drawing.Point(5, 3);
             this.btnEditCefArgs.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnEditCefArgs.Name = "btnEditCefArgs";
-            this.btnEditCefArgs.Size = new System.Drawing.Size(144, 23);
+            this.btnEditCefArgs.Size = new System.Drawing.Size(144, 25);
             this.btnEditCefArgs.TabIndex = 0;
             this.btnEditCefArgs.Text = "Edit CEF Arguments";
             this.btnEditCefArgs.UseVisualStyleBackColor = true;
             // 
             // btnEditCSS
             // 
+            this.btnEditCSS.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnEditCSS.Location = new System.Drawing.Point(155, 3);
             this.btnEditCSS.Name = "btnEditCSS";
-            this.btnEditCSS.Size = new System.Drawing.Size(144, 23);
+            this.btnEditCSS.Size = new System.Drawing.Size(144, 25);
             this.btnEditCSS.TabIndex = 1;
             this.btnEditCSS.Text = "Edit CSS";
             this.btnEditCSS.UseVisualStyleBackColor = true;
             // 
             // btnRestartArgs
             // 
+            this.btnRestartArgs.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnRestartArgs.Location = new System.Drawing.Point(155, 32);
             this.btnRestartArgs.Name = "btnRestartArgs";
-            this.btnRestartArgs.Size = new System.Drawing.Size(144, 23);
+            this.btnRestartArgs.Size = new System.Drawing.Size(144, 25);
             this.btnRestartArgs.TabIndex = 3;
             this.btnRestartArgs.Text = "Restart with Arguments";
             this.btnRestartArgs.UseVisualStyleBackColor = true;
             // 
             // btnRestart
             // 
+            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnRestart.Location = new System.Drawing.Point(155, 3);
             this.btnRestart.Name = "btnRestart";
-            this.btnRestart.Size = new System.Drawing.Size(144, 23);
+            this.btnRestart.Size = new System.Drawing.Size(144, 25);
             this.btnRestart.TabIndex = 2;
             this.btnRestart.Text = "Restart the Program";
             this.btnRestart.UseVisualStyleBackColor = true;
             // 
             // btnOpenAppFolder
             // 
+            this.btnOpenAppFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnOpenAppFolder.Location = new System.Drawing.Point(5, 3);
             this.btnOpenAppFolder.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnOpenAppFolder.Name = "btnOpenAppFolder";
-            this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 23);
+            this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 25);
             this.btnOpenAppFolder.TabIndex = 0;
             this.btnOpenAppFolder.Text = "Open Program Folder";
             this.btnOpenAppFolder.UseVisualStyleBackColor = true;
             // 
             // btnOpenDataFolder
             // 
+            this.btnOpenDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnOpenDataFolder.Location = new System.Drawing.Point(5, 32);
             this.btnOpenDataFolder.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnOpenDataFolder.Name = "btnOpenDataFolder";
-            this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 23);
+            this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 25);
             this.btnOpenDataFolder.TabIndex = 1;
             this.btnOpenDataFolder.Text = "Open Data Folder";
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
             // 
             // numClearCacheThreshold
             // 
-            this.numClearCacheThreshold.Increment = 50;
-            this.numClearCacheThreshold.Location = new System.Drawing.Point(227, 4);
-            this.numClearCacheThreshold.Maximum = 1000;
-            this.numClearCacheThreshold.Minimum = 100;
+            this.numClearCacheThreshold.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.numClearCacheThreshold.Increment = new decimal(new int[] {
+            50,
+            0,
+            0,
+            0});
+            this.numClearCacheThreshold.Location = new System.Drawing.Point(246, 5);
+            this.numClearCacheThreshold.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numClearCacheThreshold.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
             this.numClearCacheThreshold.Name = "numClearCacheThreshold";
-            this.numClearCacheThreshold.Size = new System.Drawing.Size(72, 20);
+            this.numClearCacheThreshold.Size = new System.Drawing.Size(68, 23);
             this.numClearCacheThreshold.TabIndex = 1;
+            this.numClearCacheThreshold.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.numClearCacheThreshold.TextSuffix = " MB";
-            this.numClearCacheThreshold.Value = 250;
+            this.numClearCacheThreshold.Value = new decimal(new int[] {
+            250,
+            0,
+            0,
+            0});
             // 
             // checkClearCacheAuto
             // 
             this.checkClearCacheAuto.AutoSize = true;
+            this.checkClearCacheAuto.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkClearCacheAuto.Location = new System.Drawing.Point(6, 6);
-            this.checkClearCacheAuto.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkClearCacheAuto.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
             this.checkClearCacheAuto.Name = "checkClearCacheAuto";
-            this.checkClearCacheAuto.Size = new System.Drawing.Size(215, 17);
+            this.checkClearCacheAuto.Size = new System.Drawing.Size(237, 19);
             this.checkClearCacheAuto.TabIndex = 0;
             this.checkClearCacheAuto.Text = "Clear Cache Automatically When Above";
             this.checkClearCacheAuto.UseVisualStyleBackColor = true;
@@ -154,11 +181,11 @@
             // labelApp
             // 
             this.labelApp.AutoSize = true;
-            this.labelApp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelApp.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelApp.Location = new System.Drawing.Point(0, 0);
             this.labelApp.Margin = new System.Windows.Forms.Padding(0);
             this.labelApp.Name = "labelApp";
-            this.labelApp.Size = new System.Drawing.Size(38, 20);
+            this.labelApp.Size = new System.Drawing.Size(37, 20);
             this.labelApp.TabIndex = 0;
             this.labelApp.Text = "App";
             // 
@@ -172,17 +199,17 @@
             this.panelAppButtons.Location = new System.Drawing.Point(0, 20);
             this.panelAppButtons.Margin = new System.Windows.Forms.Padding(0);
             this.panelAppButtons.Name = "panelAppButtons";
-            this.panelAppButtons.Size = new System.Drawing.Size(322, 58);
+            this.panelAppButtons.Size = new System.Drawing.Size(322, 62);
             this.panelAppButtons.TabIndex = 1;
             // 
             // labelPerformance
             // 
             this.labelPerformance.AutoSize = true;
-            this.labelPerformance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelPerformance.Location = new System.Drawing.Point(0, 98);
+            this.labelPerformance.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelPerformance.Location = new System.Drawing.Point(0, 102);
             this.labelPerformance.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelPerformance.Name = "labelPerformance";
-            this.labelPerformance.Size = new System.Drawing.Size(100, 20);
+            this.labelPerformance.Size = new System.Drawing.Size(93, 20);
             this.labelPerformance.TabIndex = 2;
             this.labelPerformance.Text = "Performance";
             // 
@@ -191,19 +218,20 @@
             this.panelClearCacheAuto.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelClearCacheAuto.Controls.Add(this.checkClearCacheAuto);
             this.panelClearCacheAuto.Controls.Add(this.numClearCacheThreshold);
-            this.panelClearCacheAuto.Location = new System.Drawing.Point(0, 198);
+            this.panelClearCacheAuto.Location = new System.Drawing.Point(0, 207);
             this.panelClearCacheAuto.Margin = new System.Windows.Forms.Padding(0);
             this.panelClearCacheAuto.Name = "panelClearCacheAuto";
-            this.panelClearCacheAuto.Size = new System.Drawing.Size(322, 26);
+            this.panelClearCacheAuto.Size = new System.Drawing.Size(322, 28);
             this.panelClearCacheAuto.TabIndex = 6;
             // 
             // labelCache
             // 
             this.labelCache.AutoSize = true;
-            this.labelCache.Location = new System.Drawing.Point(3, 156);
+            this.labelCache.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelCache.Location = new System.Drawing.Point(3, 161);
             this.labelCache.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelCache.Name = "labelCache";
-            this.labelCache.Size = new System.Drawing.Size(38, 13);
+            this.labelCache.Size = new System.Drawing.Size(40, 15);
             this.labelCache.TabIndex = 4;
             this.labelCache.Text = "Cache";
             // 
@@ -212,20 +240,20 @@
             this.panelConfiguration.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelConfiguration.Controls.Add(this.btnEditCSS);
             this.panelConfiguration.Controls.Add(this.btnEditCefArgs);
-            this.panelConfiguration.Location = new System.Drawing.Point(0, 264);
+            this.panelConfiguration.Location = new System.Drawing.Point(0, 275);
             this.panelConfiguration.Margin = new System.Windows.Forms.Padding(0);
             this.panelConfiguration.Name = "panelConfiguration";
-            this.panelConfiguration.Size = new System.Drawing.Size(322, 29);
+            this.panelConfiguration.Size = new System.Drawing.Size(322, 31);
             this.panelConfiguration.TabIndex = 8;
             // 
             // labelConfiguration
             // 
             this.labelConfiguration.AutoSize = true;
-            this.labelConfiguration.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelConfiguration.Location = new System.Drawing.Point(0, 244);
+            this.labelConfiguration.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelConfiguration.Location = new System.Drawing.Point(0, 255);
             this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelConfiguration.Name = "labelConfiguration";
-            this.labelConfiguration.Size = new System.Drawing.Size(104, 20);
+            this.labelConfiguration.Size = new System.Drawing.Size(100, 20);
             this.labelConfiguration.TabIndex = 7;
             this.labelConfiguration.Text = "Configuration";
             // 
@@ -246,7 +274,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 295);
+            this.flowPanel.Size = new System.Drawing.Size(322, 307);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -256,7 +284,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsAdvanced";
-            this.Size = new System.Drawing.Size(340, 313);
+            this.Size = new System.Drawing.Size(340, 325);
             ((System.ComponentModel.ISupportInitialize)(this.numClearCacheThreshold)).EndInit();
             this.panelAppButtons.ResumeLayout(false);
             this.panelClearCacheAuto.ResumeLayout(false);

Core/Other/Settings/TabSettingsFeedback.Designer.cs

@@ -43,21 +43,22 @@
             this.panelDataCollection.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelDataCollection.Controls.Add(this.labelDataCollectionLink);
             this.panelDataCollection.Controls.Add(this.checkDataCollection);
-            this.panelDataCollection.Location = new System.Drawing.Point(0, 74);
+            this.panelDataCollection.Location = new System.Drawing.Point(0, 78);
             this.panelDataCollection.Margin = new System.Windows.Forms.Padding(0);
             this.panelDataCollection.Name = "panelDataCollection";
-            this.panelDataCollection.Size = new System.Drawing.Size(322, 26);
+            this.panelDataCollection.Size = new System.Drawing.Size(322, 28);
             this.panelDataCollection.TabIndex = 3;
             // 
             // labelDataCollectionLink
             // 
             this.labelDataCollectionLink.AutoSize = true;
+            this.labelDataCollectionLink.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelDataCollectionLink.LinkArea = new System.Windows.Forms.LinkArea(1, 10);
             this.labelDataCollectionLink.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;
-            this.labelDataCollectionLink.Location = new System.Drawing.Point(141, 6);
-            this.labelDataCollectionLink.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelDataCollectionLink.Location = new System.Drawing.Point(153, 4);
+            this.labelDataCollectionLink.Margin = new System.Windows.Forms.Padding(0);
             this.labelDataCollectionLink.Name = "labelDataCollectionLink";
-            this.labelDataCollectionLink.Size = new System.Drawing.Size(66, 17);
+            this.labelDataCollectionLink.Size = new System.Drawing.Size(71, 21);
             this.labelDataCollectionLink.TabIndex = 1;
             this.labelDataCollectionLink.TabStop = true;
             this.labelDataCollectionLink.Text = "(learn more)";
@@ -67,17 +68,19 @@
             // checkDataCollection
             // 
             this.checkDataCollection.AutoSize = true;
+            this.checkDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkDataCollection.Location = new System.Drawing.Point(6, 6);
-            this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 6, 0, 3);
+            this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
             this.checkDataCollection.Name = "checkDataCollection";
-            this.checkDataCollection.Size = new System.Drawing.Size(135, 17);
+            this.checkDataCollection.Size = new System.Drawing.Size(147, 19);
             this.checkDataCollection.TabIndex = 0;
             this.checkDataCollection.Text = "Send Anonymous Data";
             this.checkDataCollection.UseVisualStyleBackColor = true;
             // 
             // labelDataCollectionMessage
             // 
-            this.labelDataCollectionMessage.Location = new System.Drawing.Point(6, 135);
+            this.labelDataCollectionMessage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataCollectionMessage.Location = new System.Drawing.Point(6, 143);
             this.labelDataCollectionMessage.Margin = new System.Windows.Forms.Padding(6);
             this.labelDataCollectionMessage.Name = "labelDataCollectionMessage";
             this.labelDataCollectionMessage.Size = new System.Drawing.Size(310, 67);
@@ -86,10 +89,12 @@
             // btnViewReport
             // 
             this.btnViewReport.AutoSize = true;
-            this.btnViewReport.Location = new System.Drawing.Point(5, 103);
+            this.btnViewReport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnViewReport.Location = new System.Drawing.Point(5, 109);
             this.btnViewReport.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnViewReport.Name = "btnViewReport";
-            this.btnViewReport.Size = new System.Drawing.Size(144, 23);
+            this.btnViewReport.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnViewReport.Size = new System.Drawing.Size(155, 25);
             this.btnViewReport.TabIndex = 4;
             this.btnViewReport.Text = "View My Analytics Report";
             this.btnViewReport.UseVisualStyleBackColor = true;
@@ -97,11 +102,12 @@
             // btnSendFeedback
             // 
             this.btnSendFeedback.AutoSize = true;
+            this.btnSendFeedback.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnSendFeedback.Location = new System.Drawing.Point(5, 23);
             this.btnSendFeedback.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnSendFeedback.Name = "btnSendFeedback";
-            this.btnSendFeedback.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnSendFeedback.Size = new System.Drawing.Size(164, 23);
+            this.btnSendFeedback.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnSendFeedback.Size = new System.Drawing.Size(170, 25);
             this.btnSendFeedback.TabIndex = 1;
             this.btnSendFeedback.Text = "Send Feedback / Bug Report";
             this.btnSendFeedback.UseVisualStyleBackColor = true;
@@ -109,21 +115,22 @@
             // labelDataCollection
             // 
             this.labelDataCollection.AutoSize = true;
-            this.labelDataCollection.Location = new System.Drawing.Point(3, 61);
+            this.labelDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataCollection.Location = new System.Drawing.Point(3, 63);
             this.labelDataCollection.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDataCollection.Name = "labelDataCollection";
-            this.labelDataCollection.Size = new System.Drawing.Size(79, 13);
+            this.labelDataCollection.Size = new System.Drawing.Size(88, 15);
             this.labelDataCollection.TabIndex = 2;
             this.labelDataCollection.Text = "Data Collection";
             // 
             // labelFeedback
             // 
             this.labelFeedback.AutoSize = true;
-            this.labelFeedback.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelFeedback.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelFeedback.Location = new System.Drawing.Point(0, 0);
             this.labelFeedback.Margin = new System.Windows.Forms.Padding(0);
             this.labelFeedback.Name = "labelFeedback";
-            this.labelFeedback.Size = new System.Drawing.Size(80, 20);
+            this.labelFeedback.Size = new System.Drawing.Size(72, 20);
             this.labelFeedback.TabIndex = 0;
             this.labelFeedback.Text = "Feedback";
             // 
@@ -141,7 +148,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 209);
+            this.flowPanel.Size = new System.Drawing.Size(322, 212);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -151,7 +158,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsFeedback";
-            this.Size = new System.Drawing.Size(340, 227);
+            this.Size = new System.Drawing.Size(340, 230);
             this.panelDataCollection.ResumeLayout(false);
             this.panelDataCollection.PerformLayout();
             this.flowPanel.ResumeLayout(false);

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -29,7 +29,6 @@
             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();
@@ -45,6 +44,8 @@
             this.checkSmoothScrolling = new System.Windows.Forms.CheckBox();
             this.labelBrowserPath = new System.Windows.Forms.Label();
             this.comboBoxBrowserPath = new System.Windows.Forms.ComboBox();
+            this.labelSearchEngine = new System.Windows.Forms.Label();
+            this.comboBoxSearchEngine = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
             this.panelZoom.SuspendLayout();
             this.flowPanel.SuspendLayout();
@@ -53,10 +54,11 @@
             // checkExpandLinks
             // 
             this.checkExpandLinks.AutoSize = true;
+            this.checkExpandLinks.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkExpandLinks.Location = new System.Drawing.Point(6, 26);
-            this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkExpandLinks.Name = "checkExpandLinks";
-            this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
+            this.checkExpandLinks.Size = new System.Drawing.Size(176, 19);
             this.checkExpandLinks.TabIndex = 1;
             this.checkExpandLinks.Text = "Expand Links When Hovered";
             this.checkExpandLinks.UseVisualStyleBackColor = true;
@@ -64,27 +66,32 @@
             // 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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 427);
+            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
-            this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
-            this.checkUpdateNotifications.TabIndex = 14;
+            this.checkUpdateNotifications.Size = new System.Drawing.Size(182, 19);
+            this.checkUpdateNotifications.TabIndex = 15;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
             // btnCheckUpdates
             // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 409);
+            this.btnCheckUpdates.AutoSize = true;
+            this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 451);
             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.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCheckUpdates.Size = new System.Drawing.Size(128, 25);
+            this.btnCheckUpdates.TabIndex = 16;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
             // labelZoomValue
             // 
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelZoomValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelZoomValue.Location = new System.Drawing.Point(147, 4);
             this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelZoomValue.Name = "labelZoomValue";
@@ -93,36 +100,27 @@
             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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 98);
+            this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkBestImageQuality.Name = "checkBestImageQuality";
-            this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
-            this.checkBestImageQuality.TabIndex = 5;
+            this.checkBestImageQuality.Size = new System.Drawing.Size(125, 19);
+            this.checkBestImageQuality.TabIndex = 4;
             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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 50);
+            this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
-            this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
-            this.checkOpenSearchInFirstColumn.TabIndex = 3;
+            this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(245, 19);
+            this.checkOpenSearchInFirstColumn.TabIndex = 2;
             this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
             this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
             // 
@@ -144,11 +142,12 @@
             // labelZoom
             // 
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(3, 291);
+            this.labelZoom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelZoom.Location = new System.Drawing.Point(3, 330);
             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.Size = new System.Drawing.Size(39, 15);
+            this.labelZoom.TabIndex = 12;
             this.labelZoom.Text = "Zoom";
             // 
             // zoomUpdateTimer
@@ -159,11 +158,11 @@
             // 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.Font = new System.Drawing.Font("Segoe UI", 11.25F, 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.Size = new System.Drawing.Size(100, 20);
             this.labelUI.TabIndex = 0;
             this.labelUI.Text = "User Interface";
             // 
@@ -172,32 +171,33 @@
             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.Location = new System.Drawing.Point(0, 345);
             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;
+            this.panelZoom.TabIndex = 13;
             // 
             // 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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 122);
+            this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
-            this.checkAnimatedAvatars.Size = new System.Drawing.Size(145, 17);
-            this.checkAnimatedAvatars.TabIndex = 6;
+            this.checkAnimatedAvatars.Size = new System.Drawing.Size(158, 19);
+            this.checkAnimatedAvatars.TabIndex = 5;
             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.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUpdates.Location = new System.Drawing.Point(0, 401);
             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.Size = new System.Drawing.Size(64, 20);
+            this.labelUpdates.TabIndex = 14;
             this.labelUpdates.Text = "Updates";
             // 
             // flowPanel
@@ -207,7 +207,6 @@
             | 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);
@@ -216,6 +215,8 @@
             this.flowPanel.Controls.Add(this.checkSmoothScrolling);
             this.flowPanel.Controls.Add(this.labelBrowserPath);
             this.flowPanel.Controls.Add(this.comboBoxBrowserPath);
+            this.flowPanel.Controls.Add(this.labelSearchEngine);
+            this.flowPanel.Controls.Add(this.comboBoxSearchEngine);
             this.flowPanel.Controls.Add(this.labelZoom);
             this.flowPanel.Controls.Add(this.panelZoom);
             this.flowPanel.Controls.Add(this.labelUpdates);
@@ -224,62 +225,88 @@
             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.Size = new System.Drawing.Size(322, 486);
             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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 74);
+            this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
-            this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(176, 17);
-            this.checkKeepLikeFollowDialogsOpen.TabIndex = 4;
+            this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(190, 19);
+            this.checkKeepLikeFollowDialogsOpen.TabIndex = 3;
             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.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 163);
             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.Size = new System.Drawing.Size(119, 20);
+            this.labelBrowserSettings.TabIndex = 6;
             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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 189);
+            this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkSmoothScrolling.Name = "checkSmoothScrolling";
-            this.checkSmoothScrolling.Size = new System.Drawing.Size(105, 17);
-            this.checkSmoothScrolling.TabIndex = 8;
+            this.checkSmoothScrolling.Size = new System.Drawing.Size(117, 19);
+            this.checkSmoothScrolling.TabIndex = 7;
             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.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelBrowserPath.Location = new System.Drawing.Point(3, 222);
             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.Size = new System.Drawing.Size(103, 15);
+            this.labelBrowserPath.TabIndex = 8;
             this.labelBrowserPath.Text = "Open Links With...";
             // 
             // comboBoxBrowserPath
             // 
             this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxBrowserPath.FormattingEnabled = true;
-            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 255);
+            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 240);
             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;
+            this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 23);
+            this.comboBoxBrowserPath.TabIndex = 9;
+            // 
+            // labelSearchEngine
+            // 
+            this.labelSearchEngine.AutoSize = true;
+            this.labelSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSearchEngine.Location = new System.Drawing.Point(3, 276);
+            this.labelSearchEngine.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelSearchEngine.Name = "labelSearchEngine";
+            this.labelSearchEngine.Size = new System.Drawing.Size(81, 15);
+            this.labelSearchEngine.TabIndex = 10;
+            this.labelSearchEngine.Text = "Search Engine";
+            // 
+            // comboBoxSearchEngine
+            // 
+            this.comboBoxSearchEngine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.comboBoxSearchEngine.FormattingEnabled = true;
+            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 294);
+            this.comboBoxSearchEngine.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
+            this.comboBoxSearchEngine.Name = "comboBoxSearchEngine";
+            this.comboBoxSearchEngine.Size = new System.Drawing.Size(173, 23);
+            this.comboBoxSearchEngine.TabIndex = 11;
             // 
             // TabSettingsGeneral
             // 
@@ -287,7 +314,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(340, 456);
+            this.Size = new System.Drawing.Size(340, 504);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.panelZoom.ResumeLayout(false);
             this.flowPanel.ResumeLayout(false);
@@ -306,7 +333,6 @@
         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;
@@ -319,5 +345,7 @@
         private System.Windows.Forms.ComboBox comboBoxBrowserPath;
         private System.Windows.Forms.Label labelBrowserSettings;
         private System.Windows.Forms.CheckBox checkSmoothScrolling;
+        private System.Windows.Forms.Label labelSearchEngine;
+        private System.Windows.Forms.ComboBox comboBoxSearchEngine;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -4,29 +4,34 @@ using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling.General;
+using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
 using TweetDuck.Updates;
+using TweetDuck.Updates.Events;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsGeneral : BaseTabSettings{
-        private readonly FormBrowser browser;
+        private readonly Action reloadColumns;
+
         private readonly UpdateHandler updates;
         private int updateCheckEventId = -1;
 
         private readonly int browserListIndexDefault;
         private readonly int browserListIndexCustom;
 
-        public TabSettingsGeneral(FormBrowser browser, UpdateHandler updates){
+        private readonly int searchEngineIndexDefault;
+        private readonly int searchEngineIndexCustom;
+
+        public TabSettingsGeneral(Action reloadColumns, UpdateHandler updates){
             InitializeComponent();
 
-            this.browser = browser;
+            this.reloadColumns = reloadColumns;
             
             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).");
@@ -41,7 +46,6 @@ namespace TweetDuck.Core.Other.Settings{
             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;
@@ -57,6 +61,14 @@ namespace TweetDuck.Core.Other.Settings{
             browserListIndexCustom = comboBoxBrowserPath.Items.Add("(custom program...)");
             UpdateBrowserPathSelection();
 
+            comboBoxSearchEngine.Items.Add(new SearchEngine("DuckDuckGo", "https://duckduckgo.com/?q="));
+            comboBoxSearchEngine.Items.Add(new SearchEngine("Google", "https://www.google.com/search?q="));
+            comboBoxSearchEngine.Items.Add(new SearchEngine("Bing", "https://www.bing.com/search?q="));
+            comboBoxSearchEngine.Items.Add(new SearchEngine("Yahoo", "https://search.yahoo.com/search?p="));
+            searchEngineIndexDefault = comboBoxSearchEngine.Items.Add("(no engine set)");
+            searchEngineIndexCustom = comboBoxSearchEngine.Items.Add("(custom url...)");
+            UpdateSearchEngineSelection();
+            
             trackBarZoom.SetValueSafe(Config.ZoomLevel);
             labelZoomValue.Text = trackBarZoom.Value+"%";
 
@@ -65,7 +77,6 @@ namespace TweetDuck.Core.Other.Settings{
 
         public override void OnReady(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
-            checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
             checkOpenSearchInFirstColumn.CheckedChanged += checkOpenSearchInFirstColumn_CheckedChanged;
             checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
             checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
@@ -73,6 +84,7 @@ namespace TweetDuck.Core.Other.Settings{
 
             checkSmoothScrolling.CheckedChanged += checkSmoothScrolling_CheckedChanged;
             comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
+            comboBoxSearchEngine.SelectedIndexChanged += comboBoxSearchEngine_SelectedIndexChanged;
             trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
 
             checkUpdateNotifications.CheckedChanged += checkUpdateNotifications_CheckedChanged;
@@ -87,10 +99,6 @@ namespace TweetDuck.Core.Other.Settings{
             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;
         }
@@ -105,7 +113,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         private void checkAnimatedAvatars_CheckedChanged(object sender, EventArgs e){
             Config.EnableAnimatedImages = checkAnimatedAvatars.Checked;
-            BrowserProcessHandler.UpdatePrefs().ContinueWith(task => browser.ReloadColumns());
+            BrowserProcessHandler.UpdatePrefs().ContinueWith(task => reloadColumns());
         }
 
         private void checkSmoothScrolling_CheckedChanged(object sender, EventArgs e){
@@ -141,18 +149,50 @@ namespace TweetDuck.Core.Other.Settings{
                     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 comboBoxSearchEngine_SelectedIndexChanged(object sender, EventArgs e){
+            if (comboBoxSearchEngine.SelectedIndex == searchEngineIndexCustom){
+                using(DialogSettingsSearchEngine dialog = new DialogSettingsSearchEngine()){
+                    if (dialog.ShowDialog() == DialogResult.OK){
+                        Config.SearchEngineUrl = dialog.Url.Trim();
+                    }
+                }
+
+                comboBoxSearchEngine.SelectedIndexChanged -= comboBoxSearchEngine_SelectedIndexChanged;
+                UpdateSearchEngineSelection();
+                comboBoxSearchEngine.SelectedIndexChanged += comboBoxSearchEngine_SelectedIndexChanged;
+            }
+            else{
+                Config.SearchEngineUrl = (comboBoxSearchEngine.SelectedItem as SearchEngine)?.Url; // default search engine item is a string and casts to null
+            }
+        }
+
+        private void UpdateSearchEngineSelection(){
+            if (string.IsNullOrEmpty(Config.SearchEngineUrl)){
+                comboBoxSearchEngine.SelectedIndex = searchEngineIndexDefault;
+            }
+            else{
+                SearchEngine engineInfo = comboBoxSearchEngine.Items.OfType<SearchEngine>().FirstOrDefault(engine => engine.Url == Config.SearchEngineUrl);
+                
+                if (engineInfo == null){
+                    comboBoxSearchEngine.SelectedIndex = searchEngineIndexCustom;
+                }
+                else{
+                    comboBoxSearchEngine.SelectedItem = engineInfo;
+                }
+            }
+        }
+
         private void trackBarZoom_ValueChanged(object sender, EventArgs e){
             if (trackBarZoom.AlignValueToTick()){
                 zoomUpdateTimer.Stop();
@@ -170,23 +210,44 @@ namespace TweetDuck.Core.Other.Settings{
 
             btnCheckUpdates.Enabled = false;
             updateCheckEventId = updates.Check(true);
+
+            if (updateCheckEventId == UpdateHandler.CheckCodeNotOnTweetDeck){
+                FormMessage.Error("Update Check", "Updates can only be checked once TweetDeck is fully loaded.", FormMessage.OK);
+                btnCheckUpdates.Enabled = true;
+            }
         }
 
-        private void updates_CheckFinished(object sender, UpdateEventArgs e){
-            this.InvokeAsyncSafe(() => {
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
             if (e.EventId == updateCheckEventId){
                 btnCheckUpdates.Enabled = true;
 
-                    if (!e.IsUpdateAvailable){
+                e.Result.Handle(update => {
+                    if (update.VersionTag == Program.VersionTag){
                         FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
                     }
-                }
+                }, ex => {
+                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
                 });
             }
+        }
 
         private void zoomUpdateTimer_Tick(object sender, EventArgs e){
             Config.ZoomLevel = trackBarZoom.Value;
             zoomUpdateTimer.Stop();
         }
+
+        private sealed class SearchEngine{
+            private string Name { get; }
+            public string Url { get; }
+            
+            public SearchEngine(string name, string url){
+                Name = name;
+                Url = url;
+            }
+            
+            public override int GetHashCode() => Name.GetHashCode();
+            public override bool Equals(object obj) => obj is SearchEngine other && Name == other.Name;
+            public override string ToString() => Name;
+        }
     }
 }

Core/Other/Settings/TabSettingsLocales.Designer.cs

@@ -39,10 +39,11 @@
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
+            this.checkSpellCheck.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkSpellCheck.Location = new System.Drawing.Point(6, 26);
-            this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkSpellCheck.Name = "checkSpellCheck";
-            this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
+            this.checkSpellCheck.Size = new System.Drawing.Size(125, 19);
             this.checkSpellCheck.TabIndex = 1;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.checkSpellCheck.UseVisualStyleBackColor = true;
@@ -50,11 +51,11 @@
             // 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.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelLocales.Location = new System.Drawing.Point(0, 0);
             this.labelLocales.Margin = new System.Windows.Forms.Padding(0);
             this.labelLocales.Name = "labelLocales";
-            this.labelLocales.Size = new System.Drawing.Size(64, 20);
+            this.labelLocales.Size = new System.Drawing.Size(58, 20);
             this.labelLocales.TabIndex = 0;
             this.labelLocales.Text = "Locales";
             // 
@@ -73,59 +74,63 @@
             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.Size = new System.Drawing.Size(322, 201);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
             // labelSpellCheckLanguage
             // 
             this.labelSpellCheckLanguage.AutoSize = true;
-            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 58);
+            this.labelSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 59);
             this.labelSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelSpellCheckLanguage.Name = "labelSpellCheckLanguage";
-            this.labelSpellCheckLanguage.Size = new System.Drawing.Size(115, 13);
+            this.labelSpellCheckLanguage.Size = new System.Drawing.Size(123, 15);
             this.labelSpellCheckLanguage.TabIndex = 2;
             this.labelSpellCheckLanguage.Text = "Spell Check Language";
             // 
             // comboBoxSpellCheckLanguage
             // 
             this.comboBoxSpellCheckLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxSpellCheckLanguage.FormattingEnabled = true;
-            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 74);
+            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 77);
             this.comboBoxSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxSpellCheckLanguage.Name = "comboBoxSpellCheckLanguage";
-            this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(311, 21);
+            this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(311, 23);
             this.comboBoxSpellCheckLanguage.TabIndex = 3;
             // 
             // labelTranslations
             // 
             this.labelTranslations.AutoSize = true;
-            this.labelTranslations.Font = new System.Drawing.Font("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.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTranslations.Location = new System.Drawing.Point(0, 123);
             this.labelTranslations.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelTranslations.Name = "labelTranslations";
-            this.labelTranslations.Size = new System.Drawing.Size(116, 20);
+            this.labelTranslations.Size = new System.Drawing.Size(109, 20);
             this.labelTranslations.TabIndex = 4;
             this.labelTranslations.Text = "Bing Translator";
             // 
             // labelTranslationTarget
             // 
             this.labelTranslationTarget.AutoSize = true;
-            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 150);
+            this.labelTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 155);
             this.labelTranslationTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelTranslationTarget.Name = "labelTranslationTarget";
-            this.labelTranslationTarget.Size = new System.Drawing.Size(89, 13);
+            this.labelTranslationTarget.Size = new System.Drawing.Size(96, 15);
             this.labelTranslationTarget.TabIndex = 5;
             this.labelTranslationTarget.Text = "Target Language";
             // 
             // comboBoxTranslationTarget
             // 
             this.comboBoxTranslationTarget.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxTranslationTarget.FormattingEnabled = true;
-            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 166);
+            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 173);
             this.comboBoxTranslationTarget.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxTranslationTarget.Name = "comboBoxTranslationTarget";
-            this.comboBoxTranslationTarget.Size = new System.Drawing.Size(311, 21);
+            this.comboBoxTranslationTarget.Size = new System.Drawing.Size(311, 23);
             this.comboBoxTranslationTarget.TabIndex = 6;
             // 
             // TabSettingsLocales
@@ -134,7 +139,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsLocales";
-            this.Size = new System.Drawing.Size(340, 211);
+            this.Size = new System.Drawing.Size(340, 219);
             this.flowPanel.ResumeLayout(false);
             this.flowPanel.PerformLayout();
             this.ResumeLayout(false);

Core/Other/Settings/TabSettingsLocales.cs

@@ -42,12 +42,12 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void comboBoxSpellCheckLanguage_SelectedValueChanged(object sender, EventArgs e){
-            Config.SpellCheckLanguage = (comboBoxSpellCheckLanguage.SelectedItem as LocaleUtils.Item)?.Code;
+            Config.SpellCheckLanguage = (comboBoxSpellCheckLanguage.SelectedItem as LocaleUtils.Item)?.Code ?? "en-US";
             PromptRestart();
         }
 
         private void comboBoxTranslationTarget_SelectedValueChanged(object sender, EventArgs e){
-            Config.TranslationTarget = (comboBoxTranslationTarget.SelectedItem as LocaleUtils.Item)?.Code;
+            Config.TranslationTarget = (comboBoxTranslationTarget.SelectedItem as LocaleUtils.Item)?.Code ?? "en";
         }
     }
 }

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -80,10 +80,11 @@
             // 
             // labelEdgeDistanceValue
             // 
+            this.labelEdgeDistanceValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelEdgeDistanceValue.Location = new System.Drawing.Point(145, 4);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
-            this.labelEdgeDistanceValue.Size = new System.Drawing.Size(40, 13);
+            this.labelEdgeDistanceValue.Size = new System.Drawing.Size(40, 15);
             this.labelEdgeDistanceValue.TabIndex = 1;
             this.labelEdgeDistanceValue.Text = "0 px";
             this.labelEdgeDistanceValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -91,39 +92,43 @@
             // labelDisplay
             // 
             this.labelDisplay.AutoSize = true;
-            this.labelDisplay.Location = new System.Drawing.Point(3, 451);
+            this.labelDisplay.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDisplay.Location = new System.Drawing.Point(3, 465);
             this.labelDisplay.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDisplay.Name = "labelDisplay";
-            this.labelDisplay.Size = new System.Drawing.Size(41, 13);
+            this.labelDisplay.Size = new System.Drawing.Size(45, 15);
             this.labelDisplay.TabIndex = 15;
             this.labelDisplay.Text = "Display";
             // 
             // comboBoxDisplay
             // 
             this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxDisplay.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 467);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 483);
             this.comboBoxDisplay.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxDisplay.Name = "comboBoxDisplay";
-            this.comboBoxDisplay.Size = new System.Drawing.Size(144, 21);
+            this.comboBoxDisplay.Size = new System.Drawing.Size(144, 23);
             this.comboBoxDisplay.TabIndex = 16;
             // 
             // labelEdgeDistance
             // 
             this.labelEdgeDistance.AutoSize = true;
-            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 503);
+            this.labelEdgeDistance.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 521);
             this.labelEdgeDistance.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelEdgeDistance.Name = "labelEdgeDistance";
-            this.labelEdgeDistance.Size = new System.Drawing.Size(103, 13);
+            this.labelEdgeDistance.Size = new System.Drawing.Size(112, 15);
             this.labelEdgeDistance.TabIndex = 17;
             this.labelEdgeDistance.Text = "Distance From Edge";
             // 
             // radioLocCustom
             // 
+            this.radioLocCustom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocCustom.Location = new System.Drawing.Point(205, 4);
             this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocCustom.Name = "radioLocCustom";
-            this.radioLocCustom.Size = new System.Drawing.Size(65, 41);
+            this.radioLocCustom.Size = new System.Drawing.Size(70, 43);
             this.radioLocCustom.TabIndex = 4;
             this.radioLocCustom.TabStop = true;
             this.radioLocCustom.Text = "Custom";
@@ -131,10 +136,11 @@
             // 
             // radioLocBR
             // 
+            this.radioLocBR.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocBR.Location = new System.Drawing.Point(105, 28);
             this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocBR.Name = "radioLocBR";
-            this.radioLocBR.Size = new System.Drawing.Size(92, 17);
+            this.radioLocBR.Size = new System.Drawing.Size(92, 19);
             this.radioLocBR.TabIndex = 3;
             this.radioLocBR.TabStop = true;
             this.radioLocBR.Text = "Bottom Right";
@@ -142,10 +148,11 @@
             // 
             // radioLocBL
             // 
+            this.radioLocBL.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocBL.Location = new System.Drawing.Point(5, 28);
             this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocBL.Name = "radioLocBL";
-            this.radioLocBL.Size = new System.Drawing.Size(92, 17);
+            this.radioLocBL.Size = new System.Drawing.Size(92, 19);
             this.radioLocBL.TabIndex = 2;
             this.radioLocBL.TabStop = true;
             this.radioLocBL.Text = "Bottom Left";
@@ -153,10 +160,11 @@
             // 
             // radioLocTR
             // 
+            this.radioLocTR.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocTR.Location = new System.Drawing.Point(105, 4);
             this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTR.Name = "radioLocTR";
-            this.radioLocTR.Size = new System.Drawing.Size(92, 17);
+            this.radioLocTR.Size = new System.Drawing.Size(92, 19);
             this.radioLocTR.TabIndex = 1;
             this.radioLocTR.TabStop = true;
             this.radioLocTR.Text = "Top Right";
@@ -164,10 +172,11 @@
             // 
             // radioLocTL
             // 
+            this.radioLocTL.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocTL.Location = new System.Drawing.Point(5, 4);
             this.radioLocTL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTL.Name = "radioLocTL";
-            this.radioLocTL.Size = new System.Drawing.Size(92, 17);
+            this.radioLocTL.Size = new System.Drawing.Size(92, 19);
             this.radioLocTL.TabIndex = 0;
             this.radioLocTL.TabStop = true;
             this.radioLocTL.Text = "Top Left";
@@ -196,11 +205,11 @@
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationMedium, 0, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationLong, 1, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationShort, 0, 0);
-            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 320);
+            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 332);
             this.tableLayoutDurationButtons.Name = "tableLayoutDurationButtons";
             this.tableLayoutDurationButtons.RowCount = 1;
             this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutDurationButtons.Size = new System.Drawing.Size(171, 27);
+            this.tableLayoutDurationButtons.Size = new System.Drawing.Size(180, 27);
             this.tableLayoutDurationButtons.TabIndex = 12;
             // 
             // btnDurationMedium
@@ -210,10 +219,11 @@
             this.btnDurationMedium.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationMedium.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationMedium.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDurationMedium.Location = new System.Drawing.Point(55, 1);
+            this.btnDurationMedium.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnDurationMedium.Location = new System.Drawing.Point(58, 1);
             this.btnDurationMedium.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationMedium.Name = "btnDurationMedium";
-            this.btnDurationMedium.Size = new System.Drawing.Size(59, 25);
+            this.btnDurationMedium.Size = new System.Drawing.Size(62, 25);
             this.btnDurationMedium.TabIndex = 1;
             this.btnDurationMedium.Text = "Medium";
             this.btnDurationMedium.UseVisualStyleBackColor = true;
@@ -225,10 +235,11 @@
             this.btnDurationLong.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationLong.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationLong.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDurationLong.Location = new System.Drawing.Point(116, 1);
+            this.btnDurationLong.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnDurationLong.Location = new System.Drawing.Point(122, 1);
             this.btnDurationLong.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationLong.Name = "btnDurationLong";
-            this.btnDurationLong.Size = new System.Drawing.Size(54, 25);
+            this.btnDurationLong.Size = new System.Drawing.Size(57, 25);
             this.btnDurationLong.TabIndex = 2;
             this.btnDurationLong.Text = "Long";
             this.btnDurationLong.UseVisualStyleBackColor = true;
@@ -240,10 +251,11 @@
             this.btnDurationShort.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationShort.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationShort.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnDurationShort.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnDurationShort.Location = new System.Drawing.Point(1, 1);
             this.btnDurationShort.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationShort.Name = "btnDurationShort";
-            this.btnDurationShort.Size = new System.Drawing.Size(52, 25);
+            this.btnDurationShort.Size = new System.Drawing.Size(55, 25);
             this.btnDurationShort.TabIndex = 0;
             this.btnDurationShort.Text = "Short";
             this.btnDurationShort.UseVisualStyleBackColor = true;
@@ -251,10 +263,11 @@
             // labelDurationValue
             // 
             this.labelDurationValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelDurationValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelDurationValue.Location = new System.Drawing.Point(147, 4);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
-            this.labelDurationValue.Size = new System.Drawing.Size(52, 13);
+            this.labelDurationValue.Size = new System.Drawing.Size(52, 15);
             this.labelDurationValue.TabIndex = 1;
             this.labelDurationValue.Text = "0 ms/c";
             this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -274,10 +287,11 @@
             // checkSkipOnLinkClick
             // 
             this.checkSkipOnLinkClick.AutoSize = true;
-            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 72);
-            this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkSkipOnLinkClick.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 74);
+            this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkSkipOnLinkClick.Name = "checkSkipOnLinkClick";
-            this.checkSkipOnLinkClick.Size = new System.Drawing.Size(113, 17);
+            this.checkSkipOnLinkClick.Size = new System.Drawing.Size(121, 19);
             this.checkSkipOnLinkClick.TabIndex = 3;
             this.checkSkipOnLinkClick.Text = "Skip On Link Click";
             this.checkSkipOnLinkClick.UseVisualStyleBackColor = true;
@@ -285,10 +299,11 @@
             // checkColumnName
             // 
             this.checkColumnName.AutoSize = true;
+            this.checkColumnName.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkColumnName.Location = new System.Drawing.Point(6, 26);
-            this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkColumnName.Name = "checkColumnName";
-            this.checkColumnName.Size = new System.Drawing.Size(129, 17);
+            this.checkColumnName.Size = new System.Drawing.Size(145, 19);
             this.checkColumnName.TabIndex = 1;
             this.checkColumnName.Text = "Display Column Name";
             this.checkColumnName.UseVisualStyleBackColor = true;
@@ -296,30 +311,33 @@
             // labelIdlePause
             // 
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(3, 127);
+            this.labelIdlePause.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelIdlePause.Location = new System.Drawing.Point(3, 131);
             this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelIdlePause.Name = "labelIdlePause";
-            this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
+            this.labelIdlePause.Size = new System.Drawing.Size(94, 15);
             this.labelIdlePause.TabIndex = 5;
             this.labelIdlePause.Text = "Pause When Idle";
             // 
             // comboBoxIdlePause
             // 
             this.comboBoxIdlePause.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxIdlePause.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 143);
+            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 149);
             this.comboBoxIdlePause.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxIdlePause.Name = "comboBoxIdlePause";
-            this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 21);
+            this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 23);
             this.comboBoxIdlePause.TabIndex = 6;
             // 
             // checkNonIntrusive
             // 
             this.checkNonIntrusive.AutoSize = true;
-            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 95);
-            this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkNonIntrusive.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 98);
+            this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkNonIntrusive.Name = "checkNonIntrusive";
-            this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
+            this.checkNonIntrusive.Size = new System.Drawing.Size(142, 19);
             this.checkNonIntrusive.TabIndex = 4;
             this.checkNonIntrusive.Text = "Non-Intrusive Popups";
             this.checkNonIntrusive.UseVisualStyleBackColor = true;
@@ -327,10 +345,11 @@
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
-            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 236);
-            this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkTimerCountDown.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 245);
+            this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkTimerCountDown.Name = "checkTimerCountDown";
-            this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
+            this.checkTimerCountDown.Size = new System.Drawing.Size(132, 19);
             this.checkTimerCountDown.TabIndex = 9;
             this.checkTimerCountDown.Text = "Timer Counts Down";
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
@@ -338,20 +357,22 @@
             // checkNotificationTimer
             // 
             this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 213);
-            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkNotificationTimer.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 221);
+            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkNotificationTimer.Name = "checkNotificationTimer";
-            this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
+            this.checkNotificationTimer.Size = new System.Drawing.Size(164, 19);
             this.checkNotificationTimer.TabIndex = 8;
             this.checkNotificationTimer.Text = "Display Notification Timer";
             this.checkNotificationTimer.UseVisualStyleBackColor = true;
             // 
             // radioSizeAuto
             // 
+            this.radioSizeAuto.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioSizeAuto.Location = new System.Drawing.Point(5, 4);
             this.radioSizeAuto.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioSizeAuto.Name = "radioSizeAuto";
-            this.radioSizeAuto.Size = new System.Drawing.Size(92, 17);
+            this.radioSizeAuto.Size = new System.Drawing.Size(92, 19);
             this.radioSizeAuto.TabIndex = 0;
             this.radioSizeAuto.TabStop = true;
             this.radioSizeAuto.Text = "Auto";
@@ -359,10 +380,11 @@
             // 
             // radioSizeCustom
             // 
+            this.radioSizeCustom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioSizeCustom.Location = new System.Drawing.Point(105, 4);
             this.radioSizeCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioSizeCustom.Name = "radioSizeCustom";
-            this.radioSizeCustom.Size = new System.Drawing.Size(92, 17);
+            this.radioSizeCustom.Size = new System.Drawing.Size(92, 19);
             this.radioSizeCustom.TabIndex = 1;
             this.radioSizeCustom.TabStop = true;
             this.radioSizeCustom.Text = "Custom";
@@ -371,11 +393,11 @@
             // labelGeneral
             // 
             this.labelGeneral.AutoSize = true;
-            this.labelGeneral.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelGeneral.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelGeneral.Location = new System.Drawing.Point(0, 0);
             this.labelGeneral.Margin = new System.Windows.Forms.Padding(0);
             this.labelGeneral.Name = "labelGeneral";
-            this.labelGeneral.Size = new System.Drawing.Size(66, 20);
+            this.labelGeneral.Size = new System.Drawing.Size(60, 20);
             this.labelGeneral.TabIndex = 0;
             this.labelGeneral.Text = "General";
             // 
@@ -384,7 +406,7 @@
             this.panelEdgeDistance.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelEdgeDistance.Controls.Add(this.trackBarEdgeDistance);
             this.panelEdgeDistance.Controls.Add(this.labelEdgeDistanceValue);
-            this.panelEdgeDistance.Location = new System.Drawing.Point(0, 516);
+            this.panelEdgeDistance.Location = new System.Drawing.Point(0, 536);
             this.panelEdgeDistance.Margin = new System.Windows.Forms.Padding(0);
             this.panelEdgeDistance.Name = "panelEdgeDistance";
             this.panelEdgeDistance.Size = new System.Drawing.Size(322, 36);
@@ -393,20 +415,22 @@
             // checkMediaPreviews
             // 
             this.checkMediaPreviews.AutoSize = true;
-            this.checkMediaPreviews.Location = new System.Drawing.Point(6, 49);
-            this.checkMediaPreviews.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkMediaPreviews.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkMediaPreviews.Location = new System.Drawing.Point(6, 50);
+            this.checkMediaPreviews.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkMediaPreviews.Name = "checkMediaPreviews";
-            this.checkMediaPreviews.Size = new System.Drawing.Size(131, 17);
+            this.checkMediaPreviews.Size = new System.Drawing.Size(140, 19);
             this.checkMediaPreviews.TabIndex = 2;
             this.checkMediaPreviews.Text = "Show Media Previews";
             this.checkMediaPreviews.UseVisualStyleBackColor = true;
             // 
             // labelScrollSpeedValue
             // 
+            this.labelScrollSpeedValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelScrollSpeedValue.Location = new System.Drawing.Point(145, 4);
             this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
-            this.labelScrollSpeedValue.Size = new System.Drawing.Size(38, 13);
+            this.labelScrollSpeedValue.Size = new System.Drawing.Size(38, 15);
             this.labelScrollSpeedValue.TabIndex = 1;
             this.labelScrollSpeedValue.Text = "100%";
             this.labelScrollSpeedValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -428,21 +452,22 @@
             // labelScrollSpeed
             // 
             this.labelScrollSpeed.AutoSize = true;
-            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 629);
+            this.labelScrollSpeed.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 651);
             this.labelScrollSpeed.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelScrollSpeed.Name = "labelScrollSpeed";
-            this.labelScrollSpeed.Size = new System.Drawing.Size(67, 13);
+            this.labelScrollSpeed.Size = new System.Drawing.Size(71, 15);
             this.labelScrollSpeed.TabIndex = 21;
             this.labelScrollSpeed.Text = "Scroll Speed";
             // 
             // labelLocation
             // 
             this.labelLocation.AutoSize = true;
-            this.labelLocation.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelLocation.Location = new System.Drawing.Point(0, 370);
+            this.labelLocation.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelLocation.Location = new System.Drawing.Point(0, 382);
             this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelLocation.Name = "labelLocation";
-            this.labelLocation.Size = new System.Drawing.Size(70, 20);
+            this.labelLocation.Size = new System.Drawing.Size(66, 20);
             this.labelLocation.TabIndex = 13;
             this.labelLocation.Text = "Location";
             // 
@@ -454,10 +479,10 @@
             this.panelLocation.Controls.Add(this.radioLocBL);
             this.panelLocation.Controls.Add(this.radioLocCustom);
             this.panelLocation.Controls.Add(this.radioLocBR);
-            this.panelLocation.Location = new System.Drawing.Point(0, 390);
+            this.panelLocation.Location = new System.Drawing.Point(0, 402);
             this.panelLocation.Margin = new System.Windows.Forms.Padding(0);
             this.panelLocation.Name = "panelLocation";
-            this.panelLocation.Size = new System.Drawing.Size(322, 49);
+            this.panelLocation.Size = new System.Drawing.Size(322, 51);
             this.panelLocation.TabIndex = 14;
             // 
             // panelTimer
@@ -465,7 +490,7 @@
             this.panelTimer.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelTimer.Controls.Add(this.labelDurationValue);
             this.panelTimer.Controls.Add(this.trackBarDuration);
-            this.panelTimer.Location = new System.Drawing.Point(0, 281);
+            this.panelTimer.Location = new System.Drawing.Point(0, 293);
             this.panelTimer.Margin = new System.Windows.Forms.Padding(0);
             this.panelTimer.Name = "panelTimer";
             this.panelTimer.Size = new System.Drawing.Size(322, 36);
@@ -474,32 +499,33 @@
             // labelDuration
             // 
             this.labelDuration.AutoSize = true;
-            this.labelDuration.Location = new System.Drawing.Point(3, 268);
+            this.labelDuration.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDuration.Location = new System.Drawing.Point(3, 278);
             this.labelDuration.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDuration.Name = "labelDuration";
-            this.labelDuration.Size = new System.Drawing.Size(47, 13);
+            this.labelDuration.Size = new System.Drawing.Size(53, 15);
             this.labelDuration.TabIndex = 10;
             this.labelDuration.Text = "Duration";
             // 
             // labelTimer
             // 
             this.labelTimer.AutoSize = true;
-            this.labelTimer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTimer.Location = new System.Drawing.Point(0, 187);
+            this.labelTimer.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTimer.Location = new System.Drawing.Point(0, 195);
             this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelTimer.Name = "labelTimer";
-            this.labelTimer.Size = new System.Drawing.Size(48, 20);
+            this.labelTimer.Size = new System.Drawing.Size(47, 20);
             this.labelTimer.TabIndex = 7;
             this.labelTimer.Text = "Timer";
             // 
             // labelSize
             // 
             this.labelSize.AutoSize = true;
-            this.labelSize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelSize.Location = new System.Drawing.Point(0, 572);
+            this.labelSize.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSize.Location = new System.Drawing.Point(0, 592);
             this.labelSize.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelSize.Name = "labelSize";
-            this.labelSize.Size = new System.Drawing.Size(40, 20);
+            this.labelSize.Size = new System.Drawing.Size(36, 20);
             this.labelSize.TabIndex = 19;
             this.labelSize.Text = "Size";
             // 
@@ -509,10 +535,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelSize.Controls.Add(this.radioSizeCustom);
             this.panelSize.Controls.Add(this.radioSizeAuto);
-            this.panelSize.Location = new System.Drawing.Point(0, 592);
+            this.panelSize.Location = new System.Drawing.Point(0, 612);
             this.panelSize.Margin = new System.Windows.Forms.Padding(0);
             this.panelSize.Name = "panelSize";
-            this.panelSize.Size = new System.Drawing.Size(322, 25);
+            this.panelSize.Size = new System.Drawing.Size(322, 27);
             this.panelSize.TabIndex = 20;
             // 
             // durationUpdateTimer
@@ -551,7 +577,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 678);
+            this.flowPanel.Size = new System.Drawing.Size(322, 698);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -560,7 +586,7 @@
             this.panelScrollSpeed.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelScrollSpeed.Controls.Add(this.trackBarScrollSpeed);
             this.panelScrollSpeed.Controls.Add(this.labelScrollSpeedValue);
-            this.panelScrollSpeed.Location = new System.Drawing.Point(0, 642);
+            this.panelScrollSpeed.Location = new System.Drawing.Point(0, 666);
             this.panelScrollSpeed.Margin = new System.Windows.Forms.Padding(0);
             this.panelScrollSpeed.Name = "panelScrollSpeed";
             this.panelScrollSpeed.Size = new System.Drawing.Size(322, 36);
@@ -572,7 +598,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsNotifications";
-            this.Size = new System.Drawing.Size(340, 697);
+            this.Size = new System.Drawing.Size(340, 717);
             this.ParentChanged += new System.EventHandler(this.TabSettingsNotifications_ParentChanged);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
             this.tableLayoutDurationButtons.ResumeLayout(false);

Core/Other/Settings/TabSettingsNotifications.cs

@@ -15,7 +15,7 @@ namespace TweetDuck.Core.Other.Settings{
 
             this.notification = notification;
             
-            this.notification.Initialized += (sender, args) => {
+            this.notification.Ready += (sender, args) => {
                 this.InvokeAsyncSafe(() => {
                     this.notification.ShowExampleNotification(true);
                     this.notification.Move += notification_Move;

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -47,18 +47,20 @@
             // 
             this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbCustomSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
             this.tbCustomSound.Name = "tbCustomSound";
-            this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
+            this.tbCustomSound.Size = new System.Drawing.Size(316, 23);
             this.tbCustomSound.TabIndex = 0;
             // 
             // labelVolumeValue
             // 
             this.labelVolumeValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelVolumeValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelVolumeValue.Location = new System.Drawing.Point(147, 4);
             this.labelVolumeValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelVolumeValue.Name = "labelVolumeValue";
-            this.labelVolumeValue.Size = new System.Drawing.Size(38, 13);
+            this.labelVolumeValue.Size = new System.Drawing.Size(38, 15);
             this.labelVolumeValue.TabIndex = 1;
             this.labelVolumeValue.Text = "100%";
             this.labelVolumeValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -67,10 +69,11 @@
             // 
             this.btnPlaySound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnPlaySound.AutoSize = true;
-            this.btnPlaySound.Location = new System.Drawing.Point(203, 29);
+            this.btnPlaySound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnPlaySound.Location = new System.Drawing.Point(202, 32);
             this.btnPlaySound.Name = "btnPlaySound";
-            this.btnPlaySound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnPlaySound.Size = new System.Drawing.Size(43, 23);
+            this.btnPlaySound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnPlaySound.Size = new System.Drawing.Size(43, 25);
             this.btnPlaySound.TabIndex = 2;
             this.btnPlaySound.Text = "Play";
             this.btnPlaySound.UseVisualStyleBackColor = true;
@@ -78,10 +81,11 @@
             // btnResetSound
             // 
             this.btnResetSound.AutoSize = true;
-            this.btnResetSound.Location = new System.Drawing.Point(3, 29);
+            this.btnResetSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnResetSound.Location = new System.Drawing.Point(3, 32);
             this.btnResetSound.Name = "btnResetSound";
-            this.btnResetSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnResetSound.Size = new System.Drawing.Size(51, 23);
+            this.btnResetSound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnResetSound.Size = new System.Drawing.Size(49, 25);
             this.btnResetSound.TabIndex = 3;
             this.btnResetSound.Text = "Reset";
             this.btnResetSound.UseVisualStyleBackColor = true;
@@ -90,10 +94,11 @@
             // 
             this.btnBrowseSound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnBrowseSound.AutoSize = true;
-            this.btnBrowseSound.Location = new System.Drawing.Point(252, 29);
+            this.btnBrowseSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnBrowseSound.Location = new System.Drawing.Point(251, 32);
             this.btnBrowseSound.Name = "btnBrowseSound";
-            this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnBrowseSound.Size = new System.Drawing.Size(67, 23);
+            this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnBrowseSound.Size = new System.Drawing.Size(68, 25);
             this.btnBrowseSound.TabIndex = 1;
             this.btnBrowseSound.Text = "Browse...";
             this.btnBrowseSound.UseVisualStyleBackColor = true;
@@ -101,11 +106,11 @@
             // labelSoundNotification
             // 
             this.labelSoundNotification.AutoSize = true;
-            this.labelSoundNotification.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSoundNotification.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelSoundNotification.Location = new System.Drawing.Point(0, 0);
             this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0);
             this.labelSoundNotification.Name = "labelSoundNotification";
-            this.labelSoundNotification.Size = new System.Drawing.Size(198, 20);
+            this.labelSoundNotification.Size = new System.Drawing.Size(188, 20);
             this.labelSoundNotification.TabIndex = 0;
             this.labelSoundNotification.Text = "Custom Sound Notification";
             // 
@@ -119,16 +124,17 @@
             this.panelSoundNotification.Location = new System.Drawing.Point(0, 20);
             this.panelSoundNotification.Margin = new System.Windows.Forms.Padding(0);
             this.panelSoundNotification.Name = "panelSoundNotification";
-            this.panelSoundNotification.Size = new System.Drawing.Size(322, 55);
+            this.panelSoundNotification.Size = new System.Drawing.Size(322, 59);
             this.panelSoundNotification.TabIndex = 1;
             // 
             // labelVolume
             // 
             this.labelVolume.AutoSize = true;
-            this.labelVolume.Location = new System.Drawing.Point(3, 87);
+            this.labelVolume.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelVolume.Location = new System.Drawing.Point(3, 91);
             this.labelVolume.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelVolume.Name = "labelVolume";
-            this.labelVolume.Size = new System.Drawing.Size(42, 13);
+            this.labelVolume.Size = new System.Drawing.Size(48, 15);
             this.labelVolume.TabIndex = 2;
             this.labelVolume.Text = "Volume";
             // 
@@ -157,7 +163,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 136);
+            this.flowPanel.Size = new System.Drawing.Size(322, 142);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -165,7 +171,7 @@
             // 
             this.panelVolume.Controls.Add(this.trackBarVolume);
             this.panelVolume.Controls.Add(this.labelVolumeValue);
-            this.panelVolume.Location = new System.Drawing.Point(0, 100);
+            this.panelVolume.Location = new System.Drawing.Point(0, 106);
             this.panelVolume.Margin = new System.Windows.Forms.Padding(0);
             this.panelVolume.Name = "panelVolume";
             this.panelVolume.Size = new System.Drawing.Size(322, 36);
@@ -182,7 +188,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsSounds";
-            this.Size = new System.Drawing.Size(340, 154);
+            this.Size = new System.Drawing.Size(340, 160);
             this.panelSoundNotification.ResumeLayout(false);
             this.panelSoundNotification.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).EndInit();

Core/Other/Settings/TabSettingsTray.Designer.cs

@@ -36,10 +36,11 @@
             // checkTrayHighlight
             // 
             this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 77);
-            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkTrayHighlight.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 81);
+            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkTrayHighlight.Name = "checkTrayHighlight";
-            this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
+            this.checkTrayHighlight.Size = new System.Drawing.Size(114, 19);
             this.checkTrayHighlight.TabIndex = 3;
             this.checkTrayHighlight.Text = "Enable Highlight";
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
@@ -47,31 +48,33 @@
             // comboBoxTrayType
             // 
             this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTrayType.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxTrayType.FormattingEnabled = true;
             this.comboBoxTrayType.Location = new System.Drawing.Point(5, 25);
             this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 5, 3, 3);
             this.comboBoxTrayType.Name = "comboBoxTrayType";
-            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 21);
+            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 23);
             this.comboBoxTrayType.TabIndex = 1;
             // 
             // labelTrayIcon
             // 
             this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Location = new System.Drawing.Point(3, 58);
+            this.labelTrayIcon.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 60);
             this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
             this.labelTrayIcon.Name = "labelTrayIcon";
-            this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
+            this.labelTrayIcon.Size = new System.Drawing.Size(56, 15);
             this.labelTrayIcon.TabIndex = 2;
             this.labelTrayIcon.Text = "Tray Icon";
             // 
             // labelTray
             // 
             this.labelTray.AutoSize = true;
-            this.labelTray.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTray.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelTray.Location = new System.Drawing.Point(0, 0);
             this.labelTray.Margin = new System.Windows.Forms.Padding(0);
             this.labelTray.Name = "labelTray";
-            this.labelTray.Size = new System.Drawing.Size(96, 20);
+            this.labelTray.Size = new System.Drawing.Size(88, 20);
             this.labelTray.TabIndex = 0;
             this.labelTray.Text = "System Tray";
             // 
@@ -87,7 +90,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 97);
+            this.flowPanel.Size = new System.Drawing.Size(322, 102);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -97,7 +100,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsTray";
-            this.Size = new System.Drawing.Size(340, 115);
+            this.Size = new System.Drawing.Size(340, 120);
             this.flowPanel.ResumeLayout(false);
             this.flowPanel.PerformLayout();
             this.ResumeLayout(false);

Core/TweetDeckBrowser.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
@@ -8,6 +9,7 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Notification;
+using TweetDuck.Core.Other.Interfaces;
 using TweetDuck.Core.Utils;
 using TweetDuck.Resources;
 
@@ -22,6 +24,10 @@ namespace TweetDuck.Core{
 
         public bool IsTweetDeckWebsite{
             get{
+                if (!Ready){
+                    return false;
+                }
+
                 using(IFrame frame = browser.GetBrowser().MainFrame){
                     return TwitterUtils.IsTweetDeckWebsite(frame);
                 }
@@ -43,10 +49,6 @@ namespace TweetDuck.Core{
                 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;
@@ -122,14 +124,18 @@ namespace TweetDuck.Core{
         }
 
         private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            if (e.Frame.IsMain){
+            IFrame frame = e.Frame;
+
+            if (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");
+                if (TwitterUtils.IsTwitterWebsite(frame)){
+                    ScriptLoader.ExecuteFile(frame, "twitter.js", browser);
                 }
+                
+                frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
             }
         }
 
@@ -137,11 +143,11 @@ namespace TweetDuck.Core{
             IFrame frame = e.Frame;
 
             if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
-                frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
-
                 UpdateProperties();
                 TweetDeckBridge.RestoreSessionData(frame);
-                ScriptLoader.ExecuteFile(frame, "code.js");
+                ScriptLoader.ExecuteFile(frame, "code.js", browser);
+                ScriptLoader.ExecuteFile(frame, "update.js", browser);
+
                 InjectBrowserCSS();
                 ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
                 UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
@@ -149,7 +155,7 @@ namespace TweetDuck.Core{
                 TweetDeckBridge.ResetStaticProperties();
 
                 if (Program.UserConfig.FirstRun){
-                    ScriptLoader.ExecuteFile(frame, "introduction.js");
+                    ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
                 }
             }
         }
@@ -209,7 +215,7 @@ namespace TweetDuck.Core{
         }
 
         public void InjectBrowserCSS(){
-            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css").TrimEnd());
+            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css", false, browser)?.TrimEnd() ?? string.Empty);
         }
 
         public void ReinjectCustomCSS(string css){
@@ -224,6 +230,10 @@ namespace TweetDuck.Core{
             browser.ExecuteScriptAsync("TDGF_showTweetDetail", columnId, chirpId, fallbackUrl);
         }
 
+        public void AddSearchColumn(string query){
+            browser.ExecuteScriptAsync("TDGF_performSearch", query);
+        }
+
         public void TriggerTweetScreenshot(){
             browser.ExecuteScriptAsync("TDGF_triggerScreenshot()");
         }
@@ -239,5 +249,9 @@ namespace TweetDuck.Core{
         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)));
+        }
     }
 }

Core/Utils/BrowserUtils.cs

@@ -11,7 +11,8 @@ using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
-        public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
+        public static string UserAgentVanilla => Program.BrandName+" "+Application.ProductVersion;
+        public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/"+Cef.ChromiumVersion+" Safari/537.36";
         
         public static void SetupCefArgs(IDictionary<string, string> args){
             if (!Program.SystemConfig.HardwareAcceleration){
@@ -127,6 +128,33 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
+        public static void OpenExternalSearch(string query){
+            if (string.IsNullOrWhiteSpace(query))return;
+            
+            string searchUrl = Program.UserConfig.SearchEngineUrl;
+            
+            if (string.IsNullOrEmpty(searchUrl)){
+                if (FormMessage.Question("Search Options", "You have not configured a default search engine yet, would you like to do it now?", FormMessage.Yes, FormMessage.No)){
+                    bool wereSettingsOpen = FormManager.TryFind<FormSettings>() != null;
+
+                    FormManager.TryFind<FormBrowser>()?.OpenSettings();
+                    if (wereSettingsOpen)return;
+
+                    FormSettings settings = FormManager.TryFind<FormSettings>();
+                    if (settings == null)return;
+
+                    settings.FormClosed += (sender, args) => {
+                        if (args.CloseReason == CloseReason.UserClosing && Program.UserConfig.SearchEngineUrl != searchUrl){
+                            OpenExternalSearch(query);
+                        }
+                    };
+                }
+            }
+            else{
+                OpenExternalBrowser(searchUrl+Uri.EscapeUriString(query));
+            }
+        }
+
         public static string GetFileNameFromUrl(string url){
             string file = Path.GetFileName(new Uri(url).AbsolutePath);
             return string.IsNullOrEmpty(file) ? null : file;
@@ -137,8 +165,10 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static WebClient CreateWebClient(){
+            WindowsUtils.EnsureTLS12();
+
             WebClient client = new WebClient{ Proxy = null };
-            client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;
+            client.Headers[HttpRequestHeader.UserAgent] = UserAgentVanilla;
             return client;
         }
 
@@ -172,11 +202,5 @@ namespace TweetDuck.Core.Utils{
         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

@@ -19,6 +19,14 @@ namespace TweetDuck.Core.Utils{
             return Regex.Replace(str, @"(\p{Ll})(\P{Ll})|(\P{Ll})(\P{Ll}\p{Ll})", "$1$3_$2$4").ToUpper();
         }
 
+        public static string ConvertRot13(string str){
+            return Regex.Replace(str, @"[a-zA-Z]", match => {
+                int code = match.Value[0];
+                int start = code <= 90 ? 65 : 97;
+                return ((char)(start+(code-start+13)%26)).ToString();
+            });
+        }
+
         public static int CountOccurrences(string source, string substring){
             int count = 0, index = 0;
 

Core/Utils/TwitterUtils.cs

@@ -13,11 +13,11 @@ namespace TweetDuck.Core.Utils{
         public const string TweetDeckURL = "https://tweetdeck.twitter.com";
 
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
-        public const string BackgroundColorOverride = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body,body::before{background:#1c6399!important}'";
+        public const string BackgroundColorOverride = "setTimeout(function f(){let h=document.head;if(!h){setTimeout(f,5);return;}let e=document.createElement('style');e.innerHTML='body,body::before{background:#1c6399!important}';h.appendChild(e);},1)";
 
         public static readonly ResourceLink LoadingSpinner = new ResourceLink("https://ton.twimg.com/tduck/spinner", ResourceHandler.FromByteArray(Properties.Resources.spinner, "image/apng"));
         
-        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$)([^/]+)/?$", RegexOptions.Compiled), false);
+        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$|search$|search-)([^/?]+)/?$", RegexOptions.Compiled), false);
         public static Regex RegexAccount => RegexAccountLazy.Value;
 
         public static readonly string[] DictionaryWords = {
@@ -41,8 +41,8 @@ namespace TweetDuck.Core.Utils{
         }
 
         private static string ExtractMediaBaseLink(string url){
-            int dot = url.LastIndexOf('/');
-            return dot == -1 ? url : StringUtils.ExtractBefore(url, ':', dot);
+            int slash = url.LastIndexOf('/');
+            return slash == -1 ? url : StringUtils.ExtractBefore(url, ':', slash);
         }
 
         public static string GetMediaLink(string url, ImageQuality quality){
@@ -91,7 +91,7 @@ namespace TweetDuck.Core.Utils{
                 AutoUpgradeEnabled = true,
                 OverwritePrompt = urls.Length == 1,
                 Title = "Save Image",
-                FileName = $"{string.Join(" ", fileNameParts.Where(part => part.Length > 0))}{ext}",
+                FileName = $"{string.Join(" ", fileNameParts.Where(part => !string.IsNullOrEmpty(part)))}{ext}",
                 Filter = (urls.Length == 1 ? "Image" : "Images")+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){

Core/Utils/WindowsUtils.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Net;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -17,6 +18,8 @@ namespace TweetDuck.Core.Utils{
         public static int CurrentProcessID { get; }
         public static bool ShouldAvoidToolWindow { get; }
         
+        private static bool HasMicrosoftBeenBroughtTo2008Yet;
+
         static WindowsUtils(){
             using(Process me = Process.GetCurrentProcess()){
                 CurrentProcessID = me.Id;
@@ -26,6 +29,14 @@ namespace TweetDuck.Core.Utils{
             ShouldAvoidToolWindow = ver.Major == 6 && ver.Minor == 2; // windows 8/10
         }
         
+        public static void EnsureTLS12(){
+            if (!HasMicrosoftBeenBroughtTo2008Yet){
+                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
+                ServicePointManager.SecurityProtocol &= ~(SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11);
+                HasMicrosoftBeenBroughtTo2008Yet = true;
+            }
+        }
+
         public static void CreateDirectoryForFile(string file){
             string dir = Path.GetDirectoryName(file);
 

Data/Result.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace TweetDuck.Data{
+    sealed class Result<T>{
+        public bool HasValue => exception == null;
+
+        public T Value => HasValue ? value : throw new InvalidOperationException("Requested value from a failed result.");
+        public Exception Exception => exception ?? throw new InvalidOperationException("Requested exception from a successful result.");
+
+        private readonly T value;
+        private readonly Exception exception;
+
+        public Result(T value){
+            this.value = value;
+            this.exception = null;
+        }
+
+        public Result(Exception exception){
+            this.value = default(T);
+            this.exception = exception ?? throw new ArgumentNullException(nameof(exception));
+        }
+
+        public void Handle(Action<T> onSuccess, Action<Exception> onException){
+            if (HasValue){
+                onSuccess(value);
+            }
+            else{
+                onException(exception);
+            }
+        }
+
+        public Result<R> Select<R>(Func<T, R> map){
+            return HasValue ? new Result<R>(map(value)) : new Result<R>(exception);
+        }
+    }
+}

Data/TwoKeyDictionary.cs

@@ -62,8 +62,7 @@ namespace TweetDuck.Data{
         }
         
         public bool Contains(K1 outerKey, K2 innerKey){
-            Dictionary<K2, V> innerDict;
-            return dict.TryGetValue(outerKey, out innerDict) && innerDict.ContainsKey(innerKey);
+            return dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict) && innerDict.ContainsKey(innerKey);
         }
 
         public int Count(){

Plugins/Controls/PluginControl.Designer.cs

@@ -23,6 +23,7 @@
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
             this.btnToggleState = new System.Windows.Forms.Button();
             this.labelName = new System.Windows.Forms.Label();
             this.panelDescription = new System.Windows.Forms.Panel();
@@ -33,6 +34,8 @@
             this.labelVersion = new System.Windows.Forms.Label();
             this.btnConfigure = new System.Windows.Forms.Button();
             this.labelType = new TweetDuck.Core.Controls.LabelVertical();
+            this.timerLayout = new System.Windows.Forms.Timer(this.components);
+            this.panelBorder = new System.Windows.Forms.Panel();
             this.panelDescription.SuspendLayout();
             this.flowLayoutInfo.SuspendLayout();
             this.SuspendLayout();
@@ -40,21 +43,24 @@
             // btnToggleState
             // 
             this.btnToggleState.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnToggleState.Location = new System.Drawing.Point(456, 80);
+            this.btnToggleState.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnToggleState.Location = new System.Drawing.Point(451, 59);
             this.btnToggleState.Name = "btnToggleState";
-            this.btnToggleState.Size = new System.Drawing.Size(65, 23);
-            this.btnToggleState.TabIndex = 5;
+            this.btnToggleState.Size = new System.Drawing.Size(70, 23);
+            this.btnToggleState.TabIndex = 6;
             this.btnToggleState.Text = "Disable";
             this.btnToggleState.UseVisualStyleBackColor = true;
             this.btnToggleState.Click += new System.EventHandler(this.btnToggleState_Click);
             // 
             // labelName
             // 
+            this.labelName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelName.AutoSize = true;
-            this.labelName.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelName.Location = new System.Drawing.Point(24, 7);
+            this.labelName.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelName.Location = new System.Drawing.Point(0, 0);
+            this.labelName.Margin = new System.Windows.Forms.Padding(0);
             this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(61, 24);
+            this.labelName.Size = new System.Drawing.Size(53, 21);
             this.labelName.TabIndex = 0;
             this.labelName.Text = "Name";
             this.labelName.UseMnemonic = false;
@@ -66,10 +72,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelDescription.AutoScroll = true;
             this.panelDescription.Controls.Add(this.labelDescription);
-            this.panelDescription.Location = new System.Drawing.Point(28, 35);
+            this.panelDescription.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.panelDescription.Location = new System.Drawing.Point(28, 33);
             this.panelDescription.Name = "panelDescription";
-            this.panelDescription.Size = new System.Drawing.Size(493, 39);
-            this.panelDescription.TabIndex = 2;
+            this.panelDescription.Size = new System.Drawing.Size(410, 47);
+            this.panelDescription.TabIndex = 4;
             this.panelDescription.Resize += new System.EventHandler(this.panelDescription_Resize);
             // 
             // labelDescription
@@ -80,44 +87,51 @@
             this.labelDescription.Location = new System.Drawing.Point(0, 0);
             this.labelDescription.Margin = new System.Windows.Forms.Padding(0);
             this.labelDescription.Name = "labelDescription";
-            this.labelDescription.Size = new System.Drawing.Size(13, 39);
+            this.labelDescription.Size = new System.Drawing.Size(14, 45);
             this.labelDescription.TabIndex = 0;
             this.labelDescription.Text = "a\r\nb\r\nc";
             this.labelDescription.UseMnemonic = false;
             // 
             // labelAuthor
             // 
+            this.labelAuthor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelAuthor.AutoSize = true;
-            this.labelAuthor.Location = new System.Drawing.Point(3, 0);
-            this.labelAuthor.Margin = new System.Windows.Forms.Padding(3, 0, 32, 0);
+            this.labelAuthor.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelAuthor.Location = new System.Drawing.Point(53, 5);
+            this.labelAuthor.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelAuthor.Name = "labelAuthor";
-            this.labelAuthor.Size = new System.Drawing.Size(38, 13);
-            this.labelAuthor.TabIndex = 0;
+            this.labelAuthor.Size = new System.Drawing.Size(44, 15);
+            this.labelAuthor.TabIndex = 1;
             this.labelAuthor.Text = "Author";
             this.labelAuthor.UseMnemonic = false;
             // 
             // flowLayoutInfo
             // 
-            this.flowLayoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.flowLayoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.flowLayoutInfo.Controls.Add(this.labelName);
             this.flowLayoutInfo.Controls.Add(this.labelAuthor);
             this.flowLayoutInfo.Controls.Add(this.labelWebsite);
-            this.flowLayoutInfo.Location = new System.Drawing.Point(28, 85);
+            this.flowLayoutInfo.Location = new System.Drawing.Point(24, 6);
+            this.flowLayoutInfo.Margin = new System.Windows.Forms.Padding(0);
             this.flowLayoutInfo.Name = "flowLayoutInfo";
-            this.flowLayoutInfo.Size = new System.Drawing.Size(348, 18);
-            this.flowLayoutInfo.TabIndex = 3;
+            this.flowLayoutInfo.Size = new System.Drawing.Size(414, 21);
+            this.flowLayoutInfo.TabIndex = 2;
             this.flowLayoutInfo.WrapContents = false;
             // 
             // labelWebsite
             // 
+            this.labelWebsite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.labelWebsite.AutoEllipsis = true;
             this.labelWebsite.AutoSize = true;
             this.labelWebsite.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.labelWebsite.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelWebsite.ForeColor = System.Drawing.Color.Blue;
-            this.labelWebsite.Location = new System.Drawing.Point(76, 0);
+            this.labelWebsite.Location = new System.Drawing.Point(100, 5);
+            this.labelWebsite.Margin = new System.Windows.Forms.Padding(3, 0, 0, 1);
             this.labelWebsite.Name = "labelWebsite";
-            this.labelWebsite.Size = new System.Drawing.Size(46, 13);
-            this.labelWebsite.TabIndex = 1;
+            this.labelWebsite.Size = new System.Drawing.Size(49, 15);
+            this.labelWebsite.TabIndex = 2;
             this.labelWebsite.Text = "Website";
             this.labelWebsite.UseMnemonic = false;
             this.labelWebsite.Click += new System.EventHandler(this.labelWebsite_Click);
@@ -126,22 +140,25 @@
             // 
             this.labelVersion.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelVersion.Location = new System.Drawing.Point(14, 12);
-            this.labelVersion.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
+            this.labelVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelVersion.Location = new System.Drawing.Point(88, 6);
+            this.labelVersion.Margin = new System.Windows.Forms.Padding(0, 0, 1, 0);
             this.labelVersion.Name = "labelVersion";
-            this.labelVersion.Size = new System.Drawing.Size(510, 13);
-            this.labelVersion.TabIndex = 1;
+            this.labelVersion.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3);
+            this.labelVersion.Size = new System.Drawing.Size(436, 21);
+            this.labelVersion.TabIndex = 3;
             this.labelVersion.Text = "Version";
-            this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.labelVersion.TextAlign = System.Drawing.ContentAlignment.BottomRight;
             this.labelVersion.UseMnemonic = false;
             // 
             // btnConfigure
             // 
             this.btnConfigure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnConfigure.Location = new System.Drawing.Point(382, 80);
+            this.btnConfigure.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnConfigure.Location = new System.Drawing.Point(451, 30);
             this.btnConfigure.Name = "btnConfigure";
-            this.btnConfigure.Size = new System.Drawing.Size(68, 23);
-            this.btnConfigure.TabIndex = 4;
+            this.btnConfigure.Size = new System.Drawing.Size(70, 23);
+            this.btnConfigure.TabIndex = 5;
             this.btnConfigure.Text = "Configure";
             this.btnConfigure.UseVisualStyleBackColor = true;
             this.btnConfigure.Click += new System.EventHandler(this.btnConfigure_Click);
@@ -152,12 +169,29 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.labelType.BackColor = System.Drawing.Color.DarkGray;
             this.labelType.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelType.LineHeight = 0;
             this.labelType.Location = new System.Drawing.Point(0, 0);
             this.labelType.Name = "labelType";
-            this.labelType.Size = new System.Drawing.Size(18, 109);
-            this.labelType.TabIndex = 6;
+            this.labelType.Size = new System.Drawing.Size(18, 88);
+            this.labelType.TabIndex = 0;
             this.labelType.Text = "TYPE";
             // 
+            // timerLayout
+            // 
+            this.timerLayout.Interval = 1;
+            this.timerLayout.Tick += new System.EventHandler(this.timerLayout_Tick);
+            // 
+            // panelBorder
+            // 
+            this.panelBorder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelBorder.BackColor = System.Drawing.Color.DimGray;
+            this.panelBorder.Location = new System.Drawing.Point(18, 0);
+            this.panelBorder.Margin = new System.Windows.Forms.Padding(0);
+            this.panelBorder.Name = "panelBorder";
+            this.panelBorder.Size = new System.Drawing.Size(1, 88);
+            this.panelBorder.TabIndex = 1;
+            // 
             // PluginControl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -165,22 +199,20 @@
             this.Controls.Add(this.labelType);
             this.Controls.Add(this.btnConfigure);
             this.Controls.Add(this.flowLayoutInfo);
+            this.Controls.Add(this.panelBorder);
             this.Controls.Add(this.panelDescription);
-            this.Controls.Add(this.labelName);
             this.Controls.Add(this.btnToggleState);
             this.Controls.Add(this.labelVersion);
             this.Margin = new System.Windows.Forms.Padding(0);
-            this.MaximumSize = new System.Drawing.Size(65535, 109);
-            this.MinimumSize = new System.Drawing.Size(0, 61);
+            this.MaximumSize = new System.Drawing.Size(65535, 88);
             this.Name = "PluginControl";
             this.Padding = new System.Windows.Forms.Padding(3, 3, 6, 3);
-            this.Size = new System.Drawing.Size(530, 109);
+            this.Size = new System.Drawing.Size(530, 88);
             this.panelDescription.ResumeLayout(false);
             this.panelDescription.PerformLayout();
             this.flowLayoutInfo.ResumeLayout(false);
             this.flowLayoutInfo.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -196,5 +228,7 @@
         private System.Windows.Forms.Label labelVersion;
         private System.Windows.Forms.Button btnConfigure;
         private Core.Controls.LabelVertical labelType;
+        private System.Windows.Forms.Timer timerLayout;
+        private System.Windows.Forms.Panel panelBorder;
     }
 }

Plugins/Controls/PluginControl.cs

@@ -9,8 +9,9 @@ namespace TweetDuck.Plugins.Controls{
     sealed partial class PluginControl : UserControl{
         private readonly PluginManager pluginManager;
         private readonly Plugin plugin;
+        private readonly bool isConfigurable;
         
-        private readonly float dpiScale;
+        private int nextHeight;
 
         public PluginControl(){
             InitializeComponent();
@@ -20,15 +21,21 @@ namespace TweetDuck.Plugins.Controls{
             this.pluginManager = pluginManager;
             this.plugin = plugin;
 
-            this.dpiScale = this.GetDPIScale();
+            this.isConfigurable = pluginManager.IsPluginConfigurable(plugin);
+
+            float dpiScale = this.GetDPIScale();
+
+            if (dpiScale > 1F){
+                Size = MaximumSize = new Size(MaximumSize.Width, MaximumSize.Height+3);
+            }
             
             this.labelName.Text = plugin.Name;
-            this.labelDescription.Text = plugin.CanRun ? plugin.Description : "This plugin requires TweetDuck "+plugin.RequiredVersion+" or newer.";
-            this.labelVersion.Text = plugin.Version;
-            this.labelAuthor.Text = plugin.Author;
+            this.labelDescription.Text = plugin.CanRun ? plugin.Description : $"This plugin requires TweetDuck {plugin.RequiredVersion} or newer.";
+            this.labelAuthor.Text = string.IsNullOrWhiteSpace(plugin.Author) ? string.Empty : $"by {plugin.Author}";
             this.labelWebsite.Text = plugin.Website;
+            this.labelVersion.Text = plugin.Version;
             
-            this.labelType.LineHeight = BrowserUtils.Scale(9, dpiScale);
+            this.labelType.LineHeight = BrowserUtils.Scale(11, dpiScale);
 
             UpdatePluginState();
 
@@ -36,16 +43,37 @@ namespace TweetDuck.Plugins.Controls{
                 labelDescription.Visible = false;
             }
             
-            panelDescription_Resize(panelDescription, null);
+            panelDescription_Resize(panelDescription, EventArgs.Empty);
+        }
+
+        private void timerLayout_Tick(object sender, EventArgs e){
+            timerLayout.Stop();
+            Height = nextHeight;
+            ResumeLayout();
         }
 
         private void panelDescription_Resize(object sender, EventArgs e){
-            if (labelDescription.Text.Length == 0){
-                Height = MinimumSize.Height;
+            SuspendLayout();
+            
+            int maxWidth = panelDescription.Width-(panelDescription.VerticalScroll.Visible ? SystemInformation.VerticalScrollBarWidth : 0);
+            labelDescription.MaximumSize = new Size(maxWidth, int.MaxValue);
+
+            Font font = labelDescription.Font;
+            int descriptionLines = TextRenderer.MeasureText(labelDescription.Text, font, new Size(maxWidth, int.MaxValue), TextFormatFlags.WordBreak).Height/(font.Height-1);
+            
+            int requiredLines = Math.Max(descriptionLines, 1+(string.IsNullOrEmpty(labelVersion.Text) ? 0 : 1)+(isConfigurable ? 1 : 0));
+            
+            switch(requiredLines){
+                case 1: nextHeight = MaximumSize.Height-2*(font.Height-1); break;
+                case 2: nextHeight = MaximumSize.Height-(font.Height-1); break;
+                default: nextHeight = MaximumSize.Height; break;
+            }
+
+            if (nextHeight != Height){
+                timerLayout.Start();
             }
             else{
-                labelDescription.MaximumSize = new Size(panelDescription.Width-SystemInformation.VerticalScrollBarWidth, 0);
-                Height = Math.Min(MinimumSize.Height+BrowserUtils.Scale(9, dpiScale)+labelDescription.Height, MaximumSize.Height);
+                ResumeLayout();
             }
         }
 
@@ -74,11 +102,11 @@ namespace TweetDuck.Plugins.Controls{
             labelWebsite.ForeColor = isEnabled ? Color.Blue : Color.FromArgb(90, 90, 249);
 
             if (plugin.Group == PluginGroup.Official){
-                labelType.Text = "OFFICIAL";
+                labelType.Text = "CORE";
                 labelType.BackColor = isEnabled ? Color.FromArgb(154, 195, 217) : Color.FromArgb(185, 185, 185);
             }
             else{
-                labelType.Text = "CUSTOM";
+                labelType.Text = "USER";
                 labelType.BackColor = isEnabled ? Color.FromArgb(208, 154, 217) : Color.FromArgb(185, 185, 185);
             }
 
@@ -86,7 +114,8 @@ namespace TweetDuck.Plugins.Controls{
                 labelName.ForeColor = textColor;
                 labelDescription.ForeColor = textColor;
                 btnToggleState.Text = isEnabled ? "Disable" : "Enable";
-                btnConfigure.Visible = isEnabled && pluginManager.IsPluginConfigurable(plugin);
+                btnConfigure.Visible = isConfigurable;
+                btnConfigure.Enabled = isEnabled;
             }
             else{
                 labelName.ForeColor = Color.DarkRed;

Plugins/Controls/PluginListFlowLayout.cs

@@ -9,7 +9,10 @@ namespace TweetDuck.Plugins.Controls{
         }
 
         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);
         }
     }

Plugins/Enums/PluginEnvironment.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace TweetDuck.Plugins.Enums{
     [Flags]
@@ -45,5 +48,50 @@ namespace TweetDuck.Plugins.Enums{
                 default: return string.Empty;
             }
         }
+
+        public static IReadOnlyDictionary<PluginEnvironment, T> Map<T>(T forNone, T forBrowser, T forNotification){
+            return new PluginEnvironmentDictionary<T>(forNone, forBrowser, forNotification);
+        }
+
+        [SuppressMessage("ReSharper", "MemberHidesStaticFromOuterClass")]
+        private sealed class PluginEnvironmentDictionary<T> : IReadOnlyDictionary<PluginEnvironment, T>{
+            private const int TotalKeys = 3;
+
+            public IEnumerable<PluginEnvironment> Keys => Enum.GetValues(typeof(PluginEnvironment)).Cast<PluginEnvironment>();
+            public IEnumerable<T> Values => data;
+            public int Count => TotalKeys;
+
+            public T this[PluginEnvironment key] => data[(int)key];
+
+            private readonly T[] data;
+
+            public PluginEnvironmentDictionary(T forNone, T forBrowser, T forNotification){
+                this.data = new T[TotalKeys];
+                this.data[(int)PluginEnvironment.None] = forNone;
+                this.data[(int)PluginEnvironment.Browser] = forBrowser;
+                this.data[(int)PluginEnvironment.Notification] = forNotification;
+            }
+
+            public bool ContainsKey(PluginEnvironment key){
+                return key >= 0 && (int)key < TotalKeys;
+            }
+
+            public bool TryGetValue(PluginEnvironment key, out T value){
+                if (ContainsKey(key)){
+                    value = this[key];
+                    return true;
+                }
+                else{
+                    value = default(T);
+                    return false;
+                }
+            }
+
+            public IEnumerator<KeyValuePair<PluginEnvironment, T>> GetEnumerator(){
+                return Keys.Select(key => new KeyValuePair<PluginEnvironment, T>(key, this[key])).GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        }
     }
 }

Plugins/Plugin.cs

@@ -1,28 +1,25 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins{
     sealed class Plugin{
-        private const string VersionWildcard = "*";
+        private static readonly Version AppVersion = new Version(Program.VersionTag);
 
         public string Identifier { get; }
         public PluginGroup Group { get; }
         public PluginEnvironment Environments { get; }
 
-        public string Name => metadata["NAME"];
-        public string Description => metadata["DESCRIPTION"];
-        public string Author => metadata["AUTHOR"];
-        public string Version => metadata["VERSION"];
-        public string Website => metadata["WEBSITE"];
-        public string ConfigFile => metadata["CONFIGFILE"];
-        public string ConfigDefault => metadata["CONFIGDEFAULT"];
-        public string RequiredVersion => metadata["REQUIRES"];
+        public string Name { get; }
+        public string Description { get; }
+        public string Author { get; }
+        public string Version { get; }
+        public string Website { get; }
+        public string ConfigFile { get; }
+        public string ConfigDefault { get; }
+        public Version RequiredVersion { get; }
 
-        public bool CanRun { get; private set; }
+        public bool CanRun { get; }
 
         public bool HasConfig{
             get => ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
@@ -42,41 +39,25 @@ namespace TweetDuck.Plugins{
 
         private readonly string pathRoot;
         private readonly string pathData;
-        private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(8){
-            { "NAME", "" },
-            { "DESCRIPTION", "" },
-            { "AUTHOR", "(anonymous)" },
-            { "VERSION", "(unknown)" },
-            { "WEBSITE", "" },
-            { "CONFIGFILE", "" },
-            { "CONFIGDEFAULT", "" },
-            { "REQUIRES", VersionWildcard }
-        };
 
-        private Plugin(string path, string name, PluginGroup group, PluginEnvironment environments){
-            this.pathRoot = path;
-            this.pathData = Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name);
+        private Plugin(PluginGroup group, string identifier, string pathRoot, string pathData, Builder builder){
+            this.pathRoot = pathRoot;
+            this.pathData = pathData;
 
-            this.Identifier = group.GetIdentifierPrefix()+name;
             this.Group = group;
-            this.Environments = environments;
-        }
+            this.Identifier = identifier;
+            this.Environments = builder.Environments;
 
-        private void OnMetadataLoaded(){
-            CanRun = CheckRequiredVersion(RequiredVersion);
+            this.Name = builder.Name;
+            this.Description = builder.Description;
+            this.Author = builder.Author;
+            this.Version = builder.Version;
+            this.Website = builder.Website;
+            this.ConfigFile = builder.ConfigFile;
+            this.ConfigDefault = builder.ConfigDefault;
+            this.RequiredVersion = builder.RequiredVersion;
 
-            string configPath = ConfigPath, defaultConfigPath = DefaultConfigPath;
-
-            if (configPath.Length > 0 && defaultConfigPath.Length > 0 && !File.Exists(configPath) && File.Exists(defaultConfigPath)){
-                string dataFolder = GetPluginFolder(PluginFolder.Data);
-
-                try{
-                    Directory.CreateDirectory(dataFolder);
-                    File.Copy(defaultConfigPath, configPath, false);
-                }catch(Exception e){
-                    throw new IOException("Could not generate a configuration file for '"+Identifier+"' plugin: "+e.Message, e);
-                }
-            }
+            this.CanRun = AppVersion >= RequiredVersion;
         }
 
         public string GetScriptPath(PluginEnvironment environment){
@@ -132,78 +113,77 @@ namespace TweetDuck.Plugins{
             return obj is Plugin plugin && plugin.Identifier.Equals(Identifier);
         }
 
-        // Static
+        // Builder
 
-        private static readonly Version AppVersion = new Version(Program.VersionTag);
-        private static readonly string[] EndTag = { "[END]" };
+        public sealed class Builder{
+            private static readonly Version DefaultRequiredVersion = new Version(0, 0, 0, 0);
 
-        public static Plugin CreateFromFolder(string path, PluginGroup group){
-            Plugin plugin = new Plugin(path, Path.GetFileName(path), group, LoadEnvironments(path));
-            LoadMetadata(path, plugin);
-            return plugin;
+            public string Name             { get; set; }
+            public string Description      { get; set; } = string.Empty;
+            public string Author           { get; set; } = "(anonymous)";
+            public string Version          { get; set; } = string.Empty;
+            public string Website          { get; set; } = string.Empty;
+            public string ConfigFile       { get; set; } = string.Empty;
+            public string ConfigDefault    { get; set; } = string.Empty;
+            public Version RequiredVersion { get; set; } = DefaultRequiredVersion;
+
+            public PluginEnvironment Environments { get; private set; } = PluginEnvironment.None;
+
+            private readonly PluginGroup group;
+            private readonly string pathRoot;
+            private readonly string pathData;
+            private readonly string identifier;
+
+            public Builder(PluginGroup group, string name, string pathRoot, string pathData){
+                this.group = group;
+                this.pathRoot = pathRoot;
+                this.pathData = pathData;
+                this.identifier = group.GetIdentifierPrefix()+name;
             }
 
-        private static PluginEnvironment LoadEnvironments(string path){
-            PluginEnvironment environments = PluginEnvironment.None;
-
-            foreach(string file in Directory.EnumerateFiles(path, "*.js", SearchOption.TopDirectoryOnly).Select(Path.GetFileName)){
-                environments |= PluginEnvironmentExtensions.Values.FirstOrDefault(env => file.Equals(env.GetPluginScriptFile(), StringComparison.Ordinal));
+            public void AddEnvironment(PluginEnvironment environment){
+                this.Environments |= environment;
             }
 
-            if (environments == PluginEnvironment.None){
-                throw new ArgumentException("Plugin has no script files");
-            }
-
-            return environments;
-        }
-
-        private static void LoadMetadata(string path, Plugin plugin){
-            string metaFile = Path.Combine(path, ".meta");
-
-            if (!File.Exists(metaFile)){
-                throw new ArgumentException("Missing .meta file");
-            }
-            
-            string currentTag = null, currentContents = string.Empty;
-
-            foreach(string line in File.ReadAllLines(metaFile, Encoding.UTF8).Concat(EndTag).Select(line => line.TrimEnd()).Where(line => line.Length > 0)){
-                if (line[0] == '[' && line[line.Length-1] == ']'){
-                    if (currentTag != null){
-                        plugin.metadata[currentTag] = currentContents;
-                    }
-
-                    currentTag = line.Substring(1, line.Length-2).ToUpper();
-                    currentContents = string.Empty;
-
-                    if (line.Equals(EndTag[0])){
-                        break;
-                    }
-
-                    if (!plugin.metadata.ContainsKey(currentTag)){
-                        throw new FormatException("Invalid metadata tag: "+currentTag);
-                    }
-                }
-                else if (currentTag != null){
-                    currentContents = currentContents.Length == 0 ? line : currentContents+Environment.NewLine+line;
-                }
-                else{
-                    throw new FormatException("Missing metadata tag before value: "+line);
-                }
-            }
+            public Plugin BuildAndSetup(){
+                Plugin plugin = new Plugin(group, identifier, pathRoot, pathData, this);
 
                 if (plugin.Name.Length == 0){
-                throw new FormatException("Plugin is missing a name in the .meta file");
+                    throw new InvalidOperationException("Plugin is missing a name in the .meta file");
                 }
 
-            if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion == VersionWildcard || System.Version.TryParse(plugin.RequiredVersion, out Version _))){
-                throw new FormatException("Plugin contains invalid version: "+plugin.RequiredVersion);
+                if (plugin.Environments == PluginEnvironment.None){
+                    throw new InvalidOperationException("Plugin has no script files");
                 }
 
-            plugin.OnMetadataLoaded();
+                if (plugin.Group == PluginGroup.Official){
+                    if (plugin.RequiredVersion != AppVersion){
+                        throw new InvalidOperationException("Plugin is not supported in this version of TweetDuck, this may indicate a failed update or an unsupported plugin that was not removed automatically");
+                    }
+                    else if (!string.IsNullOrEmpty(plugin.Version)){
+                        throw new InvalidOperationException("Official plugins cannot have a version identifier");
+                    }
                 }
 
-        private static bool CheckRequiredVersion(string requires){
-            return requires == VersionWildcard || AppVersion >= new Version(requires);
+                // setup
+
+                string configPath = plugin.ConfigPath, defaultConfigPath = plugin.DefaultConfigPath;
+
+                if (configPath.Length > 0 && defaultConfigPath.Length > 0 && !File.Exists(configPath) && File.Exists(defaultConfigPath)){
+                    string dataFolder = plugin.GetPluginFolder(PluginFolder.Data);
+
+                    try{
+                        Directory.CreateDirectory(dataFolder);
+                        File.Copy(defaultConfigPath, configPath, false);
+                    }catch(Exception e){
+                        throw new IOException($"Could not generate a configuration file for '{plugin.Identifier}' plugin: {e.Message}", e);
+                    }
+                }
+
+                // done
+
+                return plugin;
+            }
         }
     }
 }

Plugins/PluginLoader.cs

@@ -0,0 +1,70 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using TweetDuck.Plugins.Enums;
+
+namespace TweetDuck.Plugins{
+    static class PluginLoader{
+        private static readonly string[] EndTag = { "[END]" };
+
+        public static Plugin FromFolder(string path, PluginGroup group){
+            string name = Path.GetFileName(path);
+
+            if (string.IsNullOrEmpty(name)){
+                throw new ArgumentException("Could not extract directory name from path: "+path);
+            }
+            
+            Plugin.Builder builder = new Plugin.Builder(group, name, path, Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name));
+
+            foreach(string file in Directory.EnumerateFiles(path, "*.js", SearchOption.TopDirectoryOnly).Select(Path.GetFileName)){
+                builder.AddEnvironment(PluginEnvironmentExtensions.Values.FirstOrDefault(env => file.Equals(env.GetPluginScriptFile(), StringComparison.Ordinal)));
+            }
+
+            string metaFile = Path.Combine(path, ".meta");
+
+            if (!File.Exists(metaFile)){
+                throw new ArgumentException("Plugin is missing a .meta file");
+            }
+            
+            string currentTag = null, currentContents = string.Empty;
+
+            foreach(string line in File.ReadAllLines(metaFile, Encoding.UTF8).Concat(EndTag).Select(line => line.TrimEnd()).Where(line => line.Length > 0)){
+                if (line[0] == '[' && line[line.Length-1] == ']'){
+                    if (currentTag != null){
+                        SetProperty(builder, currentTag, currentContents);
+                    }
+
+                    currentTag = line.Substring(1, line.Length-2).ToUpper();
+                    currentContents = string.Empty;
+
+                    if (line.Equals(EndTag[0])){
+                        break;
+                    }
+                }
+                else if (currentTag != null){
+                    currentContents = currentContents.Length == 0 ? line : currentContents+Environment.NewLine+line;
+                }
+                else{
+                    throw new FormatException("Missing metadata tag before value: "+line);
+                }
+            }
+
+            return builder.BuildAndSetup();
+        }
+
+        private static void SetProperty(Plugin.Builder builder, string tag, string value){
+            switch(tag){
+                case "NAME":          builder.Name = value; break;
+                case "DESCRIPTION":   builder.Description = value; break;
+                case "AUTHOR":        builder.Author = value; break;
+                case "VERSION":       builder.Version = value; break;
+                case "WEBSITE":       builder.Website = value; break;
+                case "CONFIGFILE":    builder.ConfigFile = value; break;
+                case "CONFIGDEFAULT": builder.ConfigDefault = value; break;
+                case "REQUIRES":      builder.RequiredVersion = Version.TryParse(value, out Version version) ? version : throw new FormatException("Invalid required minimum version: "+value); break;
+                default: throw new FormatException("Invalid metadata tag: "+tag);
+            }
+        }
+    }
+}

Plugins/PluginManager.cs

@@ -4,59 +4,68 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using TweetDuck.Core;
+using TweetDuck.Core.Other.Interfaces;
+using TweetDuck.Data;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Plugins{
     sealed class PluginManager{
-        private static readonly Dictionary<PluginEnvironment, string> PluginSetupScripts = new Dictionary<PluginEnvironment, string>(4){
-            { PluginEnvironment.None, ScriptLoader.LoadResource("plugins.js") },
-            { PluginEnvironment.Browser, ScriptLoader.LoadResource("plugins.browser.js") },
-            { PluginEnvironment.Notification, ScriptLoader.LoadResource("plugins.notification.js") }
-        };
+        private static IReadOnlyDictionary<PluginEnvironment, string> LoadSetupScripts(){
+            return PluginEnvironmentExtensions.Map(
+                ScriptLoader.LoadResource("plugins.js"),
+                ScriptLoader.LoadResource("plugins.browser.js"),
+                ScriptLoader.LoadResource("plugins.notification.js")
+            );
+        }
+
+        private static readonly IReadOnlyDictionary<PluginEnvironment, string> PluginSetupScripts = LoadSetupScripts();
 
         public string PathOfficialPlugins => Path.Combine(rootPath, "official");
         public string PathCustomPlugins => Path.Combine(rootPath, "user");
 
         public IEnumerable<Plugin> Plugins => plugins;
+        public IEnumerable<InjectedHTML> NotificationInjections => bridge.NotificationInjections;
+
         public PluginConfig Config { get; }
-        public PluginBridge Bridge { get; }
         
         public event EventHandler<PluginErrorEventArgs> Reloaded;
         public event EventHandler<PluginErrorEventArgs> Executed;
 
-        private readonly ITweetDeckBrowser browser;
         private readonly string rootPath;
         private readonly string configPath;
+        private readonly PluginBridge bridge;
 
         private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
         private readonly Dictionary<int, Plugin> tokens = new Dictionary<int, Plugin>();
         private readonly Random rand = new Random();
 
-        public PluginManager(ITweetDeckBrowser browser, string rootPath, string configPath){
-            this.browser = browser;
+        private ITweetDeckBrowser mainBrowser;
+
+        public PluginManager(string rootPath, string configPath){
             this.rootPath = rootPath;
             this.configPath = configPath;
 
             this.Config = new PluginConfig();
-            this.Bridge = new PluginBridge(this);
-
-            this.browser.OnFrameLoaded(OnFrameLoaded);
-            this.browser.RegisterBridge("$TDP", Bridge);
+            this.bridge = new PluginBridge(this);
 
             Config.Load(configPath);
             Config.PluginChangedState += Config_PluginChangedState;
         }
 
-        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            browser.ExecuteFunction("TDPF_setPluginState", e.Plugin, e.IsEnabled);
-            Config.Save(configPath);
+        public void Register(ITweetDeckBrowser browser, PluginEnvironment environment, bool asMainBrowser = false){
+            browser.OnFrameLoaded(frame => ExecutePlugins(frame, environment));
+            browser.RegisterBridge("$TDP", bridge);
+
+            if (asMainBrowser){
+                mainBrowser = browser;
+            }
         }
 
-        private void OnFrameLoaded(IFrame frame){
-            ExecutePlugins(frame, PluginEnvironment.Browser);
+        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
+            mainBrowser?.ExecuteFunction("TDPF_setPluginState", e.Plugin, e.IsEnabled);
+            Config.Save(configPath);
         }
 
         public bool IsPluginInstalled(string identifier){
@@ -68,12 +77,12 @@ namespace TweetDuck.Plugins{
         }
 
         public bool IsPluginConfigurable(Plugin plugin){
-            return plugin.HasConfig || Bridge.WithConfigureFunction.Contains(plugin);
+            return plugin.HasConfig || bridge.WithConfigureFunction.Contains(plugin);
         }
 
         public void ConfigurePlugin(Plugin plugin){
-            if (Bridge.WithConfigureFunction.Contains(plugin)){
-                browser.ExecuteFunction("TDPF_configurePlugin", plugin);
+            if (bridge.WithConfigureFunction.Contains(plugin)){
+                mainBrowser?.ExecuteFunction("TDPF_configurePlugin", plugin);
             }
             else if (plugin.HasConfig){
                 if (File.Exists(plugin.ConfigPath)){
@@ -127,7 +136,7 @@ namespace TweetDuck.Plugins{
                     Plugin plugin;
 
                     try{
-                        plugin = Plugin.CreateFromFolder(fullDir, group);
+                        plugin = PluginLoader.FromFolder(fullDir, group);
                     }catch(Exception e){
                         loadErrors.Add(group.GetIdentifierPrefix()+Path.GetFileName(fullDir)+": "+e.Message);
                         continue;
@@ -143,7 +152,7 @@ namespace TweetDuck.Plugins{
             Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
         }
 
-        public void ExecutePlugins(IFrame frame, PluginEnvironment environment){
+        private void ExecutePlugins(IFrame frame, PluginEnvironment environment){
             if (!HasAnyPlugin(environment)){
                 return;
             }

Program.cs

@@ -13,25 +13,24 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
-using TweetDuck.Updates;
 
 namespace TweetDuck{
     static class Program{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.13";
-
-        public static readonly bool IsPortable = File.Exists("makeportable");
+        public const string VersionTag = "1.14.1";
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
-        public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
+        public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
 
         public static readonly string ScriptPath = Path.Combine(ProgramPath, "scripts");
         public static readonly string PluginPath = Path.Combine(ProgramPath, "plugins");
 
+        public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
+
         public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
-        private static readonly string InstallerPath = Path.Combine(StoragePath, "TD_Updates");
+        public static readonly string InstallerPath = Path.Combine(StoragePath, "TD_Updates");
         private static readonly string CefDataPath = Path.Combine(StoragePath, "TD_Chromium");
 
         public static string UserConfigFilePath => Path.Combine(StoragePath, "TD_UserConfig.cfg");
@@ -134,7 +133,7 @@ namespace TweetDuck{
             CefSharpSettings.LegacyJavascriptBindingEnabled = true;
 
             CefSettings settings = new CefSettings{
-                UserAgent = BrowserUtils.HeaderUserAgent,
+                UserAgent = BrowserUtils.UserAgentChrome,
                 BrowserSubprocessPath = BrandName+".Browser.exe",
                 CachePath = StoragePath,
                 UserDataPath = CefDataPath,
@@ -151,20 +150,14 @@ namespace TweetDuck{
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
             
-            UpdaterSettings updaterSettings = new UpdaterSettings{
-                AllowPreReleases = Arguments.HasFlag(Arguments.ArgDebugUpdates),
-                DismissedUpdate = UserConfig.DismissedUpdate,
-                InstallerDownloadFolder = InstallerPath
-            };
-
-            FormBrowser mainForm = new FormBrowser(updaterSettings);
+            FormBrowser mainForm = new FormBrowser();
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){
                 ExitCleanup();
 
                 // ProgramPath has a trailing backslash
-                string updaterArgs = "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentForInstallerCmd()+"\""+(IsPortable ? " /PORTABLE=1" : "");
+                string updaterArgs = "/SP- /SILENT /FORCECLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentForInstallerCmd()+"\""+(IsPortable ? " /PORTABLE=1" : "");
                 bool runElevated = !IsPortable || !WindowsUtils.CheckFolderWritePermission(ProgramPath);
 
                 if (WindowsUtils.OpenAssociatedProgram(mainForm.UpdateInstallerPath, updaterArgs, runElevated)){

README.md

@@ -12,51 +12,44 @@ The program was built using Visual Studio 2017. Before opening the solution, ple
 * **Desktop development with C++**
   * VC++ 2017 v141 toolset
 
-After opening the solution, download the following NuGet packages by right-clicking on the solution and selecting **Restore NuGet Packages**, or manually running these commands in the **Package Manager Console**:
+After opening the solution, right-click the solution and select **Restore NuGet Packages**, or manually run this command in the **Package Manager Console**:
 ```
-PM> Install-Package CefSharp.WinForms -Version 63.0.0-pre01 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
-PM> Install-Package Microsoft.VC120.CRT.JetBrains
+PM> Install-Package CefSharp.WinForms -Version 66.0.0-CI2615 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
 ```
 
 Note that some pre-release builds of CefSharp are not available on NuGet. To correctly restore packages in that case, open **Package Manager Settings**, and add `https://www.myget.org/F/cefsharp/api/v3/index.json` to the list of package sources.
 
 ### Debug
 
-It is recommended to create a separate data folder for debugging, otherwise you will not be able to run TweetDuck while debugging the solution.
+The `Debug` configuration uses a separate data folder by default (`%LOCALAPPDATA%\TweetDuckDebug`) to avoid affecting an existing installation of TweetDuck. You can modify this by opening **TweetDuck Properties** in Visual Studio, clicking the **Debug** tab, and changing the **Command line arguments** field.
 
-To do that, open **TweetDuck Properties**, click the **Debug** tab, make sure your **Configuration** is set to `Active (Debug)` (or just `Debug`), and insert this into the **Command line arguments** field:
-```
--datafolder TweetDuckDebug
-```
+While debugging, opening the main menu and clicking **Reload browser** automatically rebuilds all resources in the `Resources/Scripts` and `Resources/Plugins` folders. This allows editing HTML/CSS/JS files and applying the changes without restarting the program, but it will cause a short delay between browser reloads.
 
-### Build
+### Release
 
-To make a release build of TweetDuck, open **Batch Build**, tick all `Release` configurations except for the `UnitTest` project (otherwise the build will fail), and click **Rebuild**. Check the status bar to make sure it says **Rebuild All succeeded**; if not, see the [Troubleshooting](#troubleshooting) section.
+Open **Batch Build**, tick all `Release` configurations with `x86` platform except for the `UnitTest` project, and click **Rebuild**. Check the status bar to make sure it says **Rebuild All succeeded**; if not, see the [Troubleshooting](#troubleshooting) section.
 
 After the build succeeds, the `bin/x86/Release` folder will contain files intended for distribution (no debug symbols or other unnecessary files). You may package these files yourself, or see the [Installers](#installers) section for automated installer generation.
 
-If you decide to release a custom version publicly, please make it clear that it is not an official release of TweetDuck.
+The `Release` configuration omits debug symbols and other unnecessary files. You can modify this behavior by opening `TweetDuck.csproj`, and editing the `<Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">` section.
+
+If you decide to publicly release a custom version, please make it clear that it is not an official release of TweetDuck. There are many references to the official website and this repository, especially in the update system, so search for `chylex.com` and `github.com` in all files and replace them appropriately.
 
 ### Troubleshooting
 
-There are a few quirks in the build process that may catch you off guard:
-
-- **Plugin files are not updated automatically**
-  - Since official plugins (`Resources/Plugins`) are not included in the project, Visual Studio will not automatically detect changes in the files
-  - To ensure plugins are updated when testing the app, click **Rebuild Solution** before clicking **Start**
-- **Error: The command (...) exited with code 1**
-  - If the post-build event fails, open the **Output** tab and look for the cause
-  - Determine if there was an IO error while copying files or modifying folders, or whether the final .ps1 script failed (`Encountered an error while running PostBuild.ps1 on line xyz`)
-  - Some files are checked for invalid characters:
+#### Error: The command (...) exited with code 1
+- This indicates a failed post-build event, open the **Output** tab for logs
+- Determine if there was an IO error from the `rmdir` commands, or whether the error was in the **PostBuild.ps1** script (`Encountered an error while running PostBuild.ps1 on line <xyz>`)
+- Some files are checked for invalid characters:
   - `Resources/Plugins/emoji-keyboard/emoji-ordering.txt` line endings must be LF (line feed); any CR (carriage return) in the file will cause a failed build, and you will need to ensure correct line endings in your text editor
 
 ### Installers
 
-TweetDuck uses **Inno Setup** to automate the creation of installers. First, download and install [InnoSetup QuickStart Pack](http://www.jrsoftware.org/isdl.php) (non-unicode; editor and encryption support not required) and the [Inno Download Plugin](https://code.google.com/archive/p/inno-download-plugin).
+TweetDuck uses **Inno Setup** for installers and updates. First, download and install [InnoSetup QuickStart Pack](http://www.jrsoftware.org/isdl.php) (non-unicode; editor and encryption support not required) and the [Inno Download Plugin](https://code.google.com/archive/p/inno-download-plugin).
 
 Next, add the Inno Setup installation folder (usually `C:\Program Files (x86)\Inno Setup 5`) into your **PATH** environment variable. You may need to restart File Explorer for the change to take place.
 
-Now you can generate installers after a build by running `bld/RUN BUILD.bat`. Note that despite the name, this will only package the files, you still need to run the [build](#build) in Visual Studio!
+Now you can generate installers after a build by running `bld/RUN BUILD.bat`. Note that this will only package the files, you still need to run the [release build](#release) in Visual Studio!
 
 After the window closes, three installers will be generated inside the `bld/Output` folder:
 * **TweetDuck.exe**
@@ -68,8 +61,8 @@ After the window closes, three installers will be generated inside the `bld/Outp
   * This is a portable installer that does not need administrator privileges
   * It automatically creates a `makeportable` file in the program folder, which forces TweetDuck to run in portable mode
 
-Note: There is a small chance you will see a resource error when running `RUN BUILD.bat`. If that happens, close the console window (which will terminate all Inno Setup processes and leave corrupted installer files in the output folder), and run it again.
+#### Notes
 
-### Code Notes
+> There is a small chance running `RUN BUILD.bat` immediately shows a resource error. If that happens, close the console window (which terminates all Inno Setup processes and leaves corrupted installers in the output folder), and run it again.
 
-There are many references to the official TweetDuck website and this repository in the code and installers, so if you plan to release your own version, make sure to search for `tweetduck.chylex.com` and `github.com` in the whole repository and replace them appropriately.
+> Running `RUN BUILD.bat` uses about 400 MB of RAM due to high compression. You can lower this to about 140 MB by opening `gen_full.iss` and `gen_port.iss`, and changing `LZMADictionarySize=15360` to `LZMADictionarySize=4096`.

Resources/Plugins/.debug/.meta

@@ -2,14 +2,18 @@
 Debug plugin
 
 [description]
-- Enables debug functionality and tests
-- Only included in debug configuration
+Enables debug functionality and tests.
+Text line 2.
+Text line 3.
+Text line 4.
+Text line 5.
+Text line 6.
 
 [author]
 chylex
 
 [version]
-1.1
+1.2
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/.debug/browser.js

@@ -61,3 +61,7 @@ ready(){
 disabled(){
   $(document).off("keydown", this.onKeyDown);
 }
+
+configure(){
+  alert("Configure triggered");
+}

Resources/Plugins/clear-columns/.meta

@@ -1,18 +1,12 @@
 [name]
-Clear columns
+Clear column shortcuts
 
 [description]
-- Adds buttons and keyboard shortcuts to quickly clear columns
-- Hold Shift when clicking or using a keyboard shortcut to restore the column instead
+Adds convenient buttons and keyboard shortcuts to clear/restore individual or all columns.
+When enabled, the list of keyboard shortcuts is available in the [Settings] menu.
 
 [author]
 chylex
 
-[version]
-1.1.1
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.4.1
+{version}

Resources/Plugins/clear-columns/browser.js

@@ -12,7 +12,7 @@ enabled(){
   };
   
   var resetColumn = (columnName) => {
-    var col = TD.controller.columnManager.get(columnName);
+    let col = TD.controller.columnManager.get(columnName);
     col.model.setClearedTimestamp(0);
     col.reloadTweets();
   };
@@ -21,10 +21,6 @@ enabled(){
     Object.keys(TD.controller.columnManager.getAll()).forEach(func);
   };
   
-  var replaceMustache = (key, search, replace) => {
-    TD.mustaches[key] = TD.mustaches[key].replace(search, replace);
-  };
-  
   var wasShiftPressed = false;
   
   var updateShiftState = (pressed) => {
@@ -38,7 +34,7 @@ enabled(){
         $(document).off("mousemove", this.eventKeyUp);
       }
       
-      $("#clear-columns-btn-all").text(pressed ? "Restore columns" : "Clear columns");
+      $(".clear-columns-btn-all").text(pressed ? "Restore columns" : "Clear columns");
     }
   };
   
@@ -78,31 +74,37 @@ enabled(){
     }
   };
   
-  // add column buttons and keyboard shortcut info to UI
-  replaceMustache("column/column_header.mustache", "</header>", [
-    '{{^isTemporary}}',
-    '<a class="column-header-link" href="#" data-action="td-clearcolumns-dosingle" style="right:34px">',
-    '<i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>',
-    '</a>',
-    '{{/isTemporary}}',
-    '</header>'
-  ].join(""));
+  // setup clear all button
+  this.btnClearAllHTML = `
+<a class="clear-columns-btn-all-parent js-header-action link-clean cf app-nav-link padding-h--10" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
+  <div class="obj-left margin-l--2"><i class="icon icon-medium icon-clear-timeline"></i></div>
+  <div class="clear-columns-btn-all nbfc padding-ts hide-condensed txt-size--16 app-nav-link-text">Clear columns</div>
+</a>`;
   
-  replaceMustache("keyboard_shortcut_list.mustache", "</dl>  <dl", [
-    '<dd class="keyboard-shortcut-definition" style="white-space:nowrap">',
-    '<span class="text-like-keyboard-key">1</span> … <span class="text-like-keyboard-key">9</span> + <span class="text-like-keyboard-key">Del</span> Clear column 1－9',
-    '</dd><dd class="keyboard-shortcut-definition">',
-    '<span class="text-like-keyboard-key">Alt</span> + <span class="text-like-keyboard-key">Del</span> Clear all columns',
-    '</dd></dl><dl'
-  ].join(""));
+  // add column buttons and keyboard shortcut info to UI
+  window.TDPF_injectMustache("column/column_header.mustache", "prepend", "<a data-testid=\"optionsToggle\"", `
+<a class="js-action-header-button column-header-link" href="#" data-action="td-clearcolumns-dosingle">
+  <i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>
+</a>`);
+  
+  window.TDPF_injectMustache("keyboard_shortcut_list.mustache", "prepend", "</dl> <dl", `
+<dd class="keyboard-shortcut-definition" style="white-space:nowrap">
+  <span class="text-like-keyboard-key">1</span> … <span class="text-like-keyboard-key">9</span> + <span class="text-like-keyboard-key">Del</span> Clear column 1－9
+</dd><dd class="keyboard-shortcut-definition">
+  <span class="text-like-keyboard-key">Alt</span> + <span class="text-like-keyboard-key">Del</span> Clear all columns
+</dd>`);
+  
+  window.TDPF_injectMustache("menus/column_nav_menu.mustache", "replace", "{{_i}}Add column{{/i}}</div> </a> </div>", `{{_i}}Add column{{/i}}</div></a>${this.btnClearAllHTML}</div>`)
   
   // load custom style
   var css = window.TDPF_createCustomStyle(this);
-  css.insert(".column-title { margin-right: 60px !important; }");
-  css.insert(".column-type-message .column-title { margin-right: 115px !important; }");
-  css.insert(".mark-all-read-link { right: 59px !important; }");
-  css.insert(".open-compose-dm-link { right: 90px !important; }");
-  css.insert("button[data-action='clear'].btn-options-tray { display: none !important; }");
+  css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
+  css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
+  css.insert(".column-navigator-overflow { bottom: 224px !important; }");
+  css.insert("[data-action='td-clearcolumns-dosingle'] { padding: 3px 0 !important; }");
+  css.insert("[data-action='clear'].btn-options-tray { display: none !important; }");
+  css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
+  css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
 }
 
 ready(){
@@ -112,19 +114,14 @@ ready(){
   $(document).on("keydown", this.eventKeyDown);
   $(document).on("keyup", this.eventKeyUp);
   
-  // add clear all button
-  $("nav.app-navigator").first().append([
-    '<a id="clear-columns-btn-all-parent" class="js-header-action link-clean cf app-nav-link padding-h--10" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">',
-    '<div class="obj-left margin-l--2"><i class="icon icon-medium icon-clear-timeline"></i></div>',
-    '<div id="clear-columns-btn-all" class="nbfc padding-ts hide-condensed txt-size--16">Clear columns</div>',
-    '</a></nav>'
-  ].join(""));
+  // setup clear all button for nav overflow
+  $(".js-app-add-column").first().after(this.btnClearAllHTML);
   
   // setup tooltip handling
   var tooltipEvents = $._data($(".js-header-action")[0]).events;
   
   if (tooltipEvents.mouseover && tooltipEvents.mouseover.length && tooltipEvents.mouseout && tooltipEvents.mouseout.length){
-    $("#clear-columns-btn-all-parent").on("mouseover", tooltipEvents.mouseover[0].handler).on("mouseout", tooltipEvents.mouseout[0].handler);
+    $(".clear-columns-btn-all-parent").on("mouseover", tooltipEvents.mouseover[0].handler).on("mouseout", tooltipEvents.mouseout[0].handler);
   }
 }
 

Resources/Plugins/edit-design/.meta

@@ -2,16 +2,10 @@
 Edit layout & design
 
 [description]
-- Adds new layout and design configuration, which can be accessed via Settings - Edit layout & design
+Expand the [Settings] menu and open [Edit layout & design] to customize how TweetDeck looks.
 
 [author]
 chylex
 
-[version]
-1.2.3
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.10.2
+{version}

Resources/Plugins/edit-design/browser.js

@@ -21,8 +21,26 @@ enabled(){
     avatarRadius: 2
   };
   
+  var prepareDefaultConfig = () => {
+    this.defaultConfig._theme = TD.settings.getTheme();
+    
+    switch(TD.settings.getColumnWidth()){
+      case "wide": this.defaultConfig.columnWidth = "350px"; break;
+      case "narrow": this.defaultConfig.columnWidth = "270px"; break;
+    }
+    
+    switch(TD.settings.getFontSize()){
+      case "small": this.defaultConfig.fontSize = "13px"; break;
+      case "medium": this.defaultConfig.fontSize = "14px"; break;
+      case "large": this.defaultConfig.fontSize = "15px"; break;
+      case "largest": this.defaultConfig.fontSize = "16px"; break;
+    }
+  };
+  
   this.firstTimeLoad = null;
   
+  var me = this;
+  
   // modal dialog loading
   $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
     this.htmlModal = contents;
@@ -43,6 +61,7 @@ enabled(){
     else if (this.tmpConfig !== null){
       let needsResave = !("_theme" in this.tmpConfig);
       
+      prepareDefaultConfig();
       this.config = $.extend(this.defaultConfig, this.tmpConfig);
       this.tmpConfig = null;
       this.reinjectAll();
@@ -60,28 +79,11 @@ enabled(){
     this.onStageReady();
   };
   
-  if (this.$$wasLoadedBefore){
+  if (TD.ready){
     this.onStageReady();
   }
   else{
-    $(document).one("dataSettingsValues", () => {
-      this.defaultConfig._theme = TD.settings.getTheme();
-      
-      switch(TD.settings.getColumnWidth()){
-        case "wide": this.defaultConfig.columnWidth = "350px"; break;
-        case "narrow": this.defaultConfig.columnWidth = "270px"; break;
-      }
-
-      switch(TD.settings.getFontSize()){
-        case "small": this.defaultConfig.fontSize = "13px"; break;
-        case "medium": this.defaultConfig.fontSize = "14px"; break;
-        case "large": this.defaultConfig.fontSize = "15px"; break;
-        case "largest": this.defaultConfig.fontSize = "16px"; break;
-      }
-      
-      this.$$wasLoadedBefore = true;
-      this.onStageReady();
-    });
+    $(document).one("dataSettingsValues", () => this.onStageReady());
   }
     
   $TDP.checkFileExists(this.$token, configFile).then(exists => {
@@ -137,8 +139,6 @@ enabled(){
   };
   
   // modal dialog setup
-  var me = this;
-  
   var updateKey = function(key, value){
     me.config[key] = value;
     
@@ -238,7 +238,12 @@ enabled(){
     });
     
     // THEMES
-    let selectedTheme = me.config.themeOverride || TD.settings.getTheme();
+    let selectedTheme = TD.settings.getTheme();
+    
+    if (selectedTheme === "dark" && me.config.themeOverride === "black"){
+      selectedTheme = me.config.themeOverride;
+    }
+    
     modal.find("[data-td-theme='"+selectedTheme+"']").prop("checked", true);
     
     modal.find("[data-td-theme]").change(function(){
@@ -379,22 +384,26 @@ enabled(){
     this.css.insert("html[data-td-font] { font-size: "+this.config.fontSize+" !important }");
     this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
     
+    let currentTheme = TD.settings.getTheme();
+    
+    if (currentTheme === "dark" && this.config.themeOverride){
+      currentTheme = this.config.themeOverride;
+    }
+    
     let notificationScrollbarColor = null;
     
     if (this.config.themeColorTweaks){
-      switch(TD.settings.getTheme()){
-        case "dark":
-          if (this.config.themeOverride === "black"){
+      switch(currentTheme){
+        case "black":
           this.css.insert(".app-content, .app-columns-container { background-color: #444448 !important }");
           this.css.insert(".column-drag-handle { opacity: 0.5 !important }");
           this.css.insert(".column-drag-handle:hover { opacity: 1 !important }");
           this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover), .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover) { background-color: #666 !important }");
           notificationScrollbarColor = "666";
-          }
-          else{
-            this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-track, .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-track { border-left-color: #14171A !important }");
-          }
+          break;
           
+        case "dark":
+          this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-track, .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-track { border-left-color: #14171A !important }");
           break;
 
         case "light":
@@ -527,10 +536,11 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 
 .drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
 .app-search-fake .icon { margin-top: -3px !important }
+#tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
 #tduck .search-input-control .icon { font-size: 20px !important; top: -4px !important }
 
-.column-header .column-type-icon { bottom: 26px !important }
-.is-options-open .column-type-icon { bottom: 25px !important }
+.column-type-icon { margin-top: -1px !important }
+.inline-reply .pull-left .Button--link { margin-top: 3px !important }
 
 .tweet-action-item .icon-favorite-toggle { font-size: 16px !important; }
 .tweet-action-item .heartsprite { top: -260% !important; left: -260% !important; transform: scale(0.4, 0.39) translateY(0.5px) !important; }
@@ -539,10 +549,11 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
       document.head.appendChild(this.icons);
     }
     
-    if (this.config.themeOverride === "black"){
+    if (currentTheme === "black"){
       $TDP.readFileRoot(this.$token, "theme.black.css").then(contents => {
         if (this.theme){
           this.theme.element.innerHTML = contents;
+          TD.settings.setTheme("dark"); // forces refresh of notification head tag
         }
       });
     }
@@ -598,9 +609,9 @@ ${this.config.revertIcons ? `
 #tduck .icon-user-dd:before{content:"\\f01a";font-family:_of!important}
 ` : ``}
 
-${this.config.themeOverride === "black" ? `
+${currentTheme === "black" ? `
 html.dark a, html.dark a:hover, html.dark a:focus, html.dark a:active { color: #8bd }
-.btn-neutral-positive { color: #8bd !important }
+#tduck-show-thread, .other-replies-link { color: #8bd !important }
 .quoted-tweet { border-color: #292f33 !important }
 ` : ``}
 

Resources/Plugins/edit-design/modal.html

@@ -151,8 +151,7 @@
       <!-- END -->
     </div>
     <footer class="padding-vxl txt-center">
-      <button class="js-dismiss btn btn-positive pull-right">
-        <i class="icon icon-check icon-small padding-rs"></i>
+      <button class="js-dismiss Button--primary pull-right">
         <span class="label">Done</span>
       </button>
     </footer>

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

@@ -92,63 +92,31 @@ html.dark .btn[disabled],html.dark .btn[disabled]:hover,html.dark .btn[disabled]
 html.dark .btn-on-dark:focus{box-shadow:0 0 0 1px #292F33,0 0 0 3px #71C9F8}
 html.dark .mdl-content .btn-on-dark:focus{box-shadow:0 0 0 1px #fff,0 0 0 3px #71C9F8}
 html.dark .is-inverted-dark .btn:hover,html.dark .is-inverted-dark .btn:focus,html.dark .is-inverted-dark .btn:active,html.dark .is-inverted-dark .btn.is-selected{background-color:#F2F9FF}
-html.dark .is-inverted-dark .btn-positive:hover,html.dark .is-inverted-dark .btn-positive-alt:hover,html.dark .is-inverted-dark .btn-fav.s-favorited:hover,html.dark .is-inverted-dark .s-following .follow-btn:hover,html.dark .s-following .is-inverted-dark .follow-btn:hover{background-color:#005FD1}
-html.dark .is-inverted-dark .btn-positive:focus,html.dark .is-inverted-dark .btn-positive-alt:focus,html.dark .is-inverted-dark .btn-fav.s-favorited:focus,html.dark .is-inverted-dark .s-following .follow-btn:focus,html.dark .s-following .is-inverted-dark .follow-btn:focus{background-color:#005FD1}
-html.dark .is-inverted-dark .btn-positive:active,html.dark .is-inverted-dark .btn-positive-alt:active,html.dark .is-inverted-dark .btn-fav.s-favorited:active,html.dark .is-inverted-dark .s-following .follow-btn:active,html.dark .s-following .is-inverted-dark .follow-btn:active,html.dark .is-inverted-dark .btn-positive.is-selected,html.dark .is-inverted-dark .is-selected.btn-positive-alt,html.dark .is-inverted-dark .is-selected.btn-fav.s-favorited,html.dark .is-inverted-dark .s-following .is-selected.follow-btn,html.dark .s-following .is-inverted-dark .is-selected.follow-btn{background-color:#005FD1}
-html.dark .is-inverted-dark .btn-positive-alt:hover,html.dark .is-inverted-dark .btn-fav.s-favorited:hover,html.dark .is-inverted-dark .s-following .follow-btn:hover,html.dark .s-following .is-inverted-dark .follow-btn:hover{background-color:#A01744}
-html.dark .is-inverted-dark .btn-positive-alt:focus,html.dark .is-inverted-dark .btn-fav.s-favorited:focus,html.dark .is-inverted-dark .s-following .follow-btn:focus,html.dark .s-following .is-inverted-dark .follow-btn:focus{background-color:#A01744}
-html.dark .is-inverted-dark .btn-positive-alt:active,html.dark .is-inverted-dark .btn-fav.s-favorited:active,html.dark .is-inverted-dark .s-following .follow-btn:active,html.dark .s-following .is-inverted-dark .follow-btn:active,html.dark .is-inverted-dark .btn-positive-alt.is-selected,html.dark .is-inverted-dark .is-selected.btn-fav.s-favorited,html.dark .is-inverted-dark .s-following .is-selected.follow-btn,html.dark .s-following .is-inverted-dark .is-selected.follow-btn{background-color:#A01744}
-html.dark .is-inverted-dark .btn-negative:hover{background-color:#A01744}
-html.dark .is-inverted-dark .btn-negative:focus{background-color:#A01744}
-html.dark .is-inverted-dark .btn-negative:active,html.dark .is-inverted-dark .btn-negative.is-selected{background-color:#A01744}
-html.dark .is-inverted-dark .btn-tertiary:hover{background-color:#F5F8FA}
-html.dark .is-inverted-dark .btn-tertiary:focus{background-color:#F5F8FA}
-html.dark .is-inverted-dark .btn-tertiary:active,html.dark .is-inverted-dark .btn-tertiary.is-selected{background-color:#F5F8FA}
-html.dark .btn-positive,html.dark .btn-positive-alt,html.dark .btn-fav.s-favorited,html.dark .s-following .follow-btn{color:#fff;background-color:#1DA1F2;border:1px solid #1DA1F2}
-html.dark .btn-positive:hover,html.dark .btn-positive-alt:hover,html.dark .btn-fav.s-favorited:hover,html.dark .s-following .follow-btn:hover{color:#fff;background-color:#005FD1;border:1px solid #005FD1}
-html.dark .btn-positive:focus,html.dark .btn-positive-alt:focus,html.dark .btn-fav.s-favorited:focus,html.dark .s-following .follow-btn:focus{color:#fff;background-color:#005FD1;border:1px solid #005FD1;box-shadow:0 0 0 1px #fff,0 0 0 3px #71C9F8}
-html.dark .btn-positive:active,html.dark .btn-positive-alt:active,html.dark .btn-fav.s-favorited:active,html.dark .s-following .follow-btn:active,html.dark .btn-positive.is-selected,html.dark .is-selected.btn-positive-alt,html.dark .is-selected.btn-fav.s-favorited,html.dark .s-following .is-selected.follow-btn{color:#fff;background-color:#005FD1;border:1px solid #005FD1}
-html.dark .btn-positive[disabled],html.dark [disabled].btn-positive-alt,html.dark [disabled].btn-fav.s-favorited,html.dark .s-following [disabled].follow-btn,html.dark .btn-positive[disabled]:hover,html.dark [disabled].btn-positive-alt:hover,html.dark [disabled].btn-fav.s-favorited:hover,html.dark .s-following [disabled].follow-btn:hover,html.dark .btn-positive[disabled]:active,html.dark [disabled].btn-positive-alt:active,html.dark [disabled].btn-fav.s-favorited:active,html.dark .s-following [disabled].follow-btn:active,html.dark .btn-positive.is-disabled,html.dark .is-disabled.btn-positive-alt,html.dark .is-disabled.btn-fav.s-favorited,html.dark .s-following .is-disabled.follow-btn,html.dark .btn-positive.is-disabled:hover,html.dark .is-disabled.btn-positive-alt:hover,html.dark .is-disabled.btn-fav.s-favorited:hover,html.dark .s-following .is-disabled.follow-btn:hover,html.dark .btn-positive.is-disabled:focus,html.dark .is-disabled.btn-positive-alt:focus,html.dark .is-disabled.btn-fav.s-favorited:focus,html.dark .s-following .is-disabled.follow-btn:focus,html.dark .btn-positive.is-disabled:active,html.dark .is-disabled.btn-positive-alt:active,html.dark .is-disabled.btn-fav.s-favorited:active,html.dark .s-following .is-disabled.follow-btn:active{color:#fff;background-color:#1DA1F2;border:1px solid #1DA1F2}
-html.dark .btn-compose{color:#fff;background-color:#2b7bb9}
-html.dark .btn-compose:hover{color:#fff;background-color:#2b7bb9}
-html.dark .btn-compose:focus{color:#fff;background-color:#2b7bb9}
-html.dark .btn-compose:active,html.dark .btn-compose.is-selected{color:#fff;background-color:#2b7bb9}
-html.dark .btn-positive-alt:hover,html.dark .btn-fav.s-favorited:hover,html.dark .s-following .follow-btn:hover{color:#fff;background-color:#A01744;border:#A01744}
-html.dark .btn-positive-alt:active,html.dark .btn-fav.s-favorited:active,html.dark .s-following .follow-btn:active,html.dark .btn-positive-alt.is-selected,html.dark .is-selected.btn-fav.s-favorited,html.dark .s-following .is-selected.follow-btn{color:#fff;background-color:#A01744;border:#A01744}
-html.dark .btn-negative{border-color:#E0245E;color:#fff;background-color:#E0245E}
-html.dark .btn-negative:hover{color:#fff;background-color:#A01744;border-color:#A01744}
-html.dark .btn-negative:focus{color:#fff;background-color:#A01744;border-color:#A01744;box-shadow:0 0 0 1px #fff,0 0 0 3px #F6809A}
-html.dark .btn-negative:active,html.dark .btn-negative.is-selected{color:#fff;background-color:#A01744;border-color:#A01744}
-html.dark .btn-negative[disabled],html.dark .btn-negative[disabled]:hover,html.dark .btn-negative[disabled]:active,html.dark .btn-negative.is-disabled,html.dark .btn-negative.is-disabled:hover,html.dark .btn-negative.is-disabled:focus,html.dark .btn-negative.is-disabled:active{border-color:#E0245E;color:#fff;background-color:#E0245E}
-html.dark .btn-tertiary{border-color:#657786;color:#657786}
-html.dark .btn-tertiary:hover{color:#657786;background-color:#F5F8FA;border-color:#657786}
-html.dark .btn-tertiary:focus{color:#657786;background-color:#F5F8FA;border-color:#657786;box-shadow:0 0 0 1px #fff,0 0 0 3px #CCD6DD}
-html.dark .btn-tertiary:active,html.dark .btn-tertiary.is-selected{color:#657786;background-color:#F5F8FA;border-color:#657786}
-html.dark .btn-tertiary[disabled],html.dark .btn-tertiary[disabled]:hover,html.dark .btn-tertiary[disabled]:active,html.dark .btn-tertiary.is-disabled,html.dark .btn-tertiary.is-disabled:hover,html.dark .btn-tertiary.is-disabled:focus,html.dark .btn-tertiary.is-disabled:active{color:#AAB8C2;border-color:#e1e8ed;background-color:#eaeaea}
+html.dark .is-inverted-dark .btn-fav.s-favorited:hover,html.dark .is-inverted-dark .s-following .follow-btn:hover,html.dark .s-following .is-inverted-dark .follow-btn:hover{background-color:#005FD1}
+html.dark .is-inverted-dark .btn-fav.s-favorited:focus,html.dark .is-inverted-dark .s-following .follow-btn:focus,html.dark .s-following .is-inverted-dark .follow-btn:focus{background-color:#005FD1}
+html.dark .is-inverted-dark .btn-fav.s-favorited:active,html.dark .is-inverted-dark .s-following .follow-btn:active,html.dark .s-following .is-inverted-dark .follow-btn:active,html.dark .is-inverted-dark .is-selected.btn-fav.s-favorited,html.dark .is-inverted-dark .s-following .is-selected.follow-btn,html.dark .s-following .is-inverted-dark .is-selected.follow-btn{background-color:#005FD1}
+html.dark .is-inverted-dark .btn-fav.s-favorited:hover,html.dark .is-inverted-dark .s-following .follow-btn:hover,html.dark .s-following .is-inverted-dark .follow-btn:hover{background-color:#A01744}
+html.dark .is-inverted-dark .btn-fav.s-favorited:focus,html.dark .is-inverted-dark .s-following .follow-btn:focus,html.dark .s-following .is-inverted-dark .follow-btn:focus{background-color:#A01744}
+html.dark .is-inverted-dark .btn-fav.s-favorited:active,html.dark .is-inverted-dark .s-following .follow-btn:active,html.dark .s-following .is-inverted-dark .follow-btn:active,html.dark .is-inverted-dark .is-selected.btn-fav.s-favorited,html.dark .is-inverted-dark .s-following .is-selected.follow-btn,html.dark .s-following .is-inverted-dark .is-selected.follow-btn{background-color:#A01744}
+html.dark .btn-fav.s-favorited,html.dark .s-following .follow-btn{color:#fff;background-color:#1DA1F2;border:1px solid #1DA1F2}
+html.dark .btn-fav.s-favorited:hover,html.dark .s-following .follow-btn:hover{color:#fff;background-color:#005FD1;border:1px solid #005FD1}
+html.dark .btn-fav.s-favorited:focus,html.dark .s-following .follow-btn:focus{color:#fff;background-color:#005FD1;border:1px solid #005FD1;box-shadow:0 0 0 1px #fff,0 0 0 3px #71C9F8}
+html.dark .btn-fav.s-favorited:active,html.dark .s-following .follow-btn:active,html.dark .is-selected.btn-fav.s-favorited,html.dark .s-following .is-selected.follow-btn{color:#fff;background-color:#005FD1;border:1px solid #005FD1}
+html.dark [disabled].btn-fav.s-favorited,html.dark .s-following [disabled].follow-btn,html.dark [disabled].btn-fav.s-favorited:hover,html.dark .s-following [disabled].follow-btn:hover,html.dark [disabled].btn-fav.s-favorited:active,html.dark .s-following [disabled].follow-btn:active,html.dark .is-disabled.btn-fav.s-favorited,html.dark .s-following .is-disabled.follow-btn,html.dark .is-disabled.btn-fav.s-favorited:hover,html.dark .s-following .is-disabled.follow-btn:hover,html.dark .is-disabled.btn-fav.s-favorited:focus,html.dark .s-following .is-disabled.follow-btn:focus,html.dark .is-disabled.btn-fav.s-favorited:active,html.dark .s-following .is-disabled.follow-btn:active{color:#fff;background-color:#1DA1F2;border:1px solid #1DA1F2}
+html.dark .btn-fav.s-favorited:hover,html.dark .s-following .follow-btn:hover{color:#fff;background-color:#A01744;border:#A01744}
+html.dark .btn-fav.s-favorited:active,html.dark .s-following .follow-btn:active,html.dark .is-selected.btn-fav.s-favorited,html.dark .s-following .is-selected.follow-btn{color:#fff;background-color:#A01744;border:#A01744}
 html.dark .btn-on-blue{color:#fff;background-color:#66757f}
 html.dark .btn-on-blue:hover{color:#fff;background-color:#66757f}
 html.dark .btn-on-blue:focus{color:#fff;background-color:#66757f;box-shadow:0 0 2px 3px #50a5e6}
 html.dark .btn-on-blue:active,html.dark .btn-on-blue.is-selected{color:#fff;background-color:#434c51}
 html.dark .btn-on-blue[disabled],html.dark .btn-on-blue[disabled]:hover,html.dark .btn-on-blue[disabled]:active,html.dark .btn-on-blue.is-disabled,html.dark .btn-on-blue.is-disabled:hover,html.dark .btn-on-blue.is-disabled:focus,html.dark .btn-on-blue.is-disabled:active{color:#fff;background-color:#66757f}
-html.dark .btn-neutral-negative{color:#d29b9a}
-html.dark .btn-neutral-negative:hover,html.dark .btn-neutral-negative:focus{color:#d29b9a}
-html.dark .btn-neutral-negative[disabled],html.dark .btn-neutral-negative[disabled]:hover,html.dark .btn-neutral-negative[disabled]:active,html.dark .btn-neutral-negative.is-disabled,html.dark .btn-neutral-negative.is-disabled:hover,html.dark .btn-neutral-negative.is-disabled:focus,html.dark .btn-neutral-negative.is-disabled:active{color:#d29b9a}
-html.dark .btn-neutral-positive{color:#8bd}
-html.dark .btn-neutral-positive:hover,html.dark .btn-neutral-positive:focus{color:#8bd}
-html.dark .btn-neutral-positive[disabled],html.dark .btn-neutral-positive[disabled]:hover,html.dark .btn-neutral-positive[disabled]:active,html.dark .btn-neutral-positive.is-disabled,html.dark .btn-neutral-positive.is-disabled:hover,html.dark .btn-neutral-positive.is-disabled:focus,html.dark .btn-neutral-positive.is-disabled:active{color:#8bd}
 html.dark .btn-options-tray{color:#e1e8ed}
 html.dark .btn-options-tray:hover,html.dark .btn-options-tray:focus{color:#8bd}
 html.dark .btn-options-tray[disabled],html.dark .btn-options-tray[disabled]:hover,html.dark .btn-options-tray[disabled]:active,html.dark .btn-options-tray.is-disabled,html.dark .btn-options-tray.is-disabled:hover,html.dark .btn-options-tray.is-disabled:focus,html.dark .btn-options-tray.is-disabled:active{color:#8bd}
 html.dark .btn-bg-positive{background-color:rgba(102,117,127,0.5)}
 html.dark .btn-bg-positive:hover,html.dark .btn-bg-positive:focus{background-color:rgba(102,117,127,0.5)}
 html.dark .btn-bg-positive[disabled],html.dark .btn-bg-positive[disabled]:hover,html.dark .btn-bg-positive[disabled]:active,html.dark .btn-bg-positive.is-disabled,html.dark .btn-bg-positive.is-disabled:hover,html.dark .btn-bg-positive.is-disabled:focus,html.dark .btn-bg-positive.is-disabled:active{background-color:rgba(102,117,127,0.5)}
-html.dark .btn-bg-negative{background-color:#5d5457}
-html.dark .btn-bg-negative:hover,html.dark .btn-bg-negative:focus{background-color:#5d5457}
-html.dark .btn-bg-negative[disabled],html.dark .btn-bg-negative[disabled]:hover,html.dark .btn-bg-negative[disabled]:active,html.dark .btn-bg-negative.is-disabled,html.dark .btn-bg-negative.is-disabled:hover,html.dark .btn-bg-negative.is-disabled:focus,html.dark .btn-bg-negative.is-disabled:active{background-color:#5d5457}
-html.dark .btn-bg-white{background-color:#fff;color:#55acee}
-html.dark .btn-bg-white:hover,html.dark .btn-bg-white:focus{background-color:#fff;color:#55acee}
 html.dark .follow-btn .icon,html.dark .follow-btn .Icon{color:#1DA1F2}
-html.dark .input-group-button{border:1px solid #e1e8ed}
 html.dark .account-profile-header{background-color:#1DA1F2}
 html.dark .account-settings-bt{border-top:1px solid #e1e8ed}
 html.dark .account-settings-bb{border-bottom:1px solid #e1e8ed}
@@ -290,7 +258,7 @@ html.dark .app-nav-tab{color:#8899A6}
 html.dark .app-nav-tab:hover{color:#fff}
 html.dark .app-nav-tab.is-selected{color:#292f33}
 html.dark .app-nav-tab.is-selected:hover{color:#292f33}
-html.dark .attach-compose-buttons .tweet-button{background-color:#485865}
+html.dark .attach-compose-buttons .tweet-button{background-color:#485865!important}
 html.dark .with-nav-border-t:before{border-top:1px solid #777}
 html.dark .app-search-input,html.dark .app-search-fake{background-color:#14171A;color:#aab8c2;box-shadow:inset 0 1px 1px rgba(17,17,17,0.5)}
 html.dark .app-search-input::-webkit-input-placeholder{color:#aab8c2}
@@ -440,12 +408,6 @@ html.dark .char-count:disabled{color:#777}
 html.dark .over-char-count:disabled{color:#be1931}
 html.dark .cmp-replyto{background-color:#eaeaea;border-top:1px solid #ddd}
 html.dark .s-link-added.s-photo-added p:last-child{border-top:1px solid #ddd}
-html.dark .accs li{background:#eaeaea;border:1px solid #e1e8ed}
-html.dark .accs li:hover{background:#e1e8ed}
-html.dark .accs .icon,html.dark .accs .Icon{color:#999}
-html.dark .accs .acc-selected{background-color:#55acee;border:1px solid #e1e8ed}
-html.dark .accs .acc-selected i{color:#fff}
-html.dark .accs .acc-selected:hover{border-color:#e1e8ed;background-color:#50a5e6}
 html.dark .inline-reply{background-color:#485865;color:#fff}
 html.dark .inline-reply .btn-neutral,html.dark .inline-reply .character-count{color:#fff}
 html.dark .reply-triangle{border-color:transparent transparent #485865}
@@ -849,3 +811,4 @@ html.dark .DrawerModal{color:#14171A}
 /* fixes */
 html.dark .app-search-fake{border-color:transparent}
 html.dark .spinner-small,html.dark .spinner-large{filter:grayscale(80%)brightness(93%)}
+html.dark .tweet>.color-twitter-blue{color:#8bd!important}

Resources/Plugins/emoji-keyboard/.meta

@@ -1,18 +1,12 @@
 [name]
-Emoji keyboard
+Emoji picker
 
 [description]
-- Adds an emoji keyboard when writing tweets
-- Emoji list provided by http://unicode.org/emoji/charts/emoji-ordering.html
+Adds a button that opens an emoji picker in the New Tweet panel.
+Use :short_codes: to quickly add emoji when writing tweets.
 
 [author]
 chylex
 
-[version]
-1.4.2
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.5.3
+{version}

Resources/Plugins/emoji-keyboard/browser.js

@@ -32,6 +32,8 @@ enabled(){
   
   this.css = window.TDPF_createCustomStyle(this);
   this.css.insert(".emoji-keyboard { position: absolute; width: 15.35em; background-color: white; border-radius: 1px; font-size: 24px; z-index: 9999 }");
+  this.css.insert(".emoji-keyboard-popup-btn { height: 36px !important }");
+  this.css.insert(".emoji-keyboard-popup-btn .icon { vertical-align: -4px !important }");
   
   this.css.insert(".emoji-keyboard-list { height: 10.14em; padding: 0.1em; box-sizing: border-box; overflow-y: auto }");
   this.css.insert(".emoji-keyboard-list .separator { height: 26px }");
@@ -49,10 +51,10 @@ enabled(){
   
   // layout
   
-  var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--9 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
+  var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--6 padding-h--8 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
-  TD.mustaches["compose/docked_compose.mustache"] = TD.mustaches["compose/docked_compose.mustache"].replace('<div class="cf margin-t--12 margin-b--30">', '<div class="cf margin-t--12 margin-b--30">'+buttonHTML);
+  window.TDPF_injectMustache("compose/docked_compose.mustache", "append", '<div class="cf margin-t--12 margin-b--30">', buttonHTML);
   
   var maybeDockedComposePanel = $(".js-docked-compose");
   

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

@@ -59,7 +59,19 @@ Remove unsupported emoji:
 > remove copyright
 > remove registered trademark
 > remove trademark
-  0023 FE0F 20E3;keycap
+> remove keycap #
+  002A FE0F 20E3;keycap *
+> remove keycap 0
+> remove keycap 1
+> remove keycap 2
+> remove keycap 3
+> remove keycap 4
+> remove keycap 5
+> remove keycap 6
+> remove keycap 7
+> remove keycap 8
+> remove keycap 9
+  1F51F;keycap 10
   
   1F441;eye
 > remove eye in speech bubble

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

@@ -1354,18 +1354,7 @@
 2755;white exclamation mark
 2757;exclamation mark
 3030;wavy dash
-0023 FE0F 20E3;keycap #
 002A FE0F 20E3;keycap *
-0030 FE0F 20E3;keycap 0
-0031 FE0F 20E3;keycap 1
-0032 FE0F 20E3;keycap 2
-0033 FE0F 20E3;keycap 3
-0034 FE0F 20E3;keycap 4
-0035 FE0F 20E3;keycap 5
-0036 FE0F 20E3;keycap 6
-0037 FE0F 20E3;keycap 7
-0038 FE0F 20E3;keycap 8
-0039 FE0F 20E3;keycap 9
 1F51F;keycap 10
 1F4AF;hundred points
 1F520;input latin uppercase

Resources/Plugins/reply-account/.meta

@@ -1,17 +1,11 @@
 [name]
-Custom reply account
-
-[description]
-- Allows customizing the automatically selected reply account per column
+Customizable reply account
 
 [author]
 chylex
 
-[version]
-1.2.4
-
-[website]
-https://tweetduck.chylex.com
+[description]
+Allows configuring which account is pre-selected for replies in each column.
 
 [configfile]
 configuration.js
@@ -20,4 +14,4 @@ configuration.js
 configuration.default.js
 
 [requires]
-1.10.3
+{version}

Resources/Plugins/reply-account/browser.js

@@ -12,10 +12,16 @@ enabled(){
     
     if (configuration.useAdvancedSelector){
       if (configuration.customSelector){
-        if (configuration.customSelector.toString().startsWith("function (column){")){
+        let customSelectorDef = configuration.customSelector.toString();
+        
+        if (customSelectorDef.startsWith("function (column){")){
           $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector needs to be updated due to TweetDeck changes, please read the default configuration file for the updated guide");
           return;
         }
+        else if (customSelectorDef.startsWith("function (type,")){
+          $TD.alert("warning", "Plugin reply-account has invalid configuration: the type parameter is no longer present due to TweetDeck changes, please read the default configuration file for the updated guide");
+          return;
+        }
         
         var section = data.element.closest("section.js-column");
         
@@ -35,7 +41,7 @@ enabled(){
         }
         
         try{
-          query = configuration.customSelector(column.getColumnType(), columnTitle, columnAccount, column, section.hasClass("column-temp"));
+          query = configuration.customSelector(columnTitle, columnAccount, column, section.hasClass("column-temp"));
         }catch(e){
           $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector threw an error: "+e.message);
           return;

Resources/Plugins/reply-account/configuration.default.js

@@ -30,14 +30,12 @@
    *   https://tweetduck.chylex.com/guide/#dev-tools
    *
    *
-   * The 'type' parameter is TweetDeck column type. Here is the full list of column types, note that some are
-   * unused and have misleading names (for example, Home columns are 'col_timeline' instead of 'col_home'):
-   *   col_timeline, col_interactions, col_mentions, col_followers, col_search, col_list,
-   *   col_customtimeline, col_messages, col_usertweets, col_favorites, col_activity,
-   *   col_dataminr, col_home, col_me, col_inbox, col_scheduled, col_unknown
+   * In order to check the column type, use the 'window.TDPF_getColumnName(column)' function. List of available names:
+   *   Home, Mentions, Messages, Notifications, Followers, Activity, Likes,
+   *   User, Search, List, Timeline, Dataminr, Live video, Scheduled
    *
-   * If you want to see your current column types, run this in your browser console:
-   *   TD.controller.columnManager.getAllOrdered().map(obj => obj.getColumnType());
+   * If you want to see your current column types, run the following code in your browser console:
+   *   TD.controller.columnManager.getAllOrdered().map(window.TDPF_getColumnName)
    *
    *
    * The 'title' parameter is the column title. Some are fixed (such as 'Home' or 'Notifications'),
@@ -55,22 +53,22 @@
    *
    *
    * The 'isTemporary' parameter is true if the column is not attached to the main column list,
-   * for example when clicking on a profile and viewing their tweets in a modal dialog.
+   * for example when clicking on a user and viewing their tweets in a modal dialog.
    *
    */
   
   useAdvancedSelector: false,
   
-  customSelector: function(type, title, account, column, isTemporary){
+  customSelector: function(title, account, column, isTemporary){
     console.info(arguments); // Prints all arguments into the console
     
-    if (type === "col_search" && title === "TweetDuck"){
+    if (title === "TweetDuck" && window.TDPF_getColumnName(column) === "Search"){
       // This is a search column that looks for 'TweetDuck' in the tweets,
       // search columns are normally linked to the preferred account
       // so this forces the @TryTweetDuck account to be used instead
       return "@TryTweetDuck";
     }
-    else if (type === "col_timeline" && account === "@chylexcz"){
+    else if (account === "@chylexcz" && window.TDPF_getColumnName(column) === "Home"){
       // This is a Home column of my test account @chylexcz,
       // but I want to reply to tweets from my official account
       return "@chylexmc";

Resources/Plugins/templates/.meta

@@ -1,17 +1,11 @@
 [name]
-Templates
+Tweet templates
 
 [description]
-- Adds a templating system for tweets
+Adds a [Manage templates] button to the New Tweet panel.
 
 [author]
 chylex
 
-[version]
-1.0.3
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.5.3
+{version}

Resources/Plugins/templates/browser.js

@@ -34,10 +34,10 @@ enabled(){
   
   // button
   
-  var buttonHTML = '<button class="manage-templates-btn needsclick btn btn-on-blue full-width txt-left margin-b--12 padding-v--9"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
+  var buttonHTML = '<button class="manage-templates-btn needsclick btn btn-on-blue full-width txt-left margin-b--12 padding-v--6 padding-h--12"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
-  TD.mustaches["compose/docked_compose.mustache"] = TD.mustaches["compose/docked_compose.mustache"].replace('<div class="js-tweet-type-button">', buttonHTML+'<div class="js-tweet-type-button">');
+  window.TDPF_injectMustache("compose/docked_compose.mustache", "prepend", '<div class="js-tweet-type-button">', buttonHTML);
   
   var dockedComposePanel = $(".js-docked-compose");
   
@@ -267,8 +267,8 @@ enabled(){
       <ul></ul>
       
       <div class="templates-modal-bottom">
-        <button data-action="close" class="btn"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Close</span></button>
-        <button data-action="new-template" class="btn btn-positive"><i class="icon icon-plus icon-small padding-rs"></i><span class="label">New Template</span></button>
+        <button data-action="close" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Close</span></button>
+        <button data-action="new-template" class="Button--primary"><i class="icon icon-plus icon-small padding-rs"></i><span class="label">New Template</span></button>
       </div>
     </div>
 
@@ -300,8 +300,8 @@ enabled(){
       </div>
       
       <div class="templates-modal-bottom">
-        <button data-action="editor-cancel" class="btn"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Cancel</span></button>
-        <button data-action="editor-confirm" class="btn btn-positive" style="margin-left:4px"><i class="icon icon-check icon-small padding-rs"></i><span class="label">Confirm</span></button>
+        <button data-action="editor-cancel" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Cancel</span></button>
+        <button data-action="editor-confirm" class="Button--primary" style="margin-left:4px"><i class="icon icon-check icon-small padding-rs"></i><span class="label">Confirm</span></button>
       </div>
     </div>
   </div>

Resources/Plugins/timeline-polls/.meta

@@ -1,17 +1,11 @@
 [name]
-Polls in timelines
+Show poll results
 
 [description]
-- Adds poll results into timelines and quoted tweets
+Displays poll results directly in timelines and notifications.
 
 [author]
 chylex
 
-[version]
-1.1
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.7
+{version}

Resources/PostBuild.ps1

@@ -1,51 +1,125 @@
-Param([Parameter(Mandatory = $True, Position = 1)][string] $dir)
+Param(
+  [Parameter(Mandatory = $True, Position = 1)][string] $targetDir,
+  [Parameter(Mandatory = $True, Position = 2)][string] $projectDir,
+  [Parameter(Position = 3)][string] $configuration = "Release",
+  [Parameter(Position = 4)][string] $version = ""
+)
+
 $ErrorActionPreference = "Stop"
 
-Set-Location $dir
+try{
+  $sw = [Diagnostics.Stopwatch]::StartNew()
+  Write-Host "--------------------------"
   
-function Check-Carriage-Return{
-  Param([Parameter(Mandatory = $True, Position = 1)] $fname)
-  
-  $file = @(Get-ChildItem -Include $fname -Recurse)[0]
-  
-  if ((Get-Content -Path $file.FullName -Raw).Contains("`r")){
-    Throw "$fname cannot contain carriage return"
+  if ($version.Equals("")){
+    $version = (Get-Item (Join-Path $targetDir "TweetDuck.exe")).VersionInfo.FileVersion
   }
   
-  Write-Host "Verified" $file.FullName.Substring($dir.Length)
-}
+  Write-Host "TweetDuck version" $version
   
-function Rewrite-File{
-  [CmdletBinding()]
-  Param([Parameter(Mandatory = $True, ValueFromPipeline = $True)][array] $lines, [Parameter(Mandatory = $True, Position = 1)] $file)
+  Write-Host "--------------------------"
   
-  $lines | Where { $_ -ne '' } | Set-Content -Path $file.FullName
-  Write-Host "Processed" $file.FullName.Substring($dir.Length)
-}
+  # Cleanup
   
-try{
-  Check-Carriage-Return("emoji-ordering.txt")
+  if (Test-Path (Join-Path $targetDir "locales")){
+    Remove-Item -Path (Join-Path $targetDir "locales\*.pak") -Exclude "en-US.pak"
+  }
   
-  ForEach($file in Get-ChildItem -Filter *.js -Exclude configuration.default.js -Recurse){
-    $lines = Get-Content -Path $file.FullName
+  # Copy resources
+  
+  Copy-Item (Join-Path $projectDir "bld\Resources\LICENSES.txt") -Destination $targetDir -Force
+  
+  New-Item -ItemType directory -Path $targetDir -Name "scripts" | Out-Null
+  New-Item -ItemType directory -Path $targetDir -Name "plugins" | Out-Null
+  New-Item -ItemType directory -Path $targetDir -Name "plugins\official" | Out-Null
+  New-Item -ItemType directory -Path $targetDir -Name "plugins\user" | Out-Null
+  
+  Copy-Item (Join-Path $projectDir "Resources\Scripts\*") -Recurse -Destination (Join-Path $targetDir "scripts")
+  Copy-Item (Join-Path $projectDir "Resources\Plugins\*") -Recurse -Destination (Join-Path $targetDir "plugins\official") -Exclude ".debug", "emoji-instructions.txt" 
+  
+  if ($configuration -eq "Debug"){
+    New-Item -ItemType directory -Path $targetDir -Name "plugins\user\.debug" | Out-Null
+    Copy-Item (Join-Path $projectDir "Resources\Plugins\.debug\*") -Recurse -Destination (Join-Path $targetDir "plugins\user\.debug")
+  }
+  
+  # Helper functions
+  
+  function Remove-Empty-Lines{
+    Param([Parameter(Mandatory = $True, Position = 1)] $lines)
+    
+    ForEach($line in $lines){
+      if ($line -ne ''){
+        $line
+      }
+    }
+  }
+  
+  function Check-Carriage-Return{
+    Param([Parameter(Mandatory = $True, Position = 1)] $file)
+    
+    if (!(Test-Path $file)){
+      Throw "$file does not exist"
+    }
+    
+    if ((Get-Content -Path $file -Raw).Contains("`r")){
+      Throw "$file cannot contain carriage return"
+    }
+    
+    Write-Host "Verified" $file.Substring($targetDir.Length)
+  }
+  
+  function Rewrite-File{
+    Param([Parameter(Mandatory = $True, Position = 1)] $file,
+          [Parameter(Mandatory = $True, Position = 2)] $lines)
+    
+    $lines = Remove-Empty-Lines($lines)
+    $relativePath = $file.FullName.Substring($targetDir.Length)
+    
+    if ($relativePath.StartsWith("scripts\")){
+      $lines = (,("#" + $version) + $lines)
+    }
+    
+    [IO.File]::WriteAllLines($file.FullName, $lines)
+    Write-Host "Processed" $relativePath
+  }
+  
+  # Post processing
+  
+  Check-Carriage-Return(Join-Path $targetDir "plugins\official\emoji-keyboard\emoji-ordering.txt")
+  
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.js" -Exclude "configuration.default.js" -Recurse){
+    $lines = [IO.File]::ReadLines($file.FullName)
     $lines = $lines | % { $_.TrimStart() }
     $lines = $lines -Replace '^(.*?)((?<=^|[;{}()])\s?//(?:\s.*|$))?$', '$1'
     $lines = $lines -Replace '(?<!\w)return(\s.*?)? if (.*?);', 'if ($2)return$1;'
-    ,$lines | Rewrite-File $file
+    Rewrite-File $file $lines
   }
   
-  ForEach($file in Get-ChildItem -Filter *.css -Recurse){
-    $lines = Get-Content -Path $file.FullName
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.css" -Recurse){
+    $lines = [IO.File]::ReadLines($file.FullName)
     $lines = $lines -Replace '\s*/\*.*?\*/', ''
-    $lines = $lines -Replace '^\s+(.+):\s?(.+?)(?:\s?(!important))?;$', '$1:$2$3;'
-    $lines = $lines -Replace '^(\S.*?) {$', '$1{'
-    @(($lines | Where { $_ -ne '' }) -Join ' ') | Rewrite-File $file
+    $lines = $lines -Replace '^(\S.*) {$', '$1{'
+    $lines = $lines -Replace '^\s+(.+?):\s*(.+?)(?:\s*(!important))?;$', '$1:$2$3;'
+    $lines = @((Remove-Empty-Lines($lines)) -Join ' ')
+    Rewrite-File $file $lines
   }
   
-  ForEach($file in Get-ChildItem -Filter *.html -Recurse){
-    $lines = Get-Content -Path $file.FullName
-    ,($lines | % { $_.TrimStart() }) | Rewrite-File $file
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.html" -Recurse){
+    $lines = [IO.File]::ReadLines($file.FullName)
+    $lines = $lines | % { $_.TrimStart() }
+    Rewrite-File $file $lines
   }
+  
+  ForEach($file in Get-ChildItem -Path (Join-Path $targetDir "plugins") -Filter "*.meta" -Recurse){
+    $lines = [IO.File]::ReadLines($file.FullName)
+    $lines = $lines -Replace '\{version\}', $version
+    Rewrite-File $file $lines
+  }
+  
+  Write-Host "------------------"
+  $sw.Stop()
+  Write-Host "Finished in" $([math]::Round($sw.Elapsed.TotalMilliseconds)) "ms"
+  Write-Host "------------------"
 }catch{
   Write-Host "Encountered an error while running PostBuild.ps1 on line" $_.InvocationInfo.ScriptLineNumber
   Write-Host $_

Resources/PostCefUpdate.ps1

@@ -0,0 +1,18 @@
+$ErrorActionPreference = "Stop"
+
+$MainProj = "..\TweetDuck.csproj"
+$BrowserProj = "..\subprocess\TweetDuck.Browser.csproj"
+
+$Match = Select-String -Path $MainProj '<Import Project="packages\\cef\.redist\.x86\.(.*?)\\'
+$Version = $Match.Matches[0].Groups[1].Value
+
+Copy-Item "..\packages\cef.redist.x86.${Version}\CEF\devtools_resources.pak" -Destination "..\bld\Resources\" -Force
+
+$Match = Select-String -Path $MainProj '<Import Project="packages\\CefSharp\.Common\.(.*?)\\'
+$Version = $Match.Matches[0].Groups[1].Value
+
+$Contents = [IO.File]::ReadAllText($BrowserProj)
+$Contents = $Contents -Replace '(?<=<HintPath>\.\.\\packages\\CefSharp\.Common\.)(.*?)(?=\\)', $Version
+$Contents = $Contents -Replace '(?<=<Reference Include="CefSharp\.BrowserSubprocess\.Core, Version=)(\d+)', $Version.Split(".")[0]
+
+[IO.File]::WriteAllText($BrowserProj, $Contents)

Resources/ScriptLoader.cs

@@ -2,36 +2,155 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Windows.Forms;
+using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
+#if DEBUG
+using System.Diagnostics;
+using System.Reflection;
+using TweetDuck.Core;
+using TweetDuck.Plugins;
+#endif
 
 namespace TweetDuck.Resources{
     static class ScriptLoader{
-        private const string UrlPrefix = "td:";
-
-        public static string LoadResource(string name, bool silent = false){
+        public static string LoadResource(string name, bool silent = false, Control sync = null){
             try{
-                return File.ReadAllText(Path.Combine(Program.ScriptPath, name), Encoding.UTF8);
-            }catch(Exception ex){
-                if (!silent){
-                    FormMessage.Error("TweetDuck Has Failed :(", "Unfortunately, TweetDuck could not load the "+name+" file. The program will continue running with limited functionality.\n\n"+ex.Message, FormMessage.OK);
+                string path = Program.ScriptPath;
+
+                #if DEBUG
+                if (Directory.Exists(HotSwapTargetDir)){
+                    path = Path.Combine(HotSwapTargetDir, "scripts");
+                    Debug.WriteLine("Hot swap active, redirecting "+name);
+                }
+                #endif
+
+                string contents = File.ReadAllText(Path.Combine(path, name), Encoding.UTF8);
+                int separator;
+
+                // first line can be either:
+                // #<version>\r\n
+                // #<version>\n
+
+                if (contents[0] != '#'){
+                    ShowLoadError(silent, sync, $"File {name} appears to be corrupted, please try reinstalling the app.");
+                    separator = 0;
+                }
+                else{
+                    separator = contents.IndexOf('\n');
+                    string fileVersion = contents.Substring(1, separator-1).TrimEnd();
+
+                    if (fileVersion != Program.VersionTag){
+                        ShowLoadError(silent, sync, $"File {name} is made for a different version of TweetDuck ({fileVersion}) and may not function correctly in this version, please try reinstalling the app.");
+                    }
                 }
 
+                return contents.Substring(separator).TrimStart();
+            }catch(Exception ex){
+                ShowLoadError(silent, sync, $"Could not load {name}. The program will continue running with limited functionality.\n\n{ex.Message}");
                 return null;
             }
         }
 
-        public static void ExecuteFile(IFrame frame, string file){
-            ExecuteScript(frame, LoadResource(file), GetRootIdentifier(file));
+        public static bool ExecuteFile(IFrame frame, string file, Control sync = null){
+            string script = LoadResource(file, sync == null, sync);
+            ExecuteScript(frame, script, GetRootIdentifier(file));
+            return script != null;
         }
 
         public static void ExecuteScript(IFrame frame, string script, string identifier){
             if (script != null){
-                frame.ExecuteJavaScriptAsync(script, UrlPrefix+identifier, 1);
+                frame.ExecuteJavaScriptAsync(script, "td:"+identifier, 1);
             }
         }
 
         public static string GetRootIdentifier(string file){
             return "root:"+Path.GetFileNameWithoutExtension(file);
         }
+
+        private static void ShowLoadError(bool silent, Control sync, string message){
+            if (silent){
+                return;
+            }
+
+            if (sync == null){
+                FormMessage.Error("Resource Error", message, FormMessage.OK);
+            }
+            else{
+                sync.InvokeSafe(() => FormMessage.Error("Resource Error", message, FormMessage.OK));
+            }
+        }
+        
+        #if DEBUG
+        private static readonly string HotSwapProjectRoot = FixPathSlash(Path.GetFullPath(Path.Combine(Program.ProgramPath, "../../../")));
+        private static readonly string HotSwapTargetDir = FixPathSlash(Path.Combine(HotSwapProjectRoot, "bin", "tmp"));
+        private static readonly string HotSwapRebuildScript = Path.Combine(HotSwapProjectRoot, "Resources", "PostBuild.ps1");
+
+        static ScriptLoader(){
+            if (File.Exists(HotSwapRebuildScript)){
+                Debug.WriteLine("Activating resource hot swap");
+
+                ResetHotSwap();
+                Application.ApplicationExit += (sender, args) => ResetHotSwap();
+            }
+        }
+
+        public static void HotSwap(){
+            if (!File.Exists(HotSwapRebuildScript)){
+                Debug.WriteLine("Failed resource hot swap, missing rebuild script: "+HotSwapRebuildScript);
+                return;
+            }
+            
+            ResetHotSwap();
+            Directory.CreateDirectory(HotSwapTargetDir);
+
+            using(Process process = Process.Start(new ProcessStartInfo{
+                FileName = "powershell",
+                Arguments = $"-ExecutionPolicy Unrestricted -File \"{HotSwapRebuildScript}\" \"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
+                WindowStyle = ProcessWindowStyle.Hidden
+            })){
+                // ReSharper disable once PossibleNullReferenceException
+                if (!process.WaitForExit(8000)){
+                    Debug.WriteLine("Failed resource hot swap, script did not finish in time");
+                    return;
+                }
+                else if (process.ExitCode != 0){
+                    Debug.WriteLine("Failed resource hot swap, script exited with code "+process.ExitCode);
+                    return;
+                }
+            }
+
+            // Force update plugin manager setup scripts
+
+            string newPluginRoot = Path.Combine(HotSwapTargetDir, "plugins");
+            
+            const BindingFlags flagsInstance = BindingFlags.Instance | BindingFlags.NonPublic;
+            const BindingFlags flagsStatic = BindingFlags.Static | BindingFlags.NonPublic;
+
+            Type typePluginManager = typeof(PluginManager);
+            Type typeFormBrowser = typeof(FormBrowser);
+
+            // ReSharper disable PossibleNullReferenceException
+            object pluginSetupScripts = typePluginManager.GetMethod("LoadSetupScripts", flagsStatic).Invoke(null, new object[0]);
+            typePluginManager.GetField("PluginSetupScripts", flagsStatic).SetValue(null, pluginSetupScripts);
+            
+            object instPluginManager = typeFormBrowser.GetField("plugins", flagsInstance).GetValue(FormManager.TryFind<FormBrowser>());
+            typePluginManager.GetField("rootPath", flagsInstance).SetValue(instPluginManager, newPluginRoot);
+
+            Debug.WriteLine("Reloading hot swapped plugins...");
+            ((PluginManager)instPluginManager).Reload();
+            // ReSharper restore PossibleNullReferenceException
+        }
+
+        private static void ResetHotSwap(){
+            try{
+                Directory.Delete(HotSwapTargetDir, true);
+            }catch(DirectoryNotFoundException){}
+        }
+
+        private static string FixPathSlash(string path){
+            return path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)+'\\';
+        }
+        #endif
     }
 }

Resources/Scripts/code.js

@@ -25,26 +25,23 @@
   const app = $(document.body).children(".js-app");
   
   //
-  // Constant: Column types mapped to their titles.
+  // Constant: Column icon classes mapped to their titles.
   //
-  const columnTypes = {
-    "col_home": "Home",
-    "col_timeline" : "Home",
-    "col_mentions": "Mentions",
-    "col_me": "Mentions",
-    "col_inbox": "Messages",
-    "col_messages": "Messages",
-    "col_interactions": "Notifications",
-    "col_followers": "Followers",
-    "col_activity": "Activity",
-    "col_favorites": "Likes",
-    "col_usertweets": "User",
-    "col_search": "Search",
-    "col_list": "List",
-    "col_customtimeline": "Timeline",
-    "col_dataminr": "Dataminr",
-    "col_livevideo": "Live video",
-    "col_scheduled": "Scheduled"
+  const columnTitles = {
+    "icon-home": "Home",
+    "icon-mention": "Mentions",
+    "icon-message": "Messages",
+    "icon-notifications": "Notifications",
+    "icon-follow": "Followers",
+    "icon-activity": "Activity",
+    "icon-favorite": "Likes",
+    "icon-user": "User",
+    "icon-search": "Search",
+    "icon-list": "List",
+    "icon-custom-timeline": "Timeline",
+    "icon-dataminr": "Dataminr",
+    "icon-play-video": "Live video",
+    "icon-schedule": "Scheduled"
   };
   
   //
@@ -98,6 +95,27 @@
     return value;
   };
   
+  //
+  // Block: Fix columns missing any identifiable attributes to allow individual styles.
+  //
+  $(document).on("uiColumnRendered", function(e, data){
+    let icon = data.$column.find(".column-type-icon").first();
+    return if icon.length !== 1;
+    
+    let name = Array.prototype.find.call(icon[0].classList, cls => cls.startsWith("icon-"));
+    return if !name;
+    
+    data.$column.attr("data-td-icon", name);
+    data.column._tduck_icon = name;
+  });
+  
+  //
+  // Block: Setup global function to retrieve the column name.
+  //
+  window.TDGF_getColumnName = function(column){
+    return columnTitles[column._tduck_icon] || "";
+  };
+  
   //
   // Function: Event callback for a new tweet.
   //
@@ -128,7 +146,7 @@
     };
     
     let fixMedia = (html, media) => {
-      return html.find(".js-media a[data-media-entity-id='"+media.mediaId+"']").css("background-image", 'url("'+media.small()+'")').removeClass("is-zoomable");
+      return html.find("a[data-media-entity-id='"+media.mediaId+"'], .media-item").first().removeClass("is-zoomable").css("background-image", 'url("'+media.small()+'")');
     };
     
     return function(column, tweet){
@@ -163,13 +181,15 @@
         if (previews){
           html.find(".reverse-image-search").remove();
           
+          let container = html.find(".js-media");
+          
           for(let media of tweet.getMedia()){
-            fixMedia(html, media);
+            fixMedia(container, media);
           }
           
           if (tweet.quotedTweet){
             for(let media of tweet.quotedTweet.getMedia()){
-              fixMedia(html, media).addClass("media-size-medium");
+              fixMedia(container, media).addClass("media-size-medium");
             }
           }
         }
@@ -193,13 +213,19 @@
           }
         });
         
+        if (tweet.quotedTweet){
+          html.find("p.txt-mute").filter(function(){
+            return $(this).text() === "Show this thread";
+          }).first().remove();
+        }
+        
         let type = tweet.getChirpType();
         
         if (type === "follow"){
           html.find(".js-user-actions-menu").parent().remove();
           html.find(".account-bio").removeClass("padding-t--5").css("padding-top", "2px");
         }
-        else if (type.startsWith("favorite") || type.startsWith("retweet")){
+        else if ((type.startsWith("favorite") || type.startsWith("retweet")) && tweet.isAboutYou()){
           html.children().first().addClass("td-notification-padded");
         }
         else if (type.includes("list_member")){
@@ -220,7 +246,7 @@
         let tweetUrl = source ? source.getChirpURL() : "";
         let quoteUrl = source && source.quotedTweet ? source.quotedTweet.getChirpURL() : "";
 
-        $TD.onTweetPopup(column.model.privateState.apiid, chirpId, columnTypes[column.getColumnType()] || "", html.html(), duration, tweetUrl, quoteUrl);
+        $TD.onTweetPopup(column.model.privateState.apiid, chirpId, window.TDGF_getColumnName(column), html.html(), duration, tweetUrl, quoteUrl);
       }
 
       if (column.model.getHasSound()){
@@ -284,6 +310,8 @@
       let fontSizeName = TD.settings.getFontSize();
       let themeName = TD.settings.getTheme();
       
+      let columnBackground = getClassStyleProperty("column", "background-color");
+      
       let tags = [
         "<html "+Array.prototype.map.call(document.documentElement.attributes, ele => `${ele.name}="${ele.value}"`).join(" ")+"><head>"
       ];
@@ -292,21 +320,7 @@
         tags.push($(this)[0].outerHTML);
       });
       
-      tags.push("<style type='text/css'>");
-      tags.push("body { background: "+getClassStyleProperty("column", "background-color")+" !important }"); // set background color
-      tags.push("a[data-full-url] { word-break: break-all !important }"); // break long urls
-      tags.push(".media-item, .media-preview { border-radius: 1px !important }"); // square-ify media
-      tags.push(".quoted-tweet { border-radius: 0 !important }"); // square-ify quoted tweets
-      tags.push(".activity-header.has-source-avatar { margin-bottom: 4px !important }"); // tweak distance between avatar and text
-      tags.push(".activity-header .tweet-timestamp { line-height: unset !important }"); // fix timestamp position
-      tags.push(".activity-header .icon-user-filled { vertical-align: sub !important; }"); // fix follow icon position
-      tags.push("#tduck-show-thread { display: inline-block !important; cursor: pointer }");
-      
-      if (fontSizeName === "smallest"){
-        tags.push(".badge-verified:before { width: 13px !important; height: 13px !important; background-position: -223px -98px !important }"); // fix cut off badge icon
-      }
-      
-      tags.push("</style>");
+      tags.push("<style type='text/css'>body { background: "+columnBackground+" !important }</style>");
       
       doc.setAttribute("data-td-font", fontSizeName);
       doc.setAttribute("data-td-theme", themeName);
@@ -540,7 +554,8 @@
     let me = $(this)[0];
     
     if (me.classList.contains("js-media-image-link") && highlightedTweetObj){
-      let media = (highlightedTweetObj.quotedTweet || highlightedTweetObj).getMedia().find(media => media.mediaId === me.getAttribute("data-media-entity-id"));
+      let tweet = highlightedTweetObj.hasMedia() ? highlightedTweetObj : highlightedTweetObj.quotedTweet;
+      let media = tweet.getMedia().find(media => media.mediaId === me.getAttribute("data-media-entity-id"));
       
       if ((media.isVideo && media.service === "twitter") || media.isAnimatedGif){
         $TD.setLastRightClickInfo("video", media.chooseVideoVariant().url);
@@ -592,22 +607,15 @@
   // Block: Update highlighted column and tweet for context menu and other functionality.
   //
   (function(){
-    var lastTweet = "";
-    
     const updateHighlightedColumn = function(ele){
       highlightedColumnEle = ele;
       highlightedColumnObj = ele ? TD.controller.columnManager.get(ele.attr("data-column")) : null;
       return !!highlightedColumnObj;
     };
     
-    const updateHighlightedTweet = function(ele, obj, tweetUrl, quoteUrl, authors, imageList){
+    const updateHighlightedTweet = function(ele, obj){
       highlightedTweetEle = ele;
       highlightedTweetObj = obj;
-      
-      if (lastTweet !== tweetUrl){
-        $TD.setLastHighlightedTweet(tweetUrl, quoteUrl, authors, imageList);
-        lastTweet = tweetUrl;
-      }
     };
     
     const processMedia = function(chirp){
@@ -623,6 +631,19 @@
       
       mouseleave: function(){
         updateHighlightedColumn(null);
+      },
+      
+      contextmenu: function(){
+        let tweet = highlightedTweetObj;
+        
+        if (tweet && tweet.chirpType === TD.services.ChirpBase.TWEET){
+          let tweetUrl = tweet.getChirpURL();
+          let quoteUrl = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+          let chirpAuthors = tweet.quotedTweet ? [ tweet.getMainUser().screenName, tweet.quotedTweet.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
+          let chirpImages = tweet.hasImage() ? processMedia(tweet) : tweet.quotedTweet && tweet.quotedTweet.hasImage() ? processMedia(tweet.quotedTweet) : "";
+          
+          $TD.setRightClickedChirp(tweetUrl || "", quoteUrl || "", chirpAuthors, chirpImages);
+        }
       }
     });
     
@@ -634,21 +655,11 @@
         let tweet = highlightedColumnObj.findChirp(me.attr("data-tweet-id")) || highlightedColumnObj.findChirp(me.attr("data-key"));
         return if !tweet;
         
-        if (tweet.chirpType === TD.services.ChirpBase.TWEET){
-          let tweetUrl = tweet.getChirpURL();
-          let quoteUrl = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
-          let authors = tweet.quotedTweet ? [ tweet.getMainUser().screenName, tweet.quotedTweet.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
-          let imageList = tweet.quotedTweet && tweet.quotedTweet.hasImage() ? processMedia(tweet.quotedTweet) : tweet.hasImage() ? processMedia(tweet) : "";
-          
-          updateHighlightedTweet(me, tweet, tweetUrl || "", quoteUrl || "", authors, imageList);
-        }
-        else{
-          updateHighlightedTweet(me, tweet, "", "", "", "");
-        }
+        updateHighlightedTweet(me, tweet);
       },
       
       mouseleave: function(){
-        updateHighlightedTweet(null, null, "", "", "", "");
+        updateHighlightedTweet(null, null);
       }
     });
   })();
@@ -657,85 +668,52 @@
   // Block: Screenshot tweet to clipboard.
   //
   (function(){
-    var selectedTweet;
-    
-    const setImportantProperty = function(obj, property, value){
-      if (obj.length === 1){
-        obj[0].style.setProperty(property, value, "important");
-      }
-    };
-    
-    app.delegate("article.js-stream-item", "contextmenu", function(){
-      selectedTweet = $(this);
-    });
-    
     window.TDGF_triggerScreenshot = function(){
-      if (selectedTweet){
-        let tweetWidth = Math.floor(selectedTweet.width());
-        let parent = selectedTweet.parent();
+      return if !highlightedTweetObj || !highlightedColumnObj;
       
-        let isDetail = parent.hasClass("js-tweet-detail");
-        let isReply = !isDetail && (parent.hasClass("js-replies-to") || parent.hasClass("js-replies-before"));
+      let chirp = highlightedColumnObj.findChirp(highlightedTweetEle.attr("data-key")) || highlightedTweetObj;
       
-        selectedTweet = selectedTweet.clone();
+      let columnWidth = highlightedColumnEle.width();
       
-        let container = selectedTweet.children().first();
-        container.addClass($(document.documentElement).attr("class"));
-        container.addClass($(document.body).attr("class"));
-        container.css("padding-bottom", "0");
+      let html = $(chirp.render({
+        withFooter: false,
+        withTweetActions: false,
+        isInConvo: false,
+        isFavorite: false,
+        isRetweeted: false, // keeps retweet mark above tweet
+        isPossiblySensitive: false,
+        mediaPreviewSize: highlightedColumnObj.getMediaPreviewSize()
+      }));
       
-        setImportantProperty(selectedTweet.find(".js-tweet-text"), "margin-bottom", "8px");
-        setImportantProperty(selectedTweet.find(".js-quote-detail"), "margin-bottom", "10px");
-        setImportantProperty(selectedTweet.find(".js-poll-link").next(), "margin-bottom", "8px");
+      html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
+      html.find(".td-screenshot-remove").remove();
       
-        if (isDetail){
-          if (selectedTweet.find("[class*='media-grid-']").length > 0){
-            setImportantProperty(selectedTweet.find(".js-tweet-media"), "margin-bottom", "10px");
-          }
-          else{
-            setImportantProperty(selectedTweet.find(".js-tweet-media"), "margin-bottom", "6px");
-          }
-          
-          setImportantProperty(selectedTweet.find(".js-media-preview-container"), "margin-bottom", "4px");
-          selectedTweet.find(".js-translate-call-to-action").first().remove();
-          selectedTweet.find(".js-tweet").first().nextAll().remove();
-          selectedTweet.find("footer").last().prevUntil(":not(.txt-mute)").addBack().remove(); // footer, date, location
-        }
-        else{
-          setImportantProperty(selectedTweet.find(".js-media-preview-container").filter(function(){
-            return $(this).closest(".js-quote-detail").length === 0;
-          }), "margin-bottom", "10px");
-          
-          selectedTweet.find("footer").last().remove();
-        }
-        
-        if (isReply){
-          selectedTweet.find(".is-conversation").removeClass("is-conversation");
-          selectedTweet.find(".thread").remove();
-        }
-        
-        selectedTweet.find("p.link-complex-target").filter(function(){
+      html.find("p.link-complex-target,p.txt-mute").filter(function(){
         return $(this).text() === "Show this thread";
-        }).first().remove();
+      }).remove();
       
-        selectedTweet.find(".js-poll-link").remove();
-        selectedTweet.find(".td-screenshot-remove").remove();
+      html.addClass($(document.documentElement).attr("class"));
+      html.addClass($(document.body).attr("class"));
       
-        let testTweet = selectedTweet.clone().css({
-          position: "absolute",
-          left: "-999px",
-          width: tweetWidth+"px"
-        }).appendTo(document.body);
+      html.css("background-color", getClassStyleProperty("column", "background-color"));
+      html.css("border", "none");
       
-        let testTweetAvatar = testTweet.find(".tweet-avatar").first();
-        let avatarBottom = testTweetAvatar.offset().top+testTweetAvatar.height();
+      for(let selector of [ ".js-quote-detail", ".js-media-preview-container", ".js-media" ]){
+        let ele = html.find(selector);
         
-        let realHeight = Math.floor(Math.max(testTweet.height(), avatarBottom+10));
-        testTweet.remove();
-        
-        selectedTweet.find(".js-stream-item-content").first().css("height", "100vh");
-        $TD.screenshotTweet(selectedTweet.html(), tweetWidth, realHeight);
+        if (ele.length){
+          ele[0].style.setProperty("margin-bottom", "2px", "important");
+          break;
         }
+      }
+      
+      let type = chirp.getChirpType();
+      
+      if ((type.startsWith("favorite") || type.startsWith("retweet")) && chirp.isAboutYou()){
+        html.addClass("td-notification-padded");
+      }
+      
+      $TD.screenshotTweet(html[0].outerHTML, columnWidth);
     };
   })();
   
@@ -926,26 +904,15 @@
   })();
   
   //
-  // Block: Swap shift key functionality for selecting accounts, and refocus the textbox afterwards.
+  // Block: Refocus the textbox after switching accounts.
   //
   onAppReady.push(function(){
-    const onAccountClick = function(e){
-      if ($TDX.switchAccountSelectors){
-        e.shiftKey = !e.shiftKey;
-      }
-      
+    const refocusInput = function(){
       $(".js-compose-text", ".js-docked-compose").focus();
     };
     
-    $(".js-account-list", ".js-docked-compose").delegate(".js-account-item", "click", onAccountClick);
-    
-    return if !ensurePropertyExists(TD, "components", "AccountSelector", "prototype", "refreshPostingAccounts");
-    
-    TD.components.AccountSelector.prototype.refreshPostingAccounts = appendToFunction(TD.components.AccountSelector.prototype.refreshPostingAccounts, function(){
-      if (!this.$node.attr("td-account-selector-hook")){
-        this.$node.attr("td-account-selector-hook", "1");
-        this.$node.delegate(".js-account-item", "click", onAccountClick);
-      }
+    $(".js-account-list", ".js-docked-compose").delegate(".js-account-item", "click", function(e){
+      setTimeout(refocusInput, 0);
     });
   });
   
@@ -1042,10 +1009,40 @@
     };
   })();
   
+  //
+  // Block: Setup global function to inject custom HTML into mustache templates.
+  //
+  window.TDGF_injectMustache = function(name, operation, search, custom){
+    let replacement;
+    
+    switch(operation){
+      case "replace": replacement = custom; break;
+      case "append": replacement = search+custom; break;
+      case "prepend": replacement = custom+search; break;
+      default: throw "Invalid mustache injection operation. Only 'replace', 'append', 'prepend' are supported.";
+    }
+    
+    let prev = TD.mustaches[name];
+    
+    if (!prev){
+      $TD.crashDebug("Mustache injection is referencing an invalid mustache: "+name);
+      return false;
+    }
+    
+    TD.mustaches[name] = prev.replace(search, replacement);
+    
+    if (prev === TD.mustaches[name]){
+      $TD.crashDebug("Mustache injection had no effect: "+name);
+      return false;
+    }
+    
+    return true;
+  };
+  
   //
   // Block: Let's make retweets lowercase again.
   //
-  TD.mustaches["status/tweet_single.mustache"] = TD.mustaches["status/tweet_single.mustache"].replace("{{_i}} Retweeted{{/i}}", "{{_i}} retweeted{{/i}}");
+  window.TDGF_injectMustache("status/tweet_single.mustache", "replace", "{{_i}} Retweeted{{/i}}", "{{_i}} retweeted{{/i}}");
   
   if (ensurePropertyExists(TD, "services", "TwitterActionRetweet", "prototype", "generateText")){
     TD.services.TwitterActionRetweet.prototype.generateText = appendToFunction(TD.services.TwitterActionRetweet.prototype.generateText, function(){
@@ -1114,7 +1111,8 @@
       }
     });
     
-    TD.mustaches["status/media_thumb.mustache"] = TD.mustaches["status/media_thumb.mustache"].replace("is-gif", "is-gif is-paused");
+    window.TDGF_injectMustache("status/media_thumb.mustache", "append", "is-gif", " is-paused");
+    
     TD.mustaches["media/native_video.mustache"] = '<div class="js-media-gif-container media-item nbfc is-video" style="background-image:url({{imageSrc}})"><video class="js-media-gif media-item-gif full-width block {{#isPossiblySensitive}}is-invisible{{/isPossiblySensitive}}" loop src="{{videoUrl}}"></video><a class="js-gif-play pin-all is-actionable">{{> media/video_overlay}}</a></div>';
     
     if (!ensurePropertyExists(TD, "components", "MediaGallery", "prototype", "_loadTweet") ||
@@ -1203,9 +1201,33 @@
         }
       }
       
+      if (!("tweetduck" in data)){
         $(".js-app-search-input").val("");
         $(".js-perform-search").blur();
       }
+    }
+  });
+  
+  //
+  // Block: Setup global function to add a search column with the specified query.
+  //
+  onAppReady.push(function(){
+    let context = $._data(document, "events")["uiSearchInputSubmit"][0].handler.context;
+    
+    window.TDGF_performSearch = function(query){
+      context.performSearch({ query, tweetduck: true });
+    };
+  });
+  
+  //
+  // Block: Reorder search results to move accounts above hashtags.
+  //
+  onAppReady.push(function(){
+    let container = $(".js-search-in-popover");
+    let hashtags = $(".js-typeahead-topic-list", container);
+    
+    $(".js-typeahead-user-list", container).insertBefore(hashtags);
+    hashtags.addClass("list-divider");
   });
   
   //
@@ -1348,8 +1370,8 @@
   //
   // Block: Remove column mouse wheel handler, which allows smooth scrolling inside columns, and horizontally scrolling column container when holding Shift.
   //
-  if (ensurePropertyExists(TD, "ui", "columns", "setupColumn")){
-    TD.ui.columns.setupColumn = appendToFunction(TD.ui.columns.setupColumn, function(e){
+  if (ensurePropertyExists(TD, "ui", "columns", "setupColumnScrollListeners")){
+    TD.ui.columns.setupColumnScrollListeners = appendToFunction(TD.ui.columns.setupColumnScrollListeners, function(e){
       $(".js-column[data-column='"+e.model.getKey()+"']").off("mousewheel onmousewheel");
     });
   }
@@ -1404,6 +1426,8 @@
       window.gc && window.gc();
       window.location.reload();
     });
+    
+    window.TDGF_reload = function(){}; // redefine to prevent reloading multiple times
   };
   
   if (window.TD_SESSION && window.TD_SESSION.gc){

Resources/Scripts/introduction.js

@@ -93,8 +93,8 @@
           <label for="td-anonymous-data">Send anonymous usage data</label>
           <label>&nbsp;(<a href="https://github.com/chylex/TweetDuck/wiki/Send-anonymous-data" rel="nofollow">learn more</a>)</label>
         </div>
-        <button class="btn btn-positive" data-guide><span class="label">Show Guide</span></button>
-        <button class="btn btn-positive"><span class="label">Close</span</button>
+        <button class="Button--primary" data-guide><span class="label">Show Guide</span></button>
+        <button class="Button--secondary"><span class="label">Close</span</button>
       </footer>
     </div>
   </div>

Resources/Scripts/notification.js

@@ -14,9 +14,11 @@
   };
   
   //
-  // Block: Hook into links to bypass default open function and t.co.
+  // Block: Hook into links to bypass default open function and t.co, and handle skipping notification when opening links.
   //
-  addEventListener(links, "click", function(e){
+  (function(){
+    const onLinkClick = function(e){
+      if (e.button === 0 || e.button === 1){
         let ele = e.currentTarget;
 
         $TD.openBrowser(ele.hasAttribute("data-full-url") ? ele.getAttribute("data-full-url") : ele.getAttribute("href"));
@@ -29,7 +31,12 @@
             $TD.loadNextNotification();
           }
         }
-  });
+      }
+    };
+    
+    addEventListener(links, "click", onLinkClick);
+    addEventListener(links, "auxclick", onLinkClick);
+  })();
   
   //
   // Block: Allow bypassing of t.co in context menus.
@@ -122,11 +129,10 @@
   // Block: Setup a skip button.
   //
   if (!document.body.hasAttribute("td-example-notification")){
-    document.body.insertAdjacentHTML("afterbegin", `
+    document.body.children[0].insertAdjacentHTML("beforeend", `
 <svg id="td-skip" width="10" height="17" viewBox="0 0 350 600">
   <path fill="#888" d="M0,151.656l102.208-102.22l247.777,247.775L102.208,544.986L0,442.758l145.546-145.547">
-</svg>
-`);
+</svg>`);
     
     document.getElementById("td-skip").addEventListener("click", function(){
       $TD.loadNextNotification();
@@ -143,4 +149,9 @@
   document.body.addEventListener("mouseleave", function(){
     document.body.classList.remove("td-hover");
   });
+  
+  //
+  // Block: Force a reset of scroll position on every load.
+  //
+  history.scrollRestoration = "manual";
 })($TD, $TDX);

Resources/Scripts/plugins.browser.js

@@ -117,7 +117,9 @@
   //
   // Block: Setup bridges to global functions.
   //
+  window.TDPF_getColumnName = window.TDGF_getColumnName;
   window.TDPF_playVideo = window.TDGF_playVideo;
   window.TDPF_reloadColumns = window.TDGF_reloadColumns;
   window.TDPF_prioritizeNewestEvent = window.TDGF_prioritizeNewestEvent;
+  window.TDPF_injectMustache = window.TDGF_injectMustache;
 })();

Resources/Scripts/screenshot.js

@@ -0,0 +1,26 @@
+(function($TD){
+  let ele = document.getElementsByTagName("article")[0];
+  ele.style.width = "{width}px";
+  
+  ele.style.position = "absolute";
+  let contentHeight = ele.offsetHeight;
+  ele.style.position = "static";
+  
+  let avatar = ele.querySelector(".tweet-avatar");
+  let avatarBottom = avatar ? avatar.getBoundingClientRect().bottom : 0;
+  
+  $TD.setHeight(Math.floor(Math.max(contentHeight, avatarBottom+9))).then(() => {
+    let framesLeft = 5; // basic render is done in 1 frame, large media take longer
+    
+    let onNextFrame = function(){
+      if (--framesLeft < 0){
+        $TD.triggerScreenshot();
+      }
+      else{
+        requestAnimationFrame(onNextFrame);
+      }
+    };
+    
+    onNextFrame();
+  });
+})($TD_NotificationScreenshot);

Resources/Scripts/styles/browser.css

@@ -38,7 +38,7 @@
 /* Square-ify stuff */
 /********************/
 
-.btn, .mdl, .mdl-content, .popover, .lst-modal, .tooltip-inner {
+button, .btn, .mdl, .mdl-content, .popover, .lst-modal, .tooltip-inner {
   border-radius: 1px !important;
 }
 
@@ -46,14 +46,60 @@
   border-radius: 1px !important;
 }
 
-.btn-compose, .app-search-fake, .app-search-input, .compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .media-grid-container, .js-quote-tweet-holder, .detail-view-inline-text {
+.tweet-button, .app-search-fake, .app-search-input, .compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .media-grid-container, .js-quote-tweet-holder, .detail-view-inline-text {
   border-radius: 0 !important;
 }
 
-.dropdown-menu, .list-item-last, .quoted-tweet, .input-group-button, input, textarea, select, .prf-header, .accs li, .accs img {
+.dropdown-menu, .list-item-last, .quoted-tweet, input, textarea, select, .prf-header {
   border-radius: 0 !important;
 }
 
+/***********************************/
+/* Revert various design decisions */
+/***********************************/
+
+button {
+  font-weight: normal !important;
+}
+
+.tweet-button:not(:hover) {
+  background-color: #2B7BB9 !important;
+  border-color: #2B7BB9 !important;
+}
+
+#tduck .js-compose-scroller button.full-width {
+  padding: 7px 10px !important;
+}
+
+#tduck .js-compose-scroller button.full-width > i {
+  font-size: 20px !important;
+  vertical-align: -5px !important;
+}
+
+.js-show-drawer {
+  text-align: left;
+}
+
+.js-show-drawer .icon-compose {
+  display: inline-block !important;
+}
+
+.js-show-drawer span::before {
+  content: "New ";
+}
+
+#tduck .app-header .search-input-control input {
+  font-size: 13px !important;
+}
+
+#tduck .app-header .search-input-perform-search {
+  right: 8px !important;
+}
+
+.js-account-safeguard-checkbox, .js-account-safeguard-checkbox label {
+  margin-bottom: 0 !important;
+}
+
 /***********************/
 /* Hide TweetDeck logo */
 /***********************/
@@ -104,6 +150,7 @@
 
 .activity-header .icon-user-filled {
   vertical-align: sub !important;
+  margin-right: 4px !important;
 }
 
 html[data-td-theme='light'] .stream-item:not(:hover) .js-user-actions-menu {
@@ -118,19 +165,19 @@ html[data-td-theme='dark'] .stream-item:not(:hover) .js-user-actions-menu {
   opacity: 0.25;
 }
 
-.stream-item[data-key^="favorite"] .item-img, .stream-item[data-key^="retweet"] .item-img {
+.stream-item[data-key^="favorite"] .has-source-avatar .item-img, .stream-item[data-key^="retweet"] .has-source-avatar .item-img {
   position: absolute;
   left: 21px;
   top: 48px;
   width: 0 !important;
 }
 
-.stream-item[data-key^="favorite"] .activity-header > .nbfc, .stream-item[data-key^="retweet"] .activity-header > .nbfc {
+.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc, .stream-item[data-key^="retweet"] .has-source-avatar > .nbfc {
   margin-left: 46px;
   line-height: unset !important;
 }
 
-.stream-item[data-key^="favorite"] .activity-header > .nbfc > .avatar, .stream-item[data-key^="retweet"] .activity-header > .nbfc > .avatar {
+.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc > .avatar, .stream-item[data-key^="retweet"] .has-source-avatar > .nbfc > .avatar {
   position: absolute;
   margin-left: -34px;
 }
@@ -149,6 +196,11 @@ a[data-full-url] {
   color: #9f51cf !important;
 }
 
+.js-typeahead-user-list.is-hidden + .js-typeahead-topic-list {
+  /* hide custom search result divider when not needed */
+  border-top: none !important;
+}
+
 /***************************************/
 /* Replace 'Stay open' with a pin icon */
 /***************************************/
@@ -183,6 +235,37 @@ a[data-full-url] {
   vertical-align: -10% !important;
 }
 
+.column-title {
+  /* fix alignment of everything in column headers */
+  padding-top: 1px !important;
+}
+
+.column-title .attribution {
+  /* fix alignment of usernames in column headers */
+  margin: 0 0 0 6px !important;
+}
+
+.app-navigator .tooltip {
+  /* fix tooltips in navigation */
+  display: none !important;
+}
+
+.column-header-links .icon {
+  /* fix tooltips in column headers */
+  height: calc(1em + 8px) !important;
+}
+
+.js-column-options .btn-options-tray {
+  /* fix underline on buttons in column options */
+  text-decoration: none !important;
+}
+
+#tduck .nav-user-info .hide-condensed {
+  /* move login account info */
+  margin: 0px !important;
+  padding-left: 2px !important;
+}
+
 html[data-td-font='smallest'] .sprite-verified-mini {
   /* fix cut off badge when zoomed in */
   width: 13px !important;
@@ -204,11 +287,6 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   background-position: -223px -97px !important;
 }
 
-.accs-header {
-  /* fix retweet account selector heading */
-  padding-left: 0 !important;
-}
-
 .keyboard-shortcut-list {
   /* fix keyboard navigation alignment */
   vertical-align: top !important;
@@ -219,29 +297,33 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   cursor: pointer;
 }
 
-.inline-reply .btn-square, .rpl-actions .btn-square {
-  /* remove effects from buttons under reply input... this keeps happening for some stupid reason */
-  background: transparent !important;
-  box-shadow: none !important;
-}
-
 .js-add-to-customtimeline-input {
   /* the custom timeline input shadow is behaving super weird when focused */
   box-shadow: none !important;
 }
 
+#tduck .js-follow-button .icon-follow {
+  /* follow icon is too small which makes it aliased and misaligned */
+  font-size: 17px !important;
+}
+
+.js-follow-button .following-text, .js-follow-button .unfollow-text {
+  /* unfollow button has a border for some reason */
+  border-width: 0 !important;
+}
+
 /***************************************************************/
 /* Fix glaring visual issues that twitter hasn't fixed yet smh */
 /***************************************************************/
 
-.column-nav-link .attribution {
+.js-column-nav-list .attribution {
   /* fix cut off account names */
-  position: absolute !important;
+  line-height: 1.1 !important;
 }
 
 #tduck .js-docked-compose .js-drawer-close {
   /* fix close drawer button position */
-  margin: 20px 0 0 !important;
+  margin: 18px 0 0 !important;
 }
 
 .compose-reply-tweet-remove {
@@ -255,25 +337,6 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   vertical-align: -15% !important;
 }
 
-/************************************************/
-/* Fix tooltips in navigation and column header */
-/************************************************/
-
-.app-navigator .tooltip {
-  display: none !important;
-}
-
-.js-column-header .column-header-link {
-  padding: 0 !important;
-}
-
-.js-column-header .column-header-link .icon {
-  width: calc(1em + 8px);
-  height: 100%;
-  padding: 9px 4px;
-  box-sizing: border-box;
-}
-
 /*******************************************/
 /* Fix one pixel space below column header */
 /*******************************************/
@@ -286,26 +349,22 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   border-bottom: none !important;
 }
 
-.is-options-open .column-type-icon {
-  bottom: 27px !important;
-}
-
 /********************************************/
 /* Fix cut off usernames in Messages column */
 /********************************************/
 
-.column-type-message.is-shifted-1 .column-title-container {
+[data-td-icon="icon-message"].is-shifted-1 .column-title-container {
   height: 100%;
   border-bottom-color: transparent;
 }
 
-#tduck .column-type-message.is-shifted-1 .column-title-items {
+#tduck [data-td-icon="icon-message"].is-shifted-1 .column-title-items {
   height: 100%;
   margin-left: 4px !important;
   padding-top: 1px;
 }
 
-.column-type-message.is-shifted-1 .username {
+[data-td-icon="icon-message"].is-shifted-1 .username {
   vertical-align: bottom;
 }
 

Resources/Scripts/styles/notification.css

@@ -2,18 +2,24 @@
 /* General */
 /***********/
 
-body:before {
-  content: none !important;
+html, body {
+  height: auto !important;
+  overflow-x: hidden !important;
+  overflow-y: auto !important;
 }
 
-body {
-  overflow-y: auto !important;
+body::before {
+  content: none !important;
 }
 
 .column {
   background: transparent !important;
 }
 
+/***********************/
+/* Redesign scrollbars */
+/***********************/
+
 .scroll-styled-v::-webkit-scrollbar {
   width: 7px !important;
 }
@@ -26,9 +32,41 @@ body {
   border-left: 0 !important;
 }
 
-/*************/
-/* Usernames */
-/*************/
+/********************/
+/* Square-ify stuff */
+/********************/
+
+.media-item, .media-preview {
+  border-radius: 1px !important;
+}
+
+.quoted-tweet {
+  border-radius: 0 !important;
+}
+
+/***********************/
+/* Tweaks for features */
+/***********************/
+
+a[data-full-url] {
+  word-break: break-all !important;
+}
+
+#tduck-show-thread {
+  display: inline-block !important;
+  cursor: pointer;
+}
+
+/*******************************************/
+/* Fix general visual issues or annoyances */
+/*******************************************/
+
+html[data-td-font='smallest'] .badge-verified:before {
+  /* fix cut off badge icon */
+  width: 13px !important;
+  height: 13px !important;
+  background-position: -223px -98px !important;
+}
 
 .account-inline .username {
   vertical-align: 10% !important;
@@ -38,9 +76,22 @@ body {
   vertical-align: -10% !important;
 }
 
-/************************************/
-/* Favorite & retweet notifications */
-/************************************/
+/****************************************/
+/* Tweak notification layout and design */
+/****************************************/
+
+.activity-header.has-source-avatar {
+  margin-bottom: 4px !important;
+}
+
+.activity-header .tweet-timestamp {
+  line-height: unset !important;
+}
+
+.activity-header .icon-user-filled {
+  vertical-align: sub !important;
+  margin-right: 4px !important;
+}
       
 .td-notification-padded .item-img {
   position: absolute;
@@ -63,13 +114,13 @@ body {
 /* Media */
 /*********/
 
-.media-size-medium {
+.td-notification .media-size-medium {
   max-height: 240px;
   height: calc(100vh - 20px) !important;
   border-radius: 1px !important;
 }
 
-.js-quote-detail .media-size-medium {
+.td-notification .js-quote-detail .media-size-medium {
   height: calc(100vh - 28px) !important;
 }
 
@@ -88,7 +139,7 @@ body {
 
 #td-skip {
   position: fixed;
-  left: 30px;
+  left: 29px;
   bottom: 10px;
   z-index: 1000;
   cursor: pointer;

Resources/Scripts/twitter.js

@@ -4,7 +4,7 @@
   //
   var injectCSS = function(){
     if (!document.head){
-      setTimeout(injectCSS, 25);
+      setTimeout(injectCSS, 5);
       return;
     }
     
@@ -15,7 +15,7 @@
       style.sheet.insertRule(rule, 0);
     };
     
-    addRule("body { overflow: hidden !important; background-color: #1c6399 !important; }"); // remove scrollbar and change background
+    addRule("body { overflow: hidden !important; }"); // remove scrollbar
     addRule(".page-canvas { box-shadow: 0 0 150px rgba(255, 255, 255, 0.3) !important; }"); // change page box shadow
     addRule(".topbar { display: none !important; }"); // hide top bar
     
@@ -60,4 +60,16 @@
       }
     });
   }
+  //
+  // Block: Fix broken Cancel button on logout page.
+  //
+  else if (location.pathname === "/logout"){
+    document.addEventListener("DOMContentLoaded", function(){
+      let cancel = document.querySelector(".buttons .cancel");
+
+      if (cancel && cancel.tagName === "A"){
+        cancel.href = "https://tweetdeck.twitter.com/";
+      }
+    });
+  }
 })();

Resources/Scripts/update.js

@@ -1,33 +1,9 @@
 (function($, $TDU){
-  //
-  // Variable: Current timeout ID for update checking.
-  //
-  var updateCheckTimeoutID;
-  
-  //
-  // Constant: Update exe file name.
-  //
-  const updateFileName = "TweetDuck.Update.exe";
-  
-  //
-  // Constant: Url that returns JSON data about latest version.
-  //
-  const updateCheckUrlLatest = "https://api.github.com/repos/chylex/TweetDuck/releases/latest";
-  
-  //
-  // Constant: Url that returns JSON data about all versions, including prereleases.
-  //
-  const updateCheckUrlAll = "https://api.github.com/repos/chylex/TweetDuck/releases";
-  
-  //
-  // Constant: Fallback url in case the update installer file is missing.
-  //
-  const updateDownloadFallback = "https://tweetduck.chylex.com";
-  
   //
   // Function: Creates the update notification element. Removes the old one if already exists.
   //
-  var displayNotification = function(version, download, changelog){
+  var displayNotification = function(version, changelog){
+    
     // styles
     var css = $("#tweetduck-update-css");
     
@@ -167,7 +143,7 @@
 <div id='tweetduck-changelog'>
   <div id='tweetduck-changelog-box'>
     <h2>TweetDuck Update ${version}</h2>
-    ${changelog}
+    ${markdown(atob(changelog))}
   </div>
 </div>
 `).appendTo(document.body).css("display", "none");
@@ -219,17 +195,11 @@
 
     buttonDiv.children(".tdu-btn-download").click(function(){
       hide();
-      
-      if (download){
       $TDU.onUpdateAccepted();
-      }
-      else{
-        $TDU.openBrowser(updateDownloadFallback);
-      }
     });
     
     buttonDiv.children(".tdu-btn-later").click(function(){
-      clearTimeout(updateCheckTimeoutID);
+      $TDU.onUpdateDelayed();
       slide();
     });
 
@@ -245,15 +215,6 @@
     return ele;
   };
   
-  //
-  // Function: Returns milliseconds until the start of the next hour, with an extra offset in seconds that can skip an hour if the clock would roll over too soon.
-  //
-  var getTimeUntilNextHour = function(extra){
-    var now = new Date();
-    var offset = new Date(+now+extra*1000);
-    return new Date(offset.getFullYear(), offset.getMonth(), offset.getDate(), offset.getHours()+1, 0, 0)-now;
-  };
-  
   //
   // Function: Ghetto-converts markdown to HTML.
   //
@@ -274,34 +235,14 @@
   };
   
   //
-  // Function: Runs an update check and updates all DOM elements appropriately.
+  // Block: Check updates on startup.
   //
-  var runUpdateCheck = function(eventID, versionTag, dismissedVersionTag, allowPre){
-    clearTimeout(updateCheckTimeoutID);
-    updateCheckTimeoutID = setTimeout($TDU.triggerUpdateCheck, getTimeUntilNextHour(60*30)); // 30 minute offset
-    
-    $.getJSON(allowPre ? updateCheckUrlAll : updateCheckUrlLatest, function(response){
-      var release = allowPre ? response[0] : response;
-      
-      var tagName = release.tag_name;
-      var hasUpdate = tagName !== versionTag && tagName !== dismissedVersionTag && release.assets.length > 0;
-      
-      if (hasUpdate){
-        var obj = release.assets.find(asset => asset.name === updateFileName) || { browser_download_url: "" };
-        displayNotification(tagName, obj.browser_download_url, markdown(release.body));
-        
-        if (eventID){ // ignore undefined and 0
-          $TDU.onUpdateCheckFinished(eventID, tagName, obj.browser_download_url);
-        }
-      }
-      else if (eventID){ // ignore undefined and 0
-        $TDU.onUpdateCheckFinished(eventID, null, null);
-      }
+  $(document).one("TD.ready", function(){
+    $TDU.triggerUpdateCheck();
   });
-  };
   
   //
   // Block: Setup global functions.
   //
-  window.TDUF_runUpdateCheck = runUpdateCheck;
+  window.TDUF_displayNotification = displayNotification;
 })($, $TDU);

Resources/Utilities/CompareStylesheets.cs

@@ -0,0 +1,26 @@
+using System.Text.RegularExpressions;
+
+HashSet<string> ReadSelectors(string file){
+    return new HashSet<string>(
+        File.ReadAllLines(file)
+            .Where(line => line.Contains('{'))
+            .Select(line => line.Substring(0, line.IndexOf('{')).Trim())
+            .SelectMany(lines => lines.Split(new char[]{ ',', ' ' }, StringSplitOptions.RemoveEmptyEntries))
+    );
+}
+
+HashSet<string> ExtractClasses(HashSet<string> selectors){
+    return new HashSet<string>(
+        selectors.SelectMany(selector => Regex.Matches(selector, @"\.[a-zA-Z0-9_-]+").Cast<Match>().Select(match => match.Value))
+    );
+}
+
+void PrintAll(IEnumerable<string> data){
+    foreach(string line in data){
+        Print(line);
+    }
+}
+
+void PrintMissing(HashSet<string> all, HashSet<string> subset){
+    PrintAll(subset.Where(ele => !all.Contains(ele)));
+}