Release 1.13.4.1

Closes #211

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

@@ -37,13 +37,11 @@ namespace TweetDuck.Configuration{
 
         public bool FirstRun            { get; set; } = true;
         public bool AllowDataCollection { get; set; } = false;
-        public bool ShowFollowNotification { get; set; } = true;
 
         public WindowState BrowserWindow { get; set; } = new WindowState();
         public WindowState PluginsWindow { get; set; } = new WindowState();
 
         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;
@@ -52,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/FormBrowser.cs

@@ -12,11 +12,13 @@ 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{
+    sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
         private static UserConfig Config => Program.UserConfig;
 
         public bool IsWaiting{
@@ -37,6 +39,9 @@ namespace TweetDuck.Core{
         }
 
         public string UpdateInstallerPath { get; private set; }
+        private bool ignoreUpdateCheckError;
+        
+        public AnalyticsFile AnalyticsFile => analytics?.File ?? AnalyticsFile.Dummy;
 
         private readonly TweetDeckBrowser browser;
         private readonly PluginManager plugins;
@@ -64,9 +69,11 @@ namespace TweetDuck.Core{
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
             
-            this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification));
+            this.browser = 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) => {
@@ -74,6 +81,7 @@ namespace TweetDuck.Core{
                 Config.TrayBehaviorChanged -= Config_TrayBehaviorChanged;
                 
                 browser.Dispose();
+                updates.Dispose();
                 contextMenu.Dispose();
 
                 notificationScreenshotManager?.Dispose();
@@ -89,7 +97,8 @@ namespace TweetDuck.Core{
 
             UpdateTrayIcon();
 
-            this.updates = browser.CreateUpdateHandler(updaterSettings);
+            this.updates = new UpdateHandler(browser, updaterSettings);
+            this.updates.CheckFinished += updates_CheckFinished;
             this.updates.UpdateAccepted += updates_UpdateAccepted;
             this.updates.UpdateDismissed += updates_UpdateDismissed;
 
@@ -193,7 +202,7 @@ namespace TweetDuck.Core{
         }
 
         private void Config_MuteToggled(object sender, EventArgs e){
-            TriggerAnalyticsEvent(AnalyticsFile.Event.MuteNotification);
+            AnalyticsFile.NotificationMutes.Trigger();
         }
 
         private void Config_TrayBehaviorChanged(object sender, EventArgs e){
@@ -217,7 +226,7 @@ namespace TweetDuck.Core{
             }
 
             if (isLoaded){
-                ReloadToTweetDeck();
+                browser.ReloadToTweetDeck();
             }
         }
         
@@ -227,6 +236,28 @@ namespace TweetDuck.Core{
             }
         }
 
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+            this.InvokeAsyncSafe(() => {
+                e.Result.Handle(update => {
+                    if (!update.IsUpdateDismissed){
+                        if (update.IsUpdateNew){
+                            browser.ShowUpdateNotification(update.VersionTag, 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();
@@ -237,11 +268,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();
+                    }
                 });
             });
         }
@@ -268,7 +307,7 @@ namespace TweetDuck.Core{
                 }
                 else{
                     browser.OnMouseClickExtra(m.WParam);
-                    TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserExtraMouseButton);
+                    AnalyticsFile.BrowserExtraMouseButtons.Trigger();
                 }
 
                 return;
@@ -292,7 +331,17 @@ 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(){
@@ -309,10 +358,7 @@ namespace TweetDuck.Core{
 
         public void ApplyROT13(){
             browser.ApplyROT13();
-        }
-
-        public void TriggerAnalyticsEvent(AnalyticsFile.Event e){
-            analytics?.TriggerEvent(e);
+            AnalyticsFile.UsedROT13.Trigger();
         }
 
         // callback handlers
@@ -320,7 +366,6 @@ namespace TweetDuck.Core{
         public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
             if (Config.FirstRun){
                 Config.FirstRun = false;
-                Config.ShowFollowNotification = false;
                 Config.AllowDataCollection = allowDataCollection;
                 Config.Save();
 
@@ -328,10 +373,6 @@ namespace TweetDuck.Core{
                     analytics = new AnalyticsManager(this, plugins, Program.AnalyticsFilePath);
                 }
             }
-            else if (Config.ShowFollowNotification){
-                Config.ShowFollowNotification = false;
-                Config.Save();
-            }
 
             if (showGuide){
                 FormGuide.Show();
@@ -388,21 +429,21 @@ namespace TweetDuck.Core{
                     form.Dispose();
                 };
                 
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenOptions);
+                AnalyticsFile.OpenOptions.Trigger();
                 ShowChildForm(form);
             }
         }
 
         public void OpenAbout(){
             if (!FormManager.TryBringToFront<FormAbout>()){
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenAbout);
+                AnalyticsFile.OpenAbout.Trigger();
                 ShowChildForm(new FormAbout());
             }
         }
 
         public void OpenPlugins(){
             if (!FormManager.TryBringToFront<FormPlugins>()){
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenPlugins);
+                AnalyticsFile.OpenPlugins.Trigger();
                 ShowChildForm(new FormPlugins(plugins));
             }
         }
@@ -414,7 +455,7 @@ namespace TweetDuck.Core{
         }
 
         public void OnTweetSound(){
-            TriggerAnalyticsEvent(AnalyticsFile.Event.SoundNotification);
+            AnalyticsFile.SoundNotifications.Trigger();
         }
 
         public void PlayVideo(string url, string username){
@@ -432,7 +473,7 @@ namespace TweetDuck.Core{
             }
             
             videoPlayer.Launch(url, username);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.VideoPlay);
+            AnalyticsFile.VideoPlays.Trigger();
         }
 
         public bool ProcessBrowserKey(Keys key){
@@ -454,16 +495,16 @@ namespace TweetDuck.Core{
 
             notification.FinishCurrentNotification();
             browser.ShowTweetDetail(columnId, chirpId, fallbackUrl);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.TweetDetail);
+            AnalyticsFile.TweetDetails.Trigger();
         }
 
-        public void OnTweetScreenshotReady(string html, int width, int height){
+        public void OnTweetScreenshotReady(string html, int width){
             if (notificationScreenshotManager == null){
                 notificationScreenshotManager = new TweetScreenshotManager(this, plugins);
             }
 
-            notificationScreenshotManager.Trigger(html, width, height);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.TweetScreenshot);
+            notificationScreenshotManager.Trigger(html, width);
+            AnalyticsFile.TweetScreenshots.Trigger();
         }
 
         public void DisplayTooltip(string text){

Core/Handling/ContextMenuBase.cs

@@ -3,14 +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{
@@ -18,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;
@@ -39,24 +27,40 @@ 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 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;
+
+        protected ContextMenuBase(AnalyticsFile.IProvider analytics){
+            this.analytics = analytics;
+        }
+
+        private void ResetContextInfo(){
+            LastLink = default(ContextInfo.LinkInfo);
+            LastChirp = default(ContextInfo.ChirpInfo);
+            TweetDeckBridge.ContextInfo.Reset();
+        }
 
         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>);
+                ResetContextInfo();
             }
             else{
-                lastHighlightedTweetAuthors = TweetDeckBridge.LastHighlightedTweetAuthorsArray;
-                lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImagesArray;
+                LastLink = TweetDeckBridge.ContextInfo.Link;
+                LastChirp = TweetDeckBridge.ContextInfo.Chirp;
             }
 
-            bool hasTweetImage = IsImage;
-            bool hasTweetVideo = IsVideo;
+            if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && !parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
+                model.AddItem(MenuSearchInBrowser, "Search in browser");
+                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";
@@ -82,13 +86,13 @@ namespace TweetDuck.Core.Handling{
                 model.AddItem(MenuSaveMedia, TextSave("video"));
                 model.AddSeparator();
             }
-            else if (((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage) && parameters.SourceUrl != TweetNotification.AppLogoLink){
+            else if (((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage) && parameters.SourceUrl != TweetNotification.AppLogo.Url){
                 model.AddItem(MenuViewImage, "View image in photo viewer");
                 model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
                 model.AddItem(MenuSaveMedia, TextSave("image"));
 
-                if (lastHighlightedTweetImageList.Length > 1){
+                if (LastChirp.Images.Length > 1){
                     model.AddItem(MenuSaveTweetImages, TextSave("all images"));
                 }
 
@@ -97,48 +101,55 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
+            Control control = browserControl.AsControl();
+
             switch(commandId){
                 case MenuOpenLinkUrl:
-                    OpenBrowser(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.LinkUrl);
+                    OpenBrowser(control, LastLink.GetUrl(parameters, true));
                     break;
 
                 case MenuCopyLinkUrl:
-                    SetClipboardText(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.UnfilteredLinkUrl);
+                    SetClipboardText(control, LastLink.GetUrl(parameters, false));
                     break;
 
                 case MenuCopyUsername:
                     Match match = TwitterUtils.RegexAccount.Match(parameters.UnfilteredLinkUrl);
-                    SetClipboardText(browserControl.AsControl(), match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    SetClipboardText(control, match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    control.InvokeAsyncSafe(analytics.AnalyticsFile.CopiedUsernames.Trigger);
                     break;
 
                 case MenuOpenMediaUrl:
-                    OpenBrowser(browserControl.AsControl(), TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
+                    OpenBrowser(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(parameters), ImageQuality));
                     break;
 
                 case MenuCopyMediaUrl:
-                    SetClipboardText(browserControl.AsControl(), 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);
+                    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());
+
                     if (File.Exists(file)){
-                        ViewFile();
+                        ViewImage(file);
                     }
                     else{
-                        BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, ViewFile, ex => {
+                        control.InvokeAsyncSafe(analytics.AnalyticsFile.ViewedImages.Trigger);
+
+                        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);
                         });
                     }
@@ -146,17 +157,26 @@ namespace TweetDuck.Core.Handling{
                     break;
 
                 case MenuSaveMedia:
-                    if (IsVideo){
-                        TwitterUtils.DownloadVideo(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault());
+                    if (LastLink.IsVideo){
+                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedVideos.Trigger);
+                        TwitterUtils.DownloadVideo(LastLink.GetMediaSource(parameters), LastChirp.Authors.LastOrDefault());
                     }
                     else{
-                        TwitterUtils.DownloadImage(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
+                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
+                        TwitterUtils.DownloadImage(LastLink.GetMediaSource(parameters), LastChirp.Authors.LastOrDefault(), ImageQuality);
                     }
 
                     break;
 
                 case MenuSaveTweetImages:
-                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
+                    control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
+                    TwitterUtils.DownloadImages(LastChirp.Images, LastChirp.Authors.LastOrDefault(), ImageQuality);
+                    break;
+
+                case MenuSearchInBrowser:
+                    string query = parameters.SelectionText;
+                    control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalSearch(query));
+                    DeselectAll(frame);
                     break;
                     
                 case MenuOpenDevTools:
@@ -168,13 +188,17 @@ 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 DeselectAll(IFrame frame){
+            ScriptLoader.ExecuteScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
+        }
+
         protected void OpenBrowser(Control control, string url){
             control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
         }
@@ -183,6 +207,10 @@ namespace TweetDuck.Core.Handling{
             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,8 +1,6 @@
 using CefSharp;
 using System.Windows.Forms;
-using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
@@ -19,6 +17,7 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuCopyQuotedTweetUrl = (CefMenuCommand)26613;
         private const CefMenuCommand MenuScreenshotTweet    = (CefMenuCommand)26614;
         private const CefMenuCommand MenuInputApplyROT13    = (CefMenuCommand)26615;
+        private const CefMenuCommand MenuSearchInColumn     = (CefMenuCommand)26616;
 
         private const string TitleReloadBrowser = "Reload browser";
         private const string TitleMuteNotifications = "Mute notifications";
@@ -28,22 +27,22 @@ namespace TweetDuck.Core.Handling{
 
         private readonly FormBrowser form;
         
-        private string lastHighlightedTweetUrl;
-        private string lastHighlightedQuoteUrl;
-
-        public ContextMenuBrowser(FormBrowser form){
+        public ContextMenuBrowser(FormBrowser form) : base(form){
             this.form = form;
         }
 
         public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
+            bool isSelecting = parameters.TypeFlags.HasFlag(ContextMenuType.Selection);
+            bool isEditing = parameters.TypeFlags.HasFlag(ContextMenuType.Editable);
+
             model.Remove(CefMenuCommand.Back);
             model.Remove(CefMenuCommand.Forward);
             model.Remove(CefMenuCommand.Print);
             model.Remove(CefMenuCommand.ViewSource);
             RemoveSeparatorIfLast(model);
 
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection)){
-                if (parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
+            if (isSelecting){
+                if (isEditing){
                     model.AddSeparator();
                     model.AddItem(MenuInputApplyROT13, "Apply ROT13");
                 }
@@ -53,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");
@@ -75,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);
@@ -97,7 +92,7 @@ namespace TweetDuck.Core.Handling{
 
             RemoveSeparatorIfLast(model);
             
-            form.InvokeAsyncSafe(() => form.TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserContextMenu));
+            form.InvokeAsyncSafe(form.AnalyticsFile.BrowserContextMenus.Trigger);
         }
 
         public override bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
@@ -127,11 +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:
@@ -139,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:
                     form.InvokeAsyncSafe(form.ApplyROT13);
                     return true;
+
+                case MenuSearchInColumn:
+                    string query = parameters.SelectionText;
+                    form.InvokeAsyncSafe(() => form.AddSearchColumn(query));
+                    DeselectAll(frame);
+                    break;
             }
 
             return false;
@@ -166,7 +167,7 @@ namespace TweetDuck.Core.Handling{
 
             menu.Popup += (sender, args) => {
                 menu.MenuItems[1].Checked = Program.UserConfig.MuteNotifications;
-                form.TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserContextMenu);
+                form.AnalyticsFile.BrowserContextMenus.Trigger();
             };
 
             return menu;

Core/Handling/ContextMenuGuide.cs

@@ -1,7 +1,10 @@
 using CefSharp;
+using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Handling{
     sealed class ContextMenuGuide : ContextMenuBase{
+        public ContextMenuGuide(AnalyticsFile.IProvider analytics) : base(analytics){}
+
         public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
             model.Clear();
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);

Core/Handling/ContextMenuNotification.cs

@@ -1,7 +1,6 @@
 using CefSharp;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Handling{
     sealed class ContextMenuNotification : ContextMenuBase{
@@ -14,7 +13,7 @@ namespace TweetDuck.Core.Handling{
         private readonly FormNotificationBase form;
         private readonly bool enableCustomMenu;
 
-        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu){
+        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu) : base(form){
             this.form = form;
             this.enableCustomMenu = enableCustomMenu;
         }
@@ -57,7 +56,7 @@ namespace TweetDuck.Core.Handling{
 
             form.InvokeAsyncSafe(() => {
                 form.ContextMenuOpen = true;
-                form.TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationContextMenu);
+                form.AnalyticsFile.NotificationContextMenus.Trigger();
             });
         }
 

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;
 

Core/Handling/KeyboardHandlerNotification.cs

@@ -2,7 +2,6 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Handling {
     sealed class KeyboardHandlerNotification : IKeyboardHandler{
@@ -13,7 +12,7 @@ namespace TweetDuck.Core.Handling {
         }
 
         private void TriggerKeyboardShortcutAnalytics(){
-            notification.InvokeAsyncSafe(() => notification.TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationKeyboardShortcut));
+            notification.InvokeAsyncSafe(notification.AnalyticsFile.NotificationKeyboardShortcuts.Trigger);
         }
 
         bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){

Core/Handling/RequestHandlerBase.cs

@@ -1,4 +1,5 @@
-using CefSharp;
+using System.Collections.Specialized;
+using CefSharp;
 using CefSharp.Handler;
 using TweetDuck.Core.Handling.General;
 
@@ -7,5 +8,15 @@ namespace TweetDuck.Core.Handling{
         public override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
             return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
         }
+
+        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (ContextMenuBase.HasDevTools){
+                NameValueCollection headers = request.Headers;
+                headers.Remove("x-devtools-emulate-network-conditions-client-id");
+                request.Headers = headers;
+            }
+
+            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
+        }
     }
 }

Core/Handling/RequestHandlerBrowser.cs

@@ -1,4 +1,5 @@
 using CefSharp;
+using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
@@ -8,10 +9,20 @@ namespace TweetDuck.Core.Handling{
 
         public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
             if (request.ResourceType == ResourceType.Script && request.Url.Contains("analytics.")){
+                callback.Dispose();
                 return CefReturnValue.Cancel;
             }
 
-            return CefReturnValue.Continue;
+            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
+        }
+
+        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if (request.ResourceType == ResourceType.Image && request.Url.Contains("backgrounds/spinner_blue")){
+                request.Url = TwitterUtils.LoadingSpinner.Url;
+                return true;
+            }
+
+            return base.OnResourceResponse(browserControl, browser, frame, request, response);
         }
     }
 }

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

@@ -16,14 +16,13 @@ namespace TweetDuck.Core.Management{
         public enum Items{
             None = 0,
             UserConfig = 1,
-            SystemConfig = 2, // TODO implement later
+            SystemConfig = 2,
             Session = 4,
             PluginData = 8,
             All = UserConfig|SystemConfig|Session|PluginData
         }
 
         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,29 @@ 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
+            }
+        }
+    }
+
+    static class ProfileManagerExtensions{
+        public static bool NeedsRestart(this ProfileManager.Items items){
+            return items.HasFlag(ProfileManager.Items.SystemConfig) || items.HasFlag(ProfileManager.Items.Session);
         }
     }
 }

Core/Management/VideoPlayer.cs

@@ -9,28 +9,16 @@ 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 Form owner;
-        private string lastUrl;
-        private string lastUsername;
+        private readonly FormBrowser owner;
 
-        private Process currentProcess;
-        private DuplexPipe.Server currentPipe;
+        private Instance currentInstance;
         private bool isClosing;
 
-        public VideoPlayer(Form owner){
+        public VideoPlayer(FormBrowser owner){
             this.owner = owner;
             this.owner.FormClosing += owner_FormClosing;
         }
@@ -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,15 +76,16 @@ namespace TweetDuck.Core.Management{
                         break;
 
                     case "download":
-                        TwitterUtils.DownloadVideo(lastUrl, lastUsername);
+                        if (currentInstance != null){
+                            owner.AnalyticsFile.DownloadedVideos.Trigger();
+                            TwitterUtils.DownloadVideo(currentInstance.Url, currentInstance.Username);
+                        }
+
                         break;
 
                     case "rip":
-                        currentPipe.Dispose();
-                        currentPipe = null;
-                    
-                        currentProcess.Dispose();
-                        currentProcess = null;
+                        currentInstance?.Dispose();
+                        currentInstance = null;
 
                         isClosing = false;
                         TriggerProcessExitEventUnsafe();
@@ -101,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");
                 }
             }
         }
@@ -122,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;
             }
         }
 
