diff --git a/OneMore/Commands/Settings/NavigatorSheet.Designer.cs b/OneMore/Commands/Settings/NavigatorSheet.Designer.cs
index 7ab473dc90..b640a27e8d 100644
--- a/OneMore/Commands/Settings/NavigatorSheet.Designer.cs
+++ b/OneMore/Commands/Settings/NavigatorSheet.Designer.cs
@@ -30,7 +30,7 @@ protected override void Dispose(bool disposing)
 		private void InitializeComponent()
 		{
 			this.components = new System.ComponentModel.Container();
-			this.introBox = new UI.MoreMultilineLabel();
+			this.introBox = new River.OneMoreAddIn.UI.MoreMultilineLabel();
 			this.layoutPanel = new System.Windows.Forms.Panel();
 			this.advancedGroup = new River.OneMoreAddIn.UI.MoreGroupBox();
 			this.disabledBox = new River.OneMoreAddIn.UI.MoreCheckBox();
@@ -54,11 +54,11 @@ private void InitializeComponent()
 			this.introBox.Location = new System.Drawing.Point(13, 8);
 			this.introBox.Name = "introBox";
 			this.introBox.Padding = new System.Windows.Forms.Padding(0, 0, 0, 36);
-			this.introBox.ThemedBack = "ControlLightLight";
-			this.introBox.ThemedFore = "ControlText";
 			this.introBox.Size = new System.Drawing.Size(772, 66);
 			this.introBox.TabIndex = 3;
 			this.introBox.Text = "Customize advanced options for the Navigator Service";
+			this.introBox.ThemedBack = "ControlLightLight";
+			this.introBox.ThemedFore = "ControlText";
 			// 
 			// layoutPanel
 			// 
@@ -91,9 +91,12 @@ private void InitializeComponent()
 			// 
 			// disabledBox
 			// 
+			this.disabledBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
+			this.disabledBox.Cursor = System.Windows.Forms.Cursors.Hand;
+			this.disabledBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
 			this.disabledBox.Location = new System.Drawing.Point(18, 26);
 			this.disabledBox.Name = "disabledBox";
-			this.disabledBox.Size = new System.Drawing.Size(630, 24);
+			this.disabledBox.Size = new System.Drawing.Size(631, 25);
 			this.disabledBox.TabIndex = 0;
 			this.disabledBox.Text = "Disable the navigation service. This will render the Navigator window inoperaable" +
     ".";
@@ -175,12 +178,15 @@ private void InitializeComponent()
 			// 
 			this.corrallBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+			this.corrallBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
 			this.corrallBox.Checked = true;
 			this.corrallBox.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.corrallBox.Cursor = System.Windows.Forms.Cursors.Hand;
+			this.corrallBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
 			this.corrallBox.Location = new System.Drawing.Point(7, 155);
 			this.corrallBox.Margin = new System.Windows.Forms.Padding(0);
 			this.corrallBox.Name = "corrallBox";
-			this.corrallBox.Size = new System.Drawing.Size(399, 24);
+			this.corrallBox.Size = new System.Drawing.Size(686, 25);
 			this.corrallBox.TabIndex = 0;
 			this.corrallBox.Text = "Restrict the Navigator window to the active screen";
 			this.tooltip.SetToolTip(this.corrallBox, "Enabled only when multiple screens are available");
diff --git a/OneMore/Commands/Tools/AboutDialog.Designer.cs b/OneMore/Commands/Tools/AboutDialog.Designer.cs
index 34cbd9ec3d..4ffc20982c 100644
--- a/OneMore/Commands/Tools/AboutDialog.Designer.cs
+++ b/OneMore/Commands/Tools/AboutDialog.Designer.cs
@@ -76,12 +76,12 @@ private void InitializeComponent ()
 			this.versionLabel.ForeColor = System.Drawing.SystemColors.ControlText;
 			this.versionLabel.Location = new System.Drawing.Point(50, 61);
 			this.versionLabel.Name = "versionLabel";
-			this.versionLabel.ThemedBack = "ControlLightLight";
-			this.versionLabel.ThemedFore = null;
 			this.versionLabel.ReadOnly = true;
 			this.versionLabel.Size = new System.Drawing.Size(534, 30);
 			this.versionLabel.TabIndex = 2;
 			this.versionLabel.Text = "Version 1.0";
+			this.versionLabel.ThemedBack = "ControlLightLight";
+			this.versionLabel.ThemedFore = null;
 			// 
 			// copyLabel
 			// 
@@ -103,12 +103,12 @@ private void InitializeComponent ()
 			this.okButton.ImageOver = null;
 			this.okButton.Location = new System.Drawing.Point(748, 502);
 			this.okButton.Name = "okButton";
-			this.okButton.ThemedBack = null;
-			this.okButton.ThemedFore = null;
 			this.okButton.ShowBorder = true;
 			this.okButton.Size = new System.Drawing.Size(130, 42);
 			this.okButton.TabIndex = 0;
 			this.okButton.Text = "OK";
+			this.okButton.ThemedBack = null;
+			this.okButton.ThemedFore = null;
 			this.okButton.UseVisualStyleBackColor = false;
 			this.okButton.Click += new System.EventHandler(this.OK);
 			// 
@@ -125,9 +125,12 @@ private void InitializeComponent ()
 			this.logLabel.MaximumSize = new System.Drawing.Size(420, 0);
 			this.logLabel.Name = "logLabel";
 			this.logLabel.Size = new System.Drawing.Size(65, 20);
+			this.logLabel.StrictColors = false;
 			this.logLabel.TabIndex = 5;
 			this.logLabel.TabStop = true;
 			this.logLabel.Text = "tempfile";
+			this.logLabel.ThemedBack = null;
+			this.logLabel.ThemedFore = "GrayText";
 			this.logLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid;
 			this.logLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OpenLog);
 			// 
