Release 1.18.4

Closes #274

Application/LockHandler.cs

@@ -1,10 +1,10 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Application;
 
-namespace TweetDuck.Impl{
+namespace TweetDuck.Application{
     class LockHandler : IAppLockHandler{
         private const int WaitRetryDelay = 250;
         private const int RestoreFailTimeout = 2000;

Application/SystemHandler.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using TweetLib.Core.Application;
 
-namespace TweetDuck.Impl{
+namespace TweetDuck.Application{
     class SystemHandler : IAppSystemHandler{
         void IAppSystemHandler.OpenFileExplorer(string path){
             if (File.Exists(path)){

Browser/Adapters/CefScriptExecutor.cs

@@ -2,7 +2,7 @@
 using CefSharp;
 using TweetLib.Core.Browser;
 
-namespace TweetDuck.Core.Adapters{
+namespace TweetDuck.Browser.Adapters{
     sealed class CefScriptExecutor : IScriptExecutor{
         private readonly IWebBrowser browser;
 

Browser/Bridge/PropertyBridge.cs

@@ -3,7 +3,7 @@ using TweetDuck.Configuration;
 using TweetLib.Core;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Bridge{
+namespace TweetDuck.Browser.Bridge{
     static class PropertyBridge{
         public enum Environment{
             Browser, Notification

Browser/Bridge/TweetDeckBridge.cs

@@ -1,14 +1,18 @@
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Handling;
-using TweetDuck.Core.Handling;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Notification;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Management;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Bridge{
+namespace TweetDuck.Browser.Bridge{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class TweetDeckBridge{
         public static void ResetStaticProperties(){
@@ -38,9 +42,7 @@ namespace TweetDuck.Core.Bridge{
             }
             
             public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
-                form.InvokeAsyncSafe(() => {
+                form.InvokeAsyncSafe(() => form.OnIntroductionClosed(showGuide, allowDataCollection));
-                    form.OnIntroductionClosed(showGuide, allowDataCollection);
-                });
             }
 
             public void LoadNotificationLayout(string fontSize, string headLayout){
@@ -110,13 +112,30 @@ namespace TweetDuck.Core.Bridge{
         }
 
         public void FixClipboard(){
-            form.InvokeAsyncSafe(WindowsUtils.ClipboardStripHtmlStyles);
+            form.InvokeAsyncSafe(ClipboardManager.StripHtmlStyles);
         }
 
         public void OpenBrowser(string url){
             form.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
         }
 
+        public void MakeGetRequest(string url, IJavascriptCallback onSuccess, IJavascriptCallback onError){
+            Task.Run(async () => {
+                var client = WebUtils.NewClient(BrowserUtils.UserAgentVanilla);
+
+                try{
+                    var result = await client.DownloadStringTaskAsync(url);
+                    await onSuccess.ExecuteAsync(result);
+                }catch(Exception e){
+                    await onError.ExecuteAsync(e.Message);
+                }finally{
+                    onSuccess.Dispose();
+                    onError.Dispose();
+                    client.Dispose();
+                }
+            });
+        }
+
         public int GetIdleSeconds(){
             return NativeMethods.GetIdleSeconds();
         }

Browser/Bridge/UpdateBridge.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Updates;
 
-namespace TweetDuck.Core.Bridge{
+namespace TweetDuck.Browser.Bridge{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class UpdateBridge{
         private readonly UpdateHandler updates;

Browser/Data/ContextInfo.cs

@@ -2,7 +2,7 @@
 using CefSharp;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Management{
+namespace TweetDuck.Browser.Data{
     sealed class ContextInfo{
         private LinkInfo link;
         private ChirpInfo? chirp;

Browser/Data/ResourceLink.cs

@@ -1,6 +1,6 @@
 using CefSharp;
 
-namespace TweetDuck.Data{
+namespace TweetDuck.Browser.Data{
     sealed class ResourceLink{
         public string Url { get; }
         public IResourceHandler Handler { get; }

Browser/Data/WindowState.cs

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

Browser/FormBrowser.Designer.cs

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

Browser/FormBrowser.cs

@@ -5,24 +5,24 @@ using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using CefSharp;
+using TweetDuck.Browser.Bridge;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Browser.Notification.Screenshot;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
+using TweetDuck.Controls;
-using TweetDuck.Core.Controls;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Handling;
+using TweetDuck.Dialogs.Settings;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Management;
-using TweetDuck.Core.Management;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Notification.Screenshot;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Other.Settings.Dialogs;
-using TweetDuck.Core.Utils;
 using TweetDuck.Updates;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Events;
 using TweetLib.Core.Features.Updates;
 
-namespace TweetDuck.Core{
+namespace TweetDuck.Browser{
     sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
         private static UserConfig Config => Program.Config.User;
 
@@ -90,14 +90,6 @@ namespace TweetDuck.Core{
             Disposed += (sender, args) => {
                 Config.MuteToggled -= Config_MuteToggled;
                 Config.TrayBehaviorChanged -= Config_TrayBehaviorChanged;
-                
-                browser.Dispose();
-                updates.Dispose();
-                contextMenu.Dispose();
-
-                notificationScreenshotManager?.Dispose();
-                videoPlayer?.Dispose();
-                analytics?.Dispose();
             };
 
             Config.MuteToggled += Config_MuteToggled;
@@ -119,6 +111,23 @@ namespace TweetDuck.Core{
             RestoreWindow();
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+
+                browser.Dispose();
+                updates.Dispose();
+                notification.Dispose();
+                contextMenu.Dispose();
+
+                notificationScreenshotManager?.Dispose();
+                videoPlayer?.Dispose();
+                analytics?.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         private void ShowChildForm(Form form){
             form.VisibleChanged += (sender, args) => form.MoveToCenter(this);
             form.Show(this);
@@ -152,7 +161,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_Activated(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             trayIcon.HasNotifications = false;
 
@@ -162,14 +173,18 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_LocationChanged(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
             
             timerResize.Stop();
             timerResize.Start();
         }
 
         private void FormBrowser_Resize(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             if (WindowState != prevState){
                 prevState = WindowState;
@@ -190,7 +205,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_ResizeEnd(object sender, EventArgs e){ // also triggers when the window moves
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             timerResize.Stop();
             
@@ -201,7 +218,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_FormClosing(object sender, FormClosingEventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             if (Config.TrayBehavior.ShouldHideOnClose() && trayIcon.Visible && e.CloseReason == CloseReason.UserClosing){
                 Hide(); // hides taskbar too?! welp that works I guess
@@ -491,14 +510,14 @@ namespace TweetDuck.Core{
         public void OpenProfileImport(){
             FormManager.TryFind<FormSettings>()?.Close();
 
-            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins, true)){
+            using DialogSettingsManage dialog = new DialogSettingsManage(plugins, true);
+
             if (!dialog.IsDisposed && dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){ // needs disposal check because the dialog may be closed in constructor
                 BrowserProcessHandler.UpdatePrefs();
                 FormManager.TryFind<FormPlugins>()?.Close();
                 plugins.Reload(); // also reloads the browser
             }
         }
-        }
 
         public void OnTweetNotification(){ // may be called multiple times, once for each type of notification
             if (Config.EnableTrayHighlight && !ContainsFocus){
@@ -516,10 +535,7 @@ namespace TweetDuck.Core{
             if (playerPath == null || !File.Exists(playerPath)){
                 if (videoPlayer == null){
                     videoPlayer = new VideoPlayer(this);
-
+                    videoPlayer.ProcessExited += (sender, args) => browser.HideVideoOverlay(true);
-                    videoPlayer.ProcessExited += (sender, args) => {
-                        browser.HideVideoOverlay(true);
-                    };
                 }
                 
                 callShowOverlay.ExecuteAsync();

Browser/Handling/ContextMenuBase.cs

@@ -1,20 +1,21 @@
 using System;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Utils;
+using TweetDuck.Browser.Data;
-using System.Linq;
+using TweetDuck.Browser.Notification;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Controls;
-using TweetDuck.Core.Management;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Notification;
+using TweetDuck.Management;
-using TweetDuck.Core.Other;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Twitter;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
         public static ContextInfo CurrentInfo { get; } = new ContextInfo();
 
@@ -27,10 +28,11 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuViewImage       = (CefMenuCommand)26503;
         private const CefMenuCommand MenuOpenMediaUrl    = (CefMenuCommand)26504;
         private const CefMenuCommand MenuCopyMediaUrl    = (CefMenuCommand)26505;
-        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26506;
+        private const CefMenuCommand MenuCopyImage       = (CefMenuCommand)26506;
-        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26507;
+        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26507;
-        private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26508;
+        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26508;
-        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26509;
+        private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26509;
+        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26510;
         private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
         
         protected ContextInfo.ContextData Context { get; private set; }
@@ -84,6 +86,7 @@ namespace TweetDuck.Core.Handling{
                 model.AddItem(MenuViewImage, "View image in photo viewer");
                 model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
+                model.AddItem(MenuCopyImage, "Copy image");
                 model.AddItem(MenuSaveMedia, TextSave("image"));
 
                 if (Context.Chirp.Images.Length > 1){
@@ -123,6 +126,16 @@ namespace TweetDuck.Core.Handling{
                     SetClipboardText(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
+                case MenuCopyImage: {
+                    string url = Context.MediaUrl;
+
+                    control.InvokeAsyncSafe(() => {
+                        TwitterUtils.CopyImage(url, ImageQuality);
+                    });
+                    
+                    break;
+                }
+
                 case MenuViewImage: {
                     string url = Context.MediaUrl;
 
@@ -202,7 +215,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         protected static void SetClipboardText(Control control, string text){
-            control.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
+            control.InvokeAsyncSafe(() => ClipboardManager.SetText(text, TextDataFormat.UnicodeText));
         }
 
         protected static void InsertSelectionSearchItem(IMenuModel model, CefMenuCommand insertCommand, string insertLabel){

Browser/Handling/ContextMenuBrowser.cs

@@ -1,10 +1,10 @@
-using CefSharp;
+using System.Windows.Forms;
-using System.Windows.Forms;
+using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Data;
-using TweetDuck.Core.Management;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuBrowser : ContextMenuBase{
         private const CefMenuCommand MenuGlobal   = (CefMenuCommand)26600;
         private const CefMenuCommand MenuMute     = (CefMenuCommand)26601;

Browser/Handling/ContextMenuGuide.cs

@@ -1,7 +1,7 @@
 using CefSharp;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Management.Analytics;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuGuide : ContextMenuBase{
         public ContextMenuGuide(AnalyticsFile.IProvider analytics) : base(analytics){}
 

Browser/Handling/ContextMenuNotification.cs

@@ -1,8 +1,8 @@
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Notification;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuNotification : ContextMenuBase{
         private const CefMenuCommand MenuViewDetail         = (CefMenuCommand)26600;
         private const CefMenuCommand MenuSkipTweet          = (CefMenuCommand)26601;

Browser/Handling/DragHandlerBrowser.cs

@@ -2,7 +2,7 @@
 using CefSharp;
 using CefSharp.Enums;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class DragHandlerBrowser : IDragHandler{
         private readonly RequestHandlerBrowser requestHandler;
 

Browser/Handling/Filters/ResponseFilterBase.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Text;
 using CefSharp;
 
-namespace TweetDuck.Core.Handling.Filters{
+namespace TweetDuck.Browser.Handling.Filters{
     abstract class ResponseFilterBase : IResponseFilter{
         private enum State{
             Reading, Writing, Done

Browser/Handling/Filters/ResponseFilterVendor.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace TweetDuck.Core.Handling.Filters{
+namespace TweetDuck.Browser.Handling.Filters{
     sealed class ResponseFilterVendor : ResponseFilterBase{
         private static readonly Regex RegexRestoreJQuery = new Regex(@"(\w+)\.fn=\1\.prototype", RegexOptions.Compiled);
 

Browser/Handling/General/BrowserProcessHandler.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using CefSharp;
 using TweetDuck.Configuration;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class BrowserProcessHandler : IBrowserProcessHandler{
         public static Task UpdatePrefs(){
             return Cef.UIThreadTaskFactory.StartNew(UpdatePrefsInternal);

Browser/Handling/General/FileDialogHandler.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Windows.Forms;
 using CefSharp;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class FileDialogHandler : IDialogHandler{
         public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
             if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple){

Browser/Handling/General/JavaScriptDialogHandler.cs

@@ -1,11 +1,11 @@
 using System.Drawing;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class JavaScriptDialogHandler : IJsDialogHandler{
         private static FormMessage CreateMessageForm(string caption, string text){
             MessageBoxIcon icon = MessageBoxIcon.None;

Browser/Handling/General/LifeSpanHandler.cs

@@ -1,8 +1,8 @@
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class LifeSpanHandler : ILifeSpanHandler{
         private static bool IsPopupAllowed(string url){
             return url.StartsWith("https://twitter.com/teams/authorize?");

Browser/Handling/KeyboardHandlerBase.cs

@@ -1,10 +1,10 @@
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     class KeyboardHandlerBase : IKeyboardHandler{
         protected virtual bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
             if (modifiers == (CefEventFlags.ControlDown | CefEventFlags.ShiftDown) && key == Keys.I){

Browser/Handling/KeyboardHandlerBrowser.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using CefSharp;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class KeyboardHandlerBrowser : KeyboardHandlerBase{
         private readonly FormBrowser form;
 

Browser/Handling/KeyboardHandlerNotification.cs

@@ -1,9 +1,9 @@
-using CefSharp;
+using System.Windows.Forms;
-using System.Windows.Forms;
+using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Notification;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Handling {
+namespace TweetDuck.Browser.Handling{
     sealed class KeyboardHandlerNotification : KeyboardHandlerBase{
         private readonly FormNotificationBase notification;
 

Browser/Handling/RequestHandlerBase.cs

@@ -5,11 +5,11 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using CefSharp;
 using CefSharp.Handler;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Browser.Handling.General;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     class RequestHandlerBase : DefaultRequestHandler{
         private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$");
         private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);

Browser/Handling/RequestHandlerBrowser.cs

@@ -1,10 +1,10 @@
 using System.Collections.Specialized;
 using CefSharp;
-using TweetDuck.Core.Handling.Filters;
+using TweetDuck.Browser.Handling.Filters;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
         private const string UrlVendorResource = "/dist/vendor";
         private const string UrlLoadingSpinner = "/backgrounds/spinner_blue";

Browser/Handling/ResourceHandlerFactory.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Concurrent;
 using CefSharp;
-using TweetDuck.Data;
+using TweetDuck.Browser.Data;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ResourceHandlerFactory : IResourceHandlerFactory{
         public bool HasHandlers => !handlers.IsEmpty;
 

Browser/Handling/ResourceHandlerNotification.cs

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

Browser/Notification/Example/FormNotificationExample.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Notification.Example{
+namespace TweetDuck.Browser.Notification.Example{
     sealed class FormNotificationExample : FormNotificationMain{
         public override bool RequiresResize => true;
         protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;

Browser/Notification/FormNotificationBase.Designer.cs

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

Browser/Notification/FormNotificationBase.cs

@@ -1,18 +1,18 @@
-using CefSharp.WinForms;
+using System.Drawing;
-using System.Drawing;
 using System.Windows.Forms;
 using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Handling;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Utils;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     abstract partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
         public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
 
@@ -144,11 +144,7 @@ namespace TweetDuck.Core.Notification{
             this.browser.SetupZoomEvents();
 
             Controls.Add(browser);
-
+            Disposed += (sender, args) => this.owner.FormClosed -= owner_FormClosed;
-            Disposed += (sender, args) => {
-                this.browser.Dispose();
-                this.owner.FormClosed -= owner_FormClosed;
-            };
 
             DpiScale = this.GetDPIScale();
 
@@ -156,6 +152,16 @@ namespace TweetDuck.Core.Notification{
             UpdateTitle();
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+                browser.Dispose();
+                resourceHandler.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         protected override void WndProc(ref Message m){
             if (m.Msg == 0x0112 && (m.WParam.ToInt32() & 0xFFF0) == 0xF010 && !CanDragWindow){ // WM_SYSCOMMAND, SC_MOVE
                 return;

Browser/Notification/FormNotificationMain.Designer.cs

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

Browser/Notification/FormNotificationMain.cs

@@ -1,19 +1,19 @@
-using CefSharp;
+using System;
-using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Adapters;
+using CefSharp;
-using TweetDuck.Core.Bridge;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Bridge;
-using TweetDuck.Core.Handling;
+using TweetDuck.Browser.Handling;
-using TweetDuck.Core.Utils;
+using TweetDuck.Controls;
 using TweetDuck.Plugins;
+using TweetDuck.Utils;
 using TweetLib.Core.Data;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     abstract partial class FormNotificationMain : FormNotificationBase{
         private readonly PluginManager plugins;
         private readonly int timerBarHeight;

Browser/Notification/FormNotificationTweet.Designer.cs

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

Browser/Notification/FormNotificationTweet.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     sealed partial class FormNotificationTweet : FormNotificationMain{
         private const int NonIntrusiveIdleLimit = 30;
         private const int TrimMinimum = 32;

Browser/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -3,15 +3,15 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Data;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Notification.Screenshot{
+namespace TweetDuck.Browser.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{
         protected override bool CanDragWindow => false;
 
@@ -82,7 +82,8 @@ namespace TweetDuck.Core.Notification.Screenshot{
                 return false;
             }
             else{
-                using(Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb)){
+                using Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb);
+
                 try{
                     NativeMethods.RenderSourceIntoBitmap(context, bmp);
                 }finally{
@@ -94,5 +95,4 @@ namespace TweetDuck.Core.Notification.Screenshot{
             }
         }
     }
-    }
 }

Browser/Notification/Screenshot/ScreenshotBridge.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Notification.Screenshot{
+namespace TweetDuck.Browser.Notification.Screenshot{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     sealed class ScreenshotBridge{
         private readonly Control owner;

Browser/Notification/Screenshot/TweetScreenshotManager.cs

@@ -8,7 +8,7 @@
 
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Plugins;
 
 #if GEN_SCREENSHOT_FRAMES
@@ -17,7 +17,7 @@ using System.IO;
 using TweetDuck.Core.Utils;
 #endif
 
-namespace TweetDuck.Core.Notification.Screenshot{
+namespace TweetDuck.Browser.Notification.Screenshot{
     sealed class TweetScreenshotManager : IDisposable{
         private readonly FormBrowser owner;
         private readonly PluginManager plugins;

Browser/Notification/SoundNotification.cs

@@ -2,11 +2,12 @@
 using System.IO;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Other.Settings;
+using TweetDuck.Dialogs.Settings;
+using TweetDuck.Management;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     static class SoundNotification{
         public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
         
@@ -28,7 +29,7 @@ namespace TweetDuck.Core.Notification{
                 FormBrowser browser = FormManager.TryFind<FormBrowser>();
 
                 browser?.InvokeAsyncSafe(() => {
-                    using(FormMessage form = new FormMessage("Sound Notification Error", "Could not find custom notification sound file:\n" + path, MessageBoxIcon.Error)){
+                    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");
@@ -38,7 +39,6 @@ namespace TweetDuck.Core.Notification{
                     if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnViewOptions){
                         browser.OpenSettings(typeof(TabSettingsSounds));
                     }
-                    }
                 });
                 
                 return null;

Browser/TrayIcon.Designer.cs

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

Browser/TrayIcon.cs

@@ -4,7 +4,7 @@ using System.Windows.Forms;
 using TweetDuck.Configuration;
 using Res = TweetDuck.Properties.Resources;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Browser{
     sealed partial class TrayIcon : Component{
         public enum Behavior{ // keep order
             Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined
@@ -63,6 +63,15 @@ namespace TweetDuck.Core.Other{
             container.Add(this);
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+                contextMenu.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         private void UpdateIcon(){
             if (Visible){
                 notifyIcon.Icon = hasNotifications ? Res.icon_tray_new : Config.MuteNotifications ? Res.icon_tray_muted : Res.icon_tray;

Browser/TweetDeckBrowser.cs

@@ -4,21 +4,21 @@ using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
+using TweetDuck.Browser.Adapters;
+using TweetDuck.Browser.Bridge;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Notification;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Controls;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
 using TweetLib.Core.Features.Twitter;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core{
+namespace TweetDuck.Browser{
     sealed class TweetDeckBrowser : IDisposable{
         private static UserConfig Config => Program.Config.User;
 

Configuration/ConfigManager.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Drawing;
-using TweetDuck.Data;
+using TweetDuck.Browser.Data;
 using TweetLib.Core.Features.Configuration;
 using TweetLib.Core.Features.Plugins.Config;
 using TweetLib.Core.Serialization.Converters;

Configuration/UserConfig.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Drawing;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser;
-using TweetDuck.Core.Other;
+using TweetDuck.Browser.Data;
-using TweetDuck.Data;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Configuration;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Twitter;

Controls/ControlExtensions.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     static class ControlExtensions{
         public static readonly Point InvisibleLocation = new Point(-32000, -32000);
 

Controls/FlatButton.cs

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

Controls/FlatProgressBar.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class FlatProgressBar : ProgressBar{
         private readonly SolidBrush brush;
 

Controls/FlowLayoutPanelNoHScroll.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class FlowLayoutPanelNoHScroll : FlowLayoutPanel{
         protected override void WndProc(ref Message m){
             if (m.Msg == 0x85){ // WM_NCPAINT

Controls/LabelVertical.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class LabelVertical : Label{
         public int LineHeight { get; set; }
 

Controls/NumericUpDownEx.cs

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

Core/Other/Settings/BaseTabSettings.cs

@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Windows.Forms;
-using TweetDuck.Configuration;
-
-namespace TweetDuck.Core.Other.Settings{
-    class BaseTabSettings : UserControl{
-        protected static UserConfig Config => Program.Config.User;
-        protected static SystemConfig SysConfig => Program.Config.System;
-
-        public IEnumerable<Control> InteractiveControls{
-            get{
-                static IEnumerable<Control> FindInteractiveControls(Control parent){
-                    foreach(Control control in parent.Controls){
-                        if (control is Panel subPanel){
-                            foreach(Control subControl in FindInteractiveControls(subPanel)){
-                                yield return subControl;
-                            }
-                        }
-                        else{
-                            yield return control;
-                        }
-                    }
-                }
-
-                return FindInteractiveControls(this);
-            }
-        }
-
-        protected BaseTabSettings(){
-            Padding = new Padding(6);
-        }
-
-        public virtual void OnReady(){}
-        public virtual void OnClosing(){}
-    }
-}

Dialogs/FormAbout.Designer.cs

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

Dialogs/FormAbout.cs

@@ -2,9 +2,10 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
+using TweetDuck.Management;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormAbout : Form, FormManager.IAppDialog{
         private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki";
         private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues";

Dialogs/FormGuide.Designer.cs

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

Dialogs/FormGuide.cs

@@ -1,16 +1,18 @@
 using System.Drawing;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser;
-using TweetDuck.Core.Handling;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Browser.Data;
-using TweetDuck.Core.Utils;
+using TweetDuck.Browser.Handling;
-using System.Text.RegularExpressions;
+using TweetDuck.Browser.Handling.General;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Controls;
-using TweetDuck.Data;
+using TweetDuck.Management;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormGuide : Form, FormManager.IAppDialog{
         private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
         private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
@@ -85,10 +87,15 @@ namespace TweetDuck.Core.Other{
             browser.SetupZoomEvents();
 
             Controls.Add(browser);
+        }
 
-            Disposed += (sender, args) => {
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
                 browser.Dispose();
-            };
+            }
+
+            base.Dispose(disposing);
         }
 
         private void Reload(string url){

Dialogs/FormMessage.Designer.cs

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

Dialogs/FormMessage.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     [Flags]
     enum ControlType{
         None = 0,
@@ -43,7 +43,8 @@ namespace TweetDuck.Core.Other{
         }
 
         public static bool Show(string caption, string text, MessageBoxIcon icon, string buttonAccept, string buttonCancel){
-            using(FormMessage message = new FormMessage(caption, text, icon)){
+            using FormMessage message = new FormMessage(caption, text, icon);
+
             if (buttonCancel == null){
                 message.AddButton(buttonAccept, DialogResult.OK, ControlType.Cancel | ControlType.Focused);
             }
@@ -54,7 +55,6 @@ namespace TweetDuck.Core.Other{
 
             return message.ShowDialog() == DialogResult.OK;
         }
-        }
 
         // Instance
 

Dialogs/FormPlugins.Designer.cs

@@ -1,6 +1,6 @@
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     partial class FormPlugins {
         /// <summary>
         /// Required designer variable.

Dialogs/FormPlugins.cs

@@ -3,11 +3,12 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
+using TweetDuck.Management;
 using TweetDuck.Plugins;
 using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormPlugins : Form, FormManager.IAppDialog{
         private static UserConfig Config => Program.Config.User;
 

Dialogs/FormSettings.Designer.cs

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

Dialogs/FormSettings.cs

@@ -2,17 +2,19 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Browser.Handling.General;
-using TweetDuck.Core.Notification.Example;
+using TweetDuck.Browser.Notification.Example;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Configuration;
-using TweetDuck.Core.Other.Settings;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Dialogs.Settings;
-using TweetDuck.Core.Utils;
+using TweetDuck.Management;
+using TweetDuck.Management.Analytics;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Updates;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormSettings : Form, FormManager.IAppDialog{
         public bool ShouldReloadBrowser { get; private set; }
 
@@ -80,7 +82,7 @@ namespace TweetDuck.Core.Other{
         private void btnManageOptions_Click(object sender, EventArgs e){
             PrepareUnload();
 
-            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
+            using DialogSettingsManage dialog = new DialogSettingsManage(plugins);
             FormClosing -= FormSettings_FormClosing;
             
             if (dialog.ShowDialog() == DialogResult.OK){
@@ -100,13 +102,12 @@ namespace TweetDuck.Core.Other{
                 PrepareLoad();
             }
         }
-        }
 
         private void btnClose_Click(object sender, EventArgs e){
             Close();
         }
 
-        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTabSettings{
+        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTab{
             FlatButton btn = new FlatButton{
                 BackColor = SystemColors.Control,
                 FlatStyle = FlatStyle.Flat,
@@ -136,7 +137,7 @@ namespace TweetDuck.Core.Other{
             btn.Click += (sender, args) => SelectTab<T>();
         }
 
-        private void SelectTab<T>() where T : BaseTabSettings{
+        private void SelectTab<T>() where T : BaseTab{
             SelectTab(tabs[typeof(T)]);
         }
 
@@ -196,16 +197,47 @@ namespace TweetDuck.Core.Other{
         private sealed class SettingsTab{
             public Button Button { get; }
 
-            public BaseTabSettings Control => control ??= constructor();
+            public BaseTab Control => control ??= constructor();
             public bool IsInitialized => control != null;
 
-            private readonly Func<BaseTabSettings> constructor;
+            private readonly Func<BaseTab> constructor;
-            private BaseTabSettings control;
+            private BaseTab control;
 
-            public SettingsTab(Button button, Func<BaseTabSettings> constructor){
+            public SettingsTab(Button button, Func<BaseTab> constructor){
                 this.Button = button;
                 this.constructor = constructor;
             }
         }
+
+        internal abstract class BaseTab : UserControl{
+            protected static UserConfig Config => Program.Config.User;
+            protected static SystemConfig SysConfig => Program.Config.System;
+
+            public IEnumerable<Control> InteractiveControls{
+                get{
+                    static IEnumerable<Control> FindInteractiveControls(Control parent){
+                        foreach(Control control in parent.Controls){
+                            if (control is Panel subPanel){
+                                foreach(Control subControl in FindInteractiveControls(subPanel)){
+                                    yield return subControl;
+                                }
+                            }
+                            else{
+                                yield return control;
+                            }
+                        }
+                    }
+
+                    return FindInteractiveControls(this);
+                }
+            }
+
+            protected BaseTab(){
+                Padding = new Padding(6);
+            }
+
+            public virtual void OnReady(){}
+            public virtual void OnClosing(){}
+        }
     }
 }

Dialogs/Settings/DialogSettingsAnalytics.Designer.cs

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

Dialogs/Settings/DialogSettingsAnalytics.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Management.Analytics;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsAnalytics : Form{
         public DialogSettingsAnalytics(AnalyticsReport report){
             InitializeComponent();

Dialogs/Settings/DialogSettingsCSS.Designer.cs

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

Dialogs/Settings/DialogSettingsCSS.cs

@@ -2,10 +2,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsCSS : Form{
         public string BrowserCSS => textBoxBrowserCSS.Text;
         public string NotificationCSS => textBoxNotificationCSS.Text;

Dialogs/Settings/DialogSettingsCefArgs.Designer.cs

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

Dialogs/Settings/DialogSettingsCefArgs.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Collections;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsCefArgs : Form{
         public string CefArgs => textBoxArgs.Text;
 

Dialogs/Settings/DialogSettingsExternalProgram.Designer.cs

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

Dialogs/Settings/DialogSettingsExternalProgram.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using TweetLib.Core.Utils;
 using IOPath = System.IO.Path;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsExternalProgram : Form{
         public string Path{
             get => StringUtils.NullIfEmpty(textBoxPath.Text);

Dialogs/Settings/DialogSettingsManage.Designer.cs

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

Dialogs/Settings/DialogSettingsManage.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Management;
+using TweetDuck.Management;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsManage : Form{
         private enum State{
             Deciding, Reset, Import, Export

Dialogs/Settings/DialogSettingsRestart.Designer.cs

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

Dialogs/Settings/DialogSettingsRestart.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetLib.Core.Collections;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsRestart : Form{
         public CommandLineArgs Args { get; private set; }
 
@@ -38,7 +38,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 Args.SetValue(Arguments.ArgDataFolder, tbDataFolder.Text);
             }
 
-            tbShortcutTarget.Text = $@"""{Application.ExecutablePath}""{(Args.Count > 0 ? " " : "")}{Args}";
+            tbShortcutTarget.Text = $@"""{Program.ExecutablePath}""{(Args.Count > 0 ? " " : "")}{Args}";
             tbShortcutTarget.Select(tbShortcutTarget.Text.Length, 0);
         }
 

Dialogs/Settings/DialogSettingsSearchEngine.Designer.cs

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

Dialogs/Settings/DialogSettingsSearchEngine.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsSearchEngine : Form{
         public string Url => textBoxUrl.Text;
 

Dialogs/Settings/TabSettingsAdvanced.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings {
+namespace TweetDuck.Dialogs.Settings {
     partial class TabSettingsAdvanced {
         /// <summary> 
         /// Required designer variable.
@@ -32,7 +32,7 @@
             this.btnRestart = new System.Windows.Forms.Button();
             this.btnOpenAppFolder = new System.Windows.Forms.Button();
             this.btnOpenDataFolder = new System.Windows.Forms.Button();
-            this.numClearCacheThreshold = new TweetDuck.Core.Controls.NumericUpDownEx();
+            this.numClearCacheThreshold = new TweetDuck.Controls.NumericUpDownEx();
             this.checkClearCacheAuto = new System.Windows.Forms.CheckBox();
             this.labelApp = new System.Windows.Forms.Label();
             this.panelAppButtons = new System.Windows.Forms.Panel();

Dialogs/Settings/TabSettingsAdvanced.cs

@@ -2,14 +2,13 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Management;
+using TweetDuck.Management;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Utils;
-using TweetDuck.Core.Utils;
 using TweetLib.Core;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsAdvanced : BaseTabSettings{
+    sealed partial class TabSettingsAdvanced : FormSettings.BaseTab{
         private readonly Action<string> reinjectBrowserCSS;
         private readonly Action openDevTools;
 
@@ -91,12 +90,12 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void btnRestartArgs_Click(object sender, EventArgs e){
-            using(DialogSettingsRestart dialog = new DialogSettingsRestart(Arguments.GetCurrentClean())){
+            using DialogSettingsRestart dialog = new DialogSettingsRestart(Arguments.GetCurrentClean());
+
             if (dialog.ShowDialog() == DialogResult.OK){
                 Program.RestartWithArgs(dialog.Args);
             }
         }
-        }
 
         #endregion
         #region Browser Cache

Dialogs/Settings/TabSettingsFeedback.Designer.cs

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

Dialogs/Settings/TabSettingsFeedback.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Utils;
-using TweetDuck.Core.Utils;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsFeedback : BaseTabSettings{
+    sealed partial class TabSettingsFeedback : FormSettings.BaseTab{
         private readonly AnalyticsFile analyticsFile;
         private readonly AnalyticsReportGenerator.ExternalInfo analyticsInfo;
         private readonly PluginManager plugins;
@@ -50,10 +49,9 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void btnViewReport_Click(object sender, EventArgs e){
-            using(DialogSettingsAnalytics dialog = new DialogSettingsAnalytics(AnalyticsReportGenerator.Create(analyticsFile, analyticsInfo, plugins))){
+            using DialogSettingsAnalytics dialog = new DialogSettingsAnalytics(AnalyticsReportGenerator.Create(analyticsFile, analyticsInfo, plugins));
             dialog.ShowDialog();
         }
-        }
 
         #endregion
     }

Dialogs/Settings/TabSettingsGeneral.Designer.cs

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

Dialogs/Settings/TabSettingsGeneral.cs

@@ -2,15 +2,14 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Handling.General;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Utils;
-using TweetDuck.Core.Utils;
 using TweetLib.Core.Features.Updates;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsGeneral : BaseTabSettings{
+    sealed partial class TabSettingsGeneral : FormSettings.BaseTab{
         private readonly Action reloadColumns;
 
         private readonly UpdateHandler updates;

Dialogs/Settings/TabSettingsNotifications.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings {
+namespace TweetDuck.Dialogs.Settings {
     partial class TabSettingsNotifications {
         /// <summary> 
         /// Required designer variable.
@@ -35,9 +35,9 @@
             this.radioLocTL = new System.Windows.Forms.RadioButton();
             this.trackBarEdgeDistance = new System.Windows.Forms.TrackBar();
             this.tableLayoutDurationButtons = new System.Windows.Forms.TableLayoutPanel();
-            this.btnDurationMedium = new TweetDuck.Core.Controls.FlatButton();
+            this.btnDurationMedium = new TweetDuck.Controls.FlatButton();
-            this.btnDurationLong = new TweetDuck.Core.Controls.FlatButton();
+            this.btnDurationLong = new TweetDuck.Controls.FlatButton();
-            this.btnDurationShort = new TweetDuck.Core.Controls.FlatButton();
+            this.btnDurationShort = new TweetDuck.Controls.FlatButton();
             this.labelDurationValue = new System.Windows.Forms.Label();
             this.trackBarDuration = new System.Windows.Forms.TrackBar();
             this.checkSkipOnLinkClick = new System.Windows.Forms.CheckBox();
@@ -652,9 +652,9 @@
         private System.Windows.Forms.Label labelDurationValue;
         private System.Windows.Forms.TrackBar trackBarDuration;
         private System.Windows.Forms.TableLayoutPanel tableLayoutDurationButtons;
-        private TweetDuck.Core.Controls.FlatButton btnDurationMedium;
+        private TweetDuck.Controls.FlatButton btnDurationMedium;
-        private TweetDuck.Core.Controls.FlatButton btnDurationLong;
+        private TweetDuck.Controls.FlatButton btnDurationLong;
-        private TweetDuck.Core.Controls.FlatButton btnDurationShort;
+        private TweetDuck.Controls.FlatButton btnDurationShort;
         private System.Windows.Forms.CheckBox checkNonIntrusive;
         private System.Windows.Forms.Label labelIdlePause;
         private System.Windows.Forms.ComboBox comboBoxIdlePause;

Dialogs/Settings/TabSettingsNotifications.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification.Example;
-using TweetDuck.Core.Notification.Example;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Notifications;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsNotifications : BaseTabSettings{
+    sealed partial class TabSettingsNotifications : FormSettings.BaseTab{
         private static readonly int[] IdlePauseSeconds = { 0, 30, 60, 120, 300 };
 
         private readonly FormNotificationExample notification;
@@ -219,10 +219,18 @@ namespace TweetDuck.Core.Other.Settings{
         #region Location
 
         private void radioLoc_CheckedChanged(object sender, EventArgs e){
-            if (radioLocTL.Checked)Config.NotificationPosition = DesktopNotification.Position.TopLeft;
+            if (radioLocTL.Checked){
-            else if (radioLocTR.Checked)Config.NotificationPosition = DesktopNotification.Position.TopRight;
+                Config.NotificationPosition = DesktopNotification.Position.TopLeft;
-            else if (radioLocBL.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomLeft;
+            }
-            else if (radioLocBR.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomRight;
+            else if (radioLocTR.Checked){
+                Config.NotificationPosition = DesktopNotification.Position.TopRight;
+            }
+            else if (radioLocBL.Checked){
+                Config.NotificationPosition = DesktopNotification.Position.BottomLeft;
+            }
+            else if (radioLocBR.Checked){
+                Config.NotificationPosition = DesktopNotification.Position.BottomRight;
+            }
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = true;
             notification.ShowExampleNotification(false);

Dialogs/Settings/TabSettingsSounds.Designer.cs

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

Dialogs/Settings/TabSettingsSounds.cs

@@ -2,12 +2,12 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Notification;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsSounds : BaseTabSettings{
+    sealed partial class TabSettingsSounds : FormSettings.BaseTab{
         private readonly Action playSoundNotification;
 
         public TabSettingsSounds(Action playSoundNotification){
@@ -64,17 +64,17 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void btnBrowseSound_Click(object sender, EventArgs e){
-            using(OpenFileDialog dialog = new OpenFileDialog{
+            using OpenFileDialog dialog = new OpenFileDialog{
                 AutoUpgradeEnabled = true,
                 DereferenceLinks = true,
                 Title = "Custom Notification Sound",
                 Filter = $"Sound file ({SoundNotification.SupportedFormats})|{SoundNotification.SupportedFormats}|All files (*.*)|*.*"
-            }){
+            };
+
             if (dialog.ShowDialog() == DialogResult.OK){
                 tbCustomSound.Text = dialog.FileName;
             }
         }
-        }
 
         private void btnResetSound_Click(object sender, EventArgs e){
             tbCustomSound.Text = string.Empty;

Dialogs/Settings/TabSettingsTray.Designer.cs

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

Dialogs/Settings/TabSettingsTray.cs

@@ -1,7 +1,8 @@
 using System;
+using TweetDuck.Browser;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsTray : BaseTabSettings{
+    sealed partial class TabSettingsTray : FormSettings.BaseTab{
         public TabSettingsTray(){
             InitializeComponent();
 

Management/Analytics/AnalyticsFile.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using TweetLib.Core.Serialization;
 using TweetLib.Core.Serialization.Converters;
 
-namespace TweetDuck.Core.Other.Analytics{
+namespace TweetDuck.Management.Analytics{
     [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")]
     sealed class AnalyticsFile{
         private static readonly FileSerializer<AnalyticsFile> Serializer = new FileSerializer<AnalyticsFile>();

Management/Analytics/AnalyticsManager.cs

@@ -6,13 +6,14 @@ using System;
 using System.Net;
 using System.Threading.Tasks;
 using System.Timers;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser;
-using TweetDuck.Core.Utils;
+using TweetDuck.Controls;
+using TweetDuck.Utils;
 using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Other.Analytics{
+namespace TweetDuck.Management.Analytics{
     sealed class AnalyticsManager : IDisposable{
         private static readonly TimeSpan CollectionInterval = TimeSpan.FromDays(14);
 
@@ -138,8 +139,7 @@ namespace TweetDuck.Core.Other.Analytics{
                                 break;
 
                             case WebExceptionStatus.ProtocolError:
-                                HttpWebResponse response = e.Response as HttpWebResponse;
+                                message = "HTTP Error " + (e.Response is HttpWebResponse response ? $"{(int)response.StatusCode} ({response.StatusDescription})" : "(unknown code)");
-                                message = "HTTP Error " + (response != null ? $"{(int)response.StatusCode} ({response.StatusDescription})" : "(unknown code)");
                                 break;
                         }
 

Management/Analytics/AnalyticsReport.cs

@@ -2,7 +2,7 @@
 using System.Collections.Specialized;
 using System.Text;
 
-namespace TweetDuck.Core.Other.Analytics{
+namespace TweetDuck.Management.Analytics{
     sealed class AnalyticsReport : IEnumerable{
         private OrderedDictionary data = new OrderedDictionary(32);
         private int separators;

Management/Analytics/AnalyticsReportGenerator.cs

@@ -2,20 +2,21 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using TweetDuck.Configuration;
 using System.Linq;
 using System.Management;
 using System.Text.RegularExpressions;
-using TweetDuck.Core.Utils;
+using System.Windows.Forms;
+using Microsoft.Win32;
+using TweetDuck.Browser;
+using TweetDuck.Configuration;
+using TweetDuck.Utils;
 using TweetLib.Core;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Other.Analytics{
+namespace TweetDuck.Management.Analytics{
     static class AnalyticsReportGenerator{
         public static AnalyticsReport Create(AnalyticsFile file, ExternalInfo info, PluginManager plugins){
             Dictionary<string, string> editLayoutDesign = EditLayoutDesignPluginData;

Management/BrowserCache.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace TweetDuck.Core.Management{
+namespace TweetDuck.Management{
     static class BrowserCache{
         public static string CacheFolder => Path.Combine(Program.StoragePath, "Cache");
         

Management/ClipboardManager.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+
+namespace TweetDuck.Management{
+    static class ClipboardManager{
+        private static readonly Lazy<Regex> RegexStripHtmlStyles = new Lazy<Regex>(() => new Regex(@"\s?(?:style|class)="".*?"""), false);
+        private static readonly Lazy<Regex> RegexOffsetClipboardHtml = new Lazy<Regex>(() => new Regex(@"(?<=EndHTML:|EndFragment:)(\d+)"), false);
+
+        public static void SetText(string text, TextDataFormat format){
+            if (string.IsNullOrEmpty(text)){
+                return;
+            }
+
+            DataObject obj = new DataObject();
+            obj.SetText(text, format);
+            SetClipboardData(obj);
+        }
+
+        public static void SetImage(Image image){
+            DataObject obj = new DataObject();
+            obj.SetImage(image);
+            SetClipboardData(obj);
+        }
+
+        private static void SetClipboardData(DataObject obj){
+            try{
+                Clipboard.SetDataObject(obj);
+            }catch(ExternalException e){
+                Program.Reporter.HandleException("Clipboard Error", "TweetDuck could not access the clipboard as it is currently used by another process.", true, e);
+            }
+        }
+
+        public static void StripHtmlStyles(){
+            if (!Clipboard.ContainsText(TextDataFormat.Html) || !Clipboard.ContainsText(TextDataFormat.UnicodeText)){
+                return;
+            }
+
+            string originalText = Clipboard.GetText(TextDataFormat.UnicodeText);
+            string originalHtml = Clipboard.GetText(TextDataFormat.Html);
+
+            string updatedHtml = RegexStripHtmlStyles.Value.Replace(originalHtml, string.Empty);
+
+            int removed = originalHtml.Length - updatedHtml.Length;
+            updatedHtml = RegexOffsetClipboardHtml.Value.Replace(updatedHtml, match => (int.Parse(match.Value) - removed).ToString().PadLeft(match.Value.Length, '0'));
+            
+            DataObject obj = new DataObject();
+            obj.SetText(originalText, TextDataFormat.UnicodeText);
+            obj.SetText(updatedHtml, TextDataFormat.Html);
+            SetClipboardData(obj);
+        }
+    }
+}

Management/FormManager.cs

@@ -1,10 +1,12 @@
 using System.Linq;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core{
+namespace TweetDuck.Management{
     static class FormManager{
+        private static FormCollection OpenForms => System.Windows.Forms.Application.OpenForms;
+
         public static T TryFind<T>() where T : Form{
-            return Application.OpenForms.OfType<T>().FirstOrDefault();
+            return OpenForms.OfType<T>().FirstOrDefault();
         }
 
         public static bool TryBringToFront<T>() where T : Form{
@@ -14,11 +16,13 @@ namespace TweetDuck.Core{
                 form.BringToFront();
                 return true;
             }
-            else return false;
+            else{
+                return false;
+            }
         }
 
         public static void CloseAllDialogs(){
-            foreach(IAppDialog dialog in Application.OpenForms.OfType<IAppDialog>().Reverse()){
+            foreach(IAppDialog dialog in OpenForms.OfType<IAppDialog>().Reverse()){
                 ((Form)dialog).Close();
             }
         }

Management/ProfileManager.cs

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
 using TweetLib.Core.Data;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
 
-namespace TweetDuck.Core.Management{
+namespace TweetDuck.Management{
     sealed class ProfileManager{
         private static readonly string CookiesPath = Path.Combine(Program.StoragePath, "Cookies");
         private static readonly string TempCookiesPath = Path.Combine(Program.StoragePath, "CookiesTmp");

Management/VideoPlayer.cs

@@ -2,13 +2,14 @@
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
+using TweetDuck.Browser;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Communication;
 
-namespace TweetDuck.Core.Management{
+namespace TweetDuck.Management{
     sealed class VideoPlayer : IDisposable{
         private static UserConfig Config => Program.Config.User;
 

Plugins/PluginControl.Designer.cs

@@ -33,7 +33,7 @@
             this.labelWebsite = new System.Windows.Forms.Label();
             this.labelVersion = new System.Windows.Forms.Label();
             this.btnConfigure = new System.Windows.Forms.Button();
-            this.labelType = new TweetDuck.Core.Controls.LabelVertical();
+            this.labelType = new TweetDuck.Controls.LabelVertical();
             this.timerLayout = new System.Windows.Forms.Timer(this.components);
             this.panelBorder = new System.Windows.Forms.Panel();
             this.panelDescription.SuspendLayout();
@@ -227,7 +227,7 @@
         private System.Windows.Forms.Label labelWebsite;
         private System.Windows.Forms.Label labelVersion;
         private System.Windows.Forms.Button btnConfigure;
-        private Core.Controls.LabelVertical labelType;
+        private Controls.LabelVertical labelType;
         private System.Windows.Forms.Timer timerLayout;
         private System.Windows.Forms.Panel panelBorder;
     }

Plugins/PluginControl.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;