@@ -152,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;
@@ -182,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

@@ -24,7 +24,7 @@ namespace TweetDuck.Core.Notification.Example{
         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.AppLogoLink);
+            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>");

Core/Notification/FormNotificationBase.cs

@@ -12,7 +12,7 @@ using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Notification{
-    partial class FormNotificationBase : Form{
+    partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
         protected static int FontSizeLevel{
             get{
                 switch(TweetDeckBridge.FontSize){
@@ -90,6 +90,8 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
+        public AnalyticsFile AnalyticsFile => owner.AnalyticsFile;
+        
         protected override bool ShowWithoutActivation => true;
         
         protected float DpiScale { get; }
@@ -133,14 +135,8 @@ namespace TweetDuck.Core.Notification{
             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.AppLogoLink, TweetNotification.AppLogoHandler);
+            browser.SetupResourceHandler(TweetNotification.AppLogo);
 
             Controls.Add(browser);
 
@@ -149,6 +145,8 @@ namespace TweetDuck.Core.Notification{
                 this.owner.FormClosed -= owner_FormClosed;
             };
 
+            DpiScale = this.GetDPIScale();
+
             // ReSharper disable once VirtualMemberCallInContructor
             UpdateTitle();
         }
@@ -161,10 +159,6 @@ namespace TweetDuck.Core.Notification{
             base.WndProc(ref m);
         }
 
-        public void TriggerAnalyticsEvent(AnalyticsFile.Event e){
-            owner.TriggerAnalyticsEvent(e);
-        }
-
         // event handlers
 
         private void owner_FormClosed(object sender, FormClosedEventArgs e){
@@ -202,7 +196,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){
@@ -223,8 +217,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,7 +5,7 @@ using System.Windows.Forms;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Core.Other.Interfaces;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
 using TweetDuck.Plugins;
@@ -13,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);
@@ -82,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(){
@@ -128,7 +150,7 @@ namespace TweetDuck.Core.Notification{
                     }
                     
                     blockXButtonUp = true;
-                    this.InvokeAsyncSafe(() => TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationExtraMouseButton));
+                    this.InvokeAsyncSafe(AnalyticsFile.NotificationExtraMouseButtons.Trigger);
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONUP && blockXButtonUp){
@@ -167,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);
             }
         }
 
@@ -233,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/FormNotificationTweet.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using TweetDuck.Plugins;
 using System.Windows.Forms;
-using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Notification{
@@ -94,7 +93,7 @@ namespace TweetDuck.Core.Notification{
             }
 
             needsTrim |= tweetQueue.Count >= TrimMinimum;
-            TriggerAnalyticsEvent(AnalyticsFile.Event.DesktopNotification);
+            AnalyticsFile.DesktopNotifications.Trigger();
         }
 
         public override void HideNotification(){

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,37 +15,55 @@ namespace TweetDuck.Core.Notification.Screenshot{
         protected override bool CanDragWindow => false;
 
         private readonly PluginManager plugins;
+        private readonly int width;
 
-        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;
+            this.width = width;
 
-            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}", ClientSize.Width.ToString()), "screenshot");
                 }
             };