@@ -143,9 +146,12 @@ private void InitializeComponent ()
 			this.clearLogLabel.Margin = new System.Windows.Forms.Padding(3, 15, 3, 0);
 			this.clearLogLabel.Name = "clearLogLabel";
 			this.clearLogLabel.Size = new System.Drawing.Size(122, 20);
+			this.clearLogLabel.StrictColors = false;
 			this.clearLogLabel.TabIndex = 6;
 			this.clearLogLabel.TabStop = true;
 			this.clearLogLabel.Text = "Clear the log file";
+			this.clearLogLabel.ThemedBack = null;
+			this.clearLogLabel.ThemedFore = "GrayText";
 			this.clearLogLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid;
 			this.clearLogLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ClearLog);
 			// 
@@ -160,9 +166,12 @@ private void InitializeComponent ()
 			this.homeLink.Margin = new System.Windows.Forms.Padding(3, 15, 3, 0);
 			this.homeLink.Name = "homeLink";
 			this.homeLink.Size = new System.Drawing.Size(193, 20);
+			this.homeLink.StrictColors = false;
 			this.homeLink.TabIndex = 3;
 			this.homeLink.TabStop = true;
 			this.homeLink.Text = "https://onemoreaddin.com";
+			this.homeLink.ThemedBack = null;
+			this.homeLink.ThemedFore = null;
 			this.homeLink.VisitedLinkColor = System.Drawing.Color.MediumOrchid;
 			this.homeLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.GoHome);
 			// 
@@ -177,9 +186,12 @@ private void InitializeComponent ()
 			this.updateLink.Margin = new System.Windows.Forms.Padding(3, 15, 3, 0);
 			this.updateLink.Name = "updateLink";
 			this.updateLink.Size = new System.Drawing.Size(142, 20);
+			this.updateLink.StrictColors = false;
 			this.updateLink.TabIndex = 2;
 			this.updateLink.TabStop = true;
 			this.updateLink.Text = "Check for Updates";
+			this.updateLink.ThemedBack = null;
+			this.updateLink.ThemedFore = null;
 			this.updateLink.VisitedLinkColor = System.Drawing.Color.MediumOrchid;
 			this.updateLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CheckForUpdates);
 			// 
@@ -205,11 +217,11 @@ private void InitializeComponent ()
 			this.sponsorButton.ImageOver = null;
 			this.sponsorButton.Location = new System.Drawing.Point(444, 362);
 			this.sponsorButton.Name = "sponsorButton";
-			this.sponsorButton.ThemedBack = null;
-			this.sponsorButton.ThemedFore = null;
 			this.sponsorButton.ShowBorder = true;
 			this.sponsorButton.Size = new System.Drawing.Size(141, 45);
 			this.sponsorButton.TabIndex = 1;
+			this.sponsorButton.ThemedBack = null;
+			this.sponsorButton.ThemedFore = null;
 			this.sponsorButton.UseVisualStyleBackColor = true;
 			this.sponsorButton.Click += new System.EventHandler(this.GotoSponsorship);
 			// 
@@ -224,9 +236,12 @@ private void InitializeComponent ()
 			this.githubLink.Margin = new System.Windows.Forms.Padding(3, 15, 3, 0);
 			this.githubLink.Name = "githubLink";
 			this.githubLink.Size = new System.Drawing.Size(194, 20);
+			this.githubLink.StrictColors = false;
 			this.githubLink.TabIndex = 4;
 			this.githubLink.TabStop = true;
 			this.githubLink.Text = "See the project on GitHub";
+			this.githubLink.ThemedBack = null;
+			this.githubLink.ThemedFore = null;
 			this.githubLink.VisitedLinkColor = System.Drawing.Color.MediumOrchid;
 			this.githubLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.GoGitHub);
 			//