+            
+            SetScreenshotHeight(1);
+            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);
+        private void SetScreenshotHeight(int height){
             SetNotificationSize(width, height);
         }
 
         public void TakeScreenshot(){
+            if (ClientSize.Height == 0){
+                FormMessage.Error("Screenshot Failed", "Could not detect screenshot size.", FormMessage.OK);
+                return;
+            }
+            
             IntPtr context = NativeMethods.GetDC(this.Handle);
 
             if (context == IntPtr.Zero){

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

@@ -37,13 +37,12 @@ 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();
 

Core/Notification/SoundNotification.cs

@@ -8,7 +8,7 @@ using TweetDuck.Core.Other.Settings;
 
 namespace TweetDuck.Core.Notification{
     static class SoundNotification{
-        public const string SupportedFormats = "*.wav;*.ogg;*.flac;*.opus;*.weba;*.webm"; // TODO add mp3 when supported
+        public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
         
         public static IResourceHandler CreateFileHandler(string path){
             string mimeType;
@@ -18,25 +18,19 @@ namespace TweetDuck.Core.Notification{
                 case ".webm": mimeType = "audio/webm"; break;
                 case ".wav": mimeType = "audio/wav"; break;
                 case ".ogg": mimeType = "audio/ogg"; break;
+                case ".mp3": mimeType = "audio/mp3"; break;
                 case ".flac": mimeType = "audio/flac"; break;
                 case ".opus": mimeType = "audio/ogg; codecs=opus"; break;
-                case ".mp3": TryShowError("MP3 sound notifications are temporarily unsupported, please convert the file to another format, such as .ogg, .wav, or .flac."); return null;
                 default: mimeType = null; break;
             }
 
             try{
                 return ResourceHandler.FromFilePath(path, mimeType);
             }catch{
-                TryShowError("Could not find custom notification sound file:\n"+path);
-                return null;
-            }
-        }
-
-        private static void TryShowError(string message){
                 FormBrowser browser = FormManager.TryFind<FormBrowser>();
 
                 browser?.InvokeAsyncSafe(() => {
-                using(FormMessage form = new FormMessage("Sound Notification Error", message, MessageBoxIcon.Error)){
+                    using(FormMessage form = new FormMessage("Sound Notification Error", "Could not find custom notification sound file:\n"+path, MessageBoxIcon.Error)){
                         form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
                         
                         Button btnViewOptions = form.AddButton("View Options");
@@ -48,6 +42,9 @@ namespace TweetDuck.Core.Notification{
                         }
                     }
                 });
+                
+                return null;
+            }
         }
     }
 }

Core/Notification/TweetNotification.cs

@@ -2,15 +2,14 @@
 using System.Text;
 using CefSharp;
 using TweetDuck.Core.Bridge;
+using TweetDuck.Data;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification{
     sealed class TweetNotification{
         private const string DefaultHeadLayout = @"<html id='tduck' class='os-windows txt-size--14' data-td-font='medium' data-td-theme='dark'><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'><style type='text/css'>body{background:#222426}</style>";
-        private static readonly string CustomCSS = ScriptLoader.LoadResource("styles/notification.css");
-
-        public const string AppLogoLink = "https://ton.twimg.com/tduck/avatar";
-        public static readonly IResourceHandler AppLogoHandler = ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png");
+        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){
             return new TweetNotification(string.Empty, string.Empty, "Home", html, characters, string.Empty, string.Empty, true);
@@ -54,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");

Core/Other/Analytics/AnalyticsFile.cs

@@ -1,7 +1,11 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
 using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Core.Other.Analytics{
+    [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")]
     sealed class AnalyticsFile{
         private static readonly FileSerializer<AnalyticsFile> Serializer = new FileSerializer<AnalyticsFile>();
 
@@ -10,15 +14,14 @@ namespace TweetDuck.Core.Other.Analytics{
                 ConvertToString = value => value.ToBinary().ToString(),
                 ConvertToObject = value => DateTime.FromBinary(long.Parse(value))
             });
+
+            Serializer.RegisterTypeConverter(typeof(Counter), new SingleTypeConverter<Counter>{
+                ConvertToString = value => value.Value.ToString(),
+                ConvertToObject = value => int.Parse(value)
+            });
         }
 
-        public enum Event{
-            OpenOptions, OpenPlugins, OpenAbout, OpenGuide,
-            DesktopNotification, SoundNotification, MuteNotification,
-            BrowserContextMenu, BrowserExtraMouseButton,
-            NotificationContextMenu, NotificationExtraMouseButton, NotificationKeyboardShortcut,
-            TweetScreenshot, TweetDetail, VideoPlay
-        }
+        public static readonly AnalyticsFile Dummy = new AnalyticsFile();
 
         // STATE PROPERTIES
         
@@ -28,57 +31,61 @@ namespace TweetDuck.Core.Other.Analytics{
 
         // USAGE DATA
 
-        public int CountOpenOptions { get; private set; } = 0;
-        public int CountOpenPlugins { get; private set; } = 0;
-        public int CountOpenAbout   { get; private set; } = 0;
-        public int CountOpenGuide   { get; private set; } = 0;
+        public Counter OpenOptions { get; private set; } = 0;
+        public Counter OpenPlugins { get; private set; } = 0;
+        public Counter OpenAbout   { get; private set; } = 0;
+        public Counter OpenGuide   { get; private set; } = 0;
 
-        public int CountDesktopNotifications { get; private set; } = 0;
-        public int CountSoundNotifications   { get; private set; } = 0;
-        public int CountMuteNotifications    { get; private set; } = 0;
+        public Counter DesktopNotifications { get; private set; } = 0;
+        public Counter SoundNotifications   { get; private set; } = 0;
+        public Counter NotificationMutes    { get; private set; } = 0;
         
-        public int CountBrowserContextMenus           { get; private set; } = 0;
-        public int CountBrowserExtraMouseButtons      { get; private set; } = 0;
-        public int CountNotificationContextMenus      { get; private set; } = 0;
-        public int CountNotificationExtraMouseButtons { get; private set; } = 0;
-        public int CountNotificationKeyboardShortcuts { get; private set; } = 0;
+        public Counter BrowserContextMenus           { get; private set; } = 0;
+        public Counter BrowserExtraMouseButtons      { get; private set; } = 0;
+        public Counter NotificationContextMenus      { get; private set; } = 0;
+        public Counter NotificationExtraMouseButtons { get; private set; } = 0;
+        public Counter NotificationKeyboardShortcuts { get; private set; } = 0;
 
-        public int CountTweetScreenshots { get; private set; } = 0;
-        public int CountTweetDetails     { get; private set; } = 0;
-        public int CountVideoPlays       { get; private set; } = 0;
+        public Counter BrowserReloads   { get; private set; } = 0;
+        public Counter CopiedUsernames  { get; private set; } = 0;
+        public Counter ViewedImages     { get; private set; } = 0;
+        public Counter DownloadedImages { get; private set; } = 0;
+        public Counter DownloadedVideos { get; private set; } = 0;
+        public Counter UsedROT13        { get; private set; } = 0;
+
+        public Counter TweetScreenshots { get; private set; } = 0;
+        public Counter TweetDetails     { get; private set; } = 0;
+        public Counter VideoPlays       { get; private set; } = 0;
 
         // END OF DATA
 
+        public event EventHandler PropertyChanged;
+        
         private readonly string file;
         
         private AnalyticsFile(string file){
             this.file = file;
         }
 
-        public void TriggerEvent(Event e){
-            switch(e){
-                case Event.OpenOptions: ++CountOpenOptions; break;
-                case Event.OpenPlugins: ++CountOpenPlugins; break;
-                case Event.OpenAbout: ++CountOpenAbout; break;
-                case Event.OpenGuide: ++CountOpenGuide; break;
-
-                case Event.DesktopNotification: ++CountDesktopNotifications; break;
-                case Event.SoundNotification: ++CountSoundNotifications; break;
-                case Event.MuteNotification: ++CountMuteNotifications; break;
-
-                case Event.BrowserContextMenu: ++CountBrowserContextMenus; break;
-                case Event.BrowserExtraMouseButton: ++CountBrowserExtraMouseButtons; break;
-                case Event.NotificationContextMenu: ++CountNotificationContextMenus; break;
-                case Event.NotificationExtraMouseButton: ++CountNotificationExtraMouseButtons; break;
-                case Event.NotificationKeyboardShortcut: ++CountNotificationKeyboardShortcuts; break;
-
-                case Event.TweetScreenshot: ++CountTweetScreenshots; break;
-                case Event.TweetDetail: ++CountTweetDetails; break;
-                case Event.VideoPlay: ++CountVideoPlays; break;
+        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);
+            }
+        }
+
+        public void OnPropertyChanged(){
+            PropertyChanged?.Invoke(this, EventArgs.Empty);
         }
 
         public void Save(){
+            if (file == null){
+                return;
+            }
+
             try{
                 Serializer.Write(file, this);
             }catch(Exception e){
@@ -95,7 +102,34 @@ namespace TweetDuck.Core.Other.Analytics{
                 Program.Reporter.HandleException("Analytics File Error", "Could not open the analytics file.", true, e);
             }
             
+            config.SetupProperties();
             return config;
         }
+
+        public interface IProvider{
+            AnalyticsFile AnalyticsFile { get; }
+        }
+
+        public sealed class Counter{
+            public int Value { get; private set; }
+
+            private AnalyticsFile owner;
+
+            public Counter(int value){
+                this.Value = value;
+            }
+
+            public void SetOwner(AnalyticsFile owner){
+                this.owner = owner;
+            }
+
+            public void Trigger(){
+                ++Value;
+                owner?.OnPropertyChanged();
+            }
+
+            public static implicit operator int(Counter counter) => counter.Value;
+            public static implicit operator Counter(int value) => new Counter(value);
+        }
     }
 }

Core/Other/Analytics/AnalyticsManager.cs

@@ -1,4 +1,8 @@
-using System;
+// Uncomment to debug reports locally
+// #define ANALYTICS_LOCALHOST
+// #define ANALYTICS_INSTANT
+
+using System;
 using System.Net;
 using System.Threading.Tasks;
 using System.Timers;
@@ -8,8 +12,15 @@ using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Other.Analytics{
     sealed class AnalyticsManager : IDisposable{
-        private static readonly TimeSpan CollectionInterval = TimeSpan.FromDays(7);
-        private static readonly Uri CollectionUrl = new Uri("https://tweetduck.chylex.com/breadcrumb/report");
+        private static readonly TimeSpan CollectionInterval = TimeSpan.FromDays(14);
+
+        private static readonly Uri CollectionUrl = new Uri(
+            #if (DEBUG && ANALYTICS_LOCALHOST)
+            "http://localhost/newhome/tweetduck/~breadcrumb/request.php?type=report"
+            #else
+            "https://tweetduck.chylex.com/breadcrumb/report"
+            #endif
+            );
         
         public AnalyticsFile File { get; }
 
@@ -20,7 +31,9 @@ namespace TweetDuck.Core.Other.Analytics{
         public AnalyticsManager(FormBrowser browser, PluginManager plugins, string file){
             this.browser = browser;
             this.plugins = plugins;
+
             this.File = AnalyticsFile.Load(file);
+            this.File.PropertyChanged += File_PropertyChanged;
 
             this.currentTimer = new Timer{ SynchronizingObject = browser };
             this.currentTimer.Elapsed += currentTimer_Elapsed;
@@ -29,14 +42,20 @@ 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();
             }
+
+            #if (DEBUG && ANALYTICS_INSTANT)
+            SendReport();
+            #endif
         }
 
         public void Dispose(){
+            File.PropertyChanged -= File_PropertyChanged;
+
             if (saveTimer.Enabled){
                 File.Save();
             }
@@ -45,8 +64,7 @@ namespace TweetDuck.Core.Other.Analytics{
             saveTimer.Dispose();
         }
 
-        public void TriggerEvent(AnalyticsFile.Event e){
-            File.TriggerEvent(e);
+        private void File_PropertyChanged(object sender, EventArgs e){
             saveTimer.Enabled = true;
         }
 
@@ -72,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();
         }
 
@@ -95,7 +113,7 @@ namespace TweetDuck.Core.Other.Analytics{
             Task.Factory.StartNew(() => {
                 AnalyticsReport report = AnalyticsReportGenerator.Create(File, info, plugins);
 
-                #if DEBUG
+                #if (DEBUG && !ANALYTICS_INSTANT)
                 System.Diagnostics.Debugger.Break();
                 #endif
 
@@ -122,6 +140,14 @@ namespace TweetDuck.Core.Other.Analytics{
                                 message = "HTTP Error "+(response != null ? $"{(int)response.StatusCode} ({response.StatusDescription})" : "(unknown code)");
                                 break;
                         }
+
+                        #if DEBUG
+                        System.IO.Stream responseStream = e.Response.GetResponseStream();
+
+                        if (responseStream != null){
+                            System.Diagnostics.Debug.WriteLine(new System.IO.StreamReader(responseStream).ReadToEnd());
+                        }
+                        #endif
                     }
 
                     ScheduleReportIn(TimeSpan.FromHours(4), message ?? "Error: "+(task.Exception.InnerException?.Message ?? task.Exception.Message));

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -12,6 +12,7 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
+using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Core.Other.Analytics{
     static class AnalyticsReportGenerator{
@@ -37,15 +38,24 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Screen DPI"        , info.DPI != null ? Exact(info.DPI.Value) : "(unknown)" },
                 0,
                 { "Hardware Acceleration"     , Bool(SysConfig.HardwareAcceleration) },
+                { "Clear Cache Automatically" , Bool(SysConfig.ClearCacheAutomatically) },
+                { "Clear Cache Threshold"     , Exact(SysConfig.ClearCacheThreshold) },
                 0,
                 { "Expand Links"                  , Bool(UserConfig.ExpandLinksOnHover) },
-                { "Switch Account Selectors"      , Bool(UserConfig.SwitchAccountSelectors) },
+                { "Switch Account Selectors"      , Bool(false) }, // TODO remove in next major update
                 { "Search In First Column"        , Bool(UserConfig.OpenSearchInFirstColumn) },
                 { "Keep Like Follow Dialogs Open" , Bool(UserConfig.KeepLikeFollowDialogsOpen) },
                 { "Best Image Quality"            , Bool(UserConfig.BestImageQuality) },
-                { "Spell Check"                   , Bool(UserConfig.EnableSpellCheck) },
+                { "Animated Images"               , Bool(UserConfig.EnableAnimatedImages) },
+                0,
+                { "Smooth Scrolling" , Bool(UserConfig.EnableSmoothScrolling) },
+                { "Custom Browser"   , CustomBrowser },
                 { "Zoom"             , Exact(UserConfig.ZoomLevel) },
                 0,
+                { "Spell Check"                 , Bool(UserConfig.EnableSpellCheck) },
+                { "Spell Check Language"        , UserConfig.SpellCheckLanguage.ToLower() },
+                { "Translation Target Language" , UserConfig.TranslationTarget },
+                0,
                 { "Updates"          , Bool(UserConfig.EnableUpdateCheck) },
                 { "Update Dismissed" , Bool(!string.IsNullOrEmpty(UserConfig.DismissedUpdate)) },
                 0,
@@ -70,8 +80,8 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Custom Browser CSS"      , RoundUp((UserConfig.CustomBrowserCSS ?? string.Empty).Length, 50) },
                 { "Custom Notification CSS" , RoundUp((UserConfig.CustomNotificationCSS ?? string.Empty).Length, 50) },
                 0,
-                { "Plugins All"     , List(plugins.Plugins.Select(plugin => plugin.Identifier)) },
-                { "Plugins Enabled" , List(plugins.Plugins.Where(plugin => plugins.Config.IsEnabled(plugin)).Select(plugin => plugin.Identifier)) },
+                { "Plugins All"     , List(plugins.Plugins.Select(Plugin)) },
+                { "Plugins Enabled" , List(plugins.Plugins.Where(plugin => plugins.Config.IsEnabled(plugin)).Select(Plugin)) },
                 0,
                 { "Theme"               , Dict(editLayoutDesign, "_theme",                  "light/def") },
                 { "Column Width"        , Dict(editLayoutDesign, "columnWidth",             "310px/def") },
@@ -87,21 +97,27 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Reply Account Mode"  , ReplyAccountConfigFromPlugin },
                 { "Template Count"      , Exact(TemplateCountFromPlugin) },
                 0,
-                { "Opened Options"                   , LogRound(file.CountOpenOptions, 4) },
-                { "Opened Plugins"                   , LogRound(file.CountOpenPlugins, 4) },
-                { "Opened About"                     , LogRound(file.CountOpenAbout, 4) },
-                { "Opened Guide"                     , LogRound(file.CountOpenGuide, 4) },
-                { "Desktop Notifications"            , LogRound(file.CountDesktopNotifications, 5) },
-                { "Sound Notifications"              , LogRound(file.CountSoundNotifications, 5) },
-                { "Mute Notifications"               , LogRound(file.CountMuteNotifications, 2) },
-                { "Browser Context Menus"            , LogRound(file.CountBrowserContextMenus, 2) },
-                { "Browser Extra Mouse Buttons"      , LogRound(file.CountBrowserExtraMouseButtons, 2) },
-                { "Notification Context Menus"       , LogRound(file.CountNotificationContextMenus, 2) },
-                { "Notification Extra Mouse Buttons" , LogRound(file.CountNotificationExtraMouseButtons, 2) },
-                { "Notification Keyboard Shortcuts"  , LogRound(file.CountNotificationKeyboardShortcuts, 2) },
-                { "Tweet Screenshots"                , LogRound(file.CountTweetScreenshots, 2) },
-                { "Tweet Details"                    , LogRound(file.CountTweetDetails, 2) },
-                { "Video Plays"                      , LogRound(file.CountVideoPlays, 4) }
+                { "Opened Options"                   , LogRound(file.OpenOptions, 4) },
+                { "Opened Plugins"                   , LogRound(file.OpenPlugins, 4) },
+                { "Opened About"                     , LogRound(file.OpenAbout, 4) },
+                { "Opened Guide"                     , LogRound(file.OpenGuide, 4) },
+                { "Desktop Notifications"            , LogRound(file.DesktopNotifications, 5) },
+                { "Sound Notifications"              , LogRound(file.SoundNotifications, 5) },
+                { "Notification Mutes"               , LogRound(file.NotificationMutes, 2) },
+                { "Browser Context Menus"            , LogRound(file.BrowserContextMenus, 2) },
+                { "Browser Extra Mouse Buttons"      , LogRound(file.BrowserExtraMouseButtons, 2) },
+                { "Notification Context Menus"       , LogRound(file.NotificationContextMenus, 2) },
+                { "Notification Extra Mouse Buttons" , LogRound(file.NotificationExtraMouseButtons, 2) },
+                { "Notification Keyboard Shortcuts"  , LogRound(file.NotificationKeyboardShortcuts, 2) },
+                { "Browser Reloads"                  , LogRound(file.BrowserReloads, 2) },
+                { "Copied Usernames"                 , LogRound(file.CopiedUsernames, 2) },
+                { "Viewed Images"                    , LogRound(file.ViewedImages, 2) },
+                { "Downloaded Images"                , LogRound(file.DownloadedImages, 2) },
+                { "Downloaded Videos"                , LogRound(file.DownloadedVideos, 2) },
+                { "Used ROT13"                       , LogRound(file.UsedROT13, 2) },
+                { "Tweet Screenshots"                , LogRound(file.TweetScreenshots, 2) },
+                { "Tweet Details"                    , LogRound(file.TweetDetails, 2) },
+                { "Video Plays"                      , LogRound(file.VideoPlays, 4) }
             }.FinalizeReport();
         }
 
@@ -112,6 +128,7 @@ namespace TweetDuck.Core.Other.Analytics{
         private static string Exact(int value) => value.ToString();
         private static string RoundUp(int value, int multiple) => (multiple*(int)Math.Ceiling((double)value/multiple)).ToString();
         private static string LogRound(int value, int logBase) => (value <= 0 ? 0 : (int)Math.Pow(logBase, Math.Floor(Math.Log(value, logBase)))).ToString();
+        private static string Plugin(Plugin plugin) => plugin.Group.GetIdentifierPrefixShort()+plugin.Identifier.Substring(plugin.Group.GetIdentifierPrefix().Length);
         private static string Dict(Dictionary<string, string> dict, string key, string def = "(unknown)") => dict.TryGetValue(key, out string value) ? value : def;
         private static string List(IEnumerable<string> list) => string.Join("|", list.DefaultIfEmpty("(none)"));
 
@@ -182,6 +199,12 @@ namespace TweetDuck.Core.Other.Analytics{
             ProgramArguments = args.Keys.Select(key => key.TrimStart('-')).ToArray();
         }
 
+        private static string CustomBrowser{
+            get{
+                return Path.GetFileName(UserConfig.BrowserPath) ?? string.Empty;
+            }
+        }
+
         private static string TrayMode{
             get{
                 switch(UserConfig.TrayBehavior){

Core/Other/FormGuide.cs

@@ -6,7 +6,6 @@ using CefSharp.WinForms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 using System.Text.RegularExpressions;
 using TweetDuck.Resources;
@@ -43,7 +42,7 @@ namespace TweetDuck.Core.Other{
                 FormBrowser owner = FormManager.TryFind<FormBrowser>();
 
                 if (owner != null){
-                    owner.TriggerAnalyticsEvent(AnalyticsFile.Event.OpenGuide);
+                    owner.AnalyticsFile.OpenGuide.Trigger();
                     new FormGuide(url, owner).Show(owner);
                 }
             }
@@ -55,18 +54,15 @@ namespace TweetDuck.Core.Other{
 
         private readonly ChromiumWebBrowser browser;
 
-        private FormGuide(string url, Form owner){
+        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(),
+                MenuHandler = new ContextMenuGuide(owner),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler(),
                 RequestHandler = new RequestHandlerBrowser()

Core/Other/FormPlugins.cs

@@ -76,7 +76,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private void btnOpenFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "\""+pluginManager.PathCustomPlugins+"\"")){}
+            using(Process.Start("explorer.exe", '"'+pluginManager.PathCustomPlugins+'"')){}
         }
 
         private void btnReload_Click(object sender, EventArgs e){

Core/Other/FormSettings.Designer.cs

@@ -33,7 +33,7 @@
             // 
             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.Location = new System.Drawing.Point(449, 504);
             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);
@@ -52,7 +52,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, 486);
             this.panelContents.TabIndex = 1;
             // 
             // panelButtons
@@ -63,14 +63,14 @@
             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, 486);
             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.Location = new System.Drawing.Point(12, 504);
             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);
@@ -83,7 +83,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, 539);
             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)));
@@ -67,10 +67,13 @@ namespace TweetDuck.Core.Other{
                 FormClosing -= FormSettings_FormClosing;
 
                 if (dialog.ShowDialog() == DialogResult.OK){
+                    if (!dialog.IsRestarting){
                         browser.ResumeNotification();
                     
                         BrowserProcessHandler.UpdatePrefs();
                         ShouldReloadBrowser = dialog.ShouldReloadBrowser;
+                    }
+
                     Close();
                 }
                 else{
@@ -153,6 +156,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

@@ -0,0 +1,12 @@
+using System;
+using CefSharp;
+
+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/DialogSettingsCSS.Designer.cs

@@ -42,7 +42,9 @@
             // 
             // 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);
@@ -124,7 +126,9 @@
             // 
             // 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);

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

@@ -26,16 +26,17 @@
             this.components = new System.ComponentModel.Container();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnContinue = new System.Windows.Forms.Button();
-            this.cbConfig = new System.Windows.Forms.CheckBox();
+            this.cbProgramConfig = new System.Windows.Forms.CheckBox();
             this.cbSession = new System.Windows.Forms.CheckBox();
             this.cbPluginData = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.panelExport = new System.Windows.Forms.Panel();
-            this.panelDecision = new System.Windows.Forms.Panel();
-            this.radioReset = new System.Windows.Forms.RadioButton();
-            this.radioExport = new System.Windows.Forms.RadioButton();
+            this.cbSystemConfig = new System.Windows.Forms.CheckBox();
+            this.panelSelection = new System.Windows.Forms.FlowLayoutPanel();
+            this.panelDecision = new System.Windows.Forms.FlowLayoutPanel();
             this.radioImport = new System.Windows.Forms.RadioButton();
-            this.panelExport.SuspendLayout();
+            this.radioExport = new System.Windows.Forms.RadioButton();
+            this.radioReset = new System.Windows.Forms.RadioButton();
+            this.panelSelection.SuspendLayout();
             this.panelDecision.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -56,95 +57,92 @@
             this.btnContinue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnContinue.AutoSize = true;
             this.btnContinue.Enabled = false;
-            this.btnContinue.Location = new System.Drawing.Point(125, 97);
+            this.btnContinue.Location = new System.Drawing.Point(119, 97);
             this.btnContinue.Name = "btnContinue";
             this.btnContinue.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnContinue.Size = new System.Drawing.Size(45, 23);
+            this.btnContinue.Size = new System.Drawing.Size(51, 23);
             this.btnContinue.TabIndex = 3;
             this.btnContinue.Text = "Next";
             this.btnContinue.UseVisualStyleBackColor = true;
             this.btnContinue.Click += new System.EventHandler(this.btnContinue_Click);
             // 
-            // cbConfig
+            // cbProgramConfig
             // 
-            this.cbConfig.AutoSize = true;
-            this.cbConfig.Location = new System.Drawing.Point(0, 3);
-            this.cbConfig.Name = "cbConfig";
-            this.cbConfig.Size = new System.Drawing.Size(104, 17);
-            this.cbConfig.TabIndex = 0;
-            this.cbConfig.Text = "Program Options";
-            this.toolTip.SetToolTip(this.cbConfig, "Interface, notification, and update options.");
-            this.cbConfig.UseVisualStyleBackColor = true;
-            this.cbConfig.CheckedChanged += new System.EventHandler(this.cbConfig_CheckedChanged);
+            this.cbProgramConfig.AutoSize = true;
+            this.cbProgramConfig.Location = new System.Drawing.Point(3, 3);
+            this.cbProgramConfig.Name = "cbProgramConfig";
+            this.cbProgramConfig.Size = new System.Drawing.Size(104, 17);
+            this.cbProgramConfig.TabIndex = 0;
+            this.cbProgramConfig.Text = "Program Options";
+            this.toolTip.SetToolTip(this.cbProgramConfig, "Interface, notification, and update options.");
+            this.cbProgramConfig.UseVisualStyleBackColor = true;
+            this.cbProgramConfig.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
             // 
             // cbSession
             // 
             this.cbSession.AutoSize = true;
-            this.cbSession.Location = new System.Drawing.Point(0, 27);
+            this.cbSession.Location = new System.Drawing.Point(3, 49);
             this.cbSession.Name = "cbSession";
             this.cbSession.Size = new System.Drawing.Size(92, 17);
-            this.cbSession.TabIndex = 1;
+            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.");
             this.cbSession.UseVisualStyleBackColor = true;
-            this.cbSession.CheckedChanged += new System.EventHandler(this.cbSession_CheckedChanged);
+            this.cbSession.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
             // 
             // cbPluginData
             // 
             this.cbPluginData.AutoSize = true;
-            this.cbPluginData.Location = new System.Drawing.Point(0, 51);
+            this.cbPluginData.Location = new System.Drawing.Point(3, 72);
             this.cbPluginData.Name = "cbPluginData";
             this.cbPluginData.Size = new System.Drawing.Size(81, 17);
-            this.cbPluginData.TabIndex = 2;
+            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.");
             this.cbPluginData.UseVisualStyleBackColor = true;
-            this.cbPluginData.CheckedChanged += new System.EventHandler(this.cbPluginData_CheckedChanged);
+            this.cbPluginData.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
             // 
-            // panelExport
+            // cbSystemConfig
             // 
-            this.panelExport.Controls.Add(this.cbConfig);
-            this.panelExport.Controls.Add(this.cbPluginData);
-            this.panelExport.Controls.Add(this.cbSession);
-            this.panelExport.Location = new System.Drawing.Point(12, 12);
-            this.panelExport.Name = "panelExport";
-            this.panelExport.Size = new System.Drawing.Size(220, 79);
-            this.panelExport.TabIndex = 5;
-            this.panelExport.Visible = false;
+            this.cbSystemConfig.AutoSize = true;
+            this.cbSystemConfig.Location = new System.Drawing.Point(3, 26);
+            this.cbSystemConfig.Name = "cbSystemConfig";
+            this.cbSystemConfig.Size = new System.Drawing.Size(99, 17);
+            this.cbSystemConfig.TabIndex = 1;
+            this.cbSystemConfig.Text = "System Options";
+            this.toolTip.SetToolTip(this.cbSystemConfig, "Hardware acceleration and cache options.");
+            this.cbSystemConfig.UseVisualStyleBackColor = true;
+            this.cbSystemConfig.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
+            // 
+            // panelSelection
+            // 
+            this.panelSelection.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelSelection.Controls.Add(this.cbProgramConfig);
+            this.panelSelection.Controls.Add(this.cbSystemConfig);
+            this.panelSelection.Controls.Add(this.cbSession);
+            this.panelSelection.Controls.Add(this.cbPluginData);
+            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.TabIndex = 2;
+            this.panelSelection.Visible = false;
+            this.panelSelection.WrapContents = false;
             // 
             // panelDecision
             // 
-            this.panelDecision.Controls.Add(this.radioReset);
-            this.panelDecision.Controls.Add(this.radioExport);
+            this.panelDecision.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.panelDecision.Controls.Add(this.radioImport);
+            this.panelDecision.Controls.Add(this.radioExport);
+            this.panelDecision.Controls.Add(this.radioReset);
+            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, 79);
-            this.panelDecision.TabIndex = 6;
-            // 
-            // radioReset
-            // 
-            this.radioReset.AutoSize = true;
-            this.radioReset.Location = new System.Drawing.Point(3, 49);
-            this.radioReset.Name = "radioReset";
-            this.radioReset.Size = new System.Drawing.Size(104, 17);
-            this.radioReset.TabIndex = 2;
-            this.radioReset.TabStop = true;
-            this.radioReset.Text = "Restore Defaults";
-            this.radioReset.UseVisualStyleBackColor = true;
-            this.radioReset.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
-            // 
-            // radioExport
-            // 
-            this.radioExport.AutoSize = true;
-            this.radioExport.Location = new System.Drawing.Point(3, 26);
-            this.radioExport.Name = "radioExport";
-            this.radioExport.Size = new System.Drawing.Size(87, 17);
-            this.radioExport.TabIndex = 1;
-            this.radioExport.TabStop = true;
-            this.radioExport.Text = "Export Profile";
-            this.radioExport.UseVisualStyleBackColor = true;
-            this.radioExport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            this.panelDecision.Size = new System.Drawing.Size(220, 71);
+            this.panelDecision.TabIndex = 0;
+            this.panelDecision.WrapContents = false;
             // 
             // radioImport
             // 
@@ -158,25 +156,49 @@
             this.radioImport.UseVisualStyleBackColor = true;
             this.radioImport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
             // 
+            // radioExport
+            // 
+            this.radioExport.AutoSize = true;
+            this.radioExport.Location = new System.Drawing.Point(3, 26);
+            this.radioExport.Name = "radioExport";
+            this.radioExport.Size = new System.Drawing.Size(87, 17);
+            this.radioExport.TabIndex = 1;
+            this.radioExport.TabStop = true;
+            this.radioExport.Text = "Export Profile";
+            this.radioExport.UseVisualStyleBackColor = true;
+            this.radioExport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // radioReset
+            // 
+            this.radioReset.AutoSize = true;
+            this.radioReset.Location = new System.Drawing.Point(3, 49);
+            this.radioReset.Name = "radioReset";
+            this.radioReset.Size = new System.Drawing.Size(104, 17);
+            this.radioReset.TabIndex = 2;
+            this.radioReset.TabStop = true;
+            this.radioReset.Text = "Restore Defaults";
+            this.radioReset.UseVisualStyleBackColor = true;
+            this.radioReset.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
             // DialogSettingsManage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(244, 132);
-            this.Controls.Add(this.panelDecision);
-            this.Controls.Add(this.panelExport);
             this.Controls.Add(this.btnContinue);
             this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.panelDecision);
+            this.Controls.Add(this.panelSelection);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(200, 170);
+            this.MinimumSize = new System.Drawing.Size(260, 170);
             this.Name = "DialogSettingsManage";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "Manage Options";
-            this.panelExport.ResumeLayout(false);
-            this.panelExport.PerformLayout();
+            this.panelSelection.ResumeLayout(false);
+            this.panelSelection.PerformLayout();
             this.panelDecision.ResumeLayout(false);
             this.panelDecision.PerformLayout();
             this.ResumeLayout(false);
@@ -188,12 +210,13 @@
 
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Button btnContinue;
-        private System.Windows.Forms.CheckBox cbConfig;
+        private System.Windows.Forms.CheckBox cbProgramConfig;
+        private System.Windows.Forms.CheckBox cbSystemConfig;
         private System.Windows.Forms.CheckBox cbSession;
         private System.Windows.Forms.CheckBox cbPluginData;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.Panel panelExport;
-        private System.Windows.Forms.Panel panelDecision;
+        private System.Windows.Forms.FlowLayoutPanel panelSelection;
+        private System.Windows.Forms.FlowLayoutPanel panelDecision;
         private System.Windows.Forms.RadioButton radioReset;
         private System.Windows.Forms.RadioButton radioExport;
         private System.Windows.Forms.RadioButton radioImport;

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
@@ -16,15 +17,17 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
             set{
                 // this will call events and SetFlag, which also updates the UI
-                cbConfig.Checked = value.HasFlag(ProfileManager.Items.UserConfig);
-                cbSession.Checked = value.HasFlag(ProfileManager.Items.Session);
-                cbPluginData.Checked = value.HasFlag(ProfileManager.Items.PluginData);
+                foreach(KeyValuePair<CheckBox, ProfileManager.Items> kvp in checkBoxMap){
+                    kvp.Key.Checked = value.HasFlag(kvp.Value);
+                }
             }
         }
         
+        public bool IsRestarting { get; private set; }
         public bool ShouldReloadBrowser { get; private set; }
         
         private readonly PluginManager plugins;
+        private readonly Dictionary<CheckBox, ProfileManager.Items> checkBoxMap = new Dictionary<CheckBox, ProfileManager.Items>(4);
 
         private State currentState;
         private ProfileManager importManager;
@@ -36,22 +39,20 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
             this.plugins = plugins;
             this.currentState = State.Deciding;
+
+            this.checkBoxMap[cbProgramConfig] = ProfileManager.Items.UserConfig;
+            this.checkBoxMap[cbSystemConfig] = ProfileManager.Items.SystemConfig;
+            this.checkBoxMap[cbSession] = ProfileManager.Items.Session;
+            this.checkBoxMap[cbPluginData] = ProfileManager.Items.PluginData;
         }
 
         private void radioDecision_CheckedChanged(object sender, EventArgs e){
             btnContinue.Enabled = true;
         }
 
-        private void cbConfig_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ProfileManager.Items.UserConfig, cbConfig.Checked);
-        }
-
-        private void cbSession_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ProfileManager.Items.Session, cbSession.Checked);
-        }
-
-        private void cbPluginData_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ProfileManager.Items.PluginData, cbPluginData.Checked);
+        private void checkBoxSelection_CheckedChanged(object sender, EventArgs e){
+            CheckBox cb = (CheckBox)sender;
+            SetFlag(checkBoxMap[cb], cb.Checked);
         }
 
         private void btnContinue_Click(object sender, EventArgs e){
@@ -88,9 +89,9 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         Text = "Import Profile";
                         SelectedItems = importManager.FindImportItems();
 
-                        cbConfig.Enabled = cbConfig.Checked;
-                        cbSession.Enabled = cbSession.Checked;
-                        cbPluginData.Enabled = cbPluginData.Checked;
+                        foreach(CheckBox cb in checkBoxMap.Keys){
+                            cb.Enabled = cb.Checked;
+                        }
                     }
 
                     // Export
@@ -99,12 +100,13 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
                         Text = "Export Profile";
                         btnContinue.Text = "Export Profile";
-                        SelectedItems = ProfileManager.Items.All & ~ProfileManager.Items.Session;
+                        SelectedItems = ProfileManager.Items.UserConfig | ProfileManager.Items.PluginData;
                     }
                     
                     // Continue...
                     panelDecision.Visible = false;
-                    panelExport.Visible = true;
+                    panelSelection.Visible = true;
+                    Height += panelSelection.Height-panelDecision.Height;
                     break;
 
                 case State.Reset:
@@ -131,10 +133,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         }
 
                         if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
-                            Program.Restart(Arguments.ArgDeleteCookies);
+                            RestartProgram(Arguments.ArgDeleteCookies);
                         }
                         else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
-                            Program.Restart();
+                            RestartProgram();
                         }
                         else{
                             ShouldReloadBrowser = true;
@@ -152,19 +154,16 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
                         if (importManager.IsRestarting){
                             if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
-                                Program.Restart(Arguments.ArgImportCookies);
+                                RestartProgram(Arguments.ArgImportCookies);
                             }
                             else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
-                                Program.Restart();
+                                RestartProgram();
                             }
                         }
                         else{
                             ShouldReloadBrowser = true;
                         }
                     }
-                    else{
-                        Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing TweetDuck profile.", true, importManager.LastException);
-                    }
                     
                     DialogResult = DialogResult.OK;
                     Close();
@@ -190,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();
@@ -212,11 +207,16 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             btnContinue.Enabled = _selectedItems != ProfileManager.Items.None;
             
             if (currentState == State.Import){
-                btnContinue.Text = _selectedItems.HasFlag(ProfileManager.Items.Session) ? "Import && Restart" : "Import Profile";
+                btnContinue.Text = _selectedItems.NeedsRestart() ? "Import && Restart" : "Import Profile";
             }
             else if (currentState == State.Reset){
-                btnContinue.Text = _selectedItems.HasFlag(ProfileManager.Items.Session) ? "Restore && Restart" : "Restore Defaults";
+                btnContinue.Text = _selectedItems.NeedsRestart() ? "Restore && Restart" : "Restore Defaults";
             }
         }
+
+        private void RestartProgram(params string[] extraArgs){
+            IsRestarting = true;
+            Program.Restart(extraArgs);
+        }
     }
 }

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

@@ -28,21 +28,22 @@
             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.Location = new System.Drawing.Point(215, 139);
             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.TabIndex = 2;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -50,11 +51,11 @@
             // 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.Location = new System.Drawing.Point(152, 139);
             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.TabIndex = 1;
             this.btnRestart.Text = "Restart";
             this.btnRestart.UseVisualStyleBackColor = true;
             this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
@@ -62,7 +63,7 @@
             // cbLogging
             // 
             this.cbLogging.AutoSize = true;
-            this.cbLogging.Location = new System.Drawing.Point(12, 12);
+            this.cbLogging.Location = new System.Drawing.Point(3, 3);
             this.cbLogging.Name = "cbLogging";
             this.cbLogging.Size = new System.Drawing.Size(64, 17);
             this.cbLogging.TabIndex = 0;
@@ -70,25 +71,12 @@
             this.toolTip.SetToolTip(this.cbLogging, "Logging 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.Location = new System.Drawing.Point(3, 51);
             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, 20);
+            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 +85,57 @@
             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.Location = new System.Drawing.Point(3, 102);
             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, 20);
+            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.Location = new System.Drawing.Point(3, 35);
             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.TabIndex = 1;
             this.labelDataFolder.Text = "Data Folder";
             // 
             // labelShortcutTarget
             // 
             this.labelShortcutTarget.AutoSize = true;
-            this.labelShortcutTarget.Location = new System.Drawing.Point(12, 118);
+            this.labelShortcutTarget.Location = new System.Drawing.Point(3, 86);
             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.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, 127);
+            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, 174);
+            this.Controls.Add(this.flowPanel);
             this.Controls.Add(this.btnRestart);
             this.Controls.Add(this.btnCancel);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -143,8 +144,9 @@
             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 +156,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,103 @@
+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.Location = new System.Drawing.Point(12, 28);
+            this.textBoxUrl.Name = "textBoxUrl";
+            this.textBoxUrl.Size = new System.Drawing.Size(310, 20);
+            this.textBoxUrl.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(204, 56);
+            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 = 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.Location = new System.Drawing.Point(266, 56);
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnApply.Size = new System.Drawing.Size(56, 23);
+            this.btnApply.TabIndex = 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.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(264, 13);
+            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, 91);
+            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/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();
@@ -64,21 +65,21 @@
             // checkUpdateNotifications
             // 
             this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 386);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 415);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
-            this.checkUpdateNotifications.TabIndex = 14;
+            this.checkUpdateNotifications.TabIndex = 15;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
             // btnCheckUpdates
             // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 409);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 438);
             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.TabIndex = 16;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
@@ -93,36 +94,25 @@
             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.Location = new System.Drawing.Point(6, 95);
             this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkBestImageQuality.Name = "checkBestImageQuality";
             this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
-            this.checkBestImageQuality.TabIndex = 5;
+            this.checkBestImageQuality.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.Location = new System.Drawing.Point(6, 49);
             this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
             this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
-            this.checkOpenSearchInFirstColumn.TabIndex = 3;
+            this.checkOpenSearchInFirstColumn.TabIndex = 2;
             this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
             this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
             // 
@@ -144,11 +134,11 @@
             // labelZoom
             // 
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(3, 291);
+            this.labelZoom.Location = new System.Drawing.Point(3, 320);
             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.TabIndex = 12;
             this.labelZoom.Text = "Zoom";
             // 
             // zoomUpdateTimer
@@ -172,20 +162,20 @@
             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, 333);
             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.Location = new System.Drawing.Point(6, 118);
             this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
             this.checkAnimatedAvatars.Size = new System.Drawing.Size(145, 17);
-            this.checkAnimatedAvatars.TabIndex = 6;
+            this.checkAnimatedAvatars.TabIndex = 5;
             this.checkAnimatedAvatars.Text = "Enable Animated Avatars";
             this.checkAnimatedAvatars.UseVisualStyleBackColor = true;
             // 
@@ -193,11 +183,11 @@
             // 
             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.Location = new System.Drawing.Point(0, 389);
             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.TabIndex = 14;
             this.labelUpdates.Text = "Updates";
             // 
             // flowPanel
@@ -207,7 +197,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 +205,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,18 +215,18 @@
             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, 462);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
             // checkKeepLikeFollowDialogsOpen
             // 
             this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
-            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 95);
+            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 72);
             this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
             this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(176, 17);
-            this.checkKeepLikeFollowDialogsOpen.TabIndex = 4;
+            this.checkKeepLikeFollowDialogsOpen.TabIndex = 3;
             this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
             this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
             // 
@@ -243,43 +234,63 @@
             // 
             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.Location = new System.Drawing.Point(0, 158);
             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.TabIndex = 6;
             this.labelBrowserSettings.Text = "Browser Settings";
             // 
             // checkSmoothScrolling
             // 
             this.checkSmoothScrolling.AutoSize = true;
-            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 207);
+            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 184);
             this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
             this.checkSmoothScrolling.Name = "checkSmoothScrolling";
             this.checkSmoothScrolling.Size = new System.Drawing.Size(105, 17);
-            this.checkSmoothScrolling.TabIndex = 8;
+            this.checkSmoothScrolling.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.Location = new System.Drawing.Point(3, 216);
             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.TabIndex = 8;
             this.labelBrowserPath.Text = "Open Links With...";
             // 
             // comboBoxBrowserPath
             // 
             this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxBrowserPath.FormattingEnabled = true;
-            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 255);
+            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 232);
             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.TabIndex = 9;
+            // 
+            // labelSearchEngine
+            // 
+            this.labelSearchEngine.AutoSize = true;
+            this.labelSearchEngine.Location = new System.Drawing.Point(3, 268);
+            this.labelSearchEngine.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelSearchEngine.Name = "labelSearchEngine";
+            this.labelSearchEngine.Size = new System.Drawing.Size(77, 13);
+            this.labelSearchEngine.TabIndex = 10;
+            this.labelSearchEngine.Text = "Search Engine";
+            // 
+            // comboBoxSearchEngine
+            // 
+            this.comboBoxSearchEngine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSearchEngine.FormattingEnabled = true;
+            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 284);
+            this.comboBoxSearchEngine.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
+            this.comboBoxSearchEngine.Name = "comboBoxSearchEngine";
+            this.comboBoxSearchEngine.Size = new System.Drawing.Size(173, 21);
+            this.comboBoxSearchEngine.TabIndex = 11;
             // 
             // TabSettingsGeneral
             // 
@@ -287,7 +298,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, 480);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.panelZoom.ResumeLayout(false);
             this.flowPanel.ResumeLayout(false);
@@ -306,7 +317,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 +329,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,16 +210,25 @@ 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){
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
             this.InvokeAsyncSafe(() => {
                 if (e.EventId == updateCheckEventId){
                     btnCheckUpdates.Enabled = true;
 
-                    if (!e.IsUpdateAvailable){
+                    e.Result.Handle(update => {
+                        if (!update.IsUpdateNew){
                             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);
+                    });
                 }
             });
         }
@@ -188,5 +237,19 @@ namespace TweetDuck.Core.Other.Settings{
             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.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/TweetDeckBrowser.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
@@ -8,15 +9,12 @@ 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.Plugins;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Plugins.Events;
 using TweetDuck.Resources;
-using TweetDuck.Updates;
 
 namespace TweetDuck.Core{
-    sealed class TweetDeckBrowser : IDisposable{
+    sealed class TweetDeckBrowser : ITweetDeckBrowser, IDisposable{
         public bool Ready { get; private set; }
 
         public bool Enabled{
@@ -26,6 +24,10 @@ namespace TweetDuck.Core{
 
         public bool IsTweetDeckWebsite{
             get{
+                if (!Ready){
+                    return false;
+                }
+
                 using(IFrame frame = browser.GetBrowser().MainFrame){
                     return TwitterUtils.IsTweetDeckWebsite(frame);
                 }
@@ -33,11 +35,10 @@ namespace TweetDuck.Core{
         }
         
         private readonly ChromiumWebBrowser browser;
-        private readonly PluginManager plugins;
 
         private string prevSoundNotificationPath = null;
 
-        public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge bridge){
+        public TweetDeckBrowser(FormBrowser owner, TweetDeckBridge bridge){
             this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
                 DialogHandler = new FileDialogHandler(),
                 DragHandler = new DragHandlerBrowser(),
@@ -48,29 +49,22 @@ 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;
             this.browser.LoadError += browser_LoadError;
 
             this.browser.RegisterAsyncJsObject("$TD", bridge);
-            this.browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
             
             this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
             this.browser.Dock = DockStyle.None;
             this.browser.Location = ControlExtensions.InvisibleLocation;
 
-            this.browser.SetupResourceHandler(TweetNotification.AppLogoLink, TweetNotification.AppLogoHandler);
+            this.browser.SetupResourceHandler(TweetNotification.AppLogo);
+            this.browser.SetupResourceHandler(TwitterUtils.LoadingSpinner);
 
             owner.Controls.Add(browser);
             
-            this.plugins = plugins;
-            this.plugins.PluginChangedState += plugins_PluginChangedState;
-            
             Program.UserConfig.MuteToggled += UserConfig_MuteToggled;
             Program.UserConfig.ZoomLevelChanged += UserConfig_ZoomLevelChanged;
             Program.UserConfig.SoundNotificationChanged += UserConfig_SoundNotificationInfoChanged;
@@ -91,8 +85,6 @@ namespace TweetDuck.Core{
         }
 
         public void Dispose(){
-            plugins.PluginChangedState -= plugins_PluginChangedState;
-
             Program.UserConfig.MuteToggled -= UserConfig_MuteToggled;
             Program.UserConfig.ZoomLevelChanged -= UserConfig_ZoomLevelChanged;
             Program.UserConfig.SoundNotificationChanged -= UserConfig_SoundNotificationInfoChanged;
@@ -100,6 +92,24 @@ namespace TweetDuck.Core{
             browser.Dispose();
         }
         
+        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 && TwitterUtils.IsTweetDeckWebsite(frame)){
+                    callback(frame);
+                }
+            };
+        }
+
+        void ITweetDeckBrowser.ExecuteFunction(string name, params object[] args){
+            browser.ExecuteScriptAsync(name, args);
+        }
+
         // event handlers
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
@@ -114,36 +124,38 @@ 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);
             }
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && TwitterUtils.IsTweetDeckWebsite(e.Frame)){
-                e.Frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorFix);
+            IFrame frame = e.Frame;
 
+            if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
                 UpdateProperties();
-                TweetDeckBridge.RestoreSessionData(e.Frame);
-                ScriptLoader.ExecuteFile(e.Frame, "code.js");
+                TweetDeckBridge.RestoreSessionData(frame);
+                ScriptLoader.ExecuteFile(frame, "code.js", browser);
+                ScriptLoader.ExecuteFile(frame, "update.js", browser);
+
                 InjectBrowserCSS();
                 ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
                 UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
-                plugins.ExecutePlugins(e.Frame, PluginEnvironment.Browser);
 
                 TweetDeckBridge.ResetStaticProperties();
 
                 if (Program.UserConfig.FirstRun){
-                    ScriptLoader.ExecuteFile(e.Frame, "introduction.js");
-                }
-                else if (Program.UserConfig.ShowFollowNotification){
-                    ScriptLoader.ExecuteFile(e.Frame, "introduction.follow.js");
+                    ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
                 }
             }
         }
@@ -162,10 +174,6 @@ namespace TweetDuck.Core{
             }
         }
 
-        private void plugins_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            browser.ExecuteScriptAsync("TDPF_setPluginState", e.Plugin, e.IsEnabled);
-        }
-
         private void UserConfig_MuteToggled(object sender, EventArgs e){
             UpdateProperties();
         }
@@ -188,10 +196,6 @@ namespace TweetDuck.Core{
 
         // external handling
 
-        public UpdateHandler CreateUpdateHandler(UpdaterSettings settings){
-            return new UpdateHandler(browser, settings);
-        }
-
         public void HideVideoOverlay(bool focus){
             if (focus){
                 browser.GetBrowser().GetHost().SendFocusEvent(true);
@@ -211,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){
@@ -226,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()");
         }
@@ -241,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

@@ -7,6 +7,7 @@ using System.Net;
 using System.Windows.Forms;
 using CefSharp.WinForms;
 using TweetDuck.Core.Other;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
@@ -49,6 +50,10 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
+        public static void SetupResourceHandler(this ChromiumWebBrowser browser, ResourceLink resource){
+            browser.SetupResourceHandler(resource.Url, resource.Handler);
+        }
+
         private const string TwitterTrackingUrl = "t.co";
 
         public enum UrlCheckResult{
@@ -122,6 +127,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;
@@ -132,6 +164,8 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static WebClient CreateWebClient(){
+            WindowsUtils.EnsureTLS12();
+
             WebClient client = new WebClient{ Proxy = null };
             client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;
             return client;
@@ -167,11 +201,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/TwitterUtils.cs

@@ -6,15 +6,18 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDuck.Core.Other;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class TwitterUtils{
         public const string TweetDeckURL = "https://tweetdeck.twitter.com";
 
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
-        public const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
+        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)";
 
-        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$)([^/]+)/?$", RegexOptions.Compiled), false);
+        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$|search$|search-)([^/?]+)/?$", RegexOptions.Compiled), false);
         public static Regex RegexAccount => RegexAccountLazy.Value;
 
         public static readonly string[] DictionaryWords = {
@@ -38,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){
@@ -88,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/ResourceLink.cs

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

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

@@ -31,7 +31,7 @@
             this.flowLayoutInfo = new System.Windows.Forms.FlowLayoutPanel();
             this.labelWebsite = new System.Windows.Forms.Label();
             this.labelVersion = new System.Windows.Forms.Label();
-            this.btnOpenConfig = new System.Windows.Forms.Button();
+            this.btnConfigure = new System.Windows.Forms.Button();
             this.labelType = new TweetDuck.Core.Controls.LabelVertical();
             this.panelDescription.SuspendLayout();
             this.flowLayoutInfo.SuspendLayout();
@@ -135,16 +135,16 @@
             this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
             this.labelVersion.UseMnemonic = false;
             // 
-            // btnOpenConfig
+            // btnConfigure
             // 
-            this.btnOpenConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnOpenConfig.Location = new System.Drawing.Point(382, 80);
-            this.btnOpenConfig.Name = "btnOpenConfig";
-            this.btnOpenConfig.Size = new System.Drawing.Size(68, 23);
-            this.btnOpenConfig.TabIndex = 4;
-            this.btnOpenConfig.Text = "Configure";
-            this.btnOpenConfig.UseVisualStyleBackColor = true;
-            this.btnOpenConfig.Click += new System.EventHandler(this.btnOpenConfig_Click);
+            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.Name = "btnConfigure";
+            this.btnConfigure.Size = new System.Drawing.Size(68, 23);
+            this.btnConfigure.TabIndex = 4;
+            this.btnConfigure.Text = "Configure";
+            this.btnConfigure.UseVisualStyleBackColor = true;
+            this.btnConfigure.Click += new System.EventHandler(this.btnConfigure_Click);
             // 
             // labelType
             // 
@@ -163,7 +163,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.labelType);
-            this.Controls.Add(this.btnOpenConfig);
+            this.Controls.Add(this.btnConfigure);
             this.Controls.Add(this.flowLayoutInfo);
             this.Controls.Add(this.panelDescription);
             this.Controls.Add(this.labelName);
@@ -194,7 +194,7 @@
         private System.Windows.Forms.FlowLayoutPanel flowLayoutInfo;
         private System.Windows.Forms.Label labelWebsite;
         private System.Windows.Forms.Label labelVersion;
-        private System.Windows.Forms.Button btnOpenConfig;
+        private System.Windows.Forms.Button btnConfigure;
         private Core.Controls.LabelVertical labelType;
     }
 }

Plugins/Controls/PluginControl.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
@@ -38,7 +36,7 @@ namespace TweetDuck.Plugins.Controls{
                 labelDescription.Visible = false;
             }
 
-            panelDescription_Resize(panelDescription, null);
+            panelDescription_Resize(panelDescription, EventArgs.Empty);
         }
 
         private void panelDescription_Resize(object sender, EventArgs e){
@@ -57,8 +55,9 @@ namespace TweetDuck.Plugins.Controls{
             }
         }
 
-        private void btnOpenConfig_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath.Replace('/', '\\')+"\"")){}
+        private void btnConfigure_Click(object sender, EventArgs e){
+            pluginManager.ConfigurePlugin(plugin);
+            ParentForm?.Close();
         }
 
         private void btnToggleState_Click(object sender, EventArgs e){
@@ -87,14 +86,13 @@ namespace TweetDuck.Plugins.Controls{
                 labelName.ForeColor = textColor;
                 labelDescription.ForeColor = textColor;
                 btnToggleState.Text = isEnabled ? "Disable" : "Enable";
-                btnOpenConfig.Visible = plugin.HasConfig;
-                btnOpenConfig.Enabled = btnOpenConfig.Visible && File.Exists(plugin.ConfigPath);
+                btnConfigure.Visible = isEnabled && pluginManager.IsPluginConfigurable(plugin);
             }
             else{
                 labelName.ForeColor = Color.DarkRed;
                 labelDescription.ForeColor = Color.DarkRed;
                 btnToggleState.Visible = false;
-                btnOpenConfig.Visible = false;
+                btnConfigure.Visible = false;
             }
         }
     }

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/Enums/PluginGroup.cs

@@ -11,5 +11,13 @@
                 default: return "unknown/";
             }
         }
+
+        public static string GetIdentifierPrefixShort(this PluginGroup group){
+            switch(group){
+                case PluginGroup.Official: return "o/";
+                case PluginGroup.Custom: return "c/";
+                default: return "?/";
+            }
+        }
     }
 }

Plugins/Plugin.cs

@@ -1,28 +1,26 @@
 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 +40,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 +114,94 @@ 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; private set; }
+            public string Description      { get; private set; } = string.Empty;
+            public string Author           { get; private set; } = "(anonymous)";
+            public string Version          { get; private set; } = "(unknown)";
+            public string Website          { get; private set; } = string.Empty;
+            public string ConfigFile       { get; private set; } = string.Empty;
+            public string ConfigDefault    { get; private set; } = string.Empty;
+            public Version RequiredVersion { get; private 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));
-            }
-
-            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);
+            public void SetFromTag(string tag, string value){
+                switch(tag){
+                    case "NAME":          this.Name = value; break;
+                    case "DESCRIPTION":   this.Description = value; break;
+                    case "AUTHOR":        this.Author = value; break;
+                    case "VERSION":       this.Version = value; break;
+                    case "WEBSITE":       this.Website = value; break;
+                    case "CONFIGFILE":    this.ConfigFile = value; break;
+                    case "CONFIGDEFAULT": this.ConfigDefault = value; break;
+                    case "REQUIRES":      SetRequiredVersion(value); break;
+                    default: throw new FormatException("Invalid metadata tag: "+tag);
                 }
             }
-                else if (currentTag != null){
-                    currentContents = currentContents.Length == 0 ? line : currentContents+Environment.NewLine+line;
+
+            public void AddEnvironment(PluginEnvironment environment){
+                this.Environments |= environment;
+            }
+
+            private void SetRequiredVersion(string versionStr){
+                if (System.Version.TryParse(versionStr, out Version version)){
+                    this.RequiredVersion = version;
+                }
+                else if (versionStr == VersionWildcard){
+                    this.RequiredVersion = DefaultRequiredVersion;
                 }
                 else{
-                    throw new FormatException("Missing metadata tag before value: "+line);
+                    throw new FormatException("Plugin contains invalid minimum version: "+versionStr);
                 }
             }
 
+            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();
+                // 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);
+                    }
                 }
 
-        private static bool CheckRequiredVersion(string requires){
-            return requires == VersionWildcard || AppVersion >= new Version(requires);
+                // done
+
+                return plugin;
+            }
         }
     }
 }

Plugins/PluginBridge.cs

@@ -15,14 +15,15 @@ namespace TweetDuck.Plugins{
 
         private readonly PluginManager manager;
         private readonly TwoKeyDictionary<int, string, string> fileCache = new TwoKeyDictionary<int, string, string>(4, 2);
-        private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int,string,InjectedHTML>(4, 1);
+        private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int, string, InjectedHTML>(4, 1);
 
         public IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
+        public HashSet<Plugin> WithConfigureFunction { get; } = new HashSet<Plugin>();
 
         public PluginBridge(PluginManager manager){
             this.manager = manager;
             this.manager.Reloaded += manager_Reloaded;
-            this.manager.PluginChangedState += manager_PluginChangedState;
+            this.manager.Config.PluginChangedState += Config_PluginChangedState;
         }
 
         // Event handlers
@@ -31,7 +32,7 @@ namespace TweetDuck.Plugins{
             fileCache.Clear();
         }
 
-        private void manager_PluginChangedState(object sender, PluginChangedStateEventArgs e){
+        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
             if (!e.IsEnabled){
                 int token = manager.GetTokenFromPlugin(e.Plugin);
 
@@ -114,5 +115,13 @@ namespace TweetDuck.Plugins{
         public void InjectIntoNotificationsAfter(int token, string key, string search, string html){
             notificationInjections[token, key] = new InjectedHTML(InjectedHTML.Position.After, search, html);
         }
+
+        public void SetConfigurable(int token){
+            Plugin plugin = manager.GetPluginFromToken(token);
+
+            if (plugin != null){
+                WithConfigureFunction.Add(plugin);
+            }
+        }
     }
 }

Plugins/PluginConfig.cs

@@ -6,7 +6,7 @@ using TweetDuck.Plugins.Events;
 
 namespace TweetDuck.Plugins{
     sealed class PluginConfig{
-        public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
+        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         public IEnumerable<string> DisabledPlugins => disabled;
         public bool AnyDisabled => disabled.Count > 0;
@@ -20,7 +20,7 @@ namespace TweetDuck.Plugins{
 
         public void SetEnabled(Plugin plugin, bool enabled){
             if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
-                InternalPluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
+                PluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
             }
         }
 

Plugins/PluginLoader.cs

@@ -0,0 +1,56 @@
+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){
+                        builder.SetFromTag(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();
+        }
+    }
+}

Plugins/PluginManager.cs

@@ -1,51 +1,70 @@
 using CefSharp;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+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;
-        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         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();
 
+        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.bridge = new PluginBridge(this);
 
             Config.Load(configPath);
-            Config.InternalPluginChangedState += Config_InternalPluginChangedState;
+            Config.PluginChangedState += Config_PluginChangedState;
         }
 
-        private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
-            PluginChangedState?.Invoke(this, e);
+        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 Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
+            mainBrowser?.ExecuteFunction("TDPF_setPluginState", e.Plugin, e.IsEnabled);
             Config.Save(configPath);
         }
 
@@ -57,6 +76,24 @@ namespace TweetDuck.Plugins{
             return plugins.Any(plugin => plugin.Environments.HasFlag(environment));
         }
 
+        public bool IsPluginConfigurable(Plugin plugin){
+            return plugin.HasConfig || bridge.WithConfigureFunction.Contains(plugin);
+        }
+
+        public void ConfigurePlugin(Plugin plugin){
+            if (bridge.WithConfigureFunction.Contains(plugin)){
+                mainBrowser?.ExecuteFunction("TDPF_configurePlugin", plugin);
+            }
+            else if (plugin.HasConfig){
+                if (File.Exists(plugin.ConfigPath)){
+                    using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath.Replace('/', '\\')+"\"")){}
+                }
+                else{
+                    using(Process.Start("explorer.exe", '"'+plugin.GetPluginFolder(PluginFolder.Data).Replace('/', '\\')+'"')){}
+                }
+            }
+        }
+
         public int GetTokenFromPlugin(Plugin plugin){
             foreach(KeyValuePair<int, Plugin> kvp in tokens){
                 if (kvp.Value.Equals(plugin)){
@@ -99,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;
@@ -115,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

@@ -20,7 +20,7 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.12.5";
+        public const string VersionTag = "1.13.4.1";
 
         public static readonly bool IsPortable = File.Exists("makeportable");
 
@@ -129,7 +129,9 @@ namespace TweetDuck{
             }
             
             BrowserCache.RefreshTimer();
+
             CefSharpSettings.WcfEnabled = false;
+            CefSharpSettings.LegacyJavascriptBindingEnabled = true;
 
             CefSettings settings = new CefSettings{
                 UserAgent = BrowserUtils.HeaderUserAgent,
@@ -149,10 +151,9 @@ namespace TweetDuck{
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
 
-            UpdaterSettings updaterSettings = new UpdaterSettings{
+            UpdaterSettings updaterSettings = new UpdaterSettings(InstallerPath){
                 AllowPreReleases = Arguments.HasFlag(Arguments.ArgDebugUpdates),
-                DismissedUpdate = UserConfig.DismissedUpdate,
-                InstallerDownloadFolder = InstallerPath
+                DismissedUpdate = UserConfig.DismissedUpdate
             };
 
             FormBrowser mainForm = new FormBrowser(updaterSettings);

Properties/Resources.Designer.cs

@@ -99,5 +99,15 @@ namespace TweetDuck.Properties {
                 return ((System.Drawing.Icon)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] spinner {
+            get {
+                object obj = ResourceManager.GetObject("spinner", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
     }
 }

Properties/Resources.resx

@@ -130,4 +130,7 @@
   <data name="icon_tray_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-tray-new.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="spinner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\spinner.apng;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

README.md

@@ -12,10 +12,9 @@ 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, download the following NuGet packages by right-clicking on the solution and selecting **Restore NuGet Packages**, or manually running 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 64.0.0-CI2508 -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.

Resources/Plugins/.debug/browser.js

@@ -42,6 +42,14 @@ enabled(){
           col.model.setHasSound(prevSound);
         }, 1);
       }
+      
+      // ========================
+      // D key - trigger debugger
+      // ========================
+      
+      else if (e.keyCode === 68){
+        debugger;
+      }
     }
   };
 }

Resources/Plugins/clear-columns/.meta

@@ -9,7 +9,7 @@ Clear columns
 chylex
 
 [version]
-1.1.1
+1.2.1
 
 [website]
 https://tweetduck.chylex.com

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();
   };
@@ -38,7 +38,7 @@ enabled(){
         $(document).off("mousemove", this.eventKeyUp);
       }
       
-      $("#clear-columns-btn-all").text(pressed ? "Restore columns" : "Clear columns");
+      $("#clear-columns-btn-all-1,#clear-columns-btn-all-2").text(pressed ? "Restore columns" : "Clear columns");
     }
   };
   
@@ -81,7 +81,7 @@ 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">',
+    '<a class="column-header-link td-clear-column-shortcut" 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}}',
@@ -98,11 +98,15 @@ enabled(){
   
   // load custom style
   var css = window.TDPF_createCustomStyle(this);
+  css.insert(".js-app-add-column.is-hidden + #clear-columns-btn-all-parent-1 { display: none; }");
+  css.insert(".column-navigator-overflow #clear-columns-btn-all-parent-2 { display: none; }");
   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("[data-td-icon='icon-message'] .column-title { margin-right: 115px !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(){
@@ -113,18 +117,22 @@ ready(){
   $(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(""));
+  const generateButton = (idParent, idButton) => {
+    return `
+<a id="${idParent}" 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="${idButton}" class="nbfc padding-ts hide-condensed txt-size--16 app-nav-link-text">Clear columns</div>
+</a>`;
+  };
+  
+  $(".js-app-add-column").first().after(generateButton("clear-columns-btn-all-parent-1", "clear-columns-btn-all-1"));
+  $(".js-column-nav-list").first().append(generateButton("clear-columns-btn-all-parent-2", "clear-columns-btn-all-2"));
   
   // 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-1,#clear-columns-btn-all-parent-2").on("mouseover", tooltipEvents.mouseover[0].handler).on("mouseout", tooltipEvents.mouseout[0].handler);
   }
 }
 

Resources/Plugins/edit-design/.meta

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

Resources/Plugins/edit-design/browser.js

@@ -23,6 +23,8 @@ enabled(){
   
   this.firstTimeLoad = null;
   
+  var me = this;
+  
   // modal dialog loading
   $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
     this.htmlModal = contents;
@@ -126,7 +128,7 @@ enabled(){
       let itemEditDesign = $('<li class="is-selectable"><a href="#" data-action>Edit layout &amp; design</a></li>');
       itemEditDesign.insertAfter(itemTD);
       
-      itemEditDesign.on("click", "a", this.openEditDesignDialog);
+      itemEditDesign.on("click", "a", this.configure.bind(this));
       
       itemEditDesign.hover(function(){
         $(this).addClass("is-selected");
@@ -137,8 +139,6 @@ enabled(){
   };
   
   // modal dialog setup
-  var me = this;
-  
   var updateKey = function(key, value){
     me.config[key] = value;
     
@@ -148,7 +148,7 @@ enabled(){
     }, 1); // delays the slight lag caused by saving and reinjection
   };
   
-  var customDesignModal = TD.components.BaseModal.extend(function(){
+  this.customDesignModal = TD.components.BaseModal.extend(function(){
     let modal = $("#td-design-plugin-modal");
     this.setAndShowContainer(modal, false);
     
@@ -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(){
@@ -275,8 +280,6 @@ enabled(){
     }
   });
   
-  this.openEditDesignDialog = () => new customDesignModal();
-  
   // animation optimization
   this.optimizations = null;
   this.optimizationTimer = null;
@@ -381,19 +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";
-          }
+          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":
@@ -430,87 +440,87 @@ enabled(){
     
     if (this.config.revertIcons){
       let iconData = [
-        [ ".icon-twitter-bird", "00" ],
-        [ ".icon-mention", "01" ],
-        [ ".icon-following", "02" ],
-        [ ".icon-message", "03" ],
-        [ ".icon-home", "04" ],
-        [ ".icon-hashtag", "05" ],
-        [ ".icon-reply", "06" ],
-        [ ".icon-favorite", "55" ],
-        [ ".icon-retweet", "08" ],
-        [ ".icon-drafts", "09" ],
-        [ ".icon-search", "0a" ],
-        [ ".icon-trash", "0c" ],
-        [ ".icon-close", "0d" ],
-        [ ".icon-arrow-r:before,.Icon--caretRight", "0e" ],
-        [ ".icon-arrow-l:before,.Icon--caretLeft", "0f" ],
-        [ ".icon-protected", "13" ],
-        [ ".icon-list", "14" ],
-        [ ".icon-camera", "15" ],
-        [ ".icon-more", "16" ],
-        [ ".icon-settings", "18" ],
-        [ ".icon-notifications", "19" ],
-        [ ".icon-user-dd", "1a" ],
-        [ ".icon-activity", "1c" ],
-        [ ".icon-trending", "1d" ],
-        [ ".icon-minus", "1e" ],
-        [ ".icon-plus", "1f" ],
-        [ ".icon-geo", "20" ],
-        [ ".icon-check", "21" ],
-        [ ".icon-schedule", "22" ],
-        [ ".icon-dot", "23" ],
-        [ ".icon-user", "24" ],
-        [ ".icon-content", "25" ],
-        [ ".icon-arrow-d:before,.Icon--caretDown", "26" ],
-        [ ".icon-arrow-u", "27" ],
-        [ ".icon-share", "28" ],
-        [ ".icon-info", "29" ],
-        [ ".icon-verified", "2a" ],
-        [ ".icon-translator", "2b" ],
-        [ ".icon-blocked", "2c" ],
-        [ ".icon-constrain", "2d" ],
-        [ ".icon-play-video", "2e" ],
-        [ ".icon-empty", "2f" ],
-        [ ".icon-clear-input", "30" ],
-        [ ".icon-compose", "31" ],
-        [ ".icon-mark-read", "32" ],
-        [ ".icon-arrow-r-double", "33" ],
-        [ ".icon-arrow-l-double", "34" ],
-        [ ".icon-follow", "35" ],
-        [ ".icon-image", "36" ],
-        [ ".icon-popout", "37" ],
-        [ ".icon-move", "39" ],
-        [ ".icon-compose-grid", "3a" ],
-        [ ".icon-compose-minigrid", "3b" ],
-        [ ".icon-compose-list", "3c" ],
-        [ ".icon-edit", "40" ],
-        [ ".icon-clear-timeline", "41" ],
-        [ ".icon-sliders", "42" ],
-        [ ".icon-custom-timeline", "43" ],
-        [ ".icon-compose-dm", "44" ],
-        [ ".icon-bg-dot", "45" ],
-        [ ".icon-user-team-mgr", "46" ],
-        [ ".icon-user-switch", "47" ],
-        [ ".icon-conversation", "48" ],
-        [ ".icon-dataminr", "49" ],
-        [ ".icon-link", "4a", ],
-        [ ".icon-flash", "50" ],
-        [ ".icon-pointer-u", "51" ],
-        [ ".icon-analytics", "54" ],
-        [ ".icon-heart", "55" ],
-        [ ".icon-calendar", "56" ],
-        [ ".icon-attachment", "57" ],
-        [ ".icon-play", "58" ],
-        [ ".icon-bookmark", "59" ],
-        [ ".icon-play-badge", "60" ],
-        [ ".icon-gif-badge", "61" ],
-        [ ".icon-poll", "62" ],
+        [ "twitter-bird", "00" ],
+        [ "mention", "01" ],
+        [ "following", "02" ],
+        [ "message", "03" ],
+        [ "home", "04" ],
+        [ "hashtag", "05" ],
+        [ "reply", "06" ],
+        [ "favorite", "55" ],
+        [ "retweet", "08" ],
+        [ "drafts", "09" ],
+        [ "search", "0a" ],
+        [ "trash", "0c" ],
+        [ "close", "0d" ],
+        [ "arrow-r:before,.Icon--caretRight", "0e" ],
+        [ "arrow-l:before,.Icon--caretLeft", "0f" ],
+        [ "protected", "13" ],
+        [ "list", "14" ],
+        [ "camera", "15" ],
+        [ "more", "16" ],
+        [ "settings", "18" ],
+        [ "notifications", "19" ],
+        [ "user-dd", "1a" ],
+        [ "activity", "1c" ],
+        [ "trending", "1d" ],
+        [ "minus", "1e" ],
+        [ "plus", "1f" ],
+        [ "geo", "20" ],
+        [ "check", "21" ],
+        [ "schedule", "22" ],
+        [ "dot", "23" ],
+        [ "user", "24" ],
+        [ "content", "25" ],
+        [ "arrow-d:before,.Icon--caretDown", "26" ],
+        [ "arrow-u", "27" ],
+        [ "share", "28" ],
+        [ "info", "29" ],
+        [ "verified", "2a" ],
+        [ "translator", "2b" ],
+        [ "blocked", "2c" ],
+        [ "constrain", "2d" ],
+        [ "play-video", "2e" ],
+        [ "empty", "2f" ],
+        [ "clear-input", "30" ],
+        [ "compose", "31" ],
+        [ "mark-read", "32" ],
+        [ "arrow-r-double", "33" ],
+        [ "arrow-l-double", "34" ],
+        [ "follow", "35" ],
+        [ "image", "36" ],
+        [ "popout", "37" ],
+        [ "move", "39" ],
+        [ "compose-grid", "3a" ],
+        [ "compose-minigrid", "3b" ],
+        [ "compose-list", "3c" ],
+        [ "edit", "40" ],
+        [ "clear-timeline", "41" ],
+        [ "sliders", "42" ],
+        [ "custom-timeline", "43" ],
+        [ "compose-dm", "44" ],
+        [ "bg-dot", "45" ],
+        [ "user-team-mgr", "46" ],
+        [ "user-switch", "47" ],
+        [ "conversation", "48" ],
+        [ "dataminr", "49" ],
+        [ "link", "4a", ],
+        [ "flash", "50" ],
+        [ "pointer-u", "51" ],
+        [ "analytics", "54" ],
+        [ "heart", "55" ],
+        [ "calendar", "56" ],
+        [ "attachment", "57" ],
+        [ "play", "58" ],
+        [ "bookmark", "59" ],
+        [ "play-badge", "60" ],
+        [ "gif-badge", "61" ],
+        [ "poll", "62" ],
         
-        [ ".icon-heart-filled", "55" ],
-        [ ".icon-retweet-filled", "08" ],
-        [ ".icon-list-filled", "14" ],
-        [ ".icon-user-filled", "35" ],
+        [ "heart-filled", "55" ],
+        [ "retweet-filled", "08" ],
+        [ "list-filled", "14" ],
+        [ "user-filled", "35" ],
       ];
       
       this.icons = document.createElement("style");
@@ -522,9 +532,12 @@ enabled(){
   font-style: normal;
 }
 
-${iconData.map(entry => `#tduck ${entry[0]}:before{content:\"\\f0${entry[1]}\";font-family:_of!important}`).join("")}
+${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1]}\";font-family:_of!important}`).join("")}
 
 .drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
+.app-search-fake .icon { margin-top: -3px !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 }
 
@@ -535,10 +548,11 @@ ${iconData.map(entry => `#tduck ${entry[0]}:before{content:\"\\f0${entry[1]}\";f
       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
         }
       });
     }
@@ -594,6 +608,12 @@ ${this.config.revertIcons ? `
 #tduck .icon-user-dd:before{content:"\\f01a";font-family:_of!important}
 ` : ``}
 
+${currentTheme === "black" ? `
+html.dark a, html.dark a:hover, html.dark a:focus, html.dark a:active { color: #8bd }
+#tduck-show-thread, .other-replies-link { color: #8bd !important }
+.quoted-tweet { border-color: #292f33 !important }
+` : ``}
+
 ${notificationScrollbarColor ? `
 .scroll-styled-v::-webkit-scrollbar-thumb:not(:hover), .scroll-styled-h::-webkit-scrollbar-thumb:not(:hover) { background-color: #${notificationScrollbarColor} !important }
 ` : ``}
@@ -638,7 +658,7 @@ ready(){
   
   TD.components.GlobalSettings.prototype.switchTab = function(tab){
     if (tab === "tdp-edit-design"){
-      me.openEditDesignDialog();
+      me.configure();
     }
     else{
       return me.prevFuncSettingsSwitchTab.apply(this, arguments);
@@ -646,6 +666,10 @@ ready(){
   };
 }
 
+configure(){
+  new this.customDesignModal();
+}
+
 disabled(){
   if (this.css){
     this.css.remove();

Resources/Plugins/edit-design/modal.html

@@ -168,6 +168,10 @@
     height: 380px;
   }
   
+  #edit-design-panel .mdl-inner {
+    padding-top: 0;
+  }
+  
   #edit-design-panel-inner-cols {
     padding: 0 6px;
   }

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

@@ -1,27 +1,30 @@
 html.dark{color:#e1e8ed}
 html.dark .is-inverted-dark .stream-item{background-color:#fff}
-html.dark body{background-color:#1c6399}
-html.dark body:before{background-image:radial-gradient(circle,#1c6399,#274256)}
 html.dark::selection{background:#e1e8ed;color:#111}
 html.dark a{color:#8bd}
 html.dark a:hover,html.dark a:focus,html.dark a:active{color:#8bd}
 html.dark .txt-mute{color:#8899a6}
 html.dark .txt-mute a:not(:hover):not(:focus){color:#8899a6}
 html.dark .txt-mute-text-only{color:#8899a6}
-html.dark .txt-twitter-darker-gray{color:#657786}
-html.dark .txt-twitter-gray{color:#AAB8C2}
-html.dark .txt-twitter-emphasis-gray{color:#AAB8C2}
-html.dark .txt-twitter-blue{color:#1DA1F2}
-html.dark .bg-twitter-blue{background-color:#1DA1F2}
-html.dark .txt-twitter-red{color:#E0245E}
-html.dark .txt-twitter-green{color:#17BF63}
-html.dark .txt-twitter-deep-black{color:#14171A}
-html.dark .txt-twitter-dark-black{color:#292F33}
-html.dark .txt-twitter-dark-gray{color:#8899A6}
-html.dark .bg-twitter-deep-black{background-color:#292F33}
-html.dark .txt-twitter-black{color:#000}
-html.dark .txt-twitter-yellow{color:#FFAD1F}
-html.dark .bg-twitter-lightest-gray{background-color:#F5F8FA}
+html.dark .color-twitter-darker-gray{color:#657786}
+html.dark .color-twitter-white{color:#fff}
+html.dark .color-twitter-gray{color:#AAB8C2}
+html.dark .color-twitter-blue{color:#1DA1F2}
+html.dark .color-twitter-red{color:#E0245E}
+html.dark .color-twitter-deep-red{color:#A01744}
+html.dark .color-twitter-green{color:#17BF63}
+html.dark .color-twitter-deep-green{color:#008951}
+html.dark .color-twitter-deep-black{color:#14171A}
+html.dark .color-twitter-dark-black{color:#292F33}
+html.dark .color-twitter-dark-gray{color:#8899A6}
+html.dark .color-twitter-black{color:#000}
+html.dark .color-twitter-yellow{color:#FFAD1F}
+html.dark .bg-color-twitter-white{background-color:#fff}
+html.dark .bg-color-twitter-blue{background-color:#1DA1F2}
+html.dark .bg-color-twitter-medium-blue{background-color:#1DA1F2}
+html.dark .bg-color-twitter-faded-yellow{background-color:#FFE8B6}
+html.dark .bg-color-twitter-deep-black{background-color:#292F33}
+html.dark .bg-color-twitter-lightest-gray{background-color:#F5F8FA}
 html.dark .link-hover-override:hover .link-hover-target{color:#8bd}
 html.dark .scroll-styled-v::-webkit-scrollbar-track,html.dark .scroll-styled-h::-webkit-scrollbar-track{border-left:1px solid #292F33}
 html.dark .scroll-styled-v::-webkit-scrollbar-thumb,html.dark .scroll-styled-h::-webkit-scrollbar-thumb{background-color:#657786}
@@ -85,67 +88,35 @@ html.dark .icon-twitter-blue-color{color:#2b7bb9}
 html.dark .btn:hover{color:#1DA1F2;background-color:#292F33}
 html.dark .btn:focus{color:#1DA1F2;background-color:#292F33;box-shadow:0 0 0 1px #fff,0 0 0 3px #71C9F8}
 html.dark .btn:active,html.dark .btn.is-selected{color:#1DA1F2;background-color:#292F33}
-html.dark .btn[disabled],html.dark .btn[disabled]:hover,html.dark .btn[disabled]:active,html.dark .btn.is-disabled,html.dark .btn.is-disabled:hover,html.dark .btn.is-disabled:focus,html.dark .btn.is-disabled:active{border:1px solid #1DA1F2;color:#1DA1F2}
+html.dark .btn[disabled],html.dark .btn[disabled]:hover,html.dark .btn[disabled]:active,html.dark .btn.is-disabled,html.dark .btn.is-disabled:hover,html.dark .btn.is-disabled:focus,html.dark .btn.is-disabled:active{color:#1DA1F2}
 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}
@@ -287,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}
@@ -428,9 +399,8 @@ html.dark .s-minimal .mdl-header{border-bottom:1px solid #e1e8ed}
 html.dark .lst-launcher .top-row{border-bottom:1px solid #e1e8ed}
 html.dark .lst-launcher .is-disabled a,html.dark .lst-launcher .is-disabled a:hover,html.dark .lst-launcher .is-disabled a:focus,html.dark .lst-launcher .is-disabled a:active{background:#fff}
 html.dark .lst-launcher a:hover,html.dark .lst-launcher a:focus,html.dark .lst-launcher a:active{background:#f2f9ff;border:1px solid #bbddf5}
-html.dark .lst-profile a,html.dark .lst-profile a:hover,html.dark .lst-profile a:focus,html.dark .lst-profile a:active{border:1px solid #ccd6dd;color:#657786}
+html.dark .lst-profile a,html.dark .lst-profile a:hover,html.dark .lst-profile a:focus,html.dark .lst-profile a:active{color:#657786}
 html.dark .mdl-col-settings{background-color:#fff;border-left:1px solid #E1E8ED}
-html.dark .lst-profile.l-grouped{border-top:1px solid #ccd6dd}
 html.dark .mdl-links{color:#8899a6}
 html.dark .mdl-links a{color:#8899a6}
 html.dark .mdl-account-shared-warning .mdl-content{background:#fff}
@@ -438,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}
@@ -844,3 +808,7 @@ html.dark .DatePicker.date-unselected .is-rangeStart,html.dark .DatePicker.date-
 html.dark .DatePicker.date-unselected .is-rangeStart:hover,html.dark .DatePicker.date-unselected .is-rangeEnd:hover{background-color:#005091;color:#ffffff}
 html.dark .NotificationList .Notification-body{color:#14171A}
 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

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

Resources/Plugins/emoji-keyboard/browser.js

@@ -32,6 +32,7 @@ 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 .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,7 +50,7 @@ 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);

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

@@ -8,7 +8,7 @@ Custom reply account
 chylex
 
 [version]
-1.2.4
+1.3
 
 [website]
 https://tweetduck.chylex.com

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");
         
@@ -34,8 +40,8 @@ enabled(){
           columnAccount = "";
         }
         
-        try{
-          query = configuration.customSelector(column.getColumnType(), columnTitle, columnAccount, column, section.hasClass("column-temp"));
+        try{ // TODO isOfType is removed
+          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,19 @@
    *   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 'column.isOfType' function. It is recommended to always put it
+   * last in an 'if' statement, because it is much more demanding than checking the title/account.
+   *
+   * 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_activity, col_customtimeline, col_dataminr, col_favorites, col_followers,  col_home,
+   *   col_inbox,    col_interactions,   col_list,     col_livevideo, col_me,         col_mentions,
+   *   col_messages, col_scheduled,      col_search,   col_timeline,  col_usertweets, col_unknown
    *
    * If you want to see your current column types, run this in your browser console:
-   *   TD.controller.columnManager.getAllOrdered().map(obj => obj.getColumnType());
+   *
+   *   (c=>c.columnManager.getAllOrdered().map(o=>Object.keys(c.stats.columnNamespaces).find(t=>o.isOfType(t))).map(t=>t==""+void 0?"col_unknown":t))(TD.controller)
    *
    *
    * The 'title' parameter is the column title. Some are fixed (such as 'Home' or 'Notifications'),
@@ -61,16 +66,16 @@
   
   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" && column.isOfType("col_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" && column.isOfType("col_timeline")){
       // 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

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

Resources/Plugins/templates/browser.js

@@ -34,7 +34,7 @@ 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">');

Resources/PostBuild.ps1

@@ -1,32 +1,77 @@
-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] $version = ""
+)
+
 $ErrorActionPreference = "Stop"
 
-Set-Location $dir
+try{
+  Write-Host "------------------------------"
   
-function Check-Carriage-Return{
-  Param([Parameter(Mandatory = $True, Position = 1)] $fname)
+  if ($version.Equals("")){
+    $version = (Get-Item (Join-Path $targetDir "TweetDuck.exe")).VersionInfo.FileVersion
+  }
   
-  $file = @(Get-ChildItem -Include $fname -Recurse)[0]
+  Write-Host "TweetDuck version" $version
+  
+  Write-Host "------------------------------"
+  
+  # Cleanup
+  
+  if (Test-Path (Join-Path $targetDir "locales")){
+    Remove-Item -Path (Join-Path $targetDir "locales\*.pak") -Exclude "en-US.pak"
+  }
+  
+  # Copy resources
+  
+  Copy-Item (Join-Path $projectDir "bld\Resources\CEFSHARP-LICENSE.txt") -Destination $targetDir -Force
+  Copy-Item (Join-Path $projectDir "LICENSE.md") -Destination (Join-Path $targetDir "LICENSE.txt") -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\*") -Destination (Join-Path $targetDir "scripts") -Recurse
+  Copy-Item (Join-Path $projectDir "Resources\Plugins\*") -Exclude ".debug", "emoji-instructions.txt" -Destination (Join-Path $targetDir "plugins\official") -Recurse
+  
+  # Post processing
+  
+  function Check-Carriage-Return{
+    Param(
+      [Parameter(Mandatory = $True, Position = 1)] $fname
+    )
+    
+    $file = @(Get-ChildItem -Path $targetDir -Include $fname -Recurse)[0]
     
     if ((Get-Content -Path $file.FullName -Raw).Contains("`r")){
       Throw "$fname cannot contain carriage return"
     }
     
-  Write-Host "Verified" $file.FullName.Substring($dir.Length)
-}
+    Write-Host "Verified" $file.FullName.Substring($targetDir.Length)
+  }
   
-function Rewrite-File{
+  function Rewrite-File{
     [CmdletBinding()]
-  Param([Parameter(Mandatory = $True, ValueFromPipeline = $True)][array] $lines, [Parameter(Mandatory = $True, Position = 1)] $file)
+    Param(
+      [Parameter(Mandatory = $True, ValueFromPipeline = $True)][array] $lines,
+      [Parameter(Mandatory = $True, Position = 1)] $file
+    )
+    
+    $relativePath = $file.FullName.Substring($targetDir.Length)
+    
+    if ($relativePath.StartsWith("scripts\")){
+      $lines = (,("#" + $version) + $lines)
+    }
     
     $lines | Where { $_ -ne '' } | Set-Content -Path $file.FullName
-  Write-Host "Processed" $file.FullName.Substring($dir.Length)
-}
+    Write-Host "Processed" $relativePath
+  }
   
-try{
   Check-Carriage-Return("emoji-ordering.txt")
 
-  ForEach($file in Get-ChildItem -Filter *.js -Exclude configuration.default.js -Recurse){
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.js" -Exclude "configuration.default.js" -Recurse){
     $lines = Get-Content -Path $file.FullName
     $lines = $lines | % { $_.TrimStart() }
     $lines = $lines -Replace '^(.*?)((?<=^|[;{}()])\s?//(?:\s.*|$))?$', '$1'
@@ -34,7 +79,7 @@ try{
     ,$lines | Rewrite-File $file
   }
 
-  ForEach($file in Get-ChildItem -Filter *.css -Recurse){
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.css" -Recurse){
     $lines = Get-Content -Path $file.FullName
     $lines = $lines -Replace '\s*/\*.*?\*/', ''
     $lines = $lines -Replace '^\s+(.+):\s?(.+?)(?:\s?(!important))?;$', '$1:$2$3;'
@@ -42,10 +87,12 @@ try{
     @(($lines | Where { $_ -ne '' }) -Join ' ') | Rewrite-File $file
   }
 
-  ForEach($file in Get-ChildItem -Filter *.html -Recurse){
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.html" -Recurse){
     $lines = Get-Content -Path $file.FullName
     ,($lines | % { $_.TrimStart() }) | Rewrite-File $file
   }
+  
+  Write-Host "------------------------------"
 }catch{
   Write-Host "Encountered an error while running PostBuild.ps1 on line" $_.InvocationInfo.ScriptLineNumber
   Write-Host $_

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}\\\" \"{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,23 @@
     return value;
   };
   
+  //
+  // Function: Attempts to retrieve the column icon class. Returns undefined on failure.
+  //
+  const getColumnIconClass = function(column){
+    if (ensurePropertyExists(column, "ui", "_$chirpContainer")){
+      return column.ui._$chirpContainer.closest(".js-column").attr("data-td-icon");
+    }
+  };
+  
+  //
+  // Function: Retrieves column name and caches it.
+  //
+  const getColumnName = function(column){
+    let cached = column._tduck_icon || (column._tduck_icon = getColumnIconClass(column));
+    return columnTitles[cached] || "";
+  };
+  
   //
   // Function: Event callback for a new tweet.
   //
@@ -157,7 +171,6 @@
           thumbSizeClass: "media-size-medium"
         }));
         
-        html.css("border", "0");
         html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
         html.find(".js-quote-detail").removeClass("is-actionable margin-b--8"); // prevent quoted tweets from changing the cursor and reduce bottom margin
         
@@ -186,6 +199,12 @@
           return $(this).text() === "Show this thread";
         }).first().each(function(){
           this.id = "tduck-show-thread";
+          
+          let moveBefore = html.find(".tweet-body > .js-media, .tweet-body > .js-media-preview-container, .quoted-tweet");
+          
+          if (moveBefore){
+            $(this).css("margin-top", "5px").removeClass("margin-b--5").parent("span").detach().insertBefore(moveBefore);
+          }
         });
         
         let type = tweet.getChirpType();
@@ -194,6 +213,9 @@
           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")) && tweet.isAboutYou()){
+          html.children().first().addClass("td-notification-padded");
+        }
         else if (type.includes("list_member")){
           html.find(".activity-header").css("margin-top", "2px");
           html.find(".avatar").first().css("margin-bottom", "0");
@@ -212,7 +234,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, getColumnName(column), html.html(), duration, tweetUrl, quoteUrl);
       }
 
       if (column.model.getHasSound()){
@@ -276,6 +298,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>"
       ];
@@ -284,21 +308,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(".tweet-context .nbfc { text-overflow: ellipsis !important; white-space: nowrap !important }"); // force ellipsis on long usernames
-      tags.push(".activity-header { align-items: center !important; margin-bottom: 4px !important }"); // tweak alignment of avatar and text in notifications
-      tags.push(".activity-header .tweet-timestamp { line-height: unset !important }"); // fix timestamp position in notifications
-      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);
@@ -532,7 +542,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);
@@ -584,22 +595,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){
@@ -615,6 +619,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);
+        }
       }
     });
     
@@ -626,21 +643,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);
       }
     });
   })();
@@ -649,85 +656,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").filter(function(){
         return $(this).text() === "Show this thread";
       }).first().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);
     };
   })();
   
@@ -918,26 +892,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);
     });
   });
   
@@ -1195,9 +1158,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");
   });
   
   //
@@ -1337,6 +1324,11 @@
     };
   }
   
+  //
+  // Block: Fix columns missing any identifiable attributes to allow individual styles.
+  //
+  TD.mustaches["column.mustache"] = TD.mustaches["column.mustache"].replace("{{columnclass}}\"", "{{columnclass}}\" data-td-icon=\"{{columniconclass}}\"");
+  
   //
   // Block: Remove column mouse wheel handler, which allows smooth scrolling inside columns, and horizontally scrolling column container when holding Shift.
   //
@@ -1396,6 +1388,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.follow.js

@@ -1,91 +0,0 @@
-(function($, $TD){
-  $(document).one("TD.ready", function(){
-    let css = $(`
-<style>
-#td-introduction-modal {
-  display: block;
-}
-
-#td-introduction-modal .mdl {
-  width: 90%;
-  max-width: 626px;
-  height: 244px;
-}
-
-#td-introduction-modal .mdl-header-title {
-  cursor: default;
-}
-
-#td-introduction-modal .mdl-content {
-  padding: 4px 16px 0;
-  overflow-y: auto;
-}
-
-#td-introduction-modal p {
-  margin: 12px 0;
-  font-size: 1.4rem;
-}
-
-#td-introduction-modal p strong {
-  font-weight: normal;
-  text-shadow: 0 0 #000;
-}
-
-#td-introduction-modal footer {
-  padding: 10px 0;
-}
-</style>`).appendTo(document.head);
-    
-    let ele = $(`
-<div id="td-introduction-modal" class="ovl">
-  <div class="mdl is-inverted-dark">
-    <header class="mdl-header">
-      <h3 class="mdl-header-title">Quick message</h3>
-      <a href="#" class="mdl-dismiss link-normal-dark"><i class="icon icon-close"></i></a>
-    </header>
-    <div class="mdl-inner">
-      <div class="mdl-content">
-        <p>Hi! Unfortunately the old <strong>@TryTweetDuck</strong> account was suspended.</p>
-        <p>If you were following it before, or if you want to keep up with the latest news and updates about TweetDuck, please <a id="td-introduction-follow" href="#">follow @TryMyAwesomeApp</a>.</p>
-        <p>Thanks for your support!</p>
-      </div>
-      <footer class="txt-right">
-        <button class="btn btn-positive"><span class="label">Close</span</button>
-      </footer>
-    </div>
-  </div>
-</div>`).appendTo(".js-app");
-    
-    let tdUser = null;
-    let loadTweetDuckUser = (onSuccess, onError) => {
-      if (tdUser !== null){
-        onSuccess(tdUser);
-      }
-      else{
-        TD.controller.clients.getPreferredClient().getUsersByIds([ "957608948189880320" ], users => onSuccess(users[0]), onError);
-      }
-    };
-    
-    loadTweetDuckUser(user => tdUser = user);
-    
-    ele.find("#td-introduction-follow").click(function(){
-      loadTweetDuckUser(user => {
-        $(document).trigger("uiShowFollowFromOptions", { userToFollow: user });
-        
-        $(".js-modals-container").find("header a[rel='user']").each(function(){
-          this.outerHTML = "TweetDuck";
-        });
-      }, () => {
-        alert("An error occurred when retrieving the account information.");
-      });
-    });
-    
-    ele.find("button, a.mdl-dismiss").click(function(){
-      ele.fadeOut(200, function(){
-        $TD.onIntroductionClosed(false, false);
-        ele.remove();
-        css.remove();
-      });
-    });
-  });
-})($, $TD);

Resources/Scripts/introduction.js

@@ -12,6 +12,10 @@
   height: 328px;
 }
 
+#td-introduction-modal .mdl-inner {
+  padding-top: 0;
+}
+
 #td-introduction-modal .mdl-header-title {
   cursor: default;
 }
@@ -94,7 +98,7 @@
       </footer>
     </div>
   </div>
-</div>`).appendTo(".js-app");
+</div>`).appendTo(".js-app"); /* TODO btn-positive is removed, check all files again */
     
     let tdUser = null;
     let loadTweetDuckUser = (onSuccess, onError) => {

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.

Resources/Scripts/plugins.browser.js

@@ -35,6 +35,10 @@
     install(plugin){
       this.installed.push(plugin);
       
+      if (typeof plugin.obj.configure === "function"){
+        $TDP.setConfigurable(plugin.obj.$token);
+      }
+      
       if (!this.isDisabled(plugin)){
         plugin.obj.enabled();
         this.runWhenReady(plugin);
@@ -93,6 +97,13 @@
     window.TD_PLUGINS.setState(window.TD_PLUGINS.findObject(identifier), enable);
   };
   
+  //
+  // Block: Setup a function to trigger plugin configuration.
+  //
+  window.TDPF_configurePlugin = function(identifier){
+    window.TD_PLUGINS.findObject(identifier).obj.configure();
+  };
+  
   //
   // Block: Setup a function to reload the page.
   //

Resources/Scripts/screenshot.js

@@ -0,0 +1,15 @@
+(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(() => {
+    setTimeout($TD.triggerScreenshot, document.getElementsByTagName("iframe").length ? 267 : 67);
+  });
+})($TD_NotificationScreenshot);

Resources/Scripts/styles/browser.css

@@ -38,7 +38,7 @@
 /* Square-ify stuff */
 /********************/
 
-.btn, .mdl, .mdl-content, .app-search-fake, .app-search-input, .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;
 }
 
-.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 {
+.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 */
 /***********************/
@@ -94,23 +140,16 @@
 /* Tweak notification layout and design */
 /****************************************/
 
-.tweet-context .nbfc {
-  text-overflow: ellipsis !important;
-  white-space: nowrap !important;
-}
-
-.activity-header {
-  align-items: center !important;
-  margin-bottom: 4px !important;
+.activity-header.has-source-avatar {
+  margin-bottom: 4px !important
 }
 
 .activity-header .tweet-timestamp {
   line-height: unset !important;
 }
 
-.account-bio.padding-t--5 {
-  /* follow notification padding */
-  padding-top: 2px !important;
+.activity-header .icon-user-filled {
+  vertical-align: sub !important;
 }
 
 html[data-td-theme='light'] .stream-item:not(:hover) .js-user-actions-menu {
@@ -125,6 +164,23 @@ html[data-td-theme='dark'] .stream-item:not(:hover) .js-user-actions-menu {
   opacity: 0.25;
 }
 
+.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"] .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"] .has-source-avatar > .nbfc > .avatar, .stream-item[data-key^="retweet"] .has-source-avatar > .nbfc > .avatar {
+  position: absolute;
+  margin-left: -34px;
+}
+
 /***********************/
 /* Tweaks for features */
 /***********************/
@@ -139,6 +195,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 */
 /***************************************/
@@ -173,6 +234,12 @@ a[data-full-url] {
   vertical-align: -10% !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;
@@ -194,11 +261,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;
@@ -209,6 +271,21 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   cursor: pointer;
 }
 
+.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 */
 /***************************************************************/
@@ -273,17 +350,29 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
 /* 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;
 }
+
+/******************************/
+/* Hide unused Settings items */
+/******************************/
+
+#show-startup-notifications, #show-startup-notifications + span {
+  display: none;
+}
+
+#auto-play-gifs, #auto-play-gifs + span {
+  display: none;
+}

Resources/Scripts/styles/notification.css

@@ -2,14 +2,22 @@
 /* General */
 /***********/
 
-body:before {
+body.td-notification {
+  overflow-y: auto !important;
+}
+
+body::before {
   content: none !important;
 }
 
-body {
-  overflow-y: auto !important;
+.column {
+  background: transparent !important;
 }
 
+/***********************/
+/* Redesign scrollbars */
+/***********************/
+
 .scroll-styled-v::-webkit-scrollbar {
   width: 7px !important;
 }
@@ -22,9 +30,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;
@@ -34,21 +74,59 @@ body {
   vertical-align: -10% !important;
 }
 
+/****************************************/
+/* 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;
+}
+      
+.td-notification-padded .item-img {
+  position: absolute;
+  left: 21px;
+  top: 48px;
+  width: 0 !important;
+}
+
+.td-notification-padded .activity-header > .nbfc {
+  margin-left: 46px;
+  line-height: unset !important;
+}
+
+.td-notification-padded .activity-header > .nbfc > .avatar {
+  position: absolute;
+  margin-left: -34px;
+}
+
 /*********/
 /* Media */
 /*********/
 
-.media-size-medium {
+.td-notification .media-size-medium {
   max-height: 240px;
-  height: calc(100vh - 16px) !important;
+  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;
 }
 
 #tduck .js-media, #tduck .js-media-preview-container {
+  padding-top: 1px;
+  margin-bottom: 2px !important;
+}
+
+#tduck .js-quote-detail .js-media, #tduck .js-quote-detail .js-media-preview-container {
   margin-bottom: 0 !important;
 }
 

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
     

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)));
+}

TweetDuck.csproj

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props')" />
+  <Import Project="packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props')" />
+  <Import Project="packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props')" />
+  <Import Project="packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -60,12 +62,14 @@
     <DefineConstants>
     </DefineConstants>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
@@ -105,6 +109,8 @@
     <Compile Include="Core\Handling\RequestHandlerBase.cs" />
     <Compile Include="Core\Handling\RequestHandlerBrowser.cs" />
     <Compile Include="Core\Handling\ResourceHandlerNotification.cs" />
+    <Compile Include="Core\Other\Interfaces\ITweetDeckBrowser.cs" />
+    <Compile Include="Core\Management\ContextInfo.cs" />
     <Compile Include="Core\Notification\Example\FormNotificationExample.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -166,6 +172,12 @@
     <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsAnalytics.Designer.cs">
       <DependentUpon>DialogSettingsAnalytics.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsSearchEngine.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsSearchEngine.Designer.cs">
+      <DependentUpon>DialogSettingsSearchEngine.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsCSS.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -241,12 +253,14 @@
     <Compile Include="Core\Other\Settings\TabSettingsNotifications.Designer.cs">
       <DependentUpon>TabSettingsNotifications.cs</DependentUpon>
     </Compile>
-    <Compile Include="Core\Bridge\CallbackBridge.cs" />
+    <Compile Include="Core\Notification\Screenshot\ScreenshotBridge.cs" />
     <Compile Include="Data\CommandLineArgs.cs" />
     <Compile Include="Core\Notification\Screenshot\FormNotificationScreenshotable.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Core\Notification\Screenshot\TweetScreenshotManager.cs" />
+    <Compile Include="Data\ResourceLink.cs" />
+    <Compile Include="Data\Result.cs" />
     <Compile Include="Data\Serialization\FileSerializer.cs" />
     <Compile Include="Data\InjectedHTML.cs" />
     <Compile Include="Data\Serialization\ITypeConverter.cs" />
@@ -278,6 +292,7 @@
     <Compile Include="Plugins\Enums\PluginEnvironment.cs" />
     <Compile Include="Plugins\Enums\PluginGroup.cs" />
     <Compile Include="Plugins\Events\PluginErrorEventArgs.cs" />
+    <Compile Include="Plugins\PluginLoader.cs" />
     <Compile Include="Plugins\PluginManager.cs" />
     <Compile Include="Plugins\PluginScriptGenerator.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -286,6 +301,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Reporter.cs" />
+    <Compile Include="Updates\Events\UpdateCheckEventArgs.cs" />
     <Compile Include="Updates\FormUpdateDownload.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -301,13 +317,14 @@
     <Compile Include="Core\Management\BrowserCache.cs" />
     <Compile Include="Core\Utils\BrowserUtils.cs" />
     <Compile Include="Core\Utils\NativeMethods.cs" />
+    <Compile Include="Updates\UpdateCheckClient.cs" />
     <Compile Include="Updates\UpdateDownloadStatus.cs" />
     <Compile Include="Updates\UpdateHandler.cs" />
     <Compile Include="Updates\UpdateInfo.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\ScriptLoader.cs" />
-    <Compile Include="Updates\UpdateEventArgs.cs" />
+    <Compile Include="Updates\Events\UpdateEventArgs.cs" />
     <Compile Include="Updates\UpdaterSettings.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -354,6 +371,7 @@
     <None Include="Resources\icon-tray-new.ico" />
     <None Include="Resources\icon-tray.ico" />
     <None Include="Resources\PostBuild.ps1" />
+    <None Include="Resources\spinner.apng" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Plugins\" />
@@ -361,7 +379,6 @@
   <ItemGroup>
     <Content Include="Resources\avatar.png" />
     <Content Include="Resources\Scripts\code.js" />
-    <Content Include="Resources\Scripts\introduction.follow.js" />
     <Content Include="Resources\Scripts\introduction.js" />
     <Content Include="Resources\Scripts\notification.js" />
     <Content Include="Resources\Scripts\pages\error.html" />
@@ -390,39 +407,20 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(ProjectDir)LICENSE.md" "$(TargetDir)" /Y
-del "$(TargetDir)LICENSE.txt"
-ren "$(TargetDir)LICENSE.md" "LICENSE.txt"
-xcopy "$(ProjectDir)bld\Resources\CEFSHARP-LICENSE.txt" "$(TargetDir)" /Y
-xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcp120.dll" "$(TargetDir)" /Y
-xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcr120.dll" "$(TargetDir)" /Y
-
-rmdir "$(TargetDir)scripts" /S /Q
-mkdir "$(TargetDir)scripts"
-xcopy "$(ProjectDir)Resources\Scripts\*" "$(TargetDir)scripts\" /E /Y
-
-rmdir "$(TargetDir)plugins" /S /Q
-mkdir "$(TargetDir)plugins"
-mkdir "$(TargetDir)plugins\official"
-mkdir "$(TargetDir)plugins\user"
-xcopy "$(ProjectDir)Resources\Plugins\*" "$(TargetDir)plugins\official\" /E /Y
-rmdir "$(TargetDir)plugins\official\.debug" /S /Q
-del "$(TargetDir)plugins\official\emoji-keyboard\emoji-instructions.txt"
-
-rmdir "$(ProjectDir)bin\Debug"
+    <PostBuildEvent>rmdir "$(ProjectDir)bin\Debug"
 rmdir "$(ProjectDir)bin\Release"
 
-attrib +R "$(TargetDir)locales\en-US.pak"
-del /Q /A:-R "$(TargetDir)locales\*.pak"
-attrib -R "$(TargetDir)locales\en-US.pak"
+rmdir "$(TargetDir)scripts" /S /Q
+rmdir "$(TargetDir)plugins" /S /Q
+
+powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild.ps1" "$(TargetDir)\" "$(ProjectDir)\"
 
 if $(ConfigurationName) == Debug (
   rmdir "$(TargetDir)plugins\official\.debug" /S /Q
   mkdir "$(TargetDir)plugins\user\.debug"
   xcopy "$(ProjectDir)Resources\Plugins\.debug\*" "$(TargetDir)plugins\user\.debug\" /E /Y
 )
-
-powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild.ps1" "$(TargetDir)\"</PostBuildEvent>
+</PostBuildEvent>
   </PropertyGroup>
   <Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">
     <Exec Command="del &quot;$(TargetDir)*.pdb&quot;" />
@@ -434,19 +432,17 @@ powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild
   <PropertyGroup>
     <PreBuildEvent>powershell Get-Process TweetDuck.Browser -ErrorAction SilentlyContinue ^| Where-Object {$_.Path -eq '$(TargetDir)TweetDuck.Browser.exe'} ^| Stop-Process; Exit 0</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props'))" />
+    <Error Condition="!Exists('packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets'))" />
   </Target>
-  <Import Project="packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets')" />
-  <Import Project="packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets')" />
-  <Import Project="packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets')" />
+  <Import Project="packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets')" />
 </Project>

TweetDuck.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck", "TweetDuck.csproj", "{2389A7CD-E0D3-4706-8294-092929A33A2D}"
 EndProject
@@ -20,7 +20,6 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.ActiveCfg = Debug|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.Build.0 = Debug|x86
-		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.Deploy.0 = Debug|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.ActiveCfg = Release|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.Build.0 = Release|x86
 		{B10B0017-819E-4F71-870F-8256B36A26AA}.Debug|x86.ActiveCfg = Debug|x86
@@ -42,4 +41,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {43936FDB-CBF7-493D-A99A-24B516646584}
+	EndGlobalSection
 EndGlobal

Updates/Events/UpdateCheckEventArgs.cs

@@ -0,0 +1,14 @@
+using System;
+using TweetDuck.Data;
+
+namespace TweetDuck.Updates.Events{
+    sealed class UpdateCheckEventArgs : EventArgs{
+        public int EventId { get; }
+        public Result<UpdateInfo> Result { get; }
+
+        public UpdateCheckEventArgs(int eventId, Result<UpdateInfo> result){
+            this.EventId = eventId;
+            this.Result = result;
+        }
+    }
+}

Updates/Events/UpdateEventArgs.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace TweetDuck.Updates.Events{
+    sealed class UpdateEventArgs : EventArgs{
+        public UpdateInfo UpdateInfo { get; }
+        
+        public UpdateEventArgs(UpdateInfo updateInfo){
+            this.UpdateInfo = updateInfo;
+        }
+    }
+}