diff --git a/CodeMaid.UnitTests/CachedSettingSetTests.cs b/CodeMaid.UnitTests/CachedSettingSetTests.cs
index b99d5fd55..635846fdc 100644
--- a/CodeMaid.UnitTests/CachedSettingSetTests.cs
+++ b/CodeMaid.UnitTests/CachedSettingSetTests.cs
@@ -1,21 +1,19 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Helpers;
+using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests
 {
-    [TestClass]
     public class CachedSettingSetTests
     {
         private int _lookupCount;
         private int _parseCount;
         private CachedSettingSet<string> _cachedSettingSet;
 
-        [TestInitialize]
-        public void TestInitialize()
+        public CachedSettingSetTests()
         {
             Settings.Default.Reset();
 
@@ -36,45 +34,45 @@ public void TestInitialize()
                            .ToList();
                });
 
-            Assert.AreEqual(0, _lookupCount);
-            Assert.AreEqual(0, _parseCount);
-            Assert.IsNotNull(_cachedSettingSet);
+            Assert.Equal(0, _lookupCount);
+            Assert.Equal(0, _parseCount);
+            Assert.NotNull(_cachedSettingSet);
         }
 
-        [TestMethod]
+        [Fact]
         public void CachedSettingSetCanLookupAndParse()
         {
             var cleanupExclusions = _cachedSettingSet.Value;
 
-            Assert.IsNotNull(cleanupExclusions);
-            Assert.AreEqual(1, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(cleanupExclusions);
+            Assert.Equal(1, _lookupCount);
+            Assert.Equal(1, _parseCount);
         }
 
-        [TestMethod]
+        [Fact]
         public void CachedSettingSetUsesCacheOnSecondLookup()
         {
             var cleanupExclusions = _cachedSettingSet.Value;
 
-            Assert.IsNotNull(cleanupExclusions);
-            Assert.AreEqual(1, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(cleanupExclusions);
+            Assert.Equal(1, _lookupCount);
+            Assert.Equal(1, _parseCount);
 
             var cleanupExclusions2 = _cachedSettingSet.Value;
 
-            Assert.IsNotNull(cleanupExclusions2);
-            Assert.AreEqual(2, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(cleanupExclusions2);
+            Assert.Equal(2, _lookupCount);
+            Assert.Equal(1, _parseCount);
         }
 
-        [TestMethod]
+        [Fact]
         public void CachedSettingSetReParsesOnChange()
         {
             var cleanupExclusions = _cachedSettingSet.Value;
 
-            Assert.IsNotNull(cleanupExclusions);
-            Assert.AreEqual(1, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(cleanupExclusions);
+            Assert.Equal(1, _lookupCount);
+            Assert.Equal(1, _parseCount);
 
             var cleanupExclusion2 = new List<string>(cleanupExclusions) { ".*Test.*" };
             var serializedCleanupExclusions = string.Join("||", cleanupExclusion2);
@@ -83,9 +81,9 @@ public void CachedSettingSetReParsesOnChange()
 
             var memberTypeSetting2 = _cachedSettingSet.Value;
 
-            Assert.IsNotNull(memberTypeSetting2);
-            Assert.AreEqual(2, _lookupCount);
-            Assert.AreEqual(2, _parseCount);
+            Assert.NotNull(memberTypeSetting2);
+            Assert.Equal(2, _lookupCount);
+            Assert.Equal(2, _parseCount);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaid.UnitTests/CachedSettingTests.cs b/CodeMaid.UnitTests/CachedSettingTests.cs
index 285469d66..67e92ee1d 100644
--- a/CodeMaid.UnitTests/CachedSettingTests.cs
+++ b/CodeMaid.UnitTests/CachedSettingTests.cs
@@ -1,18 +1,16 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Helpers;
+using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests
 {
-    [TestClass]
     public class CachedSettingTests
     {
         private int _lookupCount;
         private int _parseCount;
         private CachedSetting<MemberTypeSetting> _cachedSetting;
 
-        [TestInitialize]
-        public void TestInitialize()
+        public CachedSettingTests()
         {
             Settings.Default.Reset();
 
@@ -30,54 +28,54 @@ public void TestInitialize()
                    return (MemberTypeSetting)x;
                });
 
-            Assert.AreEqual(0, _lookupCount);
-            Assert.AreEqual(0, _parseCount);
-            Assert.IsNotNull(_cachedSetting);
+            Assert.Equal(0, _lookupCount);
+            Assert.Equal(0, _parseCount);
+            Assert.NotNull(_cachedSetting);
         }
 
-        [TestMethod]
+        [Fact]
         public void CachedSettingCanLookupAndParse()
         {
             var memberTypeSetting = _cachedSetting.Value;
 
-            Assert.IsNotNull(memberTypeSetting);
-            Assert.AreEqual(1, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(memberTypeSetting);
+            Assert.Equal(1, _lookupCount);
+            Assert.Equal(1, _parseCount);
         }
 
-        [TestMethod]
+        [Fact]
         public void CachedSettingUsesCacheOnSecondLookup()
         {
             var memberTypeSetting = _cachedSetting.Value;
 
-            Assert.IsNotNull(memberTypeSetting);
-            Assert.AreEqual(1, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(memberTypeSetting);
+            Assert.Equal(1, _lookupCount);
+            Assert.Equal(1, _parseCount);
 
             var memberTypeSetting2 = _cachedSetting.Value;
 
-            Assert.IsNotNull(memberTypeSetting2);
-            Assert.AreEqual(2, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(memberTypeSetting2);
+            Assert.Equal(2, _lookupCount);
+            Assert.Equal(1, _parseCount);
         }
 
-        [TestMethod]
+        [Fact]
         public void CachedSettingReParsesOnChange()
         {
             var memberTypeSetting = _cachedSetting.Value;
 
-            Assert.IsNotNull(memberTypeSetting);
-            Assert.AreEqual(1, _lookupCount);
-            Assert.AreEqual(1, _parseCount);
+            Assert.NotNull(memberTypeSetting);
+            Assert.Equal(1, _lookupCount);
+            Assert.Equal(1, _parseCount);
 
             memberTypeSetting.EffectiveName = "Member Variables";
             Settings.Default.Reorganizing_MemberTypeFields = (string)memberTypeSetting;
 
             var memberTypeSetting2 = _cachedSetting.Value;
 
-            Assert.IsNotNull(memberTypeSetting2);
-            Assert.AreEqual(2, _lookupCount);
-            Assert.AreEqual(2, _parseCount);
+            Assert.NotNull(memberTypeSetting2);
+            Assert.Equal(2, _lookupCount);
+            Assert.Equal(2, _parseCount);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaid.UnitTests/CodeMaid.UnitTests.csproj b/CodeMaid.UnitTests/CodeMaid.UnitTests.csproj
index 23fc90cc9..5e3cca97c 100644
--- a/CodeMaid.UnitTests/CodeMaid.UnitTests.csproj
+++ b/CodeMaid.UnitTests/CodeMaid.UnitTests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -6,7 +6,7 @@
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ProjectGuid>{27C78B2A-18BC-4CE0-BCB1-DB4C30D805BE}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SteveCadwallader.CodeMaid.UnitTests</RootNamespace>
     <AssemblyName>SteveCadwallader.CodeMaid.UnitTests</AssemblyName>
@@ -21,6 +21,8 @@
     <LangVersion>latest</LangVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <RunSettingsFilePath>
+    </RunSettingsFilePath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,6 +64,7 @@
     <Compile Include="Formatting\XmlFormattingTests.cs" />
     <Compile Include="Formatting\ListFormattingTests.cs" />
     <Compile Include="Helpers\CodeItemTypeComparerTests.cs" />
+    <Compile Include="Helpers\CodeReorganizationManagerTests.cs" />
     <Compile Include="Helpers\FileHeaderHelperTests.cs" />
     <Compile Include="Helpers\SettingsMonitorTests.cs" />
     <Compile Include="MemberTypeSettingTests.cs" />
@@ -81,25 +84,19 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>16.10.31321.278</Version>
+      <Version>17.14.40265</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk">
-      <Version>17.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.2.7</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>2.2.7</Version>
+      <Version>18.6.0</Version>
     </PackageReference>
     <PackageReference Include="NSubstitute">
-      <Version>4.2.2</Version>
+      <Version>5.3.0</Version>
     </PackageReference>
-    <PackageReference Include="NUnit">
-      <Version>3.13.2</Version>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <Version>3.0.2</Version>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter">
-      <Version>4.0.0</Version>
+    <PackageReference Include="xunit.v3">
+      <Version>3.2.2</Version>
     </PackageReference>
   </ItemGroup>
   <Choose>
diff --git a/CodeMaid.UnitTests/Formatting/CommentFormatHelper.cs b/CodeMaid.UnitTests/Formatting/CommentFormatHelper.cs
index 7f6d1b9ad..caa584fd7 100644
--- a/CodeMaid.UnitTests/Formatting/CommentFormatHelper.cs
+++ b/CodeMaid.UnitTests/Formatting/CommentFormatHelper.cs
@@ -1,5 +1,5 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Model.Comments;
+using SteveCadwallader.CodeMaid.Model.Comments;
+using Xunit;
 using SteveCadwallader.CodeMaid.Model.Comments.Options;
 using System;
 
@@ -29,7 +29,7 @@ public static string AssertEqualAfterFormat(
             Action<FormatterOptions> options = null)
         {
             var result = CodeComment.Format(text, prefix, options);
-            Assert.AreEqual(expected ?? text, result);
+            Assert.Equal(expected ?? text, result);
             return result;
         }
     }
diff --git a/CodeMaid.UnitTests/Formatting/FormatWithPrefixTests.cs b/CodeMaid.UnitTests/Formatting/FormatWithPrefixTests.cs
index 70fe855c6..e6238e37f 100644
--- a/CodeMaid.UnitTests/Formatting/FormatWithPrefixTests.cs
+++ b/CodeMaid.UnitTests/Formatting/FormatWithPrefixTests.cs
@@ -1,22 +1,20 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Properties;
+using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
 {
     /// <summary>
     /// </summary>
-    [TestClass]
     public class FormatWithPrefixTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public FormatWithPrefixTests()
         {
             Settings.Default.Reset();
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormatWithPrefixTests_KeepsPrefix()
         {
             var input = "// Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
@@ -26,8 +24,8 @@ public void SimpleFormatWithPrefixTests_KeepsPrefix()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, "//", o => o.WrapColumn = 40);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormatWithPrefixTests_TrimsTrailingSpace()
         {
             var input = "// Trailing space  ";
@@ -35,8 +33,8 @@ public void SimpleFormatWithPrefixTests_TrimsTrailingSpace()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, "//");
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormatWithPrefixTests_TrimsTrailingLines()
         {
             var input =
@@ -48,8 +46,8 @@ public void SimpleFormatWithPrefixTests_TrimsTrailingLines()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, "//");
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormatWithPrefixTests_TrimsLeadingLines()
         {
             var input =
@@ -62,16 +60,16 @@ public void SimpleFormatWithPrefixTests_TrimsLeadingLines()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, "//");
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormatWithPrefixTests_KeepsLeadingSpace()
         {
             var input = "    // Lorem ipsum.";
             CommentFormatHelper.AssertEqualAfterFormat(input, input, "    //");
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormatWithPrefixTests_AlignsToFirstPrefix()
         {
             var input =
@@ -83,8 +81,8 @@ public void SimpleFormatWithPrefixTests_AlignsToFirstPrefix()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, "    //", o => o.WrapColumn = 40);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormatWithPrefixTests_NoTrailingWhitespaceOnEmptyLine()
         {
             var input =
diff --git a/CodeMaid.UnitTests/Formatting/HeaderFormattingTests.cs b/CodeMaid.UnitTests/Formatting/HeaderFormattingTests.cs
index 613007bc2..0b5499882 100644
--- a/CodeMaid.UnitTests/Formatting/HeaderFormattingTests.cs
+++ b/CodeMaid.UnitTests/Formatting/HeaderFormattingTests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
 {
@@ -8,11 +8,9 @@ namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
     /// Class with simple unit tests for formatting header type comments. This calls the formatter
     /// directly, rather than invoking it through the UI as with the integration tests.
     /// </summary>
-    [TestClass]
     public class HeaderFormattingTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public HeaderFormattingTests()
         {
             Settings.Default.Reset();
         }
@@ -20,8 +18,8 @@ public void TestInitialize()
         /// <summary>
         /// Tests the forced indenting of the XML copyright file header.
         /// </summary>
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void HeaderFormattingTests_Copyright_Indenting()
         {
             var input =
@@ -37,8 +35,8 @@ public void HeaderFormattingTests_Copyright_Indenting()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.Xml.Default.Indent = 0);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void HeaderFormattingTests_PreservesHyphenLinesWithoutXML()
         {
             var input =
@@ -51,8 +49,8 @@ public void HeaderFormattingTests_PreservesHyphenLinesWithoutXML()
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void HeaderFormattingTests_Copyright_PreservesHyphenLinesWithXML()
         {
             var input =
diff --git a/CodeMaid.UnitTests/Formatting/IgnorePrefixesTests.cs b/CodeMaid.UnitTests/Formatting/IgnorePrefixesTests.cs
index 5757a163f..862d46c1e 100644
--- a/CodeMaid.UnitTests/Formatting/IgnorePrefixesTests.cs
+++ b/CodeMaid.UnitTests/Formatting/IgnorePrefixesTests.cs
@@ -1,30 +1,28 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Properties;
+using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
 {
     /// <summary>
     /// Test for the ignoring of comments lines starting with certain prefixes.
     /// </summary>
-    [TestClass]
     public class IgnorePrefixesTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public IgnorePrefixesTests()
         {
             Settings.Default.Reset();
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void IgnorePrefixesTests_DoesNotWrapSingleLine()
         {
             CommentFormatHelper.AssertEqualAfterFormat(@"TODO: Lorem ipsum dolor sit amet, consectetur adipiscing elit.", o => o.WrapColumn = 30);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void IgnorePrefixesTests_DoesNotWrapLineInsideComment()
         {
             var input =
@@ -43,8 +41,8 @@ public void IgnorePrefixesTests_DoesNotWrapLineInsideComment()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.WrapColumn = 30);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void IgnorePrefixesTests_DoesNotCombineSubsequentLines()
         {
             var input =
diff --git a/CodeMaid.UnitTests/Formatting/ListFormattingTests.cs b/CodeMaid.UnitTests/Formatting/ListFormattingTests.cs
index f44c0952d..903788450 100644
--- a/CodeMaid.UnitTests/Formatting/ListFormattingTests.cs
+++ b/CodeMaid.UnitTests/Formatting/ListFormattingTests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Properties;
+using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
 {
@@ -8,17 +8,15 @@ namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
     /// Class with list oriented unit tests for formatting. This calls the formatter directly, rather
     /// than invoking it through the UI as with the integration tests.
     /// </summary>
-    [TestClass]
     public class ListFormattingTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public ListFormattingTests()
         {
             Settings.Default.Reset();
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void ListFormattingTests_DashedList()
         {
             var input =
@@ -38,8 +36,8 @@ public void ListFormattingTests_DashedList()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.WrapColumn = 30);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void ListFormattingTests_NumberedList()
         {
             var input =
@@ -59,8 +57,8 @@ public void ListFormattingTests_NumberedList()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.WrapColumn = 30);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void ListFormattingTests_WordList()
         {
             var input =
@@ -80,8 +78,8 @@ public void ListFormattingTests_WordList()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.WrapColumn = 35);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void ListFormattingTests_XmlListWithHeader()
         {
             var input =
@@ -115,8 +113,8 @@ public void ListFormattingTests_XmlListWithHeader()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void ListFormattingTests_XmlListWithHeaderAndIndent()
         {
             var input =
diff --git a/CodeMaid.UnitTests/Formatting/SimpleFormattingTests.cs b/CodeMaid.UnitTests/Formatting/SimpleFormattingTests.cs
index 8185f56df..ccc145768 100644
--- a/CodeMaid.UnitTests/Formatting/SimpleFormattingTests.cs
+++ b/CodeMaid.UnitTests/Formatting/SimpleFormattingTests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Properties;
+using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
 {
@@ -8,24 +8,22 @@ namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
     /// Class with simple unit tests for formatting. This calls the formatter directly, rather than
     /// invoking it through the UI as with the integration tests.
     /// </summary>
-    [TestClass]
     public class SimpleFormattingTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public SimpleFormattingTests()
         {
             Settings.Default.Reset();
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_DoesNotCreateText()
         {
             CommentFormatHelper.AssertEqualAfterFormat(string.Empty, string.Empty);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_DoesNotWrapShortLines()
         {
             var input = "Lorem ipsum dolor sit amet.";
@@ -33,8 +31,8 @@ public void SimpleFormattingTests_DoesNotWrapShortLines()
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_PreservesMultipleBlankLine()
         {
             var input = "Lorem ipsum\r\n\r\n\r\ndolor sit amet.";
@@ -42,8 +40,8 @@ public void SimpleFormattingTests_PreservesMultipleBlankLine()
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_PreservesSingleBlankLine()
         {
             var input = "Lorem ipsum\r\n\r\ndolor sit amet.";
@@ -51,8 +49,8 @@ public void SimpleFormattingTests_PreservesSingleBlankLine()
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_NoTrailingWhitespace()
         {
             var input =
@@ -68,8 +66,8 @@ public void SimpleFormattingTests_NoTrailingWhitespace()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_RemoveBlankLinesAfter()
         {
             var input = "Lorem ipsum dolor sit amet.\r\n\r\n";
@@ -78,8 +76,8 @@ public void SimpleFormattingTests_RemoveBlankLinesAfter()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_RemoveBlankLinesBefore()
         {
             var input = "\r\n\r\nLorem ipsum dolor sit amet.";
@@ -88,8 +86,8 @@ public void SimpleFormattingTests_RemoveBlankLinesBefore()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_RemovesLineBreaks()
         {
             var input = "Lorem ipsum\r\ndolor sit amet.";
@@ -98,8 +96,8 @@ public void SimpleFormattingTests_RemovesLineBreaks()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_SkipWrapOnLastWord()
         {
             var input = "Lorem ipsum dolor sit amet.";
@@ -112,8 +110,8 @@ public void SimpleFormattingTests_SkipWrapOnLastWord()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_WrapOnLastWord()
         {
             var input = "Lorem ipsum dolor sit amet.";
@@ -126,24 +124,24 @@ public void SimpleFormattingTests_WrapOnLastWord()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_HyperlinkOnNewLine()
         {
             var input = "http://foo";
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_HyperlinkBetweenWords()
         {
             var input = "Look at this http://foo pretty link.";
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_WrapsLinesAsExpected()
         {
             var input = "Lorem ipsum dolor sit.";
@@ -152,8 +150,8 @@ public void SimpleFormattingTests_WrapsLinesAsExpected()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.WrapColumn = 12);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void SimpleFormattingTests_MergesHyphenAndNonHyphenLines()
         {
             var input =
diff --git a/CodeMaid.UnitTests/Formatting/XmlFormattingTests.cs b/CodeMaid.UnitTests/Formatting/XmlFormattingTests.cs
index 9936aeaae..625920313 100644
--- a/CodeMaid.UnitTests/Formatting/XmlFormattingTests.cs
+++ b/CodeMaid.UnitTests/Formatting/XmlFormattingTests.cs
@@ -1,7 +1,7 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Model.Comments.Options;
+using SteveCadwallader.CodeMaid.Model.Comments.Options;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
 {
@@ -9,17 +9,15 @@ namespace SteveCadwallader.CodeMaid.UnitTests.Formatting
     /// Class with simple unit tests for formatting XML based comments. This calls the formatter
     /// directly, rather than invoking it through the UI as with the integration tests.
     /// </summary>
-    [TestClass]
     public class XmlFormattingTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public XmlFormattingTests()
         {
             Settings.Default.Reset();
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_AddSpaceToInsideTags()
         {
             var input = "<xml><see/></xml>";
@@ -31,8 +29,8 @@ public void XmlFormattingTests_AddSpaceToInsideTags()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_AddSpaceToTagContent()
         {
             var input = "<xml><c>test</c></xml>";
@@ -44,8 +42,8 @@ public void XmlFormattingTests_AddSpaceToTagContent()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_AddSpaceToTagContentWithSelfClosingTag()
         {
             var input = "<tag1><tag2/></tag1>";
@@ -58,8 +56,8 @@ public void XmlFormattingTests_AddSpaceToTagContentWithSelfClosingTag()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_AddSpaceToTagContentWithSelfClosingTagMultiline()
         {
             // Add space to content should not add a space when tag content is on it's own line.
@@ -77,8 +75,8 @@ public void XmlFormattingTests_AddSpaceToTagContentWithSelfClosingTagMultiline()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespace1()
         {
             var input = "<xml>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</xml>";
@@ -96,8 +94,8 @@ public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespa
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespace2()
         {
             var input =
@@ -119,8 +117,8 @@ public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespa
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_AllRootLevelTagsOnNewLine()
         {
             var input = "<tag1>abc</tag1><tag2>abc</tag2>";
@@ -131,8 +129,8 @@ public void XmlFormattingTests_AllRootLevelTagsOnNewLine()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_BreakAllTags()
         {
             var input = "<tag1></tag1><tag2></tag2>";
@@ -149,8 +147,8 @@ public void XmlFormattingTests_BreakAllTags()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_BreakLongParagraphs()
         {
             var input = "<example><para>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nisi neque, placerat sed neque vitae.</para></example>";
@@ -165,8 +163,8 @@ public void XmlFormattingTests_BreakLongParagraphs()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.WrapColumn = 60);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_BreakTagsWhenContainsParagraphs()
         {
             var input = "<example><para>test</para></example>";
@@ -182,8 +180,8 @@ public void XmlFormattingTests_BreakTagsWhenContainsParagraphs()
         /// If XML tag indenting is set, this should not affect any literal content. However, content
         /// after the literal should be indented as normal.
         /// </summary>
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_DoesIndentAfterLiteralContent()
         {
             var input =
@@ -215,8 +213,8 @@ public void XmlFormattingTests_DoesIndentAfterLiteralContent()
             CommentFormatHelper.AssertEqualAfterFormat(result, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_DoesNotIndentCloseTag()
         {
             var input = "<tag1></tag1><tag2></tag2>";
@@ -239,8 +237,8 @@ public void XmlFormattingTests_DoesNotIndentCloseTag()
         /// If XML tag indenting is set, this should not affect any literal content. Since whitespace
         /// is preserved on literals, this would increase the indenting with every pass.
         /// </summary>
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_DoesNotIndentLiteralContent()
         {
             var input =
@@ -274,38 +272,38 @@ public void XmlFormattingTests_DoesNotIndentLiteralContent()
             CommentFormatHelper.AssertEqualAfterFormat(result, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_DoNotAutoCollapseTags()
         {
             CommentFormatHelper.AssertEqualAfterFormat("<xml></xml>");
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_DoNotAutoExpandTags()
         {
             CommentFormatHelper.AssertEqualAfterFormat("<xml/>", o => o.Xml.Default.SpaceSelfClosing = false);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_HyperlinkBetweenWords()
         {
             var input = "<summary>" + Environment.NewLine + "Look at this http://foo pretty link." + Environment.NewLine + "</summary>";
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_HyperlinkOnNewLine()
         {
             var input = "<summary>" + Environment.NewLine + "http://foo" + Environment.NewLine + "</summary>";
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_IndentsXml()
         {
             var input = "<summary>Lorem ipsum dolor sit amet.</summary>";
@@ -320,8 +318,8 @@ public void XmlFormattingTests_IndentsXml()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_IndentsXmlMultiLevel()
         {
             var input = "<summary>Lorem ipsum dolor <para>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nisi neque, placerat sed neque vitae.</para> sit amet.</summary>";
@@ -342,8 +340,8 @@ public void XmlFormattingTests_IndentsXmlMultiLevel()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_IndentsXmlSingleLevel()
         {
             var input = "<summary>Lorem ipsum dolor <para>Lorem ipsum dolor sit amet.</para> sit amet.</summary>";
@@ -365,8 +363,8 @@ public void XmlFormattingTests_IndentsXmlSingleLevel()
         /// Test to make sure there is no spacing is added between an inline XML tag directly
         /// followed by interpunction.
         /// </summary>
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_InterpunctionNoSpacing()
         {
             var input = "<test>Line with <interpunction/>.</test>";
@@ -374,8 +372,8 @@ public void XmlFormattingTests_InterpunctionNoSpacing()
             CommentFormatHelper.AssertEqualAfterFormat(input, o => o.Xml.Default.SpaceSelfClosing = false);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_KeepShortParagraphs()
         {
             var input =
@@ -393,8 +391,8 @@ public void XmlFormattingTests_KeepShortParagraphs()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_RemoveSpaceFromInsideTags()
         {
             var input = "<xml><see /></xml>";
@@ -403,8 +401,8 @@ public void XmlFormattingTests_RemoveSpaceFromInsideTags()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.Xml.Default.SpaceSelfClosing = false);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_RemoveSpaceFromTagContent()
         {
             var input = "<xml> <c> test </c> </xml>";
@@ -413,8 +411,8 @@ public void XmlFormattingTests_RemoveSpaceFromTagContent()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.Xml.Default.SpaceContent = false);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_SplitAlwaysOnSingleTag()
         {
             var input = "<tag1></tag1><tag2></tag2>";
@@ -431,8 +429,8 @@ public void XmlFormattingTests_SplitAlwaysOnSingleTag()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_SplitsTagsWhenLineDoesNotFit()
         {
             var input = "<test>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nisi neque, placerat sed neque vitae</test>";
@@ -448,8 +446,8 @@ public void XmlFormattingTests_SplitsTagsWhenLineDoesNotFit()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_TagCase_Keep()
         {
             var input = "<Xml></Xml>";
@@ -457,8 +455,8 @@ public void XmlFormattingTests_TagCase_Keep()
             CommentFormatHelper.AssertEqualAfterFormat(input, o => o.Xml.Default.Case = XmlTagCase.Keep);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_TagCase_Lower()
         {
             var input = "<Xml></Xml>";
@@ -466,8 +464,8 @@ public void XmlFormattingTests_TagCase_Lower()
             CommentFormatHelper.AssertEqualAfterFormat(input, expected, o => o.Xml.Default.Case = XmlTagCase.LowerCase);
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_TagCase_Upper()
         {
             var input = "<Xml></Xml>";
@@ -479,8 +477,8 @@ public void XmlFormattingTests_TagCase_Upper()
         /// If XML tag indenting is set, this should not affect any literal content. Since whitespace
         /// is preserved on literals, this would increase the indenting with every pass.
         /// </summary>
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_Literal_DoesNotIndent()
         {
             var input =
@@ -516,8 +514,8 @@ public void XmlFormattingTests_Literal_DoesNotIndent()
         /// If XML tag indenting is set, this should not affect any literal content. however, content
         /// after the literal should be indented as normal.
         /// </summary>
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_Literal_IndentsAfterContent()
         {
             var input =
@@ -555,8 +553,8 @@ public void XmlFormattingTests_Literal_IndentsAfterContent()
             });
         }
 
-        [TestMethod]
-        [TestCategory("Formatting UnitTests")]
+        [Fact]
+        [Trait("Category", "Formatting UnitTests")]
         public void XmlFormattingTests_Literal_KeepFormatting()
         {
             var input =
diff --git a/CodeMaid.UnitTests/Helpers/CodeItemTypeComparerTests.cs b/CodeMaid.UnitTests/Helpers/CodeItemTypeComparerTests.cs
index 0fa12a30e..badd41ff1 100644
--- a/CodeMaid.UnitTests/Helpers/CodeItemTypeComparerTests.cs
+++ b/CodeMaid.UnitTests/Helpers/CodeItemTypeComparerTests.cs
@@ -1,22 +1,20 @@
 using EnvDTE80;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NSubstitute;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using SteveCadwallader.CodeMaid.Properties;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Helpers
 {
-    [TestClass]
     public class CodeItemTypeComparerTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public CodeItemTypeComparerTests()
         {
             Settings.Default.Reset();
         }
 
-        [TestMethod]
+        [Fact]
         public void ShouldSortItemsOfTheSameTypeByName()
         {
             BaseCodeItem itemB = Create<CodeItemField>("b", 1);
@@ -25,10 +23,10 @@ public void ShouldSortItemsOfTheSameTypeByName()
 
             int result = comparer.Compare(itemA, itemB);
 
-            Assert.IsTrue(result < 0);
+            Assert.True(result < 0);
         }
 
-        [TestMethod]
+        [Fact]
         public void ShouldSortItemsOfTheSameTypeByOffset()
         {
             BaseCodeItem itemB = Create<CodeItemField>("b", 1);
@@ -37,10 +35,10 @@ public void ShouldSortItemsOfTheSameTypeByOffset()
 
             int result = comparer.Compare(itemA, itemB);
 
-            Assert.IsTrue(result > 0);
+            Assert.True(result > 0);
         }
 
-        [TestMethod]
+        [Fact]
         public void ShouldSortByGroupType()
         {
             BaseCodeItem method = Create<CodeItemMethod>("a", 1);
@@ -49,10 +47,10 @@ public void ShouldSortByGroupType()
 
             int result = comparer.Compare(field, method);
 
-            Assert.IsTrue(result < 0);
+            Assert.True(result < 0);
         }
 
-        [TestMethod]
+        [Fact]
         public void ShouldSortByExplicitInterfaceMemberName()
         {
             CodeItemMethod methodZ = CreateExplicitMethod("Interface", "Z", 1);
@@ -62,10 +60,10 @@ public void ShouldSortByExplicitInterfaceMemberName()
             Settings.Default.Reorganizing_ExplicitMembersAtEnd = false;
             int result = comparer.Compare(methodX, methodZ);
 
-            Assert.IsTrue(result < 0);
+            Assert.True(result < 0);
         }
 
-        [TestMethod]
+        [Fact]
         public void ShouldPlaceExplicitInterfaceMembersAtTheEndOfTheGroup()
         {
             CodeItemMethod methodA = CreateExplicitMethod("Interface", "A", 1);
@@ -75,7 +73,7 @@ public void ShouldPlaceExplicitInterfaceMembersAtTheEndOfTheGroup()
             Settings.Default.Reorganizing_ExplicitMembersAtEnd = true;
             int result = comparer.Compare(methodB, methodA);
 
-            Assert.IsTrue(result < 0);
+            Assert.True(result < 0);
         }
 
         private static T Create<T>(string name, int offset) where T : BaseCodeItem, new()
diff --git a/CodeMaid.UnitTests/Helpers/CodeReorganizationManagerTests.cs b/CodeMaid.UnitTests/Helpers/CodeReorganizationManagerTests.cs
new file mode 100644
index 000000000..ea7762a0a
--- /dev/null
+++ b/CodeMaid.UnitTests/Helpers/CodeReorganizationManagerTests.cs
@@ -0,0 +1,227 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
+using NSubstitute;
+using SteveCadwallader.CodeMaid.Logic.Reorganizing;
+using SteveCadwallader.CodeMaid.Model.CodeItems;
+using SteveCadwallader.CodeMaid.Properties;
+using Xunit;
+
+namespace SteveCadwallader.CodeMaid.UnitTests.Helpers
+{
+    public class CodeReorganizationManagerTests
+    {
+        private readonly CodeReorganizationManager _manager;
+
+        public CodeReorganizationManagerTests()
+        {
+            Settings.Default.Reset();
+
+            InitializeUIThread();
+
+            // Use FormatterServices.GetUninitializedObject to create an uninitialized instance,
+            // to avoid initializing other VS components when calling the constructor because Package is null.
+            _manager = (CodeReorganizationManager)FormatterServices.GetUninitializedObject(typeof(CodeReorganizationManager));
+        }
+
+        [Fact]
+        public void ShouldReorganizeChildren_WhenParentIsEnum_ReturnsFalse()
+        {
+            var parent = new CodeItemEnum();
+
+            var result = InvokeShouldReorganizeChildren(parent);
+
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ShouldReorganizeChildren_WhenParentIsClassWithoutAttributes_ReturnsTrue()
+        {
+            var parent = new CodeItemClass();
+
+            var result = InvokeShouldReorganizeChildren(parent);
+
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void ShouldReorganizeChildren_WhenParentHasComImportAttribute_ReturnsFalse()
+        {
+            var parent = new CodeItemClass();
+            SetMockAttributes(parent, new[] { "System.Runtime.InteropServices.ComImportAttribute" });
+
+            var result = InvokeShouldReorganizeChildren(parent);
+
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ShouldReorganizeChildren_WhenParentHasStructLayoutAttribute_ReturnsFalse()
+        {
+            var parent = new CodeItemClass();
+            SetMockAttributes(parent, new[] { "System.Runtime.InteropServices.StructLayoutAttribute" });
+
+            var result = InvokeShouldReorganizeChildren(parent);
+
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ShouldReorganizeChildren_WhenParentHasOtherAttributes_ReturnsTrue()
+        {
+            var parent = new CodeItemClass();
+            SetMockAttributes(parent, new[] { "System.SerializableAttribute" });
+
+            var result = InvokeShouldReorganizeChildren(parent);
+
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void RegionsFlatten_WhenKeepMembersWithinRegionsIsTrue_ReturnsOriginalList()
+        {
+            Settings.Default.Reorganizing_KeepMembersWithinRegions = true;
+
+            var field1 = new CodeItemField { Name = "Field1" };
+            var subRegion = new CodeItemRegion { Name = "SubRegion" };
+            var codeItems = new List<BaseCodeItem> { field1, subRegion };
+
+            var result = InvokeRegionsFlatten(codeItems).ToList();
+
+            Assert.Equal(2, result.Count);
+            Assert.Contains(field1, result);
+            Assert.Contains(subRegion, result);
+        }
+
+        [Fact]
+        public void RegionsFlatten_WhenKeepMembersWithinRegionsIsFalse_FlattensAllRegions()
+        {
+            Settings.Default.Reorganizing_KeepMembersWithinRegions = false;
+
+            var field1 = new CodeItemField { Name = "Field1" };
+            var field2 = new CodeItemField { Name = "Field2" };
+            var method1 = new CodeItemMethod { Name = "Method1" };
+
+            var subRegion = new CodeItemRegion { Name = "SubRegion" };
+            subRegion.Children.Add(method1);
+
+            var mainRegion = new CodeItemRegion { Name = "MainRegion" };
+            mainRegion.Children.Add(field2);
+            mainRegion.Children.Add(subRegion);
+
+            var codeItems = new List<BaseCodeItem> { field1, mainRegion };
+
+            var result = InvokeRegionsFlatten(codeItems).ToList();
+
+            // 預期僅包含 field1, field2, method1，不應包含 any Region
+            Assert.Equal(3, result.Count);
+            Assert.Contains(field1, result);
+            Assert.Contains(field2, result);
+            Assert.Contains(method1, result);
+            Assert.All(result, item => Assert.False(IsRegion(item)));
+        }
+
+        private static bool IsRegion(BaseCodeItem item)
+        {
+            return item is CodeItemRegion;
+        }
+
+        private static void InitializeUIThread()
+        {
+            // 強迫 ThreadHelper.Generic 被 lazy-init 初始化，使其內部實例不為 null
+            var genericValue = ThreadHelper.Generic;
+
+            // 將當前執行測試方法的執行緒註冊為 UI 執行緒
+#pragma warning disable VSSDK005
+            var context = new JoinableTaskContext(System.Threading.Thread.CurrentThread);
+#pragma warning restore VSSDK005
+
+            // 取得當前測試執行緒的 Dispatcher
+            var dispatcher = System.Windows.Threading.Dispatcher.CurrentDispatcher;
+
+            // 1. 強制透過反射設定 ThreadHelper 的私有 static JoinableTaskContext 與 uiThreadDispatcher 欄位
+            var fields = typeof(ThreadHelper).GetFields(BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
+            foreach (var f in fields)
+            {
+                if (f.FieldType == typeof(JoinableTaskContext))
+                {
+                    f.SetValue(null, context);
+                }
+                else if (f.FieldType == typeof(System.Windows.Threading.Dispatcher))
+                {
+                    f.SetValue(null, dispatcher);
+                }
+            }
+
+            // 2. 設定 _generic 實例的所有 JoinableTaskContext 與 uiThreadDispatcher 欄位
+            if (genericValue != null)
+            {
+                var instFields = typeof(ThreadHelper).GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+                foreach (var f in instFields)
+                {
+                    if (f.FieldType == typeof(JoinableTaskContext))
+                    {
+                        f.SetValue(genericValue, context);
+                    }
+                    else if (f.FieldType == typeof(System.Windows.Threading.Dispatcher))
+                    {
+                        f.SetValue(genericValue, dispatcher);
+                    }
+                }
+            }
+        }
+
+        private bool InvokeShouldReorganizeChildren(BaseCodeItemElement parent)
+        {
+            InitializeUIThread();
+
+            var method = typeof(CodeReorganizationManager).GetMethod("ShouldReorganizeChildren",
+                BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                throw new InvalidOperationException("Could not find private method ShouldReorganizeChildren");
+            }
+            return (bool)method.Invoke(_manager, new object[] { parent });
+        }
+
+        private IEnumerable<BaseCodeItem> InvokeRegionsFlatten(IEnumerable<BaseCodeItem> codeItems)
+        {
+            var method = typeof(CodeReorganizationManager).GetMethod("RegionsFlatten",
+                BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                throw new InvalidOperationException("Could not find private method RegionsFlatten");
+            }
+            return (IEnumerable<BaseCodeItem>)method.Invoke(_manager, new object[] { codeItems });
+        }
+
+        private void SetMockAttributes(BaseCodeItemElement element, string[] attributeFullNames)
+        {
+            var mockAttributes = Substitute.For<CodeElements>();
+            var attributesList = new List<CodeAttribute>();
+
+            foreach (var fullName in attributeFullNames)
+            {
+                var mockAttr = Substitute.For<CodeAttribute>();
+                mockAttr.FullName.Returns(fullName);
+                attributesList.Add(mockAttr);
+            }
+
+            mockAttributes.GetEnumerator().Returns(attributesList.GetEnumerator());
+            ((System.Collections.IEnumerable)mockAttributes).GetEnumerator().Returns(attributesList.GetEnumerator());
+
+            var field = typeof(BaseCodeItemElement).GetField("_Attributes",
+                BindingFlags.NonPublic | BindingFlags.Instance);
+            if (field == null)
+            {
+                throw new InvalidOperationException("Could not find field _Attributes in BaseCodeItemElement");
+            }
+            field.SetValue(element, new Lazy<CodeElements>(() => mockAttributes));
+        }
+    }
+}
diff --git a/CodeMaid.UnitTests/Helpers/FileHeaderHelperTests.cs b/CodeMaid.UnitTests/Helpers/FileHeaderHelperTests.cs
index d904f2610..a7b4e2f1b 100644
--- a/CodeMaid.UnitTests/Helpers/FileHeaderHelperTests.cs
+++ b/CodeMaid.UnitTests/Helpers/FileHeaderHelperTests.cs
@@ -1,217 +1,229 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NUnit.Framework;
 using SteveCadwallader.CodeMaid.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using Assert = NUnit.Framework.Assert;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Helpers
 {
     // remark: EnvDTE only counts 1 character per newline
-    [TestClass]
     public class FileHeaderHelperTests
     {
-        [TestCase(CodeLanguage.CSharp, "// some CSharp test header\r\n")]
-        [TestCase(CodeLanguage.CSharp, "/* some C# \r\n* test\r\n header\r\n *\r\n *\r\n* !!! */\r\n")]
-        [TestCase(CodeLanguage.JavaScript, "// some JavaScript test header\r\n")]
-        [TestCase(CodeLanguage.JavaScript, "/* some JS \r\n* test \r\n header !!! */\r\n")]
-        [TestCase(CodeLanguage.LESS, "// some LESS test header\r\n")]
-        [TestCase(CodeLanguage.LESS, "/* some LESS \r\n* test \r\n header !!! */\r\n")]
-        [TestCase(CodeLanguage.SCSS, "// some SCSS test header\r\n")]
-        [TestCase(CodeLanguage.SCSS, "/* some SCSS\r\n * test\r\n header !!! */\r\n")]
-        [TestCase(CodeLanguage.TypeScript, "// some TypeScript test header\r\n")]
-        [TestCase(CodeLanguage.TypeScript, "/* some TypeScript\r\n* test\r\n header !!! */\r\n")]
-        [TestCase(CodeLanguage.HTML, "<!-- some HTML test header -->\r\n")]
-        [TestCase(CodeLanguage.HTML, "<!-- some HTML \r\n test\r\n header ! -->")]
-        [TestCase(CodeLanguage.XAML, "<!-- some XAML test header -->\r\n")]
-        [TestCase(CodeLanguage.XAML, "<!-- some XAML \r\n test\r\n header ! -->")]
-        [TestCase(CodeLanguage.XML, "<!-- some XML test header -->\r\n")]
-        [TestCase(CodeLanguage.XML, "<!-- some XML \r\n test\r\n header ! -->")]
-        [TestCase(CodeLanguage.CSS, "/* some CSS test header */\r\n")]
-        [TestCase(CodeLanguage.CSS, "/* some CSS \r\ntest \r\nheader */\r\n")]
-        [TestCase(CodeLanguage.CPlusPlus, "// some CPlusPlus test header\r\n")]
-        [TestCase(CodeLanguage.CPlusPlus, "/* some C++ \r\ntest\r\n header */\r\n")]
-        [TestCase(CodeLanguage.PHP, "// some PHP test header\r\n")]
-        [TestCase(CodeLanguage.PHP, "# some PHP test header\r\n")]
-        [TestCase(CodeLanguage.PHP, "/* some PHP \r\n test\r\nheader */")]
-        [TestCase(CodeLanguage.PowerShell, "# some PowerShell test header\r\n")]
-        [TestCase(CodeLanguage.PowerShell, "<# some PowerShell\r\ntest\r\n  header ! #>")]
-        [TestCase(CodeLanguage.R, "# some R test header\r\n")]
-        [TestCase(CodeLanguage.FSharp, "// some F# test header\r\n")]
-        [TestCase(CodeLanguage.FSharp, "(* some F#\r\n test \r\nheader\r\n*)")]
-        [TestCase(CodeLanguage.VisualBasic, "' some PowerShell test header\r\n")]
+        [InlineData(CodeLanguage.CSharp, "// some CSharp test header\r\n")]
+        [InlineData(CodeLanguage.CSharp, "/* some C# \r\n* test\r\n header\r\n *\r\n *\r\n* !!! */\r\n")]
+        [InlineData(CodeLanguage.JavaScript, "// some JavaScript test header\r\n")]
+        [InlineData(CodeLanguage.JavaScript, "/* some JS \r\n* test \r\n header !!! */\r\n")]
+        [InlineData(CodeLanguage.LESS, "// some LESS test header\r\n")]
+        [InlineData(CodeLanguage.LESS, "/* some LESS \r\n* test \r\n header !!! */\r\n")]
+        [InlineData(CodeLanguage.SCSS, "// some SCSS test header\r\n")]
+        [InlineData(CodeLanguage.SCSS, "/* some SCSS\r\n * test\r\n header !!! */\r\n")]
+        [InlineData(CodeLanguage.TypeScript, "// some TypeScript test header\r\n")]
+        [InlineData(CodeLanguage.TypeScript, "/* some TypeScript\r\n* test\r\n header !!! */\r\n")]
+        [InlineData(CodeLanguage.HTML, "<!-- some HTML test header -->\r\n")]
+        [InlineData(CodeLanguage.HTML, "<!-- some HTML \r\n test\r\n header ! -->")]
+        [InlineData(CodeLanguage.XAML, "<!-- some XAML test header -->\r\n")]
+        [InlineData(CodeLanguage.XAML, "<!-- some XAML \r\n test\r\n header ! -->")]
+        [InlineData(CodeLanguage.XML, "<!-- some XML test header -->\r\n")]
+        [InlineData(CodeLanguage.XML, "<!-- some XML \r\n test\r\n header ! -->")]
+        [InlineData(CodeLanguage.CSS, "/* some CSS test header */\r\n")]
+        [InlineData(CodeLanguage.CSS, "/* some CSS \r\ntest \r\nheader */\r\n")]
+        [InlineData(CodeLanguage.CPlusPlus, "// some CPlusPlus test header\r\n")]
+        [InlineData(CodeLanguage.CPlusPlus, "/* some C++ \r\ntest\r\n header */\r\n")]
+        [InlineData(CodeLanguage.PHP, "// some PHP test header\r\n")]
+        [InlineData(CodeLanguage.PHP, "# some PHP test header\r\n")]
+        [InlineData(CodeLanguage.PHP, "/* some PHP \r\n test\r\nheader */")]
+        [InlineData(CodeLanguage.PowerShell, "# some PowerShell test header\r\n")]
+        [InlineData(CodeLanguage.PowerShell, "<# some PowerShell\r\ntest\r\n  header ! #>")]
+        [InlineData(CodeLanguage.R, "# some R test header\r\n")]
+        [InlineData(CodeLanguage.FSharp, "// some F# test header\r\n")]
+        [InlineData(CodeLanguage.FSharp, "(* some F#\r\n test \r\nheader\r\n*)")]
+        [InlineData(CodeLanguage.VisualBasic, "' some PowerShell test header\r\n")]
+        [Theory]
         public void GetHeaderLengthLanguage(CodeLanguage language, string text)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(language, text);
 
-            Assert.IsTrue(headerLength > 0, $"Expecting value > 0, found {headerLength}");
+            Assert.True(headerLength > 0, $"Expecting value > 0, found {headerLength}");
         }
 
-        [TestCase(CodeLanguage.CSharp, "# some CSharp test header\r\n")]
-        [TestCase(CodeLanguage.JavaScript, "<!-- some JavaScript test header -->\r\n")]
-        [TestCase(CodeLanguage.LESS, "' some LESS test header\r\n")]
-        [TestCase(CodeLanguage.SCSS, "# some SCSS test header\r\n")]
-        [TestCase(CodeLanguage.TypeScript, "<!-- some TypeScript test header -->\r\n")]
-        [TestCase(CodeLanguage.HTML, "// some HTML test header\r\n")]
-        [TestCase(CodeLanguage.XAML, "/* some XAML test header */\r\n")]
-        [TestCase(CodeLanguage.XML, "' some XML test header\r\n")]
-        [TestCase(CodeLanguage.CSS, "// some CSS test header\r\n")]
-        [TestCase(CodeLanguage.CPlusPlus, "# some CPlusPlus test header\r\n")]
-        [TestCase(CodeLanguage.PHP, "' some PHP test header\r\n")]
-        [TestCase(CodeLanguage.PowerShell, "/* some PowerShell\r\ntest\r\n  header ! */")]
-        [TestCase(CodeLanguage.R, "// some R test header\r\n")]
-        [TestCase(CodeLanguage.FSharp, "/* some F#\r\n test \r\nheader\r\n*/")]
-        [TestCase(CodeLanguage.VisualBasic, "// some PowerShell test header\r\n")]
+        [InlineData(CodeLanguage.CSharp, "# some CSharp test header\r\n")]
+        [InlineData(CodeLanguage.JavaScript, "<!-- some JavaScript test header -->\r\n")]
+        [InlineData(CodeLanguage.LESS, "' some LESS test header\r\n")]
+        [InlineData(CodeLanguage.SCSS, "# some SCSS test header\r\n")]
+        [InlineData(CodeLanguage.TypeScript, "<!-- some TypeScript test header -->\r\n")]
+        [InlineData(CodeLanguage.HTML, "// some HTML test header\r\n")]
+        [InlineData(CodeLanguage.XAML, "/* some XAML test header */\r\n")]
+        [InlineData(CodeLanguage.XML, "' some XML test header\r\n")]
+        [InlineData(CodeLanguage.CSS, "// some CSS test header\r\n")]
+        [InlineData(CodeLanguage.CPlusPlus, "# some CPlusPlus test header\r\n")]
+        [InlineData(CodeLanguage.PHP, "' some PHP test header\r\n")]
+        [InlineData(CodeLanguage.PowerShell, "/* some PowerShell\r\ntest\r\n  header ! */")]
+        [InlineData(CodeLanguage.R, "// some R test header\r\n")]
+        [InlineData(CodeLanguage.FSharp, "/* some F#\r\n test \r\nheader\r\n*/")]
+        [InlineData(CodeLanguage.VisualBasic, "// some PowerShell test header\r\n")]
+        [Theory]
         public void GetHeaderLengthLanguageWithWrongTags(CodeLanguage language, string text)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(language, text);
 
-            Assert.IsTrue(headerLength == 0, $"Expecting 0, found {headerLength}");
+            Assert.True(headerLength == 0, $"Expecting 0, found {headerLength}");
         }
 
-        [TestCase("/* */", "/*", "*/")]
-        [TestCase("/* \r\n   Copyright © 2021 \r\n */", "/*", "*/")]
-        [TestCase("<!-- -->", "<!--", "-->")]
-        [TestCase("<!-- =========== \r\n \r\n  Copyright © 2021 \r\n \r\n =========== -->", "<!--", "-->")]
-        [TestCase("<# #>", "<#", "#>")]
-        [TestCase("<# //////////////// \r\n   Copyright © 2021 \r\n //////////////// #>", "<#", "#>")]
-        [TestCase("(* *)", "(*", "*)")]
-        [TestCase("(* ~~~~ \r\n ~~ \r\n  Copyright © 2021 \r\n ~~ \r\n ~~~~ *)", "(*", "*)")]
+        [InlineData("/* */", "/*", "*/")]
+        [InlineData("/* \r\n   Copyright © 2021 \r\n */", "/*", "*/")]
+        [InlineData("<!-- -->", "<!--", "-->")]
+        [InlineData("<!-- =========== \r\n \r\n  Copyright © 2021 \r\n \r\n =========== -->", "<!--", "-->")]
+        [InlineData("<# #>", "<#", "#>")]
+        [InlineData("<# //////////////// \r\n   Copyright © 2021 \r\n //////////////// #>", "<#", "#>")]
+        [InlineData("(* *)", "(*", "*)")]
+        [InlineData("(* ~~~~ \r\n ~~ \r\n  Copyright © 2021 \r\n ~~ \r\n ~~~~ *)", "(*", "*)")]
+        [Theory]
         public void GetHeaderLengthMultiLine(string text, string tagStart, string tagEnd)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tagStart, tagEnd, false);
             var expectedLength = text.Length - Regex.Matches(text, Environment.NewLine).Count + 1;
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("using System;\r\n/* */", "/*", "*/", 6)]
-        [TestCase("using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n/* \r\n   Copyright © 2021 \r\n */", "/*", "*/", 29)]
+        [InlineData("using System;\r\n/* */", "/*", "*/", 6)]
+        [InlineData("using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n/* \r\n   Copyright © 2021 \r\n */", "/*", "*/", 29)]
+        [Theory]
         public void GetHeaderLengthMultiLineSkipUsings(string text, string tagStart, string tagEnd, int expectedLength)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tagStart, tagEnd, true);
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("\r\n/* */", "/*", "*/")]
-        [TestCase("\r\n\r\n\r\n/*    Copyright © 2021  */", "/*", "*/")]
-        [TestCase("\r\n\r\n<!-- -->", "<!--", "-->")]
+        [InlineData("\r\n/* */", "/*", "*/")]
+        [InlineData("\r\n\r\n\r\n/*    Copyright © 2021  */", "/*", "*/")]
+        [InlineData("\r\n\r\n<!-- -->", "<!--", "-->")]
+        [Theory]
         public void GetHeaderLengthMultiLineWithEmptyLines(string text, string tagStart, string tagEnd)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tagStart, tagEnd, false);
             var expectedLength = text.Length - Regex.Matches(text, Environment.NewLine).Count + 1;
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n\r\n\r\n/* \r\n   Copyright © 2021 \r\n */", "/*", "*/", 29)]
-        [TestCase("using System;\r\n\r\n<!-- -->", "<!--", "-->", 9)]
+        [InlineData("using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n\r\n\r\n/* \r\n   Copyright © 2021 \r\n */", "/*", "*/", 29)]
+        [InlineData("using System;\r\n\r\n<!-- -->", "<!--", "-->", 9)]
+        [Theory]
         public void GetHeaderLengthMultiLineWithEmptyLinesSkipUsings(string text, string tagStart, string tagEnd, int expectedLength)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tagStart, tagEnd, true);
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("", "/*", "*/")]
-        [TestCase("some text", "/*", "*/")]
-        [TestCase("/*     \r\n \r\n      ", "/*", "*/")]
-        [TestCase("/* header */", "/*", "*>")]
-        [TestCase("*/           ", "/*", "*/")]
+        [InlineData("", "/*", "*/")]
+        [InlineData("some text", "/*", "*/")]
+        [InlineData("/*     \r\n \r\n      ", "/*", "*/")]
+        [InlineData("/* header */", "/*", "*>")]
+        [InlineData("*/           ", "/*", "*/")]
+        [Theory]
         public void GetHeaderLengthMultiLineZero(string text, string tagStart, string tagEnd)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tagStart, tagEnd, false);
 
-            Assert.IsTrue(headerLength == 0, $"Expecting 0, found {headerLength}");
+            Assert.True(headerLength == 0, $"Expecting 0, found {headerLength}");
         }
 
-        [TestCase("using System;", "/*", "*/")]
-        [TestCase("using System;\r\n/*     \r\n \r\n      ", "/*", "*/")]
-        [TestCase("using System;\r\n/* header */", "/*", "*>")]
-        [TestCase("using System;\r\n*/           ", "/*", "*/")]
+        [InlineData("using System;", "/*", "*/")]
+        [InlineData("using System;\r\n/*     \r\n \r\n      ", "/*", "*/")]
+        [InlineData("using System;\r\n/* header */", "/*", "*>")]
+        [InlineData("using System;\r\n*/           ", "/*", "*/")]
+        [Theory]
         public void GetHeaderLengthMultiLineZeroSkipUsings(string text, string tagStart, string tagEnd)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tagStart, tagEnd, true);
 
-            Assert.IsTrue(headerLength == 0, $"Expecting 0, found {headerLength}");
+            Assert.True(headerLength == 0, $"Expecting 0, found {headerLength}");
         }
 
-        [TestCase("//", "// header fdsfndksjnfe\r\n")]
-        [TestCase("#", "# header eropf opekfropze jaqozerijfg uihgsdfidnffdsfg\r\n")]
-        [TestCase("'", "'header  sdvq qsudg bqudgybuydzeau _(àç_ç*ù$^$*ùàyguozadgzao\r\n")]
-        [TestCase("//", "// ====================\r\n// Copyright\r\n// ====================\r\n")]
-        [TestCase("#", "# ==============\r\n#   Copyright !\r\n#    ~~\r\n# ==============\r\n")]
-        [TestCase("'", "' ==============\r\n' some text\r\n'   Copyright !\r\n' ==============\r\n")]
+        [InlineData("//", "// header fdsfndksjnfe\r\n")]
+        [InlineData("#", "# header eropf opekfropze jaqozerijfg uihgsdfidnffdsfg\r\n")]
+        [InlineData("'", "'header  sdvq qsudg bqudgybuydzeau _(àç_ç*ù$^$*ùàyguozadgzao\r\n")]
+        [InlineData("//", "// ====================\r\n// Copyright\r\n// ====================\r\n")]
+        [InlineData("#", "# ==============\r\n#   Copyright !\r\n#    ~~\r\n# ==============\r\n")]
+        [InlineData("'", "' ==============\r\n' some text\r\n'   Copyright !\r\n' ==============\r\n")]
+        [Theory]
         public void GetHeaderLengthMultiSingleLine(string tag, string text)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tag, false);
             var expectedLength = text.Length - Regex.Matches(text, Environment.NewLine).Count;
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("//", "using System;\r\n// header\r\nnamespace ", 11)]
-        [TestCase("//", "using System;\r\n// header I\r\n// header II\r\nnamespace ", 26)]
+        [InlineData("//", "using System;\r\n// header\r\nnamespace ", 11)]
+        [InlineData("//", "using System;\r\n// header I\r\n// header II\r\nnamespace ", 26)]
+        [Theory]
         public void GetHeaderLengthMultiSingleLineSkipUsings(string tag, string text, int expectedLength)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tag, true);
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("//", "//  header \r\nnamespace\r\npublic class Test\r\n", 12)]
-        [TestCase("//", "//  header \r\n// more header \r\n some code\r\n", 28)]
-        [TestCase("#", "# some header\r\nnamespace\r\npublic class Test\r\n", 14)]
-        [TestCase("'", "' some header\r\nnamespace\r\npublic class Test\r\n", 14)]
+        [InlineData("//", "//  header \r\nnamespace\r\npublic class Test\r\n", 12)]
+        [InlineData("//", "//  header \r\n// more header \r\n some code\r\n", 28)]
+        [InlineData("#", "# some header\r\nnamespace\r\npublic class Test\r\n", 14)]
+        [InlineData("'", "' some header\r\nnamespace\r\npublic class Test\r\n", 14)]
+        [Theory]
         public void GetHeaderLengthMultiSingleLineWithCode(string tag, string text, int expectedLength)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tag, false);
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("//", "using System;\r\n\r\n//  header \r\nnamespace System.Windows;\r\npublic class Test\r\n", 13)]
-        [TestCase("//", "using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n\r\n\r\n//  header \r\n// more header \r\nnamespace SteveCadwallader.CodeMaid;\r\n", 29)]
-        [TestCase("//", "using System;\r\n\r\n//  header \r\n[assembly: AssemblyTitle(\"SteveCadwallader.CodeMaid.UnitTests\")]\r\nnamespace ", 13)]
+        [InlineData("//", "using System;\r\n\r\n//  header \r\nnamespace System.Windows;\r\npublic class Test\r\n", 13)]
+        [InlineData("//", "using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n\r\n\r\n//  header \r\n// more header \r\nnamespace SteveCadwallader.CodeMaid;\r\n", 29)]
+        [InlineData("//", "using System;\r\n\r\n//  header \r\n[assembly: AssemblyTitle(\"SteveCadwallader.CodeMaid.UnitTests\")]\r\nnamespace ", 13)]
+        [Theory]
         public void GetHeaderLengthMultiSingleLineWithCodeSkipUsings(string tag, string text, int expectedLength)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tag, true);
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("//", "\r\n//  header \r\n// header\r\nnamespace\r\n//not header\r\n public class Test\r\n", 23)]
-        [TestCase("//", "\r\n\r\n\r\n//  header \r\n// more header \r\n some code\r\n", 31)]
-        [TestCase("#", "\r\n# some header\r\nnamespace\r\npublic class Test\r\n", 15)]
-        [TestCase("'", "\r\n' some header\r\nnamespace\r\npublic class Test\r\n", 15)]
+        [InlineData("//", "\r\n//  header \r\n// header\r\nnamespace\r\n//not header\r\n public class Test\r\n", 23)]
+        [InlineData("//", "\r\n\r\n\r\n//  header \r\n// more header \r\n some code\r\n", 31)]
+        [InlineData("#", "\r\n# some header\r\nnamespace\r\npublic class Test\r\n", 15)]
+        [InlineData("'", "\r\n' some header\r\nnamespace\r\npublic class Test\r\n", 15)]
+        [Theory]
         public void GetHeaderLengthMultiSingleLineWithEmptyLines(string tag, string text, int expectedLength)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tag, false);
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("//", "using System;\r\n\r\n\r\n//  header \r\n// header\r\nnamespace \r\n//not header\r\n public class Test\r\n", 23)]
-        [TestCase("//", "using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n//  header \r\n// more header \r\n namespace System.Text;\r\n{\r\n", 29)]
+        [InlineData("//", "using System;\r\n\r\n\r\n//  header \r\n// header\r\nnamespace \r\n//not header\r\n public class Test\r\n", 23)]
+        [InlineData("//", "using EnvDTE;\r\nusing System;\r\nusing SteveCadwallader.CodeMaid.Helpers;\r\n//  header \r\n// more header \r\n namespace System.Text;\r\n{\r\n", 29)]
+        [Theory]
         public void GetHeaderLengthMultiSingleLineWithEmptyLinesSkipUsings(string tag, string text, int expectedLength)
         {
             var headerLength = FileHeaderHelper.GetHeaderLength(text, tag, true);
 
-            Assert.IsTrue(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
+            Assert.True(headerLength == expectedLength, $"Expecting {expectedLength}, found {headerLength}");
         }
 
-        [TestCase("using ", "", "", 0)]
-        [TestCase(" using", "using System;\r\nnamespace CodeMaid", "namespace ", 0)]
-        [TestCase("using ", " using System;\r\nnamespace CodeMaid", "namespace ", 1)]
-        [TestCase("using ", "using System;\r\nusing System.Collections;\r\n\r\nnamespace CodeMaid", "namespace ", 2)]
-        [TestCase("using ", "using System;\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\nusing System.Collections;\r\n\r\nnamespace CodeMaid", "namespace ", 10)]
+        [InlineData("using ", "", "", 0)]
+        [InlineData(" using", "using System;\r\nnamespace CodeMaid", "namespace ", 0)]
+        [InlineData("using ", " using System;\r\nnamespace CodeMaid", "namespace ", 1)]
+        [InlineData("using ", "using System;\r\nusing System.Collections;\r\n\r\nnamespace CodeMaid", "namespace ", 2)]
+        [InlineData("using ", "using System;\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\nusing System.Collections;\r\n\r\nnamespace CodeMaid", "namespace ", 10)]
+        [Theory]
         public void GetNbLinesToSkip(string patternToFind, string text, string limit, int expectedNbLines)
         {
             var nbLines = FileHeaderHelper.GetNbLinesToSkip(patternToFind, text, new List<string>() { limit });
 
-            Assert.IsTrue(nbLines == expectedNbLines, $"Expecting {expectedNbLines}, found {expectedNbLines}");
+            Assert.True(nbLines == expectedNbLines, $"Expecting {expectedNbLines}, found {expectedNbLines}");
         }
     }
 }
\ No newline at end of file
diff --git a/CodeMaid.UnitTests/Helpers/SettingsMonitorTests.cs b/CodeMaid.UnitTests/Helpers/SettingsMonitorTests.cs
index e31b17f8d..b18b5d917 100644
--- a/CodeMaid.UnitTests/Helpers/SettingsMonitorTests.cs
+++ b/CodeMaid.UnitTests/Helpers/SettingsMonitorTests.cs
@@ -1,21 +1,19 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Helpers;
+using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Linq;
 using System.Threading.Tasks;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests.Helpers
 {
-    [TestClass]
     public class SettingsMonitorTests
     {
-        [TestInitialize]
-        public void TestInitialize()
+        public SettingsMonitorTests()
         {
             Settings.Default.Reset();
         }
 
-        [TestMethod]
+        [Fact]
         public async Task CallbackShouldBeCalledAtOnce()
         {
             var monitor = new SettingsMonitor<Settings>(Settings.Default, null);
@@ -28,10 +26,10 @@ await monitor.WatchAsync(s => s.Feature_CleanupAllCode, _ =>
                 return Task.CompletedTask;
             });
 
-            Assert.AreEqual(/*Initial Call Times*/1, callbackTimes);
+            Assert.Equal(/*Initial Call Times*/1, callbackTimes);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task CallbackShouldNotBeCalledIfSettingNotChanged()
         {
             Settings.Default.Feature_CleanupAllCode = false;
@@ -50,11 +48,11 @@ await monitor.WatchAsync(s => s.Feature_CleanupAllCode, v =>
             Settings.Default.Feature_CleanupAllCode = false;
             Settings.Default.Save();
 
-            Assert.AreEqual(/*Initial Call Times*/1 + 0, callbackTimes);
-            Assert.AreEqual(Settings.Default.Feature_CleanupAllCode, value);
+            Assert.Equal(/*Initial Call Times*/1 + 0, callbackTimes);
+            Assert.Equal(value, Settings.Default.Feature_CleanupAllCode);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task CallbackShouldBeCalledOnceSettingChanged()
         {
             Settings.Default.Feature_CleanupAllCode = false;
@@ -73,11 +71,11 @@ await monitor.WatchAsync(s => s.Feature_CleanupAllCode, v =>
             Settings.Default.Feature_CleanupAllCode = true;
             Settings.Default.Save();
 
-            Assert.AreEqual(/*Initial Call Times*/ 1 + 1, callbackTimes);
-            Assert.AreEqual(Settings.Default.Feature_CleanupAllCode, value);
+            Assert.Equal(/*Initial Call Times*/ 1 + 1, callbackTimes);
+            Assert.Equal(value, Settings.Default.Feature_CleanupAllCode);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task AllCallbacksShouldBeCalledOnceSettingChanged()
         {
             Settings.Default.Feature_CleanupAllCode = false;
@@ -103,13 +101,13 @@ await monitor.WatchAsync(s => s.Feature_CleanupAllCode, v =>
             Settings.Default.Feature_CleanupAllCode = true;
             Settings.Default.Save();
 
-            Assert.AreEqual(/*Initial Call Times*/1 + 1, callbackTimes1);
-            Assert.AreEqual(/*Initial Call Times*/1 + 1, callbackTimes2);
-            Assert.AreEqual(Settings.Default.Feature_CleanupAllCode, value1);
-            Assert.AreEqual(Settings.Default.Feature_CleanupAllCode, value2);
+            Assert.Equal(/*Initial Call Times*/1 + 1, callbackTimes1);
+            Assert.Equal(/*Initial Call Times*/1 + 1, callbackTimes2);
+            Assert.Equal(value1, Settings.Default.Feature_CleanupAllCode);
+            Assert.Equal(value2, Settings.Default.Feature_CleanupAllCode);
         }
 
-        [TestMethod]
+        [Fact]
         public async Task CallbackShouldBeCalledOnceAnyWatchedSettingChanged()
         {
             Settings.Default.Feature_CleanupAllCode = false;
@@ -134,8 +132,8 @@ await monitor.WatchAsync<bool>(new[]{
             Settings.Default.Feature_CleanupSelectedCode = false;
             Settings.Default.Save();
 
-            Assert.AreEqual(/*Initial Call Times*/1 + 1, callbackTimes);
-            Assert.IsTrue(values.All(v => v == false));
+            Assert.Equal(/*Initial Call Times*/1 + 1, callbackTimes);
+            Assert.True(values.All(v => v == false));
         }
     }
 }
\ No newline at end of file
diff --git a/CodeMaid.UnitTests/MemberTypeSettingTests.cs b/CodeMaid.UnitTests/MemberTypeSettingTests.cs
index b9a1efea4..65a0ebc5d 100644
--- a/CodeMaid.UnitTests/MemberTypeSettingTests.cs
+++ b/CodeMaid.UnitTests/MemberTypeSettingTests.cs
@@ -1,32 +1,31 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SteveCadwallader.CodeMaid.Helpers;
+using SteveCadwallader.CodeMaid.Helpers;
+using Xunit;
 
 namespace SteveCadwallader.CodeMaid.UnitTests
 {
-    [TestClass]
     public class MemberTypeSettingTests
     {
-        [TestMethod]
+        [Fact]
         public void CanSerializeMemberTypeSetting()
         {
             var memberTypeSetting = new MemberTypeSetting("Fields", "Member Variables", 1);
-            Assert.IsNotNull(memberTypeSetting);
+            Assert.NotNull(memberTypeSetting);
 
             var serializedString = (string)memberTypeSetting;
-            Assert.IsFalse(string.IsNullOrWhiteSpace(serializedString));
+            Assert.False(string.IsNullOrWhiteSpace(serializedString));
         }
 
-        [TestMethod]
+        [Fact]
         public void CanDeserializeMemberTypeSetting()
         {
             const string serializedString = @"Fields||1||Member Variables";
 
             var memberTypeSetting = (MemberTypeSetting)serializedString;
 
-            Assert.IsNotNull(memberTypeSetting);
-            Assert.AreEqual(memberTypeSetting.DefaultName, "Fields");
-            Assert.AreEqual(memberTypeSetting.EffectiveName, "Member Variables");
-            Assert.AreEqual(memberTypeSetting.Order, 1);
+            Assert.NotNull(memberTypeSetting);
+            Assert.Equal("Fields", memberTypeSetting.DefaultName);
+            Assert.Equal("Member Variables", memberTypeSetting.EffectiveName);
+            Assert.Equal(1, memberTypeSetting.Order);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaid.UnitTests/Properties/AssemblyInfo.cs b/CodeMaid.UnitTests/Properties/AssemblyInfo.cs
index 96acd2c65..b844a4d5b 100644
--- a/CodeMaid.UnitTests/Properties/AssemblyInfo.cs
+++ b/CodeMaid.UnitTests/Properties/AssemblyInfo.cs
@@ -1,3 +1,8 @@
 using System.Reflection;
+using Xunit;
 
-[assembly: AssemblyTitle("SteveCadwallader.CodeMaid.UnitTests")]
\ No newline at end of file
+[assembly: AssemblyTitle("SteveCadwallader.CodeMaid.UnitTests")]
+
+// 停用測試並行化：各測試類別共享全域 Settings.Default 靜態狀態，
+// 序列執行以避免競態（等同原先 MSTest 的預設行為）。
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/CodeMaid.UnitTests/app.config b/CodeMaid.UnitTests/app.config
index af636acd8..b53bb5b71 100644
--- a/CodeMaid.UnitTests/app.config
+++ b/CodeMaid.UnitTests/app.config
@@ -6,18 +6,10 @@
         <assemblyIdentity name="Microsoft.VisualStudio.ComponentModelHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <startup>
diff --git a/CodeMaid.VS2022/CodeMaid.VS2022.csproj b/CodeMaid.VS2022/CodeMaid.VS2022.csproj
index 10e8a1cc0..ef3abd5a7 100644
--- a/CodeMaid.VS2022/CodeMaid.VS2022.csproj
+++ b/CodeMaid.VS2022/CodeMaid.VS2022.csproj
@@ -16,7 +16,7 @@
     <AssemblyName>SteveCadwallader.CodeMaid.VS2022</AssemblyName>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\CodeMaid.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UICulture>en-US</UICulture>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -28,6 +28,7 @@
     <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
     <StartArguments>/rootsuffix Exp</StartArguments>
     <LangVersion>latest</LangVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,6 +52,9 @@
     <Prefer32Bit>false</Prefer32Bit>
     <DeployExtension>False</DeployExtension>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>CodeMaid.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore" />
@@ -85,6 +89,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="CodeMaid.ico" />
     <Resource Include="..\CodeMaid\Integration\Images\IDE\progressToolWindow.png">
       <Link>Integration\Images\IDE\progressToolWindow.png</Link>
     </Resource>
@@ -96,6 +101,11 @@
       <IncludeInVSIX>true</IncludeInVSIX>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="..\CodeMaid\zh-Hant\extension.vsixlangpack">
+      <Link>zh-Hant\extension.vsixlangpack</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Resource Include="source.extension.ico">
       <DependentUpon>source.extension.vsixmanifest</DependentUpon>
     </Resource>
@@ -603,6 +613,11 @@
       <ResourceName>Menus.ctmenu</ResourceName>
       <DependentUpon>CodeMaid.vsct</DependentUpon>
     </VSCTCompile>
+    <VSCTCompile Include="..\CodeMaid\CodeMaid.zh-Hant.vsct">
+      <Link>CodeMaid.zh-Hant.vsct</Link>
+      <ResourceName>Menus.ctmenu</ResourceName>
+      <DependentUpon>CodeMaid.vsct</DependentUpon>
+    </VSCTCompile>
     <VSCTCompile Include="..\CodeMaid\CodeMaid.en-US.vsct">
       <Link>CodeMaid.en-US.vsct</Link>
       <ResourceName>Menus.ctmenu</ResourceName>
@@ -704,6 +719,9 @@
       <LogicalName>VSPackage.en-US.resources</LogicalName>
       <DependentUpon>source.extension.vsixmanifest</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="source.extension.zh-Hant.resx">
+      <DependentUpon>source.extension.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="source.extension.resx">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -716,18 +734,24 @@
       <LogicalName>VSPackage.zh-Hans.resources</LogicalName>
       <DependentUpon>source.extension.vsixmanifest</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="source.extension.zh-Hant.resx">
+      <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.zh-Hant.resources</LogicalName>
+      <DependentUpon>source.extension.vsixmanifest</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Expression.Blend.Sdk">
       <Version>1.0.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>17.0.0-previews-2-31512-422</Version>
+      <Version>17.14.40265</Version>
       <ExcludeAssets>runtime</ExcludeAssets>
       <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.0.3177-preview3</Version>
+      <Version>18.5.40034</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/CodeMaid.VS2022/CodeMaid.ico b/CodeMaid.VS2022/CodeMaid.ico
new file mode 100644
index 000000000..a1aa855d8
Binary files /dev/null and b/CodeMaid.VS2022/CodeMaid.ico differ
diff --git a/CodeMaid.VS2022/source.extension.zh-Hant.resx b/CodeMaid.VS2022/source.extension.zh-Hant.resx
new file mode 100644
index 000000000..2be126619
--- /dev/null
+++ b/CodeMaid.VS2022/source.extension.zh-Hant.resx
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="110" xml:space="preserve">
+    <value>CodeMaid</value>
+  </data>
+  <data name="112" xml:space="preserve">
+    <value>CodeMaid 是一個開源 Visual Studio 延伸模組，用於清理和簡化我們的 C#、C++、F#、VB、PHP、PowerShell、R、JSON、XAML、XML、ASP、HTML、CSS、LESS、SCSS、JavaScript 和TypeScript 程式碼。</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>source.extension.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/CodeMaid.ico b/CodeMaid.ico
new file mode 100644
index 000000000..a1aa855d8
Binary files /dev/null and b/CodeMaid.ico differ
diff --git a/CodeMaid.png b/CodeMaid.png
new file mode 100644
index 000000000..9dc237950
Binary files /dev/null and b/CodeMaid.png differ
diff --git a/CodeMaid/CodeMaid.csproj b/CodeMaid/CodeMaid.csproj
index e0ea74656..476b24f3d 100644
--- a/CodeMaid/CodeMaid.csproj
+++ b/CodeMaid/CodeMaid.csproj
@@ -53,6 +53,9 @@
     <Prefer32Bit>false</Prefer32Bit>
     <DeployExtension>False</DeployExtension>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>CodeMaid.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore" />
@@ -86,8 +89,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="zh-Hant\extension.vsixlangpack" />
     <Resource Include="Integration\Images\IDE\progressToolWindow.png" />
     <Resource Include="Integration\Images\IDE\spadeToolWindow.png" />
+    <Resource Include="CodeMaid.ico" />
     <Content Include="zh-Hans\extension.vsixlangpack">
       <IncludeInVSIX>true</IncludeInVSIX>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -340,12 +345,13 @@
       <Version>1.0.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>16.10.31321.278</Version>
+      <Version>17.14.40265</Version>
       <ExcludeAssets>runtime</ExcludeAssets>
       <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>16.11.35</Version>
+      <Version>18.5.40034</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/CodeMaid/CodeMaid.ico b/CodeMaid/CodeMaid.ico
new file mode 100644
index 000000000..a1aa855d8
Binary files /dev/null and b/CodeMaid/CodeMaid.ico differ
diff --git a/CodeMaid/CodeMaid.zh-Hant.vsct b/CodeMaid/CodeMaid.zh-Hant.vsct
new file mode 100644
index 000000000..7801ae48b
--- /dev/null
+++ b/CodeMaid/CodeMaid.zh-Hant.vsct
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <Include href="CodeMaid.vsct" />
+
+  <!--The Commands section is where we the commands, menus and menu groups are defined.
+      This section uses a Guid to identify the package that provides the command defined inside it. -->
+  <Commands package="GuidCodeMaidPackage">
+    <!-- Inside this section we have different sub-sections: one for the menus, another
+    for the menu groups, one for the buttons (the actual commands), one for the combos
+    and the last one for the bitmaps used. Each element is identified by a command id that
+    is a unique pair of guid and numeric identifier; the guid part of the identifier is usually
+    called "command set" and is used to group different command inside a logically related
+    group; your package should define its own command set in order to avoid collisions
+    with command ids defined by other packages. -->
+
+    <!-- Menu section definition -->
+    <Menus>
+      <Menu guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidMenuBaseGroup" priority="0x0700" type="Menu">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_MM_TOOLSADDINS" />
+        <Strings>
+          <ButtonText>&amp;CodeMaid</ButtonText>
+          <CommandName>&amp;CodeMaid</CommandName>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="ToolbarIDCodeMaidToolbarSpade" type="ToolWindowToolbar">
+        <CommandFlag>DefaultDocked</CommandFlag>
+        <Strings>
+          <ButtonText>CodeMaid Spade Toolbar</ButtonText>
+          <CommandName>CodeMaid Spade 工具列</CommandName>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextSpade" type="Context">
+        <Strings>
+          <ButtonText>CodeMaid Spade Context Menu</ButtonText>
+          <CommandName>CodeMaid Spade 內容選單</CommandName>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextASPXWindowMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextASPXWindowGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextASPXCodeWindowMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextASPXCodeWindowGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextCodeWindowMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextCodeWindowGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextCSSWindowMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextCSSWindowGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextCSSDocumentMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextCSSDocumentGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextHTMLWindowMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextHTMLWindowGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextHTMLDocumentMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextHTMLDocumentGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextJSONDocumentMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextJSONDocumentGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextScriptWindowMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextScriptWindowGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+      <Menu guid="GuidCodeMaidMenuSet" id="MenuIDCodeMaidContextXAMLWindowMenu" priority="0x0100" type="Menu">
+        <Parent guid="GuidCodeMaidMenuSet" id="GroupIDCodeMaidContextXAMLWindowGroup" />
+        <Strings>
+          <ButtonText>CodeMaid</ButtonText>
+        </Strings>
+      </Menu>
+    </Menus>
+
+    <!--Buttons section. -->
+    <!--This section defines the elements the user can interact with, like a menu command or a button
+        or combo box in a toolbar. -->
+    <Buttons>
+      <!--To define a menu group you have to specify its ID, the parent menu and its display priority.
+          The command is visible and enabled by default. If you need to change the visibility, status, etc, you can use
+          the CommandFlag node.
+          You can add more than one CommandFlag node e.g.:
+              <CommandFlag>DefaultInvisible</CommandFlag>
+              <CommandFlag>DynamicVisibility</CommandFlag>
+          If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> -->
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidAbout" priority="0x0100" type="Button">
+        <Icon guid="GuidImageInfo" id="IconInfo" />
+        <Strings>
+          <ButtonText>關於 CodeMaid...</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidBuildProgressToolWindow" priority="0x0100" type="Button">
+        <Icon guid="GuidImageProgress" id="IconProgress" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>生成進度(&amp;B)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCleanupActiveCode" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCleanup" id="IconCleanup" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>TextChanges</CommandFlag>
+        <Strings>
+          <ButtonText>清理活動檔案(&amp;C)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCleanupAllCode" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCleanupAll" id="IconCleanupAll" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>清理所有程式碼(&amp;A)...</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCleanupOpenCode" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCleanup" id="IconCleanup" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>清理打開的程式碼(&amp;C)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCleanupSelectedCode" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCleanup" id="IconCleanup" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>清理已選程式碼(&amp;C)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCloseAllReadOnly" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCloseLocked" id="IconCloseLocked" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>關閉所有唯讀檔(&amp;R)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCollapseAllSolutionExplorer" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCollapse" id="IconCollapse" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>收合全部專案(&amp;L)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCollapseSelectedSolutionExplorer" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCollapse" id="IconCollapse" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>收合選取專案(&amp;L)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidCommentFormat" priority="0x0100" type="Button">
+        <Icon guid="GuidImageCommentFormat" id="IconCommentFormat" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>格式化註解(&amp;N)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidFindInSolutionExplorer" priority="0x0100" type="Button">
+        <Icon guid="GuidImageFind" id="IconFind" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>在解決方案資源管理器中尋找(&amp;F)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidJoinLines" priority="0x0100" type="Button">
+        <Icon guid="GuidImageJoin" id="IconJoin" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>連接多行(&amp;J)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidOptions" priority="0x0100" type="Button">
+        <Icon guid="GuidImageOptions" id="IconOptions" />
+        <Strings>
+          <ButtonText>選項(&amp;O)...</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidReadOnlyToggle" priority="0x0100" type="Button">
+        <Icon guid="GuidImageUnlock" id="IconUnlock" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>切換唯讀(&amp;R)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidRemoveRegion" priority="0x0100" type="Button">
+        <Icon guid="GuidImageRemoveRegion" id="IconRemoveRegion" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>TextChanges</CommandFlag>
+        <Strings>
+          <ButtonText>移除所有 #regions(&amp;R)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidReorganizeActiveCode" priority="0x0100" type="Button">
+        <Icon guid="GuidImageReorganize" id="IconReorganize" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>TextChanges</CommandFlag>
+        <Strings>
+          <ButtonText>整理活動檔案(&amp;Z)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSettingCleanupOnSave" priority="0x0100" type="Button">
+        <Icon guid="GuidImageOptions" id="IconOptions" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>TextChanges</CommandFlag>
+        <Strings>
+          <ButtonText>儲存時自動清理(&amp;A)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSortLines" priority="0x0100" type="Button">
+        <Icon guid="GuidImageSortAlpha" id="IconSortAlpha" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>排序多行(&amp;S)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeContextDelete" priority="0x0100" type="Button">
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>刪除(&amp;D)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeContextFindReferences" priority="0x0100" type="Button">
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>尋找引用(&amp;F)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeContextInsertRegion" priority="0x0100" type="Button">
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>插入 #region(&amp;I)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeContextRemoveRegion" priority="0x0100" type="Button">
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>移除 #region(&amp;R)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeOptions" priority="0x0100" type="Button">
+        <Icon guid="GuidImageOptions" id="IconOptions" />
+        <Strings>
+          <ButtonText>選項(&amp;O)...</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeRefresh" priority="0x0100" type="Button">
+        <Icon guid="GuidImageRefresh" id="IconRefresh" />
+        <Strings>
+          <ButtonText>更新Spade窗口</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeSearch" priority="0x0100" type="Button">
+        <Strings>
+          <ButtonText>搜索Spade窗口</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeSortOrderAlpha" priority="0x0100" type="Button">
+        <Icon guid="GuidImageSortAlpha" id="IconSortAlpha" />
+        <Strings>
+          <ButtonText>按字母排序</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeSortOrderFile" priority="0x0100" type="Button">
+        <Icon guid="GuidImageSortNumeric" id="IconSortNumeric" />
+        <Strings>
+          <ButtonText>按文件排序</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeSortOrderType" priority="0x0100" type="Button">
+        <Icon guid="GuidImageSortType" id="IconSortType" />
+        <Strings>
+          <ButtonText>按類型排序</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSpadeToolWindow" priority="0x0100" type="Button">
+        <Icon guid="GuidImageSpade" id="IconSpade" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <Strings>
+          <ButtonText>Spade窗口(&amp;S)</ButtonText>
+        </Strings>
+      </Button>
+
+      <Button guid="GuidCodeMaidMenuSet" id="CmdIDCodeMaidSwitchFile" priority="0x0100" type="Button">
+        <Icon guid="GuidImageSwitch" id="IconSwitch" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>TextChanges</CommandFlag>
+        <Strings>
+          <ButtonText>切換文件(&amp;S)</ButtonText>
+        </Strings>
+      </Button>
+    </Buttons>
+  </Commands>
+</CommandTable>
\ No newline at end of file
diff --git a/CodeMaid/zh-Hant/extension.vsixlangpack b/CodeMaid/zh-Hant/extension.vsixlangpack
new file mode 100644
index 000000000..977c0d02b
--- /dev/null
+++ b/CodeMaid/zh-Hant/extension.vsixlangpack
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageLanguagePackManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
+  <Metadata>
+    <DisplayName>CodeMaid</DisplayName>
+    <Description>CodeMaid 是一個開源的 Visual Studio 擴充套件，用於清理和簡化我們的 C#、C++、F#、VB、PHP、PowerShell、R、JSON、XAML、XML、ASP、HTML、CSS、LESS、SCSS、JavaScript 和 TypeScript 程式碼。</Description>
+  </Metadata>
+</PackageLanguagePackManifest>
\ No newline at end of file
diff --git a/CodeMaidShared/CodeMaidPackage.cs b/CodeMaidShared/CodeMaidPackage.cs
index f8a1ef571..8466eca7d 100644
--- a/CodeMaidShared/CodeMaidPackage.cs
+++ b/CodeMaidShared/CodeMaidPackage.cs
@@ -1,4 +1,12 @@
-using EnvDTE;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Windows;
+using System.Windows.Threading;
+using EnvDTE;
 using EnvDTE80;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
@@ -11,14 +19,6 @@
 using SteveCadwallader.CodeMaid.UI;
 using SteveCadwallader.CodeMaid.UI.ToolWindows.BuildProgress;
 using SteveCadwallader.CodeMaid.UI.ToolWindows.Spade;
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Windows;
-using System.Windows.Threading;
 using Task = System.Threading.Tasks.Task;
 using VSColorTheme = Microsoft.VisualStudio.PlatformUI.VSColorTheme;
 
@@ -114,6 +114,7 @@ public Document ActiveDocument
         {
             get
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 try
                 {
                     return IDE.ActiveDocument;
@@ -218,6 +219,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         /// </param>
         private void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.General_DiagnosticsMode) return;
 
             OutputWindowHelper.ExceptionWriteLine("Diagnostics mode caught and marked as handled the following DispatcherUnhandledException raised in Visual Studio", e.Exception);
@@ -229,6 +231,7 @@ private void OnDispatcherUnhandledException(object sender, DispatcherUnhandledEx
         /// </summary>
         private void OnSolutionClosedShowStartPage()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.General_ShowStartPageOnSolutionClose) return;
 
             IDE.ExecuteCommand("View.StartPage");
@@ -280,6 +283,7 @@ private async Task RegisterCommandsAsync()
         /// </remarks>
         private async Task RegisterEventListenersAsync()
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             var codeModelManager = CodeModelManager.GetInstance(this);
             var settingsContextHelper = SettingsContextHelper.GetInstance(this);
 
@@ -353,4 +357,4 @@ await SettingsMonitor.WatchAsync(s => s.Feature_CollapseAllSolutionExplorer, on
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/CodeMaidShared.projitems b/CodeMaidShared/CodeMaidShared.projitems
index a9033ee27..48ece1d9b 100644
--- a/CodeMaidShared/CodeMaidShared.projitems
+++ b/CodeMaidShared/CodeMaidShared.projitems
@@ -384,5 +384,8 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Properties\Resources.zh-Hans.resx">
       <DependentUpon>Resources.resx</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Properties\Resources.zh-Hant.resx">
+      <DependentUpon>Resources.resx</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/CodeMaidShared/Helpers/ActiveDocumentRestorer.cs b/CodeMaidShared/Helpers/ActiveDocumentRestorer.cs
index 11cb1668e..59a660dc9 100644
--- a/CodeMaidShared/Helpers/ActiveDocumentRestorer.cs
+++ b/CodeMaidShared/Helpers/ActiveDocumentRestorer.cs
@@ -1,5 +1,6 @@
-using EnvDTE;
+using EnvDTE;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -17,6 +18,7 @@ internal class ActiveDocumentRestorer : IDisposable
         /// <param name="package">The hosting package.</param>
         internal ActiveDocumentRestorer(CodeMaidPackage package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Package = package;
 
             StartTracking();
@@ -31,6 +33,7 @@ internal ActiveDocumentRestorer(CodeMaidPackage package)
         /// </summary>
         internal void StartTracking()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Cache the active document.
             TrackedDocument = Package.ActiveDocument;
         }
@@ -40,6 +43,7 @@ internal void StartTracking()
         /// </summary>
         internal void RestoreTrackedDocument()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (TrackedDocument != null && Package.ActiveDocument != TrackedDocument)
             {
                 TrackedDocument.Activate();
@@ -56,6 +60,7 @@ internal void RestoreTrackedDocument()
         /// </summary>
         public void Dispose()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             RestoreTrackedDocument();
         }
 
@@ -75,4 +80,4 @@ public void Dispose()
 
         #endregion Private Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/CodeCommentHelper.cs b/CodeMaidShared/Helpers/CodeCommentHelper.cs
index 3fa641929..9d89cbb83 100644
--- a/CodeMaidShared/Helpers/CodeCommentHelper.cs
+++ b/CodeMaidShared/Helpers/CodeCommentHelper.cs
@@ -1,8 +1,9 @@
-using EnvDTE;
+using EnvDTE;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -92,6 +93,7 @@ internal static Regex GetCommentRegex(CodeLanguage codeLanguage, bool includePre
         /// <returns></returns>
         public static IEnumerable<string> GetTaskListTokens(CodeMaidPackage package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var settings = package.IDE.Properties["Environment", "TaskList"];
             var tokens = settings.Item("CommentTokens").Value as string[];
             if (tokens == null || tokens.Length < 1)
@@ -109,6 +111,7 @@ internal static bool IsCommentLine(EditPoint point)
 
         internal static Match LineMatchesRegex(EditPoint point, Regex regex)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var line = point.GetLine();
             var match = regex.Match(line);
             return match;
@@ -119,4 +122,4 @@ internal static string SpaceToFake(string value)
             return value.Replace(Spacer, KeepTogetherSpacer);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/CodeElementHelper.cs b/CodeMaidShared/Helpers/CodeElementHelper.cs
index 11d6a353b..cff415eff 100644
--- a/CodeMaidShared/Helpers/CodeElementHelper.cs
+++ b/CodeMaidShared/Helpers/CodeElementHelper.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using EnvDTE80;
 using System;
 using System.Text.RegularExpressions;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -17,6 +18,7 @@ internal static class CodeElementHelper
         /// <returns>The calculated complexity.</returns>
         internal static int CalculateComplexity(CodeElement element)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             EditPoint startPoint = element.StartPoint.CreateEditPoint();
             string functionText = startPoint.GetText(element.EndPoint);
 
@@ -78,6 +80,7 @@ internal static string GetAccessModifierKeyword(vsCMAccess accessModifier)
         /// <returns>The string declaration.</returns>
         internal static string GetClassDeclaration(CodeClass codeClass)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point after the attributes.
             var startPoint = codeClass.GetStartPoint(vsCMPart.vsCMPartHeader);
 
@@ -91,6 +94,7 @@ internal static string GetClassDeclaration(CodeClass codeClass)
         /// <returns>The string declaration.</returns>
         internal static string GetDelegateDeclaration(CodeDelegate codeDelegate)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point at the end of the attributes if there are any (vsCMPartHeader is
             // not available for delegates).
             var startPoint = codeDelegate.Attributes.Count > 0
@@ -107,6 +111,7 @@ internal static string GetDelegateDeclaration(CodeDelegate codeDelegate)
         /// <returns>The string declaration.</returns>
         internal static string GetEnumerationDeclaration(CodeEnum codeEnum)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point after the attributes.
             var startPoint = codeEnum.GetStartPoint(vsCMPart.vsCMPartHeader);
 
@@ -120,6 +125,7 @@ internal static string GetEnumerationDeclaration(CodeEnum codeEnum)
         /// <returns>The string declaration.</returns>
         internal static string GetEventDeclaration(CodeEvent codeEvent)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point at the end of the attributes if there are any (vsCMPartHeader is
             // not available for events).
             var startPoint = codeEvent.Attributes.Count > 0
@@ -136,6 +142,7 @@ internal static string GetEventDeclaration(CodeEvent codeEvent)
         /// <returns>The string declaration.</returns>
         internal static string GetFieldDeclaration(CodeVariable codeField)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point at the end of the attributes if there are any (vsCMPartHeader is
             // not available for fields).
             var startPoint = codeField.Attributes.Count > 0
@@ -152,6 +159,7 @@ internal static string GetFieldDeclaration(CodeVariable codeField)
         /// <returns>The string declaration.</returns>
         internal static string GetInterfaceDeclaration(CodeInterface codeInterface)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point after the attributes.
             var startPoint = codeInterface.GetStartPoint(vsCMPart.vsCMPartHeader);
 
@@ -165,6 +173,7 @@ internal static string GetInterfaceDeclaration(CodeInterface codeInterface)
         /// <returns>The string declaration.</returns>
         internal static string GetMethodDeclaration(CodeFunction codeFunction)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point after the attributes.
             var startPoint = codeFunction.GetStartPoint(vsCMPart.vsCMPartHeader);
 
@@ -178,6 +187,7 @@ internal static string GetMethodDeclaration(CodeFunction codeFunction)
         /// <returns>The string declaration.</returns>
         internal static string GetPropertyDeclaration(CodeProperty codeProperty)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point at the end of the attributes if there are any (vsCMPartHeader is
             // not available for properties).
             var startPoint = codeProperty.Attributes.Count > 0
@@ -194,10 +204,11 @@ internal static string GetPropertyDeclaration(CodeProperty codeProperty)
         /// <returns>The string declaration.</returns>
         internal static string GetStructDeclaration(CodeStruct codeStruct)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the start point after the attributes.
             var startPoint = codeStruct.GetStartPoint(vsCMPart.vsCMPartHeader);
 
             return TextDocumentHelper.GetTextToFirstMatch(startPoint, @"[\{;]");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/CodeMaidSettingsProvider.cs b/CodeMaidShared/Helpers/CodeMaidSettingsProvider.cs
index e287b0200..e621839bd 100644
--- a/CodeMaidShared/Helpers/CodeMaidSettingsProvider.cs
+++ b/CodeMaidShared/Helpers/CodeMaidSettingsProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Configuration;
 using System.Xml;
 
@@ -286,4 +286,4 @@ private static XmlNode CreateXmlValue(object serializedValue)
 
         #endregion Write Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/CommandHelper.cs b/CodeMaidShared/Helpers/CommandHelper.cs
index 962064e7e..c456e1074 100644
--- a/CodeMaidShared/Helpers/CommandHelper.cs
+++ b/CodeMaidShared/Helpers/CommandHelper.cs
@@ -1,6 +1,7 @@
-using EnvDTE;
+using EnvDTE;
 using System;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -52,6 +53,7 @@ private CommandHelper(CodeMaidPackage package)
         /// <returns>The found command, otherwise null.</returns>
         public Command FindCommand(params string[] commandNames)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (commandNames == null || commandNames.Length == 0) return null;
 
             return _package.IDE.Commands.OfType<Command>().FirstOrDefault(x => commandNames.Contains(x.Name));
@@ -65,6 +67,7 @@ public Command FindCommand(params string[] commandNames)
         /// <returns>The found command, otherwise null.</returns>
         public Command FindCommand(string guid, int id)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return _package.IDE.Commands.OfType<Command>().FirstOrDefault(x => x.Guid == guid && x.ID == id);
         }
 
@@ -75,6 +78,7 @@ public Command FindCommand(string guid, int id)
         /// <param name="commandNames">The cleanup command name(s).</param>
         public void ExecuteCommand(TextDocument textDocument, params string[] commandNames)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 var command = FindCommand(commandNames);
@@ -95,4 +99,4 @@ public void ExecuteCommand(TextDocument textDocument, params string[] commandNam
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/CursorPositionRestorer.cs b/CodeMaidShared/Helpers/CursorPositionRestorer.cs
index 718d12a11..c4bc53eab 100644
--- a/CodeMaidShared/Helpers/CursorPositionRestorer.cs
+++ b/CodeMaidShared/Helpers/CursorPositionRestorer.cs
@@ -1,5 +1,6 @@
-using EnvDTE;
+using EnvDTE;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -17,6 +18,7 @@ internal class CursorPositionRestorer : IDisposable
         /// <param name="textDocument">The text document.</param>
         internal CursorPositionRestorer(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             TextDocument = textDocument;
 
             CaptureCursorPosition();
@@ -31,6 +33,7 @@ internal CursorPositionRestorer(TextDocument textDocument)
         /// </summary>
         internal void CaptureCursorPosition()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (TextDocument != null && TextDocument.Selection != null)
             {
                 TrackedCursorPosition = new CursorPosition(TextDocument.Selection);
@@ -66,6 +69,7 @@ internal void RestoreCursorPosition()
         /// <returns>True if the cursor position was reset, otherwise false.</returns>
         private bool IsCursorPositionReset()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return TextDocument.Selection.ActivePoint.AtStartOfDocument ||
                    TextDocument.Selection.ActivePoint.AtEndOfDocument;
         }
@@ -80,6 +84,7 @@ private bool IsCursorPositionReset()
         /// </summary>
         public void Dispose()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             RestoreCursorPosition();
         }
 
@@ -114,6 +119,7 @@ private struct CursorPosition
             /// <param name="textSelection">The text selection.</param>
             public CursorPosition(TextSelection textSelection)
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 Line = textSelection.CurrentLine;
                 Column = textSelection.CurrentColumn;
             }
@@ -130,4 +136,4 @@ public CursorPosition(TextSelection textSelection)
 
         #endregion Private Structures
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/DocumentExtensions.cs b/CodeMaidShared/Helpers/DocumentExtensions.cs
index 078d207df..70f5a8b82 100644
--- a/CodeMaidShared/Helpers/DocumentExtensions.cs
+++ b/CodeMaidShared/Helpers/DocumentExtensions.cs
@@ -1,4 +1,5 @@
-using EnvDTE;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -14,6 +15,7 @@ internal static class DocumentExtensions
         /// <returns>A <see cref="CodeLanguage"/>.</returns>
         internal static CodeLanguage GetCodeLanguage(this Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return CodeLanguageHelper.GetCodeLanguage(document.Language);
         }
 
@@ -24,6 +26,7 @@ internal static CodeLanguage GetCodeLanguage(this Document document)
         /// <returns>The associated text document, otherwise null.</returns>
         internal static TextDocument GetTextDocument(this Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return document.Object("TextDocument") as TextDocument;
         }
 
@@ -34,9 +37,10 @@ internal static TextDocument GetTextDocument(this Document document)
         /// <returns>True if the document is external, otherwise false.</returns>
         internal static bool IsExternal(this Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var projectItem = document.ProjectItem;
 
             return projectItem == null || projectItem.IsExternal();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/EditPointExtensions.cs b/CodeMaidShared/Helpers/EditPointExtensions.cs
index 98dd71960..b41bdc95e 100644
--- a/CodeMaidShared/Helpers/EditPointExtensions.cs
+++ b/CodeMaidShared/Helpers/EditPointExtensions.cs
@@ -1,4 +1,5 @@
-using EnvDTE;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -14,6 +15,7 @@ internal static class EditPointExtensions
         /// <returns>A <see cref="CodeLanguage"/>.</returns>
         internal static CodeLanguage GetCodeLanguage(this EditPoint editPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return editPoint.Parent.GetCodeLanguage();
         }
 
@@ -24,7 +26,8 @@ internal static CodeLanguage GetCodeLanguage(this EditPoint editPoint)
         /// <returns>The text of the edit point's line.</returns>
         internal static string GetLine(this EditPoint editPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return editPoint.GetLines(editPoint.Line, editPoint.Line + 1);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/ExplicitInterfaceImplementationHelper.cs b/CodeMaidShared/Helpers/ExplicitInterfaceImplementationHelper.cs
index 243051812..83fe7902c 100644
--- a/CodeMaidShared/Helpers/ExplicitInterfaceImplementationHelper.cs
+++ b/CodeMaidShared/Helpers/ExplicitInterfaceImplementationHelper.cs
@@ -1,5 +1,6 @@
-using EnvDTE;
+using EnvDTE;
 using EnvDTE80;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -26,6 +27,8 @@ public static bool IsExplicitInterfaceImplementation(CodeEvent codeEvent)
                 return true;
             }
 
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             // Otherwise, look for the element name with a preceding dot.
             var declaration = CodeElementHelper.GetEventDeclaration(codeEvent);
             var matchString = @"\." + codeEvent.Name;
@@ -46,6 +49,8 @@ public static bool IsExplicitInterfaceImplementation(CodeFunction2 codeFunction)
                 return true;
             }
 
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             // Otherwise, look for the element name with a preceding dot.
             var declaration = CodeElementHelper.GetMethodDeclaration(codeFunction);
             var matchString = @"\." + codeFunction.Name;
@@ -66,6 +71,8 @@ public static bool IsExplicitInterfaceImplementation(CodeProperty codeProperty)
                 return true;
             }
 
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             // Otherwise, look for the element name with a preceding dot.
             var declaration = CodeElementHelper.GetPropertyDeclaration(codeProperty);
             var matchString = @"\." + codeProperty.Name;
@@ -73,4 +80,4 @@ public static bool IsExplicitInterfaceImplementation(CodeProperty codeProperty)
             return RegexNullSafe.IsMatch(declaration, matchString);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/FileHeaderHelper.cs b/CodeMaidShared/Helpers/FileHeaderHelper.cs
index aa0a57b6d..9c0700e7e 100644
--- a/CodeMaidShared/Helpers/FileHeaderHelper.cs
+++ b/CodeMaidShared/Helpers/FileHeaderHelper.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -17,6 +18,7 @@ internal static class FileHeaderHelper
         /// <returns>A file header from settings.</returns>
         internal static string GetFileHeaderFromSettings(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             switch (textDocument.GetCodeLanguage())
             {
                 case CodeLanguage.CPlusPlus: return Settings.Default.Cleaning_UpdateFileHeaderCPlusPlus;
@@ -41,6 +43,7 @@ internal static string GetFileHeaderFromSettings(TextDocument textDocument)
 
         internal static HeaderPosition GetFileHeaderPositionFromSettings(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             switch (textDocument.GetCodeLanguage())
             {
                 case CodeLanguage.CSharp:
@@ -353,4 +356,4 @@ private static IEnumerable<string> SplitLines(string text)
             return text.Split(separator, StringSplitOptions.None);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/MemberTypeSetting.cs b/CodeMaidShared/Helpers/MemberTypeSetting.cs
index 6cc8b7543..bea468b52 100644
--- a/CodeMaidShared/Helpers/MemberTypeSetting.cs
+++ b/CodeMaidShared/Helpers/MemberTypeSetting.cs
@@ -1,4 +1,4 @@
-using SteveCadwallader.CodeMaid.UI;
+using SteveCadwallader.CodeMaid.UI;
 using System;
 using System.Text.RegularExpressions;
 
@@ -92,4 +92,4 @@ public static explicit operator string(MemberTypeSetting memberTypeSetting)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/OutputWindowHelper.cs b/CodeMaidShared/Helpers/OutputWindowHelper.cs
index 377eb369b..0eab1ce4e 100644
--- a/CodeMaidShared/Helpers/OutputWindowHelper.cs
+++ b/CodeMaidShared/Helpers/OutputWindowHelper.cs
@@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
@@ -32,14 +32,17 @@ internal static class OutputWindowHelper
         /// <param name="ex">An optional exception that was handled.</param>
         internal static void DiagnosticWriteLine(string message, Exception ex = null)
         {
-            if (!Settings.Default.General_DiagnosticsMode) return;
-
-            if (ex != null)
+            UIThread.RunOnUIThread(() =>
             {
-                message += $": {ex}";
-            }
+                if (!Settings.Default.General_DiagnosticsMode) return;
+
+                if (ex != null)
+                {
+                    message += $": {ex}";
+                }
 
-            WriteLine(Resources.Diagnostic, message);
+                WriteLine(Resources.Diagnostic, message);
+            });
         }
 
         /// <summary>
@@ -49,9 +52,11 @@ internal static void DiagnosticWriteLine(string message, Exception ex = null)
         /// <param name="ex">The exception that was handled.</param>
         internal static void ExceptionWriteLine(string message, Exception ex)
         {
-            var exceptionMessage = $"{message}: {ex}";
-
-            WriteLine(Resources.HandledException, exceptionMessage);
+            UIThread.RunOnUIThread(() =>
+            {
+                var exceptionMessage = $"{message}: {ex}";
+                WriteLine(Resources.HandledException, exceptionMessage);
+            });
         }
 
         /// <summary>
@@ -60,7 +65,7 @@ internal static void ExceptionWriteLine(string message, Exception ex)
         /// <param name="message">The message.</param>
         internal static void WarningWriteLine(string message)
         {
-            WriteLine(Resources.Warning, message);
+            UIThread.RunOnUIThread(() => WriteLine(Resources.Warning, message));
         }
 
         /// <summary>
@@ -100,4 +105,4 @@ private static void WriteLine(string category, string message)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/ProjectItemExtensions.cs b/CodeMaidShared/Helpers/ProjectItemExtensions.cs
index 4c1cf53c2..8050dde23 100644
--- a/CodeMaidShared/Helpers/ProjectItemExtensions.cs
+++ b/CodeMaidShared/Helpers/ProjectItemExtensions.cs
@@ -1,6 +1,7 @@
-using EnvDTE;
+using EnvDTE;
 using System;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -16,6 +17,7 @@ internal static class ProjectItemExtensions
         /// <returns>The filename of the project item if available, otherwise null.</returns>
         internal static string GetFileName(this ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 return projectItem.FileNames[1];
@@ -34,6 +36,7 @@ internal static string GetFileName(this ProjectItem projectItem)
         /// <returns>The parent project item, otherwise null.</returns>
         internal static ProjectItem GetParentProjectItem(this ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 var parentProjectItem = projectItem.Collection?.Parent as ProjectItem;
@@ -53,6 +56,7 @@ internal static ProjectItem GetParentProjectItem(this ProjectItem projectItem)
         /// <returns>True if the project item is external, otherwise false.</returns>
         internal static bool IsExternal(this ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 if (projectItem.Collection == null || !projectItem.IsPhysicalFile())
@@ -76,6 +80,7 @@ internal static bool IsExternal(this ProjectItem projectItem)
         /// <returns>True if the project item is a physical file, otherwise false.</returns>
         internal static bool IsPhysicalFile(this ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 return string.Equals(projectItem.Kind, Constants.vsProjectItemKindPhysicalFile, StringComparison.OrdinalIgnoreCase);
@@ -88,4 +93,4 @@ internal static bool IsPhysicalFile(this ProjectItem projectItem)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/RegexNullSafe.cs b/CodeMaidShared/Helpers/RegexNullSafe.cs
index 43c18f5d5..3e0093944 100644
--- a/CodeMaidShared/Helpers/RegexNullSafe.cs
+++ b/CodeMaidShared/Helpers/RegexNullSafe.cs
@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -25,4 +25,4 @@ public static bool IsMatch(string input, string pattern)
             return Regex.IsMatch(input, pattern);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/RegionHelper.cs b/CodeMaidShared/Helpers/RegionHelper.cs
index f987097b4..e8efd0652 100644
--- a/CodeMaidShared/Helpers/RegionHelper.cs
+++ b/CodeMaidShared/Helpers/RegionHelper.cs
@@ -1,5 +1,6 @@
-using EnvDTE;
+using EnvDTE;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -12,6 +13,7 @@ internal static class RegionHelper
 
         internal static string GetRegionName(EditPoint editPoint, string regionText)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var codeLanguage = editPoint.GetCodeLanguage();
             switch (codeLanguage)
             {
@@ -31,6 +33,7 @@ internal static string GetRegionName(EditPoint editPoint, string regionText)
 
         internal static string GetRegionTagText(EditPoint editPoint, string name = null)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var codeLanguage = editPoint.GetCodeLanguage();
             switch (codeLanguage)
             {
@@ -49,6 +52,7 @@ internal static string GetRegionTagText(EditPoint editPoint, string name = null)
 
         internal static string GetEndRegionTagText(EditPoint editPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var codeLanguage = editPoint.GetCodeLanguage();
             switch (codeLanguage)
             {
@@ -65,6 +69,7 @@ internal static string GetEndRegionTagText(EditPoint editPoint)
 
         internal static bool LanguageSupportsUpdatingEndRegionDirectives(EditPoint editPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var codeLanguage = editPoint.GetCodeLanguage();
 
             switch (codeLanguage)
@@ -79,4 +84,4 @@ internal static bool LanguageSupportsUpdatingEndRegionDirectives(EditPoint editP
 
         #endregion Internal Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/SettingsContextHelper.cs b/CodeMaidShared/Helpers/SettingsContextHelper.cs
index 2a3db90e8..1ee7136b2 100644
--- a/CodeMaidShared/Helpers/SettingsContextHelper.cs
+++ b/CodeMaidShared/Helpers/SettingsContextHelper.cs
@@ -1,7 +1,8 @@
-using SteveCadwallader.CodeMaid.Properties;
+using SteveCadwallader.CodeMaid.Properties;
 using System;
 using System.Configuration;
 using System.IO;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -72,6 +73,7 @@ internal static string GetUserSettingsPath()
         /// <returns>True if solution-specific settings were loaded, otherwise false.</returns>
         internal bool LoadSolutionSpecificSettings(Settings settings, bool canCreate = false)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (_package.IDE.Solution.IsOpen && !string.IsNullOrWhiteSpace(_package.IDE.Solution.FullName))
             {
                 var solutionPath = Path.GetDirectoryName(_package.IDE.Solution.FullName);
@@ -115,6 +117,7 @@ internal async void OnSolutionClosed()
         internal async void OnSolutionOpened()
 #pragma warning restore VSTHRD100 // Avoid async void methods
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             if (LoadSolutionSpecificSettings(Settings.Default))
             {
                 await _package.SettingsMonitor.NotifySettingsChangedAsync();
@@ -140,4 +143,4 @@ internal bool UnloadSolutionSpecificSettings(Settings settings)
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/SettingsMonitor.cs b/CodeMaidShared/Helpers/SettingsMonitor.cs
index 6f5d4c916..8af079bf4 100644
--- a/CodeMaidShared/Helpers/SettingsMonitor.cs
+++ b/CodeMaidShared/Helpers/SettingsMonitor.cs
@@ -72,7 +72,9 @@ internal async Task NotifySettingsChangedAsync()
 
         private object[] FindValues(string[] settings) => Array.ConvertAll(settings, key => _settings[key]);
 
-        private async void OnSettingsSaving(object sender, CancelEventArgs e)
+        private void OnSettingsSaving(object sender, CancelEventArgs e) => OnSettingsSavingAsync().Forget();
+
+        private async Task OnSettingsSavingAsync()
         {
             if (_joinableTaskFactory != null)
             {
diff --git a/CodeMaidShared/Helpers/SolutionHelper.cs b/CodeMaidShared/Helpers/SolutionHelper.cs
index 83db122d7..2beee559d 100644
--- a/CodeMaidShared/Helpers/SolutionHelper.cs
+++ b/CodeMaidShared/Helpers/SolutionHelper.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -41,6 +42,7 @@ internal static IEnumerable<T> GetAllItemsInSolution<T>(Solution solution)
         internal static IEnumerable<T> GetItemsRecursively<T>(object parentItem)
             where T : class
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (parentItem == null)
             {
                 throw new ArgumentNullException(nameof(parentItem));
@@ -74,6 +76,7 @@ internal static IEnumerable<T> GetItemsRecursively<T>(object parentItem)
         /// <returns>The enumerable set of selected project items.</returns>
         internal static IEnumerable<ProjectItem> GetSelectedProjectItemsRecursively(CodeMaidPackage package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var selectedProjectItems = new List<ProjectItem>();
             var selectedUIHierarchyItems = UIHierarchyHelper.GetSelectedUIHierarchyItems(package);
 
@@ -93,6 +96,7 @@ internal static IEnumerable<ProjectItem> GetSelectedProjectItemsRecursively(Code
         /// <returns>The enumerable set of similar project items.</returns>
         internal static IEnumerable<ProjectItem> GetSimilarProjectItems(CodeMaidPackage package, ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var allItems = GetAllItemsInSolution<ProjectItem>(package.IDE.Solution);
 
             return allItems.Where(x => x.Name == projectItem.Name && x.Kind == projectItem.Kind && x.Document.FullName == projectItem.Document.FullName);
@@ -109,6 +113,7 @@ internal static IEnumerable<ProjectItem> GetSimilarProjectItems(CodeMaidPackage
         /// <returns>An enumerable set of children, may be empty.</returns>
         private static IEnumerable<object> GetChildren(object parentItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // First check if the item is a solution.
             var solution = parentItem as Solution;
             if (solution?.Projects != null)
@@ -145,4 +150,4 @@ private static IEnumerable<object> GetChildren(object parentItem)
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/TextDocumentExtensions.cs b/CodeMaidShared/Helpers/TextDocumentExtensions.cs
index b9080b3be..ea94d3d62 100644
--- a/CodeMaidShared/Helpers/TextDocumentExtensions.cs
+++ b/CodeMaidShared/Helpers/TextDocumentExtensions.cs
@@ -1,4 +1,5 @@
-using EnvDTE;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -14,6 +15,7 @@ internal static class TextDocumentExtensions
         /// <returns>A <see cref="CodeLanguage"/>.</returns>
         internal static CodeLanguage GetCodeLanguage(this TextDocument document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return CodeLanguageHelper.GetCodeLanguage(document.Language);
         }
 
@@ -24,10 +26,11 @@ internal static CodeLanguage GetCodeLanguage(this TextDocument document)
         /// <returns>An edit point at the cursor.</returns>
         internal static EditPoint GetEditPointAtCursor(this TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var cursor = textDocument.CreateEditPoint();
             cursor.MoveToPoint(textDocument.Selection.ActivePoint);
 
             return cursor;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/TextDocumentHelper.cs b/CodeMaidShared/Helpers/TextDocumentHelper.cs
index 03abb05c2..f7513b3a6 100644
--- a/CodeMaidShared/Helpers/TextDocumentHelper.cs
+++ b/CodeMaidShared/Helpers/TextDocumentHelper.cs
@@ -42,9 +42,8 @@ internal static class TextDocumentHelper
         internal static IEnumerable<EditPoint> FindMatches(TextDocument textDocument, string patternString)
         {
             var matches = new List<EditPoint>();
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
 
                 if (TryGetTextBufferAt(textDocument.Parent.FullName, out ITextBuffer textBuffer))
                 {
@@ -69,9 +68,8 @@ internal static IEnumerable<EditPoint> FindMatches(TextDocument textDocument, st
         internal static IEnumerable<EditPoint> FindMatches(TextSelection textSelection, string patternString)
         {
             var matches = new List<EditPoint>();
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
                 if (TryGetTextBufferAt(textSelection.Parent.Parent.FullName, out ITextBuffer textBuffer))
                 {
                     IFinder finder = GetFinder(patternString, textBuffer);
@@ -95,9 +93,8 @@ internal static IEnumerable<EditPoint> FindMatches(TextSelection textSelection,
         internal static EditPoint FirstOrDefaultMatch(TextDocument textDocument, string patternString)
         {
             EditPoint result = null;
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
 
                 if (TryGetTextBufferAt(textDocument.Parent.FullName, out ITextBuffer textBuffer))
                 {
@@ -125,9 +122,8 @@ internal static bool TryFindNextMatch(EditPoint startPoint, ref EditPoint endPoi
             bool result = false;
             EditPoint resultEndPoint = null;
 
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
 
                 if (TryGetTextBufferAt(startPoint.Parent.Parent.FullName, out ITextBuffer textBuffer))
                 {
@@ -154,9 +150,8 @@ internal static bool TryFindNextMatch(EditPoint startPoint, ref EditPoint endPoi
         internal static string GetTextToFirstMatch(TextPoint startPoint, string matchString)
         {
             string result = null;
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
 
                 if (TryGetTextBufferAt(startPoint.Parent.Parent.FullName, out ITextBuffer textBuffer))
                 {
@@ -177,6 +172,8 @@ internal static string GetTextToFirstMatch(TextPoint startPoint, string matchStr
         /// <param name="point">The point.</param>
         internal static void InsertBlankLineBeforePoint(EditPoint point)
         {
+            UIThread.RunOnUIThread(() =>
+            {
             if (point.Line <= 1) return;
 
             point.LineUp(1);
@@ -188,6 +185,7 @@ internal static void InsertBlankLineBeforePoint(EditPoint point)
                 point.EndOfLine();
                 point.Insert(Environment.NewLine);
             }
+            });
         }
 
         /// <summary>
@@ -196,6 +194,8 @@ internal static void InsertBlankLineBeforePoint(EditPoint point)
         /// <param name="point">The point.</param>
         internal static void InsertBlankLineAfterPoint(EditPoint point)
         {
+            UIThread.RunOnUIThread(() =>
+            {
             if (point.AtEndOfDocument) return;
 
             point.LineDown(1);
@@ -206,6 +206,7 @@ internal static void InsertBlankLineAfterPoint(EditPoint point)
             {
                 point.Insert(Environment.NewLine);
             }
+            });
         }
 
         /// <summary>
@@ -216,6 +217,8 @@ internal static void InsertBlankLineAfterPoint(EditPoint point)
         /// <param name="centerOnWhole">True if the whole element should be used for centering.</param>
         internal static void MoveToCodeItem(Document document, BaseCodeItem codeItem, bool centerOnWhole)
         {
+            UIThread.RunOnUIThread(() =>
+            {
             var textDocument = document.GetTextDocument();
             if (textDocument == null) return;
 
@@ -259,6 +262,7 @@ internal static void MoveToCodeItem(Document document, BaseCodeItem codeItem, bo
                 // Always set focus within the code editor window.
                 document.Activate();
             }
+            });
         }
 
         /// <summary>
@@ -268,6 +272,8 @@ internal static void MoveToCodeItem(Document document, BaseCodeItem codeItem, bo
         /// <param name="codeItem">The code item.</param>
         internal static void SelectCodeItem(Document document, BaseCodeItem codeItem)
         {
+            UIThread.RunOnUIThread(() =>
+            {
             var textDocument = document.GetTextDocument();
             if (textDocument == null) return;
 
@@ -288,6 +294,7 @@ internal static void SelectCodeItem(Document document, BaseCodeItem codeItem)
                 // Always set focus within the code editor window.
                 document.Activate();
             }
+            });
         }
 
         /// <summary>
@@ -299,9 +306,8 @@ internal static void SelectCodeItem(Document document, BaseCodeItem codeItem)
         /// <param name="replacementString">The replacement string.</param>
         internal static void SubstituteAllStringMatches(TextDocument textDocument, string patternString, string replacementString)
         {
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
 
                 if (TryGetTextBufferAt(textDocument.Parent.FullName, out ITextBuffer textBuffer))
                 {
@@ -320,9 +326,8 @@ internal static void SubstituteAllStringMatches(TextDocument textDocument, strin
         /// <param name="replacementString">The replacement string.</param>
         internal static void SubstituteAllStringMatches(TextSelection textSelection, string patternString, string replacementString)
         {
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
 
                 if (TryGetTextBufferAt(textSelection.Parent.Parent.FullName, out ITextBuffer textBuffer))
                 {
@@ -342,9 +347,8 @@ internal static void SubstituteAllStringMatches(TextSelection textSelection, str
         /// <param name="replacementString">The replacement string.</param>
         internal static void SubstituteAllStringMatches(EditPoint startPoint, EditPoint endPoint, string patternString, string replacementString)
         {
-            UIThread.Run(() =>
+            UIThread.RunOnUIThread(() =>
             {
-                ThreadHelper.ThrowIfNotOnUIThread();
 
                 if (TryGetTextBufferAt(startPoint.Parent.Parent.FullName, out ITextBuffer textBuffer))
                 {
@@ -360,8 +364,6 @@ internal static void SubstituteAllStringMatches(EditPoint startPoint, EditPoint
 
         private static EditPoint GetEditPointForSnapshotPosition(TextDocument textDocument, ITextSnapshot textSnapshot, int position)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
             var editPoint = textDocument.CreateEditPoint();
             var textSnapshotLine = textSnapshot.GetLineFromPosition(position);
             editPoint.MoveToLineAndOffset(textSnapshotLine.LineNumber + 1, position - textSnapshotLine.Start.Position + 1);
@@ -384,8 +386,6 @@ private static IFinder GetFinder(string findWhat, string replaceWith, ITextBuffe
 
         private static Span GetSnapshotSpanForTextSelection(ITextSnapshot textSnapshot, TextSelection selection)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
             var startPosition = GetSnapshotPositionForTextPoint(textSnapshot, selection.AnchorPoint);
             var endPosition = GetSnapshotPositionForTextPoint(textSnapshot, selection.ActivePoint);
 
@@ -401,16 +401,12 @@ private static Span GetSnapshotSpanForTextSelection(ITextSnapshot textSnapshot,
 
         private static int GetSnapshotPositionForTextPoint(ITextSnapshot textSnapshot, TextPoint textPoint)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
             var textSnapshotLine = textSnapshot.GetLineFromLineNumber(textPoint.Line - 1);
             return textSnapshotLine.Start.Position + textPoint.LineCharOffset - 1;
         }
 
         private static Span GetSnapshotSpanForExtent(ITextSnapshot textSnapshot, EditPoint startPoint, EditPoint endPoint)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
             var startPosition = GetSnapshotPositionForTextPoint(textSnapshot, startPoint);
             var endPosition = GetSnapshotPositionForTextPoint(textSnapshot, endPoint);
 
@@ -471,4 +467,4 @@ private static bool TryGetTextBufferAt(string filePath, out ITextBuffer textBuff
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/UIHierarchyHelper.cs b/CodeMaidShared/Helpers/UIHierarchyHelper.cs
index dc7b433e5..113aaebf4 100644
--- a/CodeMaidShared/Helpers/UIHierarchyHelper.cs
+++ b/CodeMaidShared/Helpers/UIHierarchyHelper.cs
@@ -1,9 +1,10 @@
-using EnvDTE;
+using EnvDTE;
 using EnvDTE80;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -21,6 +22,7 @@ internal static class UIHierarchyHelper
         /// <param name="parentItem">The parent item to collapse from.</param>
         internal static void CollapseRecursively(UIHierarchyItem parentItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (parentItem == null)
             {
                 throw new ArgumentNullException(nameof(parentItem));
@@ -55,6 +57,7 @@ internal static void CollapseRecursively(UIHierarchyItem parentItem)
         /// <returns>The enumerable set of selected UI hierarchy items.</returns>
         internal static IEnumerable<UIHierarchyItem> GetSelectedUIHierarchyItems(CodeMaidPackage package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var solutionExplorer = GetSolutionExplorer(package);
 
             return ((object[])solutionExplorer.SelectedItems).Cast<UIHierarchyItem>().ToList();
@@ -67,6 +70,7 @@ internal static IEnumerable<UIHierarchyItem> GetSelectedUIHierarchyItems(CodeMai
         /// <returns>The solution explorer.</returns>
         internal static UIHierarchy GetSolutionExplorer(CodeMaidPackage package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return package.IDE.ToolWindows.SolutionExplorer;
         }
 
@@ -77,6 +81,7 @@ internal static UIHierarchy GetSolutionExplorer(CodeMaidPackage package)
         /// <returns>The top level (solution) UI hierarchy item, otherwise null.</returns>
         internal static UIHierarchyItem GetTopUIHierarchyItem(CodeMaidPackage package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var solutionExplorer = GetSolutionExplorer(package);
 
             return solutionExplorer.UIHierarchyItems.Count > 0
@@ -91,6 +96,7 @@ internal static UIHierarchyItem GetTopUIHierarchyItem(CodeMaidPackage package)
         /// <returns>True if there are expanded children, false otherwise.</returns>
         internal static bool HasExpandedChildren(UIHierarchyItem parentItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (parentItem == null)
             {
                 throw new ArgumentNullException(nameof(parentItem));
@@ -111,6 +117,7 @@ internal static bool HasExpandedChildren(UIHierarchyItem parentItem)
         /// <returns>True if the item should be collapsed, otherwise false.</returns>
         private static bool ShouldCollapseItem(UIHierarchyItem parentItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Make sure not to collapse the solution, causes odd behavior.
             if (parentItem.Object is Solution)
             {
@@ -135,4 +142,4 @@ private static bool ShouldCollapseItem(UIHierarchyItem parentItem)
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/UIThread.cs b/CodeMaidShared/Helpers/UIThread.cs
index df45539e7..481c12ed5 100644
--- a/CodeMaidShared/Helpers/UIThread.cs
+++ b/CodeMaidShared/Helpers/UIThread.cs
@@ -21,17 +21,36 @@ public static void Run(Action action)
             }
         }
 
+        public static void RunOnUIThread(Action action)
+        {
+            Run(() =>
+            {
+                ThreadHelper.ThrowIfNotOnUIThread();
+                action();
+            });
+        }
+
         public static T Run<T>(Func<T> func)
         {
             if (ThreadHelper.CheckAccess())
             {
                 return func();
             }
+
             return ThreadHelper.JoinableTaskFactory.Run(async () =>
             {
                 await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
                 return func();
             });
         }
+
+        public static T RunOnUIThread<T>(Func<T> func)
+        {
+            return Run(() =>
+            {
+                ThreadHelper.ThrowIfNotOnUIThread();
+                return func();
+            });
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Helpers/UndoTransactionHelper.cs b/CodeMaidShared/Helpers/UndoTransactionHelper.cs
index 53f449275..a26390292 100644
--- a/CodeMaidShared/Helpers/UndoTransactionHelper.cs
+++ b/CodeMaidShared/Helpers/UndoTransactionHelper.cs
@@ -1,5 +1,6 @@
-using SteveCadwallader.CodeMaid.Properties;
+using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Helpers
 {
@@ -40,6 +41,7 @@ public UndoTransactionHelper(CodeMaidPackage package, string transactionName)
         /// <param name="catchAction">The action to be performed wihin a catch block.</param>
         public void Run(Action tryAction, Action<Exception> catchAction = null)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             bool shouldCloseUndoContext = false;
 
             // Start an undo transaction (unless inside one already or within an auto save context).
@@ -80,4 +82,4 @@ public void Run(Action tryAction, Action<Exception> catchAction = null)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/AboutCommand.cs b/CodeMaidShared/Integration/Commands/AboutCommand.cs
index f7875136e..24ca76cd3 100644
--- a/CodeMaidShared/Integration/Commands/AboutCommand.cs
+++ b/CodeMaidShared/Integration/Commands/AboutCommand.cs
@@ -1,5 +1,6 @@
 using SteveCadwallader.CodeMaid.UI.Dialogs.About;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -38,9 +39,10 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             new AboutWindow().ShowModal();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/BaseCommand.cs b/CodeMaidShared/Integration/Commands/BaseCommand.cs
index ab42920fa..020fd4509 100644
--- a/CodeMaidShared/Integration/Commands/BaseCommand.cs
+++ b/CodeMaidShared/Integration/Commands/BaseCommand.cs
@@ -64,6 +64,7 @@ protected virtual void OnBeforeQueryStatus()
         /// </summary>
         protected virtual void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             OutputWindowHelper.DiagnosticWriteLine($"{GetType().Name}.OnExecute invoked");
         }
 
@@ -85,8 +86,9 @@ private static void BaseCommand_BeforeQueryStatus(object sender, EventArgs e)
         /// <param name="e">The <see cref="System.EventArgs" /> instance containing the event data.</param>
         private static void BaseCommand_Execute(object sender, EventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var command = sender as BaseCommand;
             command?.OnExecute();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/BuildProgressToolWindowCommand.cs b/CodeMaidShared/Integration/Commands/BuildProgressToolWindowCommand.cs
index 49f001e03..1bef64e3f 100644
--- a/CodeMaidShared/Integration/Commands/BuildProgressToolWindowCommand.cs
+++ b/CodeMaidShared/Integration/Commands/BuildProgressToolWindowCommand.cs
@@ -2,6 +2,7 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -31,6 +32,7 @@ private IVsWindowFrame BuildProgressWindowFrame
         {
             get
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 var buildProgress = Package.BuildProgressForceLoad;
                 if (buildProgress != null)
                 {
@@ -54,6 +56,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
 
         public override async Task SwitchAsync(bool on)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await base.SwitchAsync(on);
 
             if (!on)
@@ -69,6 +72,7 @@ public override async Task SwitchAsync(bool on)
         /// <param name="action">The action.</param>
         internal void OnBuildBegin(vsBuildScope scope, vsBuildAction action)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var buildProgress = Package.BuildProgressForceLoad;
             if (buildProgress != null)
             {
@@ -88,6 +92,7 @@ internal void OnBuildBegin(vsBuildScope scope, vsBuildAction action)
         /// <param name="action">The action.</param>
         internal void OnBuildDone(vsBuildScope scope, vsBuildAction action)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var buildProgress = Package.BuildProgressForceLoad;
             if (buildProgress != null)
             {
@@ -150,6 +155,7 @@ protected override void OnExecute()
         /// <param name="frame">The frame.</param>
         private static void DockWindowIfFloating(IVsWindowFrame frame)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the current tool window frame mode.
             frame.GetProperty((int)__VSFPROPID.VSFPROPID_FrameMode, out object currentFrameMode);
 
@@ -190,6 +196,7 @@ private void ShowBuildProgressToolWindow()
         /// </summary>
         private void ShowBuildProgressToolWindowWithoutActivation()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var frame = BuildProgressWindowFrame;
             if (frame != null)
             {
@@ -198,4 +205,4 @@ private void ShowBuildProgressToolWindowWithoutActivation()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CleanupActiveCodeCommand.cs b/CodeMaidShared/Integration/Commands/CleanupActiveCodeCommand.cs
index 2aa47ab6b..59103899b 100644
--- a/CodeMaidShared/Integration/Commands/CleanupActiveCodeCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CleanupActiveCodeCommand.cs
@@ -3,6 +3,7 @@
 using SteveCadwallader.CodeMaid.Logic.Cleaning;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -54,6 +55,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// <param name="document">The document about to be saved.</param>
         internal void OnBeforeDocumentSave(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_AutoCleanupOnFileSave) return;
             if (!CodeCleanupAvailabilityLogic.CanCleanupDocument(document)) return;
 
@@ -77,6 +79,7 @@ internal void OnBeforeDocumentSave(Document document)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = Package.ActiveDocument != null;
         }
 
@@ -85,9 +88,10 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             CodeCleanupManager.Cleanup(Package.ActiveDocument);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CleanupAllCodeCommand.cs b/CodeMaidShared/Integration/Commands/CleanupAllCodeCommand.cs
index b6d29c6fc..fd1224d74 100644
--- a/CodeMaidShared/Integration/Commands/CleanupAllCodeCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CleanupAllCodeCommand.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -57,6 +58,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = Package.IDE.Solution.IsOpen;
         }
 
@@ -65,6 +67,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             if (!CodeCleanupAvailabilityLogic.IsCleanupEnvironmentAvailable())
@@ -88,4 +91,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CleanupOpenCodeCommand.cs b/CodeMaidShared/Integration/Commands/CleanupOpenCodeCommand.cs
index 39f1599f2..800f3f3bb 100644
--- a/CodeMaidShared/Integration/Commands/CleanupOpenCodeCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CleanupOpenCodeCommand.cs
@@ -1,10 +1,11 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Logic.Cleaning;
 using SteveCadwallader.CodeMaid.UI.Dialogs.CleanupProgress;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -69,6 +70,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             using (new ActiveDocumentRestorer(Package))
@@ -80,4 +82,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CleanupSelectedCodeCommand.cs b/CodeMaidShared/Integration/Commands/CleanupSelectedCodeCommand.cs
index 3d3dcb2d4..a218771d5 100644
--- a/CodeMaidShared/Integration/Commands/CleanupSelectedCodeCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CleanupSelectedCodeCommand.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -55,6 +56,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = Package.IDE.Solution.IsOpen;
         }
 
@@ -63,6 +65,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             using (new ActiveDocumentRestorer(Package))
@@ -74,4 +77,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CloseAllReadOnlyCommand.cs b/CodeMaidShared/Integration/Commands/CloseAllReadOnlyCommand.cs
index 86ae54d53..085d5e856 100644
--- a/CodeMaidShared/Integration/Commands/CloseAllReadOnlyCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CloseAllReadOnlyCommand.cs
@@ -1,6 +1,7 @@
 using EnvDTE;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -39,6 +40,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = Package.IDE.Documents.Cast<Document>().Any(x => x.ReadOnly && x.Saved);
         }
 
@@ -47,6 +49,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var docs = Package.IDE.Documents;
@@ -60,4 +63,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CollapseAllSolutionExplorerCommand.cs b/CodeMaidShared/Integration/Commands/CollapseAllSolutionExplorerCommand.cs
index 83178cbb9..a75a2426a 100644
--- a/CodeMaidShared/Integration/Commands/CollapseAllSolutionExplorerCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CollapseAllSolutionExplorerCommand.cs
@@ -2,6 +2,7 @@
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -50,6 +51,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         internal void OnSolutionOpened()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Collapsing_CollapseSolutionWhenOpened) return;
 
             var topItem = TopUIHierarchyItem;
@@ -93,4 +95,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CollapseSelectedSolutionExplorerCommand.cs b/CodeMaidShared/Integration/Commands/CollapseSelectedSolutionExplorerCommand.cs
index 4bc7a8bb5..1d2fc1d3b 100644
--- a/CodeMaidShared/Integration/Commands/CollapseSelectedSolutionExplorerCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CollapseSelectedSolutionExplorerCommand.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -46,6 +47,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = SelectedUIHierarchyItems.Any(x => x.UIHierarchyItems.Expanded);
         }
 
@@ -54,6 +56,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             foreach (UIHierarchyItem item in SelectedUIHierarchyItems)
@@ -62,4 +65,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/CommentFormatCommand.cs b/CodeMaidShared/Integration/Commands/CommentFormatCommand.cs
index 1b178c268..89e3122aa 100644
--- a/CodeMaidShared/Integration/Commands/CommentFormatCommand.cs
+++ b/CodeMaidShared/Integration/Commands/CommentFormatCommand.cs
@@ -3,6 +3,7 @@
 using SteveCadwallader.CodeMaid.Logic.Formatting;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -51,6 +52,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = ActiveTextDocument != null;
         }
 
@@ -59,6 +61,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var activeTextDocument = ActiveTextDocument;
@@ -107,4 +110,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/FindInSolutionExplorerCommand.cs b/CodeMaidShared/Integration/Commands/FindInSolutionExplorerCommand.cs
index ac7fc2fc1..92f2ecae3 100644
--- a/CodeMaidShared/Integration/Commands/FindInSolutionExplorerCommand.cs
+++ b/CodeMaidShared/Integration/Commands/FindInSolutionExplorerCommand.cs
@@ -47,6 +47,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = Package.ActiveDocument != null;
         }
 
@@ -55,6 +56,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             Document document = Package.ActiveDocument;
@@ -96,6 +98,7 @@ protected override void OnExecute()
         /// </summary>
         private void ClearSolutionExplorerSearchFilter()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var solutionExplorer = VsShellUtilities.GetUIHierarchyWindow(Package, VSConstants.StandardToolWindows.SolutionExplorer);
             var ws = solutionExplorer as IVsWindowSearch;
             ws?.ClearSearch();
@@ -108,6 +111,7 @@ private void ClearSolutionExplorerSearchFilter()
         /// <param name="parentItem">The parent item to inspect.</param>
         private void ToggleSolutionFoldersOpenTemporarily(UIHierarchyItem parentItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (parentItem == null)
             {
                 throw new ArgumentNullException(nameof(parentItem));
@@ -143,4 +147,4 @@ private void ToggleSolutionFoldersOpenTemporarily(UIHierarchyItem parentItem)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/JoinLinesCommand.cs b/CodeMaidShared/Integration/Commands/JoinLinesCommand.cs
index 13ce85f8e..fd373152f 100644
--- a/CodeMaidShared/Integration/Commands/JoinLinesCommand.cs
+++ b/CodeMaidShared/Integration/Commands/JoinLinesCommand.cs
@@ -2,6 +2,7 @@
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -48,6 +49,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = ActiveTextDocument != null;
         }
 
@@ -56,6 +58,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var activeTextDocument = ActiveTextDocument;
@@ -75,6 +78,7 @@ protected override void OnExecute()
         /// <param name="textSelection">The text selection.</param>
         private void JoinText(TextSelection textSelection)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // If the selection has no length, try to pick up the next line.
             if (textSelection.IsEmpty)
             {
@@ -92,4 +96,4 @@ private void JoinText(TextSelection textSelection)
             textSelection.CharRight();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/OptionsCommand.cs b/CodeMaidShared/Integration/Commands/OptionsCommand.cs
index 106bd7bc2..b314e3376 100644
--- a/CodeMaidShared/Integration/Commands/OptionsCommand.cs
+++ b/CodeMaidShared/Integration/Commands/OptionsCommand.cs
@@ -1,5 +1,6 @@
 using SteveCadwallader.CodeMaid.UI.Dialogs.Options;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -38,9 +39,10 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             new OptionsWindow { DataContext = new OptionsViewModel(Package) }.ShowModal();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/ReadOnlyToggleCommand.cs b/CodeMaidShared/Integration/Commands/ReadOnlyToggleCommand.cs
index 0ad79e358..c618df5b6 100644
--- a/CodeMaidShared/Integration/Commands/ReadOnlyToggleCommand.cs
+++ b/CodeMaidShared/Integration/Commands/ReadOnlyToggleCommand.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -42,6 +43,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = Package.ActiveDocument != null;
         }
 
@@ -50,6 +52,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             Document document = Package.ActiveDocument;
@@ -69,4 +72,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/RemoveRegionCommand.cs b/CodeMaidShared/Integration/Commands/RemoveRegionCommand.cs
index 3d63917e2..37e3abd7a 100644
--- a/CodeMaidShared/Integration/Commands/RemoveRegionCommand.cs
+++ b/CodeMaidShared/Integration/Commands/RemoveRegionCommand.cs
@@ -1,9 +1,10 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Logic.Cleaning;
 using SteveCadwallader.CodeMaid.Model;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -63,6 +64,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var regionCommandScope = GetRegionCommandScope();
 
             Enabled = regionCommandScope != RegionCommandScope.None;
@@ -88,6 +90,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var regionCommandScope = GetRegionCommandScope();
@@ -113,6 +116,7 @@ protected override void OnExecute()
         /// <returns>The scope that should be used for the region command.</returns>
         private RegionCommandScope GetRegionCommandScope()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (_removeRegionLogic.CanRemoveRegions(Package.ActiveDocument))
             {
                 var activeTextDocument = ActiveTextDocument;
@@ -139,4 +143,4 @@ private RegionCommandScope GetRegionCommandScope()
             return RegionCommandScope.None;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/ReorganizeActiveCodeCommand.cs b/CodeMaidShared/Integration/Commands/ReorganizeActiveCodeCommand.cs
index d49c58de7..1ffb29ca9 100644
--- a/CodeMaidShared/Integration/Commands/ReorganizeActiveCodeCommand.cs
+++ b/CodeMaidShared/Integration/Commands/ReorganizeActiveCodeCommand.cs
@@ -1,5 +1,6 @@
 using SteveCadwallader.CodeMaid.Logic.Reorganizing;
 using Task = System.Threading.Tasks.Task;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -48,6 +49,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = Package.ActiveDocument != null;
         }
 
@@ -56,9 +58,10 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             CodeReorganizationManager.Reorganize(Package.ActiveDocument);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SettingCleanupOnSaveCommand.cs b/CodeMaidShared/Integration/Commands/SettingCleanupOnSaveCommand.cs
index 1977cbbd9..695d3336c 100644
--- a/CodeMaidShared/Integration/Commands/SettingCleanupOnSaveCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SettingCleanupOnSaveCommand.cs
@@ -1,5 +1,6 @@
-using SteveCadwallader.CodeMaid.Properties;
+using SteveCadwallader.CodeMaid.Properties;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -61,6 +62,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             CleanupOnSave = !CleanupOnSave;
@@ -69,4 +71,4 @@ protected override void OnExecute()
             Package.IDE.StatusBar.Text = $"{Resources.CodeMaidTurnedAutomaticCleanupOnSave} {CleanupOnSaveStateText}.";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SortLinesCommand.cs b/CodeMaidShared/Integration/Commands/SortLinesCommand.cs
index 3e5dd0105..ee084f150 100644
--- a/CodeMaidShared/Integration/Commands/SortLinesCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SortLinesCommand.cs
@@ -1,4 +1,4 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using TextSelection = EnvDTE.TextSelection;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -52,6 +53,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Enabled = ActiveTextDocument != null;
         }
 
@@ -60,6 +62,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var activeTextDocument = ActiveTextDocument;
@@ -79,6 +82,7 @@ protected override void OnExecute()
         /// <param name="textSelection">The text selection.</param>
         private void SortText(TextSelection textSelection)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // If the selection has no length, try to pick up the next line.
             if (textSelection.IsEmpty)
             {
@@ -126,4 +130,4 @@ private void SortText(TextSelection textSelection)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeContextDeleteCommand.cs b/CodeMaidShared/Integration/Commands/SpadeContextDeleteCommand.cs
index a96e358e1..f3f110298 100644
--- a/CodeMaidShared/Integration/Commands/SpadeContextDeleteCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeContextDeleteCommand.cs
@@ -1,10 +1,11 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -62,6 +63,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var spade = Package.Spade;
@@ -97,4 +99,4 @@ private static bool IsDeletable(BaseCodeItem codeItem)
             return !(codeItem is CodeItemRegion) || !((CodeItemRegion)codeItem).IsPseudoGroup;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeContextFindReferencesCommand.cs b/CodeMaidShared/Integration/Commands/SpadeContextFindReferencesCommand.cs
index c9cfae7be..4b42c9d7e 100644
--- a/CodeMaidShared/Integration/Commands/SpadeContextFindReferencesCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeContextFindReferencesCommand.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -50,6 +51,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var spade = Package.Spade;
@@ -72,4 +74,4 @@ protected override void OnExecute()
             Package.IDE.ExecuteCommand("Edit.FindAllReferences");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeContextInsertRegionCommand.cs b/CodeMaidShared/Integration/Commands/SpadeContextInsertRegionCommand.cs
index c6e9e6f68..e8cda98d4 100644
--- a/CodeMaidShared/Integration/Commands/SpadeContextInsertRegionCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeContextInsertRegionCommand.cs
@@ -1,9 +1,10 @@
-using SteveCadwallader.CodeMaid.Helpers;
+using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Logic.Reorganizing;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -47,6 +48,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             bool visible = false;
 
             var spade = Package.Spade;
@@ -65,6 +67,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var spade = Package.Spade;
@@ -100,4 +103,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeContextRemoveRegionCommand.cs b/CodeMaidShared/Integration/Commands/SpadeContextRemoveRegionCommand.cs
index c9af9945b..5adf188ad 100644
--- a/CodeMaidShared/Integration/Commands/SpadeContextRemoveRegionCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeContextRemoveRegionCommand.cs
@@ -1,7 +1,8 @@
-using SteveCadwallader.CodeMaid.Logic.Cleaning;
+using SteveCadwallader.CodeMaid.Logic.Cleaning;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -59,6 +60,7 @@ protected override void OnBeforeQueryStatus()
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var spade = Package.Spade;
@@ -81,4 +83,4 @@ private static bool IsRemoveableRegion(CodeItemRegion region)
             return !region.IsPseudoGroup && region.StartLine > 0 && region.EndLine > 0;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeOptionsCommand.cs b/CodeMaidShared/Integration/Commands/SpadeOptionsCommand.cs
index 6d3b69b46..31fd10e2c 100644
--- a/CodeMaidShared/Integration/Commands/SpadeOptionsCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeOptionsCommand.cs
@@ -1,6 +1,7 @@
 using SteveCadwallader.CodeMaid.UI.Dialogs.Options;
 using SteveCadwallader.CodeMaid.UI.Dialogs.Options.Digging;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -39,9 +40,10 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             new OptionsWindow { DataContext = new OptionsViewModel(Package, typeof(DiggingViewModel)) }.ShowModal();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeRefreshCommand.cs b/CodeMaidShared/Integration/Commands/SpadeRefreshCommand.cs
index 569cfb49b..bb797d019 100644
--- a/CodeMaidShared/Integration/Commands/SpadeRefreshCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeRefreshCommand.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -37,6 +38,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var spade = Package.Spade;
@@ -46,4 +48,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeSearchCommand.cs b/CodeMaidShared/Integration/Commands/SpadeSearchCommand.cs
index 9bdfa2d83..c44aba0fe 100644
--- a/CodeMaidShared/Integration/Commands/SpadeSearchCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeSearchCommand.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -37,6 +38,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnExecute();
 
             var spade = Package.Spade;
@@ -46,4 +48,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SpadeToolWindowCommand.cs b/CodeMaidShared/Integration/Commands/SpadeToolWindowCommand.cs
index c574d99e8..3d36ad4fd 100644
--- a/CodeMaidShared/Integration/Commands/SpadeToolWindowCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SpadeToolWindowCommand.cs
@@ -1,6 +1,7 @@
 using EnvDTE;
 using Microsoft.VisualStudio.Shell.Interop;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -36,6 +37,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
 
         public override async Task SwitchAsync(bool on)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             await base.SwitchAsync(on);
 
             if (!on)
@@ -50,6 +52,7 @@ public override async Task SwitchAsync(bool on)
         /// <param name="document">The document that was saved.</param>
         internal void OnAfterDocumentSave(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var spade = Package.Spade;
             if (spade != null)
             {
@@ -63,6 +66,7 @@ internal void OnAfterDocumentSave(Document document)
         /// <param name="document">The document that got focus, may be null.</param>
         internal void OnWindowChange(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var spade = Package.Spade;
             if (spade != null)
             {
@@ -84,4 +88,4 @@ protected override void OnExecute()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Commands/SwitchFileCommand.cs b/CodeMaidShared/Integration/Commands/SwitchFileCommand.cs
index 0aa70c225..1181cb60f 100644
--- a/CodeMaidShared/Integration/Commands/SwitchFileCommand.cs
+++ b/CodeMaidShared/Integration/Commands/SwitchFileCommand.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using Task = System.Threading.Tasks.Task;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Commands
 {
@@ -59,6 +60,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             string alternatePath = GetAlternatePathIfExists(Package.ActiveDocument);
             bool canAlterate = !string.IsNullOrEmpty(alternatePath);
 
@@ -95,6 +97,7 @@ protected override void OnExecute()
         /// <returns>The path to an alternate document, otherwise null.</returns>
         private string GetAlternatePathIfExists(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var alternatePaths = GetAlternatePaths(document);
 
             return alternatePaths.FirstOrDefault(x => !string.IsNullOrEmpty(x) && Package.IDE.Solution.FindProjectItem(x) != null);
@@ -107,6 +110,7 @@ private string GetAlternatePathIfExists(Document document)
         /// <returns>The alternate paths, otherwise null.</returns>
         private IEnumerable<string> GetAlternatePaths(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var results = new List<string>();
 
             if (document != null)
@@ -139,4 +143,4 @@ private IEnumerable<string> GetAlternatePaths(Document document)
             return results;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Events/BuildProgressEventListener.cs b/CodeMaidShared/Integration/Events/BuildProgressEventListener.cs
index f2f70afe3..c9fcbd3de 100644
--- a/CodeMaidShared/Integration/Events/BuildProgressEventListener.cs
+++ b/CodeMaidShared/Integration/Events/BuildProgressEventListener.cs
@@ -1,6 +1,7 @@
 using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Events
 {
@@ -16,6 +17,7 @@ internal sealed class BuildProgressEventListener : BaseEventListener
         private BuildProgressEventListener(CodeMaidPackage package)
             : base(package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Store access to the build events, otherwise events will not register properly via DTE.
             BuildEvents = Package.IDE.Events.BuildEvents;
         }
@@ -66,6 +68,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void RegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             BuildEvents.OnBuildBegin += BuildEvents_OnBuildBegin;
             BuildEvents.OnBuildProjConfigBegin += BuildEvents_OnBuildProjConfigBegin;
             BuildEvents.OnBuildProjConfigDone += BuildEvents_OnBuildProjConfigDone;
@@ -77,6 +80,7 @@ protected override void RegisterListeners()
         /// </summary>
         protected override void UnRegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             BuildEvents.OnBuildBegin -= BuildEvents_OnBuildBegin;
             BuildEvents.OnBuildProjConfigBegin -= BuildEvents_OnBuildProjConfigBegin;
             BuildEvents.OnBuildProjConfigDone -= BuildEvents_OnBuildProjConfigDone;
@@ -90,6 +94,7 @@ protected override void UnRegisterListeners()
         /// <param name="action">The action.</param>
         private void BuildEvents_OnBuildBegin(vsBuildScope scope, vsBuildAction action)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var buildBegin = BuildBegin;
             if (buildBegin != null)
             {
@@ -106,6 +111,7 @@ private void BuildEvents_OnBuildBegin(vsBuildScope scope, vsBuildAction action)
         /// <param name="action">The action.</param>
         private void BuildEvents_OnBuildDone(vsBuildScope scope, vsBuildAction action)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var buildDone = BuildDone;
             if (buildDone != null)
             {
@@ -124,6 +130,7 @@ private void BuildEvents_OnBuildDone(vsBuildScope scope, vsBuildAction action)
         /// <param name="solutionConfig">The solution config.</param>
         private void BuildEvents_OnBuildProjConfigBegin(string project, string projectConfig, string platform, string solutionConfig)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var buildProjConfigBegin = BuildProjConfigBegin;
             if (buildProjConfigBegin != null)
             {
@@ -143,6 +150,7 @@ private void BuildEvents_OnBuildProjConfigBegin(string project, string projectCo
         /// <param name="success">True if project build was successful, otherwise false.</param>
         private void BuildEvents_OnBuildProjConfigDone(string project, string projectConfig, string platform, string solutionConfig, bool success)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var buildProjConfigDone = BuildProjConfigDone;
             if (buildProjConfigDone != null)
             {
@@ -152,4 +160,4 @@ private void BuildEvents_OnBuildProjConfigDone(string project, string projectCon
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Events/DocumentEventListener.cs b/CodeMaidShared/Integration/Events/DocumentEventListener.cs
index b27fd2a4b..bd24b2487 100644
--- a/CodeMaidShared/Integration/Events/DocumentEventListener.cs
+++ b/CodeMaidShared/Integration/Events/DocumentEventListener.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using System;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Events
 {
@@ -17,6 +18,7 @@ internal sealed class DocumentEventListener : BaseEventListener
         private DocumentEventListener(CodeMaidPackage package)
             : base(package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Store access to the document events, otherwise events will not register properly via DTE.
             DocumentEvents = Package.IDE.Events.DocumentEvents;
         }
@@ -52,6 +54,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void RegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             DocumentEvents.DocumentClosing += DocumentEvents_DocumentClosing;
         }
 
@@ -60,6 +63,7 @@ protected override void RegisterListeners()
         /// </summary>
         protected override void UnRegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             DocumentEvents.DocumentClosing -= DocumentEvents_DocumentClosing;
         }
 
@@ -69,6 +73,7 @@ protected override void UnRegisterListeners()
         /// <param name="document">The document that is closing.</param>
         private void DocumentEvents_DocumentClosing(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var onDocumentClosing = OnDocumentClosing;
             if (onDocumentClosing != null)
             {
@@ -78,4 +83,4 @@ private void DocumentEvents_DocumentClosing(Document document)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Events/RunningDocumentTableEventListener.cs b/CodeMaidShared/Integration/Events/RunningDocumentTableEventListener.cs
index a6d737766..00e595d7a 100644
--- a/CodeMaidShared/Integration/Events/RunningDocumentTableEventListener.cs
+++ b/CodeMaidShared/Integration/Events/RunningDocumentTableEventListener.cs
@@ -90,6 +90,7 @@ await package.SettingsMonitor.WatchAsync<bool>(new[] {
         /// <returns>S_OK if successful, otherwise an error code.</returns>
         public int OnAfterSave(uint docCookie)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var afterSave = AfterSave;
             if (afterSave != null)
             {
@@ -152,6 +153,7 @@ protected override void UnRegisterListeners()
         /// <returns>The document object, otherwise null.</returns>
         private Document GetDocumentFromCookie(uint docCookie)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Retrieve document information from the cookie to get the full document name.
             var documentName = RunningDocumentTable.GetDocumentInfo(docCookie).Moniker;
 
@@ -159,4 +161,4 @@ private Document GetDocumentFromCookie(uint docCookie)
             return Package.IDE.Documents.OfType<Document>().FirstOrDefault(x => x.FullName == documentName);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Events/SolutionEventListener.cs b/CodeMaidShared/Integration/Events/SolutionEventListener.cs
index 9f7e0f646..269cc8fea 100644
--- a/CodeMaidShared/Integration/Events/SolutionEventListener.cs
+++ b/CodeMaidShared/Integration/Events/SolutionEventListener.cs
@@ -2,6 +2,7 @@
 using SteveCadwallader.CodeMaid.Helpers;
 using System;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Events
 {
@@ -17,6 +18,7 @@ internal sealed class SolutionEventListener : BaseEventListener
         private SolutionEventListener(CodeMaidPackage package)
             : base(package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Store access to the solutions events, otherwise events will not register properly via DTE.
             SolutionEvents = Package.IDE.Events.SolutionEvents;
         }
@@ -63,6 +65,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void RegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             SolutionEvents.Opened += SolutionEvents_Opened;
             SolutionEvents.AfterClosing += SolutionEvents_AfterClosing;
         }
@@ -72,6 +75,7 @@ protected override void RegisterListeners()
         /// </summary>
         protected override void UnRegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             SolutionEvents.Opened -= SolutionEvents_Opened;
             SolutionEvents.AfterClosing -= SolutionEvents_AfterClosing;
         }
@@ -81,6 +85,7 @@ protected override void UnRegisterListeners()
         /// </summary>
         private void SolutionEvents_AfterClosing()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var onSolutionClosed = OnSolutionClosed;
             if (onSolutionClosed != null)
             {
@@ -95,6 +100,7 @@ private void SolutionEvents_AfterClosing()
         /// </summary>
         private void SolutionEvents_Opened()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var onSolutionOpened = OnSolutionOpened;
             if (onSolutionOpened != null)
             {
@@ -104,4 +110,4 @@ private void SolutionEvents_Opened()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Events/TextEditorEventListener.cs b/CodeMaidShared/Integration/Events/TextEditorEventListener.cs
index 18485f194..f0f1efd08 100644
--- a/CodeMaidShared/Integration/Events/TextEditorEventListener.cs
+++ b/CodeMaidShared/Integration/Events/TextEditorEventListener.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using System;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Events
 {
@@ -17,6 +18,7 @@ internal sealed class TextEditorEventListener : BaseEventListener
         private TextEditorEventListener(CodeMaidPackage package)
             : base(package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Store access to the text editor events, otherwise events will not register properly
             // via DTE.
             TextEditorEvents = Package.IDE.Events.TextEditorEvents;
@@ -53,6 +55,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void RegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             TextEditorEvents.LineChanged += TextEditorEvents_LineChanged;
         }
 
@@ -61,6 +64,7 @@ protected override void RegisterListeners()
         /// </summary>
         protected override void UnRegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             TextEditorEvents.LineChanged -= TextEditorEvents_LineChanged;
         }
 
@@ -72,6 +76,7 @@ protected override void UnRegisterListeners()
         /// <param name="hint">A hint as to the type of change that has occurred.</param>
         private void TextEditorEvents_LineChanged(TextPoint startPoint, TextPoint endPoint, int hint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = startPoint?.Parent;
             if (textDocument == null) return;
 
@@ -86,4 +91,4 @@ private void TextEditorEvents_LineChanged(TextPoint startPoint, TextPoint endPoi
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Integration/Events/WindowEventListener.cs b/CodeMaidShared/Integration/Events/WindowEventListener.cs
index dff919a09..b1cfef908 100644
--- a/CodeMaidShared/Integration/Events/WindowEventListener.cs
+++ b/CodeMaidShared/Integration/Events/WindowEventListener.cs
@@ -2,6 +2,7 @@
 using SteveCadwallader.CodeMaid.Helpers;
 using System;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Integration.Events
 {
@@ -17,6 +18,7 @@ internal sealed class WindowEventListener : BaseEventListener
         private WindowEventListener(CodeMaidPackage package)
             : base(package)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Store access to the window events, otherwise events will not register properly via DTE.
             WindowEvents = Package.IDE.Events.WindowEvents;
         }
@@ -52,6 +54,7 @@ public static async Task InitializeAsync(CodeMaidPackage package)
         /// </summary>
         protected override void RegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             WindowEvents.WindowActivated += WindowEvents_WindowActivated;
         }
 
@@ -60,6 +63,7 @@ protected override void RegisterListeners()
         /// </summary>
         protected override void UnRegisterListeners()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             WindowEvents.WindowActivated -= WindowEvents_WindowActivated;
         }
 
@@ -69,6 +73,7 @@ protected override void UnRegisterListeners()
         /// <param name="document">The document that got focus, may be null.</param>
         private void RaiseWindowChange(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var onWindowChange = OnWindowChange;
             if (onWindowChange != null)
             {
@@ -85,6 +90,7 @@ private void RaiseWindowChange(Document document)
         /// <param name="lostFocus">The window that lost focus.</param>
         private void WindowEvents_WindowActivated(Window gotFocus, Window lostFocus)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (gotFocus.Kind == "Document")
             {
                 RaiseWindowChange(gotFocus.Document);
@@ -95,4 +101,4 @@ private void WindowEvents_WindowActivated(Window gotFocus, Window lostFocus)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/CodeCleanupAvailabilityLogic.cs b/CodeMaidShared/Logic/Cleaning/CodeCleanupAvailabilityLogic.cs
index 21af739b1..e765a43ca 100644
--- a/CodeMaidShared/Logic/Cleaning/CodeCleanupAvailabilityLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/CodeCleanupAvailabilityLogic.cs
@@ -9,6 +9,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -37,7 +38,7 @@ internal class CodeCleanupAvailabilityLogic
                                                    .Where(y => !string.IsNullOrEmpty(y))
                                                    .ToList());
 
-        private EditorFactory _editorFactory;
+        private readonly Lazy<EditorFactory> _editorFactory = new Lazy<EditorFactory>(() => new EditorFactory());
 
         #endregion Fields
 
@@ -84,7 +85,7 @@ private CodeCleanupAvailabilityLogic(CodeMaidPackage package)
         /// <summary>
         /// A default editor factory, used for its knowledge of language service-extension mappings.
         /// </summary>
-        private EditorFactory EditorFactory => _editorFactory ?? (_editorFactory = new EditorFactory());
+        private EditorFactory EditorFactory => _editorFactory.Value;
 
         #endregion Properties
 
@@ -98,6 +99,7 @@ private CodeCleanupAvailabilityLogic(CodeMaidPackage package)
         /// <returns>True if item can be cleaned up, otherwise false.</returns>
         internal bool CanCleanupDocument(Document document, bool allowUserPrompts = false)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!IsCleanupEnvironmentAvailable())
             {
                 OutputWindowHelper.DiagnosticWriteLine($"CodeCleanupAvailabilityLogic.CanCleanupDocument returned false due to the cleanup environment not being available.");
@@ -156,6 +158,7 @@ internal bool CanCleanupDocument(Document document, bool allowUserPrompts = fals
         /// <returns>True if item can be cleaned up, otherwise false.</returns>
         internal bool CanCleanupProjectItem(ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!IsCleanupEnvironmentAvailable())
             {
                 OutputWindowHelper.DiagnosticWriteLine($"CodeCleanupAvailabilityLogic.CanCleanupProjectItem returned false due to the cleanup environment not being available.");
@@ -203,6 +206,7 @@ internal bool CanCleanupProjectItem(ProjectItem projectItem)
         /// <returns>True if cleanup can occur, false otherwise.</returns>
         internal bool IsCleanupEnvironmentAvailable()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return _package.IDE.Debugger.CurrentMode == dbgDebugMode.dbgDesignMode;
         }
 
@@ -217,6 +221,7 @@ internal bool IsCleanupEnvironmentAvailable()
         /// <returns>The file extension, otherwise an empty string.</returns>
         private static string GetProjectItemExtension(ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 return Path.GetExtension(projectItem.Name) ?? string.Empty;
@@ -234,6 +239,7 @@ private static string GetProjectItemExtension(ProjectItem projectItem)
         /// <returns>True an auto-generated header is detected, otherwise false.</returns>
         private bool HasAutoGeneratedHeader(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = document.GetTextDocument();
             if (textDocument != null)
             {
@@ -260,6 +266,7 @@ private bool HasAutoGeneratedHeader(Document document)
         /// </returns>
         private bool IsDocumentExcludedBecauseExternal(Document document, bool allowUserPrompts)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!document.IsExternal()) return false;
 
             switch ((AskYesNo)Settings.Default.Cleaning_PerformPartialCleanupOnExternal)
@@ -289,6 +296,7 @@ private bool IsDocumentExcludedBecauseExternal(Document document, bool allowUser
         /// <returns>True if the document language is included, otherwise false.</returns>
         private bool IsDocumentLanguageIncludedByOptions(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var projectItem = document.ProjectItem;
             var extension = GetProjectItemExtension(projectItem);
             if (extension.Equals(".php", StringComparison.CurrentCultureIgnoreCase))
@@ -342,7 +350,15 @@ private bool IsFileNameExcludedByOptions(string filename)
                 return false;
             }
 
-            return cleanupExclusions.Any(cleanupExclusion => Regex.IsMatch(filename, cleanupExclusion, RegexOptions.IgnoreCase));
+            try
+            {
+                return cleanupExclusions.Any(cleanupExclusion => Regex.IsMatch(filename, cleanupExclusion, RegexOptions.IgnoreCase));
+            }
+            catch (ArgumentException ex)
+            {
+                OutputWindowHelper.WarningWriteLine($"Invalid regex expression found in cleaning exclusions options: {ex.Message}");
+                return false;
+            }
         }
 
         /// <summary>
@@ -364,7 +380,15 @@ private bool IsFileNameIncludedByOptions(string filename)
             }
             else
             {
-                return cleanupInclusions.Any(cleanupInclusion => Regex.IsMatch(filename, cleanupInclusion, RegexOptions.IgnoreCase));
+                try
+                {
+                    return cleanupInclusions.Any(cleanupInclusion => Regex.IsMatch(filename, cleanupInclusion, RegexOptions.IgnoreCase));
+                }
+                catch (ArgumentException ex)
+                {
+                    OutputWindowHelper.WarningWriteLine($"Invalid regex expression found in cleaning inclusions options: {ex.Message}");
+                    return true;
+                }
             }
         }
 
@@ -376,6 +400,7 @@ private bool IsFileNameIncludedByOptions(string filename)
         /// <returns>True if the parent is excluded by options, otherwise false.</returns>
         private static bool IsParentCodeGeneratorExcludedByOptions(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (document == null) return false;
 
             return IsParentCodeGeneratorExcludedByOptions(document.ProjectItem);
@@ -389,6 +414,7 @@ private static bool IsParentCodeGeneratorExcludedByOptions(Document document)
         /// <returns>True if the parent is excluded by options, otherwise false.</returns>
         private static bool IsParentCodeGeneratorExcludedByOptions(ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var parentProjectItem = projectItem?.GetParentProjectItem();
             if (parentProjectItem == null) return false;
 
@@ -408,6 +434,7 @@ private static bool IsParentCodeGeneratorExcludedByOptions(ProjectItem projectIt
         /// <returns>True if the document language is included, otherwise false.</returns>
         private bool IsProjectItemLanguageIncludedByOptions(ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var extension = GetProjectItemExtension(projectItem);
             if (extension.Equals(".js", StringComparison.CurrentCultureIgnoreCase))
             {
@@ -453,6 +480,7 @@ private bool IsProjectItemLanguageIncludedByOptions(ProjectItem projectItem)
         /// <returns>True if external files should be cleaned, otherwise false.</returns>
         private static bool PromptUserAboutCleaningExternalFiles(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 var viewModel = new YesNoPromptViewModel
@@ -494,4 +522,4 @@ private static bool PromptUserAboutCleaningExternalFiles(Document document)
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/CodeCleanupManager.cs b/CodeMaidShared/Logic/Cleaning/CodeCleanupManager.cs
index 850536ca5..a16f8989d 100644
--- a/CodeMaidShared/Logic/Cleaning/CodeCleanupManager.cs
+++ b/CodeMaidShared/Logic/Cleaning/CodeCleanupManager.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -101,6 +102,7 @@ private CodeCleanupManager(CodeMaidPackage package)
         /// <param name="projectItem">The project item for cleanup.</param>
         internal void Cleanup(ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!_codeCleanupAvailabilityLogic.CanCleanupProjectItem(projectItem)) return;
 
             // Attempt to open the document if not already opened.
@@ -135,6 +137,7 @@ internal void Cleanup(ProjectItem projectItem)
         /// <param name="document">The document for cleanup.</param>
         internal void Cleanup(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!_codeCleanupAvailabilityLogic.CanCleanupDocument(document, true)) return;
 
             // Make sure the document to be cleaned up is active, required for some commands like format document.
@@ -186,6 +189,7 @@ internal void Cleanup(Document document)
         /// <returns>The code cleanup method, otherwise null.</returns>
         private Action<Document> FindCodeCleanupMethod(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             switch (document.GetCodeLanguage())
             {
                 case CodeLanguage.CSharp:
@@ -227,6 +231,7 @@ private Action<Document> FindCodeCleanupMethod(Document document)
         /// <param name="document">The document for cleanup.</param>
         private void RunCodeCleanupCSharp(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = document.GetTextDocument();
 
             // Perform any actions that can modify the file code model first.
@@ -346,6 +351,7 @@ private void RunCodeCleanupCSharp(Document document)
         /// <param name="document">The document for cleanup.</param>
         private void RunCodeCleanupVB(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = document.GetTextDocument();
 
             // Perform any actions that can modify the file code model first.
@@ -446,6 +452,7 @@ private void RunCodeCleanupVB(Document document)
         /// <param name="document">The document for cleanup.</param>
         private void RunCodeCleanupC(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = document.GetTextDocument();
 
             RunExternalFormatting(textDocument);
@@ -475,6 +482,7 @@ private void RunCodeCleanupC(Document document)
         /// <param name="document">The document for cleanup.</param>
         private void RunCodeCleanupMarkup(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = document.GetTextDocument();
 
             RunExternalFormatting(textDocument);
@@ -506,6 +514,7 @@ private void RunCodeCleanupMarkup(Document document)
         /// <param name="document">The document for cleanup.</param>
         private void RunCodeCleanupGeneric(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = document.GetTextDocument();
 
             RunExternalFormatting(textDocument);
@@ -534,6 +543,7 @@ private void RunCodeCleanupGeneric(Document document)
         /// <param name="textDocument">The text document to cleanup.</param>
         private void RunExternalFormatting(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             RunVisualStudioFormatDocument(textDocument);
             RunJetBrainsReSharperCleanup(textDocument);
             RunTelerikJustCodeCleanup(textDocument);
@@ -547,6 +557,7 @@ private void RunExternalFormatting(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         private void RunVisualStudioFormatDocument(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RunVisualStudioFormatDocumentCommand) return;
 
             _commandHelper.ExecuteCommand(textDocument, "Edit.FormatDocument");
@@ -571,6 +582,7 @@ private void RunJetBrainsReSharperCleanup(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         private void RunTelerikJustCodeCleanup(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.ThirdParty_UseTelerikJustCodeCleanup) return;
 
             _commandHelper.ExecuteCommand(textDocument, "JustCode.JustCode_CleanCodeWithDefaultProfile");
@@ -603,4 +615,4 @@ private void RunOtherCleanupCommands(TextDocument textDocument)
 
         #endregion Private Cleanup Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/FileHeaderLogic.cs b/CodeMaidShared/Logic/Cleaning/FileHeaderLogic.cs
index c9d19992c..a872ad0c7 100644
--- a/CodeMaidShared/Logic/Cleaning/FileHeaderLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/FileHeaderLogic.cs
@@ -1,10 +1,11 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using SteveCadwallader.CodeMaid.UI.Enumerations;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -57,6 +58,7 @@ private FileHeaderLogic(CodeMaidPackage package)
         /// <param name="textDocument">The text document to update.</param>
         internal void UpdateFileHeader(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var settingsFileHeader = FileHeaderHelper.GetFileHeaderFromSettings(textDocument);
             if (string.IsNullOrWhiteSpace(settingsFileHeader))
             {
@@ -85,6 +87,7 @@ internal void UpdateFileHeader(TextDocument textDocument)
 
         private int GetHeaderLength(TextDocument textDocument, bool skipUsings)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var headerBlock = ReadTextBlock(textDocument);
             var language = textDocument.GetCodeLanguage();
 
@@ -111,6 +114,7 @@ private string GetCurrentHeader(TextDocument textDocument, bool skipUsings)
 
         private int GetNbLinesToSkip(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var docHeadBlock = ReadTextBlock(textDocument);
 
             return FileHeaderHelper.GetNbLinesToSkip("using ", docHeadBlock, new List<string> { "namespace ", "[assembly:" });
@@ -118,6 +122,7 @@ private int GetNbLinesToSkip(TextDocument textDocument)
 
         private void InsertFileHeader(TextDocument textDocument, string settingsFileHeader)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             switch (FileHeaderHelper.GetFileHeaderPositionFromSettings(textDocument))
             {
                 case HeaderPosition.DocumentStart:
@@ -193,6 +198,7 @@ private string ReadTextBlock(TextDocument textDocument)
 
         private void ReplaceFileHeader(TextDocument textDocument, string settingsFileHeader)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             switch (FileHeaderHelper.GetFileHeaderPositionFromSettings(textDocument))
             {
                 case HeaderPosition.DocumentStart:
@@ -263,4 +269,4 @@ private void ReplaceFileHeaderDocumentStart(TextDocument textDocument, string se
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/InsertBlankLinePaddingLogic.cs b/CodeMaidShared/Logic/Cleaning/InsertBlankLinePaddingLogic.cs
index bace30f5a..91e556d97 100644
--- a/CodeMaidShared/Logic/Cleaning/InsertBlankLinePaddingLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/InsertBlankLinePaddingLogic.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -185,6 +186,7 @@ internal bool ShouldBeFollowedByBlankLine(BaseCodeItem codeItem)
         /// <param name="regions">The regions to pad.</param>
         internal void InsertPaddingBeforeRegionTags(IEnumerable<CodeItemRegion> regions)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankLinePaddingBeforeRegionTags) return;
 
             foreach (var region in regions.Where(x => !x.IsInvalidated))
@@ -201,6 +203,7 @@ internal void InsertPaddingBeforeRegionTags(IEnumerable<CodeItemRegion> regions)
         /// <param name="regions">The regions to pad.</param>
         internal void InsertPaddingAfterRegionTags(IEnumerable<CodeItemRegion> regions)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankLinePaddingAfterRegionTags) return;
 
             foreach (var region in regions.Where(x => !x.IsInvalidated))
@@ -217,6 +220,7 @@ internal void InsertPaddingAfterRegionTags(IEnumerable<CodeItemRegion> regions)
         /// <param name="regions">The regions to pad.</param>
         internal void InsertPaddingBeforeEndRegionTags(IEnumerable<CodeItemRegion> regions)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankLinePaddingBeforeEndRegionTags) return;
 
             foreach (var region in regions.Where(x => !x.IsInvalidated))
@@ -233,6 +237,7 @@ internal void InsertPaddingBeforeEndRegionTags(IEnumerable<CodeItemRegion> regio
         /// <param name="regions">The regions to pad.</param>
         internal void InsertPaddingAfterEndRegionTags(IEnumerable<CodeItemRegion> regions)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankLinePaddingAfterEndRegionTags) return;
 
             foreach (var region in regions.Where(x => !x.IsInvalidated))
@@ -251,6 +256,7 @@ internal void InsertPaddingAfterEndRegionTags(IEnumerable<CodeItemRegion> region
         internal void InsertPaddingBeforeCodeElements<T>(IEnumerable<T> codeElements)
             where T : BaseCodeItemElement
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             foreach (T codeElement in codeElements.Where(ShouldBePrecededByBlankLine))
             {
                 TextDocumentHelper.InsertBlankLineBeforePoint(codeElement.StartPoint);
@@ -265,6 +271,7 @@ internal void InsertPaddingBeforeCodeElements<T>(IEnumerable<T> codeElements)
         internal void InsertPaddingAfterCodeElements<T>(IEnumerable<T> codeElements)
             where T : BaseCodeItemElement
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             foreach (T codeElement in codeElements.Where(ShouldBeFollowedByBlankLine))
             {
                 TextDocumentHelper.InsertBlankLineAfterPoint(codeElement.EndPoint);
@@ -277,6 +284,7 @@ internal void InsertPaddingAfterCodeElements<T>(IEnumerable<T> codeElements)
         /// <param name="textDocument">The text document.</param>
         internal void InsertPaddingBeforeCaseStatements(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankLinePaddingBeforeCaseStatements) return;
 
             const string pattern = @"(^[ \t]*)(break;|return([ \t][^;]*)?;)\r?\n([ \t]*)(case|default)";
@@ -292,6 +300,7 @@ internal void InsertPaddingBeforeCaseStatements(TextDocument textDocument)
         /// <param name="textDocument">The text document.</param>
         internal void InsertPaddingBeforeSingleLineComments(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankLinePaddingBeforeSingleLineComments) return;
 
             const string pattern = @"(^[ \t]*(?!//)[^ \t\r\n\{].*\r?\n)([ \t]*//)(?!//)";
@@ -306,10 +315,13 @@ internal void InsertPaddingBeforeSingleLineComments(TextDocument textDocument)
         /// <param name="properties">The properties.</param>
         internal void InsertPaddingBetweenMultiLinePropertyAccessors(IEnumerable<CodeItemProperty> properties)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankLinePaddingBetweenPropertiesMultiLineAccessors) return;
 
             foreach (var property in properties)
             {
+                if (property?.CodeProperty == null) continue;
+
                 var getter = property.CodeProperty.Getter;
                 var setter = property.CodeProperty.Setter;
 
@@ -325,4 +337,4 @@ internal void InsertPaddingBetweenMultiLinePropertyAccessors(IEnumerable<CodeIte
 
         #endregion Insertion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/InsertExplicitAccessModifierLogic.cs b/CodeMaidShared/Logic/Cleaning/InsertExplicitAccessModifierLogic.cs
index 04faa90c7..d3c16ba91 100644
--- a/CodeMaidShared/Logic/Cleaning/InsertExplicitAccessModifierLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/InsertExplicitAccessModifierLogic.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -52,6 +53,7 @@ private InsertExplicitAccessModifierLogic()
         /// <param name="classes">The classes.</param>
         public void InsertExplicitAccessModifiersOnClasses(IEnumerable<CodeItemClass> classes)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnClasses) return;
 
             foreach (var codeClass in classes.Select(x => x.CodeClass).Where(y => y != null))
@@ -67,7 +69,14 @@ public void InsertExplicitAccessModifiersOnClasses(IEnumerable<CodeItemClass> cl
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(classDeclaration, codeClass.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeClass.Access = codeClass.Access;
+                    try
+                    {
+                        codeClass.Access = codeClass.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on class {codeClass.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -78,6 +87,7 @@ public void InsertExplicitAccessModifiersOnClasses(IEnumerable<CodeItemClass> cl
         /// <param name="delegates">The delegates.</param>
         public void InsertExplicitAccessModifiersOnDelegates(IEnumerable<CodeItemDelegate> delegates)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnDelegates) return;
 
             foreach (var codeDelegate in delegates.Select(x => x.CodeDelegate).Where(y => y != null))
@@ -87,7 +97,14 @@ public void InsertExplicitAccessModifiersOnDelegates(IEnumerable<CodeItemDelegat
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(delegateDeclaration, codeDelegate.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeDelegate.Access = codeDelegate.Access;
+                    try
+                    {
+                        codeDelegate.Access = codeDelegate.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on delegate {codeDelegate.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -98,6 +115,7 @@ public void InsertExplicitAccessModifiersOnDelegates(IEnumerable<CodeItemDelegat
         /// <param name="enumerations">The enumerations.</param>
         public void InsertExplicitAccessModifiersOnEnumerations(IEnumerable<CodeItemEnum> enumerations)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnEnumerations) return;
 
             foreach (var codeEnum in enumerations.Select(x => x.CodeEnum).Where(y => y != null))
@@ -107,7 +125,14 @@ public void InsertExplicitAccessModifiersOnEnumerations(IEnumerable<CodeItemEnum
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(enumDeclaration, codeEnum.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeEnum.Access = codeEnum.Access;
+                    try
+                    {
+                        codeEnum.Access = codeEnum.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on enum {codeEnum.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -118,10 +143,14 @@ public void InsertExplicitAccessModifiersOnEnumerations(IEnumerable<CodeItemEnum
         /// <param name="events">The events.</param>
         public void InsertExplicitAccessModifiersOnEvents(IEnumerable<CodeItemEvent> events)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnEvents) return;
 
-            foreach (var codeEvent in events.Select(x => x.CodeEvent).Where(y => y != null))
+            foreach (var item in events)
             {
+                if (item?.CodeEvent == null) continue;
+                var codeEvent = item.CodeEvent;
+
                 try
                 {
                     // Skip events defined inside an interface.
@@ -147,7 +176,14 @@ public void InsertExplicitAccessModifiersOnEvents(IEnumerable<CodeItemEvent> eve
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(eventDeclaration, codeEvent.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeEvent.Access = codeEvent.Access;
+                    try
+                    {
+                        codeEvent.Access = codeEvent.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on event {codeEvent.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -158,10 +194,14 @@ public void InsertExplicitAccessModifiersOnEvents(IEnumerable<CodeItemEvent> eve
         /// <param name="fields">The fields.</param>
         public void InsertExplicitAccessModifiersOnFields(IEnumerable<CodeItemField> fields)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnFields) return;
 
-            foreach (var codeField in fields.Select(x => x.CodeVariable).Where(y => y != null))
+            foreach (var item in fields)
             {
+                if (item?.CodeVariable == null) continue;
+                var codeField = item.CodeVariable;
+
                 try
                 {
                     // Skip "fields" defined inside an enumeration.
@@ -181,7 +221,14 @@ public void InsertExplicitAccessModifiersOnFields(IEnumerable<CodeItemField> fie
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(fieldDeclaration, codeField.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeField.Access = codeField.Access;
+                    try
+                    {
+                        codeField.Access = codeField.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on field {codeField.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -192,16 +239,27 @@ public void InsertExplicitAccessModifiersOnFields(IEnumerable<CodeItemField> fie
         /// <param name="interfaces">The interfaces.</param>
         public void InsertExplicitAccessModifiersOnInterfaces(IEnumerable<CodeItemInterface> interfaces)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnInterfaces) return;
 
-            foreach (var codeInterface in interfaces.Select(x => x.CodeInterface).Where(y => y != null))
+            foreach (var item in interfaces)
             {
+                if (item?.CodeInterface == null) continue;
+                var codeInterface = item.CodeInterface;
+
                 var interfaceDeclaration = CodeElementHelper.GetInterfaceDeclaration(codeInterface);
 
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(interfaceDeclaration, codeInterface.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeInterface.Access = codeInterface.Access;
+                    try
+                    {
+                        codeInterface.Access = codeInterface.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on interface {codeInterface.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -212,10 +270,14 @@ public void InsertExplicitAccessModifiersOnInterfaces(IEnumerable<CodeItemInterf
         /// <param name="methods">The methods.</param>
         public void InsertExplicitAccessModifiersOnMethods(IEnumerable<CodeItemMethod> methods)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnMethods) return;
 
-            foreach (var codeFunction in methods.Select(x => x.CodeFunction).Where(y => y != null))
+            foreach (var item in methods)
             {
+                if (item?.CodeFunction == null) continue;
+                var codeFunction = item.CodeFunction;
+
                 try
                 {
                     // Skip static constructors - they should not have an access modifier.
@@ -259,7 +321,14 @@ public void InsertExplicitAccessModifiersOnMethods(IEnumerable<CodeItemMethod> m
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(methodDeclaration, codeFunction.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeFunction.Access = codeFunction.Access;
+                    try
+                    {
+                        codeFunction.Access = codeFunction.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on method {codeFunction.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -270,10 +339,14 @@ public void InsertExplicitAccessModifiersOnMethods(IEnumerable<CodeItemMethod> m
         /// <param name="properties">The properties.</param>
         public void InsertExplicitAccessModifiersOnProperties(IEnumerable<CodeItemProperty> properties)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnProperties) return;
 
-            foreach (var codeProperty in properties.Select(x => x.CodeProperty).Where(y => y != null))
+            foreach (var item in properties)
             {
+                if (item?.CodeProperty == null) continue;
+                var codeProperty = item.CodeProperty;
+
                 try
                 {
                     // Skip explicit interface implementations.
@@ -299,7 +372,14 @@ public void InsertExplicitAccessModifiersOnProperties(IEnumerable<CodeItemProper
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(propertyDeclaration, codeProperty.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeProperty.Access = codeProperty.Access;
+                    try
+                    {
+                        codeProperty.Access = codeProperty.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on property {codeProperty.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -310,16 +390,27 @@ public void InsertExplicitAccessModifiersOnProperties(IEnumerable<CodeItemProper
         /// <param name="structs">The structs.</param>
         public void InsertExplicitAccessModifiersOnStructs(IEnumerable<CodeItemStruct> structs)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertExplicitAccessModifiersOnStructs) return;
 
-            foreach (var codeStruct in structs.Select(x => x.CodeStruct).Where(y => y != null))
+            foreach (var item in structs)
             {
+                if (item?.CodeStruct == null) continue;
+                var codeStruct = item.CodeStruct;
+
                 var structDeclaration = CodeElementHelper.GetStructDeclaration(codeStruct);
 
                 if (!IsAccessModifierExplicitlySpecifiedOnCodeElement(structDeclaration, codeStruct.Access))
                 {
                     // Set the access value to itself to cause the code to be added.
-                    codeStruct.Access = codeStruct.Access;
+                    try
+                    {
+                        codeStruct.Access = codeStruct.Access;
+                    }
+                    catch (Exception ex)
+                    {
+                        OutputWindowHelper.WarningWriteLine($"Unable to set explicit access modifier on struct {codeStruct.Name}: {ex.Message}");
+                    }
                 }
             }
         }
@@ -336,6 +427,7 @@ public void InsertExplicitAccessModifiersOnStructs(IEnumerable<CodeItemStruct> s
         /// <returns>True if access modifier is explicitly specified, otherwise false.</returns>
         private static bool IsAccessModifierExplicitlySpecifiedOnCodeElement(string codeElementDeclaration, vsCMAccess accessModifier)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             string keyword = CodeElementHelper.GetAccessModifierKeyword(accessModifier);
 
             return IsKeywordSpecified(codeElementDeclaration, keyword);
@@ -349,6 +441,7 @@ private static bool IsAccessModifierExplicitlySpecifiedOnCodeElement(string code
         /// <returns>True if the keyword is present, otherwise false.</returns>
         private static bool IsKeywordSpecified(string codeElementDeclaration, string keyword)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             string matchString = @"(^|\s)" + keyword + @"\s";
 
             return RegexNullSafe.IsMatch(codeElementDeclaration, matchString);
@@ -356,4 +449,4 @@ private static bool IsKeywordSpecified(string codeElementDeclaration, string key
 
         #endregion Helper Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/InsertWhitespaceLogic.cs b/CodeMaidShared/Logic/Cleaning/InsertWhitespaceLogic.cs
index d745feca2..1c9c56c20 100644
--- a/CodeMaidShared/Logic/Cleaning/InsertWhitespaceLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/InsertWhitespaceLogic.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -52,6 +53,7 @@ private InsertWhitespaceLogic(CodeMaidPackage package)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void InsertBlankSpaceBeforeSelfClosingAngleBracket(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertBlankSpaceBeforeSelfClosingAngleBrackets) return;
 
             const string pattern = @"([^ \t])/>";
@@ -66,6 +68,7 @@ internal void InsertBlankSpaceBeforeSelfClosingAngleBracket(TextDocument textDoc
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void InsertEOFTrailingNewLine(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_InsertEndOfFileTrailingNewLine) return;
 
             EditPoint cursor = textDocument.EndPoint.CreateEditPoint();
@@ -78,4 +81,4 @@ internal void InsertEOFTrailingNewLine(TextDocument textDocument)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/RemoveRegionLogic.cs b/CodeMaidShared/Logic/Cleaning/RemoveRegionLogic.cs
index 8bc094f7d..4e935f77c 100644
--- a/CodeMaidShared/Logic/Cleaning/RemoveRegionLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/RemoveRegionLogic.cs
@@ -1,4 +1,4 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -60,6 +61,7 @@ private RemoveRegionLogic(CodeMaidPackage package)
         /// <returns>True if document can remove regions, otherwise false.</returns>
         internal bool CanRemoveRegions(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return _package.IDE.Debugger.CurrentMode == dbgDebugMode.dbgDesignMode &&
                    document != null &&
                    (document.GetCodeLanguage() == CodeLanguage.CSharp ||
@@ -72,6 +74,7 @@ internal bool CanRemoveRegions(Document document)
         /// <param name="textDocument">The text document to update.</param>
         internal void RemoveRegions(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Retrieve the regions and put them in reverse order (reduces line number updates during removal).
             var regions = _codeModelHelper.RetrieveCodeRegions(textDocument).OrderByDescending(x => x.StartLine);
 
@@ -79,7 +82,7 @@ internal void RemoveRegions(TextDocument textDocument)
             {
                 foreach (var region in regions)
                 {
-                    RemoveRegion(region);
+                    RemoveRegion(region, createTransaction: false);
                 }
             });
         }
@@ -90,6 +93,7 @@ internal void RemoveRegions(TextDocument textDocument)
         /// <param name="textSelection">The text selection to update.</param>
         internal void RemoveRegions(TextSelection textSelection)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Retrieve the regions and put them in reverse order (reduces line number updates during removal).
             var regions = _codeModelHelper.RetrieveCodeRegions(textSelection).OrderByDescending(x => x.StartLine);
 
@@ -97,7 +101,7 @@ internal void RemoveRegions(TextSelection textSelection)
             {
                 foreach (var region in regions)
                 {
-                    RemoveRegion(region);
+                    RemoveRegion(region, createTransaction: false);
                 }
             });
         }
@@ -108,12 +112,14 @@ internal void RemoveRegions(TextSelection textSelection)
         /// <param name="regions">The regions to update.</param>
         internal void RemoveRegions(IEnumerable<CodeItemRegion> regions)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             new UndoTransactionHelper(_package, Resources.CodeMaidRemoveRegions).Run(() =>
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 // Iterate through regions in reverse order (reduces line number updates during removal).
                 foreach (var region in regions.OrderByDescending(x => x.StartLine))
                 {
-                    RemoveRegion(region);
+                    RemoveRegion(region, createTransaction: false);
                 }
             });
         }
@@ -124,6 +130,7 @@ internal void RemoveRegions(IEnumerable<CodeItemRegion> regions)
         /// <param name="regions">The regions to update.</param>
         internal void RemoveRegionsPerSettings(IEnumerable<CodeItemRegion> regions)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var setting = (NoneEmptyAll)Settings.Default.Cleaning_RemoveRegions;
             if (setting == NoneEmptyAll.None) return;
 
@@ -136,7 +143,7 @@ internal void RemoveRegionsPerSettings(IEnumerable<CodeItemRegion> regions)
                     continue;
                 }
 
-                RemoveRegion(region);
+                RemoveRegion(region, createTransaction: false);
             }
         }
 
@@ -144,14 +151,15 @@ internal void RemoveRegionsPerSettings(IEnumerable<CodeItemRegion> regions)
         /// Removes the region tags from the specified region.
         /// </summary>
         /// <param name="region">The region to update.</param>
-        internal void RemoveRegion(CodeItemRegion region)
+        internal void RemoveRegion(CodeItemRegion region, bool createTransaction = true)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (region == null || region.IsInvalidated || region.IsPseudoGroup || region.StartLine <= 0 || region.EndLine <= 0)
             {
                 return;
             }
 
-            new UndoTransactionHelper(_package, Resources.CodeMaidRemoveRegion + region.Name).Run(() =>
+            Action removeAction = () =>
             {
                 var end = region.EndPoint.CreateEditPoint();
                 end.StartOfLine();
@@ -166,9 +174,18 @@ internal void RemoveRegion(CodeItemRegion region)
                 start.Insert(Environment.NewLine);
 
                 region.IsInvalidated = true;
-            });
+            };
+
+            if (createTransaction)
+            {
+                new UndoTransactionHelper(_package, Resources.CodeMaidRemoveRegion + region.Name).Run(removeAction);
+            }
+            else
+            {
+                removeAction();
+            }
         }
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/RemoveWhitespaceLogic.cs b/CodeMaidShared/Logic/Cleaning/RemoveWhitespaceLogic.cs
index be0d1ad92..6b261f4f1 100644
--- a/CodeMaidShared/Logic/Cleaning/RemoveWhitespaceLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/RemoveWhitespaceLogic.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -52,6 +53,7 @@ private RemoveWhitespaceLogic(CodeMaidPackage package)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankLinesAtBottom(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankLinesAtBottom) return;
 
             EditPoint cursor = textDocument.EndPoint.CreateEditPoint();
@@ -64,6 +66,7 @@ internal void RemoveBlankLinesAtBottom(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankLinesAtTop(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankLinesAtTop) return;
 
             EditPoint cursor = textDocument.StartPoint.CreateEditPoint();
@@ -76,6 +79,7 @@ internal void RemoveBlankLinesAtTop(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankLinesAfterAttributes(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankLinesAfterAttributes) return;
 
             const string pattern = @"(^[ \t]*\[[^\]]+\][ \t]*(//[^\r\n]*)*)(\r?\n){2}(?![ \t]*//)";
@@ -90,6 +94,7 @@ internal void RemoveBlankLinesAfterAttributes(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankLinesAfterOpeningBrace(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankLinesAfterOpeningBrace) return;
 
             const string pattern = @"\{([ \t]*(//[^\r\n]*)*)(\r?\n){2,}";
@@ -104,6 +109,7 @@ internal void RemoveBlankLinesAfterOpeningBrace(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankLinesBeforeClosingBrace(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankLinesBeforeClosingBrace) return;
 
             const string pattern = @"(\r?\n){2,}([ \t]*)\}";
@@ -118,6 +124,7 @@ internal void RemoveBlankLinesBeforeClosingBrace(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankLinesBeforeClosingTag(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankLinesBeforeClosingTags) return;
 
             const string pattern = @"(\r?\n){2,}([ \t]*)</";
@@ -132,6 +139,7 @@ internal void RemoveBlankLinesBeforeClosingTag(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankLinesBetweenChainedStatements(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankLinesBetweenChainedStatements) return;
 
             const string pattern = @"(\r?\n){2,}([ \t]*)(else|catch|finally)( |\t|\r?\n)";
@@ -146,6 +154,7 @@ internal void RemoveBlankLinesBetweenChainedStatements(TextDocument textDocument
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveBlankSpacesBeforeClosingAngleBracket(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveBlankSpacesBeforeClosingAngleBrackets) return;
 
             // Remove blank spaces before regular closing angle brackets.
@@ -177,6 +186,7 @@ internal void RemoveBlankSpacesBeforeClosingAngleBracket(TextDocument textDocume
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveEOFTrailingNewLine(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveEndOfFileTrailingNewLine) return;
 
             EditPoint cursor = textDocument.EndPoint.CreateEditPoint();
@@ -185,6 +195,7 @@ internal void RemoveEOFTrailingNewLine(TextDocument textDocument)
             {
                 // Make an exception for C++ resource files to work-around known EOF issue: http://connect.microsoft.com/VisualStudio/feedback/details/173903/resource-compiler-returns-a-rc1004-unexpected-eof-found-error#details
                 if (textDocument.GetCodeLanguage() == CodeLanguage.CPlusPlus &&
+                    textDocument.Parent != null &&
                     (textDocument.Parent.FullName.EndsWith(".h") || textDocument.Parent.FullName.EndsWith(".rc2")))
                 {
                     return;
@@ -202,6 +213,7 @@ internal void RemoveEOFTrailingNewLine(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveEOLWhitespace(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveEndOfLineWhitespace) return;
 
             const string pattern = @"[ \t]+\r?\n";
@@ -216,6 +228,7 @@ internal void RemoveEOLWhitespace(TextDocument textDocument)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void RemoveMultipleConsecutiveBlankLines(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RemoveMultipleConsecutiveBlankLines) return;
 
             const string pattern = @"(\r?\n){3,}";
@@ -226,4 +239,4 @@ internal void RemoveMultipleConsecutiveBlankLines(TextDocument textDocument)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/UpdateLogic.cs b/CodeMaidShared/Logic/Cleaning/UpdateLogic.cs
index a4651b080..6047a6276 100644
--- a/CodeMaidShared/Logic/Cleaning/UpdateLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/UpdateLogic.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -62,6 +63,7 @@ private UpdateLogic(CodeMaidPackage package)
         /// <param name="textDocument">The text document to cleanup.</param>
         internal void UpdateEndRegionDirectives(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_UpdateEndRegionDirectives) return;
 
             var regionStack = new Stack<string>();
@@ -108,16 +110,16 @@ internal void UpdateEndRegionDirectives(TextDocument textDocument)
                             cursor.Delete(eolCursor);
                             cursor.Insert(" " + matchingRegion);
                         }
+                        else
+                        {
+                            // This document is improperly formatted, but we continue processing instead of aborting.
+                            OutputWindowHelper.DiagnosticWriteLine("Improperly formatted endregion directive found; skipping this directive.");
+                        }
                     }
-                    else
-                    {
-                        // This document is improperly formatted, abort.
-                        return;
-                    }
-                }
 
-                // Note: eolCursor may be outdated now if changes have been made.
-                cursor.EndOfLine();
+                    // Note: eolCursor may be outdated now if changes have been made.
+                    cursor.EndOfLine();
+                }
             }
         }
 
@@ -127,24 +129,29 @@ internal void UpdateEndRegionDirectives(TextDocument textDocument)
         /// <param name="events">The events to update.</param>
         internal void UpdateEventAccessorsToBothBeSingleLineOrMultiLine(IEnumerable<CodeItemEvent> events)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_UpdateAccessorsToBothBeSingleLineOrMultiLine) return;
 
             foreach (var item in events)
             {
+                if (item?.CodeEvent == null) continue;
                 UpdateAccessorsToBothBeSingleLineOrMultiLine(item.CodeEvent.Adder, item.CodeEvent.Remover);
             }
         }
 
+
         /// <summary>
         /// Updates the property accessors to either both be single-line or multi-line.
         /// </summary>
         /// <param name="properties">The properties to update.</param>
         internal void UpdatePropertyAccessorsToBothBeSingleLineOrMultiLine(IEnumerable<CodeItemProperty> properties)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_UpdateAccessorsToBothBeSingleLineOrMultiLine) return;
 
             foreach (var item in properties)
             {
+                if (item?.CodeProperty == null) continue;
                 UpdateAccessorsToBothBeSingleLineOrMultiLine(item.CodeProperty.Getter, item.CodeProperty.Setter);
             }
         }
@@ -155,9 +162,10 @@ internal void UpdatePropertyAccessorsToBothBeSingleLineOrMultiLine(IEnumerable<C
         /// <param name="methods">The methods to update.</param>
         internal void UpdateSingleLineMethods(IEnumerable<CodeItemMethod> methods)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_UpdateSingleLineMethods) return;
 
-            var singleLineMethods = methods.Where(x => x.StartPoint.Line == x.EndPoint.Line && x.OverrideKind != vsCMOverrideKind.vsCMOverrideKindAbstract && !(x.CodeFunction.Parent is CodeInterface));
+            var singleLineMethods = methods.Where(x => x != null && x.CodeFunction != null && x.StartPoint.Line == x.EndPoint.Line && x.OverrideKind != vsCMOverrideKind.vsCMOverrideKindAbstract && !(x.CodeFunction.Parent is CodeInterface));
             foreach (var singleLineMethod in singleLineMethods)
             {
                 SpreadSingleLineMethodOntoMultipleLines(singleLineMethod.CodeFunction);
@@ -170,6 +178,7 @@ internal void UpdateSingleLineMethods(IEnumerable<CodeItemMethod> methods)
         /// <param name="method">The method to update.</param>
         private void JoinMultiLineMethodOntoSingleLine(CodeFunction method)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var start = method.StartPoint.CreateEditPoint();
             var end = method.EndPoint.CreateEditPoint();
 
@@ -186,6 +195,7 @@ private void JoinMultiLineMethodOntoSingleLine(CodeFunction method)
         /// <param name="method">The method to update.</param>
         private void SpreadSingleLineMethodOntoMultipleLines(CodeFunction method)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 var start = method.GetStartPoint(vsCMPart.vsCMPartBody).CreateEditPoint();
@@ -220,6 +230,7 @@ private void SpreadSingleLineMethodOntoMultipleLines(CodeFunction method)
         /// <param name="second">The second accessor.</param>
         private void UpdateAccessorsToBothBeSingleLineOrMultiLine(CodeFunction first, CodeFunction second)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (first == null || second == null) return;
 
             bool isFirstSingleLine = first.StartPoint.Line == first.EndPoint.Line;
@@ -257,4 +268,4 @@ private void UpdateAccessorsToBothBeSingleLineOrMultiLine(CodeFunction first, Co
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Cleaning/UsingStatementCleanupLogic.cs b/CodeMaidShared/Logic/Cleaning/UsingStatementCleanupLogic.cs
index f83dfd305..2b0f94dcd 100644
--- a/CodeMaidShared/Logic/Cleaning/UsingStatementCleanupLogic.cs
+++ b/CodeMaidShared/Logic/Cleaning/UsingStatementCleanupLogic.cs
@@ -3,6 +3,7 @@
 using SteveCadwallader.CodeMaid.Properties;
 using System;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Cleaning
 {
@@ -67,6 +68,7 @@ private UsingStatementCleanupLogic(CodeMaidPackage package)
         /// <param name="textDocument">The text document to update.</param>
         public void RemoveAndSortUsingStatements(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Cleaning_RunVisualStudioRemoveAndSortUsingStatements) return;
             if (_package.IsAutoSaveContext && Settings.Default.Cleaning_SkipRemoveAndSortUsingStatementsDuringAutoCleanupOnSave) return;
 
@@ -74,14 +76,14 @@ public void RemoveAndSortUsingStatements(TextDocument textDocument)
             const string patternFormat = @"^[ \t]*{0}[ \t]*\r?\n";
 
             var usingStatementsToReinsert = _usingStatementsToReinsertWhenRemoved.Value
-                .Where(usingStatement => TextDocumentHelper.FirstOrDefaultMatch(textDocument, string.Format(patternFormat, usingStatement)) != null)
+                .Where(usingStatement => TextDocumentHelper.FirstOrDefaultMatch(textDocument, string.Format(patternFormat, System.Text.RegularExpressions.Regex.Escape(usingStatement))) != null)
                 .ToList();
 
             _commandHelper.ExecuteCommand(textDocument, "EditorContextMenus.CodeWindow.RemoveAndSort");
 
             // Ignore any using statements that are still referenced
             usingStatementsToReinsert = usingStatementsToReinsert
-                 .Where(usingStatement => TextDocumentHelper.FirstOrDefaultMatch(textDocument, string.Format(patternFormat, usingStatement)) == null)
+                 .Where(usingStatement => TextDocumentHelper.FirstOrDefaultMatch(textDocument, string.Format(patternFormat, System.Text.RegularExpressions.Regex.Escape(usingStatement))) == null)
                  .ToList();
 
             if (usingStatementsToReinsert.Count > 0)
@@ -102,4 +104,4 @@ public void RemoveAndSortUsingStatements(TextDocument textDocument)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Digging/OutliningSynchronizationManager.cs b/CodeMaidShared/Logic/Digging/OutliningSynchronizationManager.cs
index 48fd457fe..7f3c97e9a 100644
--- a/CodeMaidShared/Logic/Digging/OutliningSynchronizationManager.cs
+++ b/CodeMaidShared/Logic/Digging/OutliningSynchronizationManager.cs
@@ -60,6 +60,7 @@ public Document Document
             get { return _document; }
             set
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 if (_document != value)
                 {
                     if (_document != null && _outliningManager != null)
@@ -92,6 +93,7 @@ public Document Document
         /// <param name="codeItems">The code items.</param>
         public void UpdateCodeItems(SetCodeItems codeItems)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             TearDownCodeItemParents();
 
             // Retrieve and cache an updated list of code item parents.
@@ -111,6 +113,7 @@ public void UpdateCodeItems(SetCodeItems codeItems)
         /// <param name="eventArgs">The event arguments.</param>
         private void OnCodeItemParentIsExpandedChanged(object sender, EventArgs eventArgs)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (sender is ICodeItemParent codeItemParent)
             {
                 var iCollapsible = FindCollapsibleFromCodeItemParent(codeItemParent);
@@ -189,6 +192,7 @@ private ICodeItemParent FindCodeItemParentFromCollapsible(ICollapsible collapsib
         /// <returns>The <see cref="ICollapsible" /> on the same starting line, otherwise null.</returns>
         private ICollapsible FindCollapsibleFromCodeItemParent(ICodeItemParent parent)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (_outliningManager == null || _wpfTextView == null)
             {
                 return null;
@@ -234,6 +238,7 @@ private static int GetStartLineForCollapsible(ICollapsible collapsible)
         /// <returns>The associated outlining manager, otherwise null.</returns>
         private IOutliningManager GetOutliningManager(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 _wpfTextView = GetWpfTextView(document);
@@ -257,6 +262,7 @@ private IOutliningManager GetOutliningManager(Document document)
         /// <returns>The associated WPF text view, otherwise null.</returns>
         private IWpfTextView GetWpfTextView(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textView = GetTextView(document);
             if (textView != null && _editorAdaptersFactoryService != null)
             {
@@ -273,6 +279,7 @@ private IWpfTextView GetWpfTextView(Document document)
         /// <returns>The associated text view, otherwise null.</returns>
         private IVsTextView GetTextView(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (document == null)
             {
                 return null;
@@ -309,6 +316,7 @@ private static IEnumerable<ICodeItemParent> RecursivelyGetAllCodeItemParents(Set
         /// </summary>
         private void InitializeCodeItemParents()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             foreach (var codeItemParent in _codeItemParents ?? Enumerable.Empty<ICodeItemParent>())
             {
                 var iCollapsible = FindCollapsibleFromCodeItemParent(codeItemParent);
@@ -345,6 +353,7 @@ private void TearDownCodeItemParents()
         /// </summary>
         public void Dispose()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             TearDownCodeItemParents();
 
             Document = null;
@@ -352,4 +361,4 @@ public void Dispose()
 
         #endregion Implementation of IDisposable
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Formatting/CommentFormatLogic.cs b/CodeMaidShared/Logic/Formatting/CommentFormatLogic.cs
index 318037f88..e47a82005 100644
--- a/CodeMaidShared/Logic/Formatting/CommentFormatLogic.cs
+++ b/CodeMaidShared/Logic/Formatting/CommentFormatLogic.cs
@@ -1,9 +1,10 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.Comments;
 using SteveCadwallader.CodeMaid.Model.Comments.Options;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Formatting
 {
@@ -44,6 +45,7 @@ private CommentFormatLogic(CodeMaidPackage package)
         /// <param name="textDocument">The text document.</param>
         public void FormatComments(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Formatting_CommentRunDuringCleanup) return;
 
             FormatComments(textDocument, textDocument.StartPoint.CreateEditPoint(), textDocument.EndPoint.CreateEditPoint());
@@ -58,12 +60,14 @@ public void FormatComments(TextDocument textDocument)
         /// <param name="end">The end point.</param>
         public bool FormatComments(TextDocument textDocument, EditPoint start, EditPoint end)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             bool foundComments = false;
 
             var options = FormatterOptions
                 .FromSettings(Settings.Default)
                 .Set(o =>
                 {
+                    ThreadHelper.ThrowIfNotOnUIThread();
                     o.TabSize = textDocument.TabSize;
                     o.IgnoreTokens = CodeCommentHelper
                         .GetTaskListTokens(_package)
@@ -113,4 +117,4 @@ internal static CommentFormatLogic GetInstance(CodeMaidPackage package)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Reorganizing/CodeReorganizationAvailabilityLogic.cs b/CodeMaidShared/Logic/Reorganizing/CodeReorganizationAvailabilityLogic.cs
index 35976e8dd..dad0fbcd5 100644
--- a/CodeMaidShared/Logic/Reorganizing/CodeReorganizationAvailabilityLogic.cs
+++ b/CodeMaidShared/Logic/Reorganizing/CodeReorganizationAvailabilityLogic.cs
@@ -1,9 +1,10 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using SteveCadwallader.CodeMaid.UI.Dialogs.Prompts;
 using SteveCadwallader.CodeMaid.UI.Enumerations;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Reorganizing
 {
@@ -56,6 +57,7 @@ private CodeReorganizationAvailabilityLogic(CodeMaidPackage package)
         /// <returns>True if item can be reorganized, otherwise false.</returns>
         internal bool CanReorganize(Document document, bool allowUserPrompts = false)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!IsReorganizationEnvironmentAvailable())
             {
                 OutputWindowHelper.DiagnosticWriteLine($"CodeReorganizationAvailabilityLogic.CanReorganize returned false due to the reorganization environment not being available.");
@@ -95,6 +97,7 @@ internal bool CanReorganize(Document document, bool allowUserPrompts = false)
         /// <returns>True if reorganization can occur, false otherwise.</returns>
         internal bool IsReorganizationEnvironmentAvailable()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             return _package.IDE.Debugger.CurrentMode == dbgDebugMode.dbgDesignMode;
         }
 
@@ -113,6 +116,7 @@ internal bool IsReorganizationEnvironmentAvailable()
         /// </returns>
         private bool IsDocumentExcludedBecausePreprocessorConditionals(Document document, bool allowUserPrompts)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!HasPreprocessorConditionalCompilationDirectives(document)) return false;
 
             switch ((AskYesNo)Settings.Default.Reorganizing_PerformWhenPreprocessorConditionals)
@@ -142,6 +146,7 @@ private bool IsDocumentExcludedBecausePreprocessorConditionals(Document document
         /// <returns>True if preprocessor conditional compilation directives are detected, otherwise false.</returns>
         private bool HasPreprocessorConditionalCompilationDirectives(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var textDocument = document.GetTextDocument();
             if (textDocument != null)
             {
@@ -164,6 +169,7 @@ private bool HasPreprocessorConditionalCompilationDirectives(Document document)
         /// <returns>True if files with preprocessor conditionals should be reorganized, otherwise false.</returns>
         private static bool PromptUserAboutReorganizingPreprocessorConditionals(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 var viewModel = new YesNoPromptViewModel
@@ -203,4 +209,4 @@ private static bool PromptUserAboutReorganizingPreprocessorConditionals(Document
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Reorganizing/CodeReorganizationManager.cs b/CodeMaidShared/Logic/Reorganizing/CodeReorganizationManager.cs
index e333e76bc..0807953b8 100644
--- a/CodeMaidShared/Logic/Reorganizing/CodeReorganizationManager.cs
+++ b/CodeMaidShared/Logic/Reorganizing/CodeReorganizationManager.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Reorganizing
 {
@@ -73,6 +74,7 @@ private CodeReorganizationManager(CodeMaidPackage package)
         /// <param name="baseItem">The base item.</param>
         internal void MoveItemAboveBase(BaseCodeItem itemToMove, BaseCodeItem baseItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             new UndoTransactionHelper(_package, Resources.CodeMaidMoveItemAbove).Run(
                 () => RepositionItemAboveBase(itemToMove, baseItem));
         }
@@ -84,6 +86,7 @@ internal void MoveItemAboveBase(BaseCodeItem itemToMove, BaseCodeItem baseItem)
         /// <param name="baseItem">The base item.</param>
         internal void MoveItemBelowBase(BaseCodeItem itemToMove, BaseCodeItem baseItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             new UndoTransactionHelper(_package, Resources.CodeMaidMoveItemBelow).Run(
                 () => RepositionItemBelowBase(itemToMove, baseItem));
         }
@@ -95,6 +98,7 @@ internal void MoveItemBelowBase(BaseCodeItem itemToMove, BaseCodeItem baseItem)
         /// <param name="baseItem">The base item.</param>
         internal void MoveItemIntoBase(BaseCodeItem itemToMove, ICodeItemParent baseItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             new UndoTransactionHelper(_package, Resources.CodeMaidMoveItemInto).Run(
                 () => RepositionItemIntoBase(itemToMove, baseItem));
         }
@@ -105,6 +109,7 @@ internal void MoveItemIntoBase(BaseCodeItem itemToMove, ICodeItemParent baseItem
         /// <param name="document">The document for reorganizing.</param>
         internal void Reorganize(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!_codeReorganizationAvailabilityLogic.CanReorganize(document, true)) return;
 
             new UndoTransactionHelper(_package, string.Format(Resources.CodeMaidReorganizeFor0, document.Name)).Run(
@@ -139,6 +144,7 @@ internal void Reorganize(Document document)
         /// <returns>The set of reorganizable code item elements.</returns>
         private static IList<BaseCodeItemElement> GetReorganizableCodeItemElements(IEnumerable<BaseCodeItem> codeItems)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get all code item elements.
             var codeItemElements = codeItems.OfType<BaseCodeItemElement>().ToList();
 
@@ -160,6 +166,7 @@ private static IList<BaseCodeItemElement> GetReorganizableCodeItemElements(IEnum
         /// </param>
         private static string GetTextAndRemoveItem(BaseCodeItem itemToRemove, out int cursorOffset)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Refresh the code item and capture its end points.
             itemToRemove.RefreshCachedPositionAndName();
             var removeStartPoint = itemToRemove.StartPoint;
@@ -205,6 +212,7 @@ private bool ShouldBeSeparatedByNewLine(BaseCodeItem firstItem, BaseCodeItem sec
         /// <returns>True if the parent's children should be reorganized, otherwise false.</returns>
         private bool ShouldReorganizeChildren(BaseCodeItemElement parent)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Enumeration values should never be reordered.
             if (parent is CodeItemEnum)
             {
@@ -237,6 +245,7 @@ private bool ShouldReorganizeChildren(BaseCodeItemElement parent)
         /// <param name="baseItem">The base item.</param>
         private void RepositionItemAboveBase(BaseCodeItem itemToMove, BaseCodeItem baseItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (itemToMove == baseItem) return;
 
             bool separateWithNewLine = ShouldBeSeparatedByNewLine(itemToMove, baseItem);
@@ -272,6 +281,7 @@ private void RepositionItemAboveBase(BaseCodeItem itemToMove, BaseCodeItem baseI
         /// <param name="baseItem">The base item.</param>
         private void RepositionItemBelowBase(BaseCodeItem itemToMove, BaseCodeItem baseItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (itemToMove == baseItem) return;
 
             bool separateWithNewLine = ShouldBeSeparatedByNewLine(baseItem, itemToMove);
@@ -311,6 +321,7 @@ private void RepositionItemBelowBase(BaseCodeItem itemToMove, BaseCodeItem baseI
         /// <param name="baseItem">The base item.</param>
         private void RepositionItemIntoBase(BaseCodeItem itemToMove, ICodeItemParent baseItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (itemToMove == baseItem) return;
 
             bool padWithNewLine = _insertBlankLinePaddingLogic.ShouldBeFollowedByBlankLine(itemToMove);
@@ -346,6 +357,7 @@ private void RepositionItemIntoBase(BaseCodeItem itemToMove, ICodeItemParent bas
         /// <param name="parent">The parent to the code items, otherwise null.</param>
         private void RecursivelyReorganize(IEnumerable<BaseCodeItem> codeItems, ICodeItemParent parent = null)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!codeItems.Any())
             {
                 // If there are no code items, the only action we may want to take is conditionally insert regions.
@@ -405,6 +417,7 @@ private void RecursivelyReorganize(IEnumerable<BaseCodeItem> codeItems, ICodeIte
         /// <returns>An updated code items collection.</returns>
         private IEnumerable<BaseCodeItem> RegionsRemoveExisting(IEnumerable<BaseCodeItem> codeItems)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!Settings.Default.Reorganizing_RegionsRemoveExistingRegions)
             {
                 return codeItems;
@@ -479,6 +492,7 @@ private IEnumerable<BaseCodeItem> RegionsFlatten(IEnumerable<BaseCodeItem> codeI
         /// <param name="parent">The parent to the code items, otherwise null.</param>
         private void RegionsInsert(IEnumerable<BaseCodeItem> codeItems, ICodeItemParent parent)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (Settings.Default.Reorganizing_RegionsInsertNewRegions)
             {
                 // Only insert regions when directly inside the scope of a class, interface or struct.
@@ -491,4 +505,4 @@ private void RegionsInsert(IEnumerable<BaseCodeItem> codeItems, ICodeItemParent
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Logic/Reorganizing/GenerateRegionLogic.cs b/CodeMaidShared/Logic/Reorganizing/GenerateRegionLogic.cs
index 3da5e7c92..c01bb6cf0 100644
--- a/CodeMaidShared/Logic/Reorganizing/GenerateRegionLogic.cs
+++ b/CodeMaidShared/Logic/Reorganizing/GenerateRegionLogic.cs
@@ -1,4 +1,4 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Logic.Cleaning;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Thread = System.Threading.Thread;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Logic.Reorganizing
 {
@@ -92,6 +93,7 @@ public IEnumerable<CodeItemRegion> GetRegionsToRemove(IEnumerable<BaseCodeItem>
         /// <param name="insertPoint">The default insertion point.</param>
         public void InsertRegions(IEnumerable<BaseCodeItem> codeItems, EditPoint insertPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Refresh and sort the code items.
             foreach (var codeItem in codeItems)
             {
@@ -168,6 +170,7 @@ public void InsertRegions(IEnumerable<BaseCodeItem> codeItems, EditPoint insertP
         /// <returns>The updated cursor.</returns>
         public EditPoint InsertRegionTag(CodeItemRegion region, EditPoint startPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var cursor = startPoint.CreateEditPoint();
 
             // If the cursor is not preceeded only by whitespace, insert a new line.
@@ -200,6 +203,7 @@ public EditPoint InsertRegionTag(CodeItemRegion region, EditPoint startPoint)
         /// <returns>The updated cursor.</returns>
         public EditPoint InsertEndRegionTag(CodeItemRegion region, EditPoint endPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var cursor = endPoint.CreateEditPoint();
 
             // If the cursor is not preceeded only by whitespace, insert a new line.
@@ -352,4 +356,4 @@ private CodeItemRegion ComposeRegionForCodeItem(BaseCodeItem codeItem)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/BaseCodeItem.cs b/CodeMaidShared/Model/CodeItems/BaseCodeItem.cs
index aa5e15702..330667053 100644
--- a/CodeMaidShared/Model/CodeItems/BaseCodeItem.cs
+++ b/CodeMaidShared/Model/CodeItems/BaseCodeItem.cs
@@ -1,6 +1,7 @@
 using EnvDTE;
 using SteveCadwallader.CodeMaid.UI;
 using System.Diagnostics;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -74,6 +75,7 @@ public virtual void LoadLazyInitializedValues()
         /// </summary>
         public virtual void RefreshCachedPositionAndName()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             StartLine = StartPoint.Line;
             StartOffset = StartPoint.AbsoluteCharOffset;
             EndLine = EndPoint.Line;
@@ -82,4 +84,4 @@ public virtual void RefreshCachedPositionAndName()
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/BaseCodeItemElement.cs b/CodeMaidShared/Model/CodeItems/BaseCodeItemElement.cs
index 595e40810..0c5734851 100644
--- a/CodeMaidShared/Model/CodeItems/BaseCodeItemElement.cs
+++ b/CodeMaidShared/Model/CodeItems/BaseCodeItemElement.cs
@@ -2,6 +2,7 @@
 using SteveCadwallader.CodeMaid.Helpers;
 using System;
 using System.Threading;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -67,6 +68,7 @@ public override void LoadLazyInitializedValues()
         /// </summary>
         public override void RefreshCachedPositionAndName()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var startPoint = CodeElement.GetStartPoint();
             var endPoint = CodeElement.GetEndPoint();
 
@@ -154,6 +156,7 @@ protected static T TryDefault<T>(Func<T> func)
         /// <returns>The adjusted starting point.</returns>
         private static EditPoint GetStartPointAdjustedForComments(TextPoint originalPoint)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var commentPrefix = CodeCommentHelper.GetCommentPrefix(originalPoint.Parent);
             var point = originalPoint.CreateEditPoint();
 
@@ -177,4 +180,4 @@ private static EditPoint GetStartPointAdjustedForComments(TextPoint originalPoin
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/CodeItemClass.cs b/CodeMaidShared/Model/CodeItems/CodeItemClass.cs
index 8e0c95798..61bc6798d 100644
--- a/CodeMaidShared/Model/CodeItems/CodeItemClass.cs
+++ b/CodeMaidShared/Model/CodeItems/CodeItemClass.cs
@@ -1,6 +1,7 @@
 using EnvDTE;
 using EnvDTE80;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -55,4 +56,4 @@ public CodeItemClass()
 
         #endregion Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/CodeItemEvent.cs b/CodeMaidShared/Model/CodeItems/CodeItemEvent.cs
index 78003dc65..63db26ad6 100644
--- a/CodeMaidShared/Model/CodeItems/CodeItemEvent.cs
+++ b/CodeMaidShared/Model/CodeItems/CodeItemEvent.cs
@@ -2,6 +2,7 @@
 using EnvDTE80;
 using SteveCadwallader.CodeMaid.Helpers;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -79,4 +80,4 @@ public override void LoadLazyInitializedValues()
 
         #endregion Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/CodeItemField.cs b/CodeMaidShared/Model/CodeItems/CodeItemField.cs
index e475e1afa..fa8a37c77 100644
--- a/CodeMaidShared/Model/CodeItems/CodeItemField.cs
+++ b/CodeMaidShared/Model/CodeItems/CodeItemField.cs
@@ -1,6 +1,7 @@
 using EnvDTE;
 using EnvDTE80;
 using System;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -96,4 +97,4 @@ public override void LoadLazyInitializedValues()
 
         #endregion Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/CodeItemMethod.cs b/CodeMaidShared/Model/CodeItems/CodeItemMethod.cs
index d11909bf4..75427dbd9 100644
--- a/CodeMaidShared/Model/CodeItems/CodeItemMethod.cs
+++ b/CodeMaidShared/Model/CodeItems/CodeItemMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -147,4 +148,4 @@ public override void LoadLazyInitializedValues()
 
         #endregion Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/CodeItemProperty.cs b/CodeMaidShared/Model/CodeItems/CodeItemProperty.cs
index 8277b5c64..29067dd30 100644
--- a/CodeMaidShared/Model/CodeItems/CodeItemProperty.cs
+++ b/CodeMaidShared/Model/CodeItems/CodeItemProperty.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -113,4 +114,4 @@ public override void LoadLazyInitializedValues()
 
         #endregion Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/CodeItemRegion.cs b/CodeMaidShared/Model/CodeItems/CodeItemRegion.cs
index e8b77c816..bb5aac1f3 100644
--- a/CodeMaidShared/Model/CodeItems/CodeItemRegion.cs
+++ b/CodeMaidShared/Model/CodeItems/CodeItemRegion.cs
@@ -1,6 +1,7 @@
 using EnvDTE;
 using System;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -55,6 +56,7 @@ public EditPoint InsertPoint
         {
             get
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 var startPoint = StartPoint;
                 if (startPoint != null)
                 {
@@ -96,6 +98,7 @@ public bool IsEmpty
         {
             get
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 if (Children.Any())
                 {
                     return false;
@@ -125,4 +128,4 @@ public bool IsEmpty
 
         #endregion Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeItems/FactoryCodeItems.cs b/CodeMaidShared/Model/CodeItems/FactoryCodeItems.cs
index 9750d9f1c..7a8923317 100644
--- a/CodeMaidShared/Model/CodeItems/FactoryCodeItems.cs
+++ b/CodeMaidShared/Model/CodeItems/FactoryCodeItems.cs
@@ -1,5 +1,6 @@
 using EnvDTE;
 using EnvDTE80;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.CodeItems
 {
@@ -15,6 +16,7 @@ public static class FactoryCodeItems
         /// <returns>A generated code item element, otherwise null.</returns>
         public static BaseCodeItemElement CreateCodeItemElement(CodeElement codeElement)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (codeElement == null) return null;
 
             BaseCodeItemElement codeItem;
@@ -76,4 +78,4 @@ public static BaseCodeItemElement CreateCodeItemElement(CodeElement codeElement)
             return codeItem;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeModel.cs b/CodeMaidShared/Model/CodeModel.cs
index 130208d7e..0b3167699 100644
--- a/CodeMaidShared/Model/CodeModel.cs
+++ b/CodeMaidShared/Model/CodeModel.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using System.Threading;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model
 {
@@ -53,6 +54,7 @@ internal bool IsBuilding
             get { return _isBuilding; }
             set
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 if (_isBuilding != value)
                 {
                     OutputWindowHelper.DiagnosticWriteLine($"CodeModel.IsBuilding changing to '{value}' for '{Document.FullName}'");
@@ -83,6 +85,7 @@ internal bool IsStale
             get { return _isStale; }
             set
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 if (_isStale != value)
                 {
                     OutputWindowHelper.DiagnosticWriteLine($"CodeModel.IsStale changing to '{value}' for '{Document.FullName}'");
@@ -94,4 +97,4 @@ internal bool IsStale
 
         #endregion Properties
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeModelBuilder.cs b/CodeMaidShared/Model/CodeModelBuilder.cs
index c04a11280..1440680bb 100644
--- a/CodeMaidShared/Model/CodeModelBuilder.cs
+++ b/CodeMaidShared/Model/CodeModelBuilder.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model
 {
@@ -57,6 +58,7 @@ internal static CodeModelBuilder GetInstance(CodeMaidPackage package)
         /// <returns>The set of code items within the document, including regions.</returns>
         internal SetCodeItems RetrieveAllCodeItems(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var codeItems = new SetCodeItems();
 
             var fileCodeModel = RetrieveFileCodeModel(document.ProjectItem);
@@ -78,6 +80,7 @@ internal SetCodeItems RetrieveAllCodeItems(Document document)
         /// <returns>The associated FileCodeModel, otherwise null.</returns>
         private FileCodeModel RetrieveFileCodeModel(ProjectItem projectItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (projectItem == null)
             {
                 return null;
@@ -112,6 +115,7 @@ private FileCodeModel RetrieveFileCodeModel(ProjectItem projectItem)
         /// <param name="fcm">The FileCodeModel to walk.</param>
         private static void RetrieveCodeItems(SetCodeItems codeItems, FileCodeModel fcm)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (fcm != null && fcm.CodeElements != null)
             {
                 RetrieveCodeItemsFromElements(codeItems, fcm.CodeElements);
@@ -125,6 +129,7 @@ private static void RetrieveCodeItems(SetCodeItems codeItems, FileCodeModel fcm)
         /// <param name="codeElements">The CodeElements to walk.</param>
         private static void RetrieveCodeItemsFromElements(SetCodeItems codeItems, CodeElements codeElements)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             foreach (CodeElement child in codeElements)
             {
                 RetrieveCodeItemsRecursively(codeItems, child);
@@ -139,6 +144,7 @@ private static void RetrieveCodeItemsFromElements(SetCodeItems codeItems, CodeEl
         /// <param name="codeElement">The CodeElement to walk (add and recurse).</param>
         private static void RetrieveCodeItemsRecursively(SetCodeItems codeItems, CodeElement codeElement)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var parentCodeItem = FactoryCodeItems.CreateCodeItemElement(codeElement);
             if (parentCodeItem != null)
             {
@@ -153,4 +159,4 @@ private static void RetrieveCodeItemsRecursively(SetCodeItems codeItems, CodeEle
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeModelCache.cs b/CodeMaidShared/Model/CodeModelCache.cs
index 2bbbffe2d..589a8dfd9 100644
--- a/CodeMaidShared/Model/CodeModelCache.cs
+++ b/CodeMaidShared/Model/CodeModelCache.cs
@@ -1,7 +1,8 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Collections.Generic;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model
 {
@@ -38,6 +39,7 @@ internal CodeModelCache()
         /// <returns>A code model representing the document.</returns>
         internal CodeModel GetCodeModel(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             CodeModel codeModel;
 
             OutputWindowHelper.DiagnosticWriteLine($"CodeModelCache.GetCodeModel for '{document.FullName}'");
@@ -71,6 +73,7 @@ internal CodeModel GetCodeModel(Document document)
         /// <param name="document">The document.</param>
         internal void RemoveCodeModel(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             lock (_cache)
             {
                 if (_cache.Remove(document.FullName))
@@ -86,6 +89,7 @@ internal void RemoveCodeModel(Document document)
         /// <param name="document">The document.</param>
         internal void StaleCodeModel(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (_cache.TryGetValue(document.FullName, out CodeModel codeModel))
             {
                 codeModel.IsStale = true;
@@ -95,4 +99,4 @@ internal void StaleCodeModel(Document document)
 
         #endregion Internal Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeModelHelper.cs b/CodeMaidShared/Model/CodeModelHelper.cs
index 391cb3200..56e8c10f5 100644
--- a/CodeMaidShared/Model/CodeModelHelper.cs
+++ b/CodeMaidShared/Model/CodeModelHelper.cs
@@ -1,8 +1,9 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model
 {
@@ -86,6 +87,7 @@ internal static IEnumerable<IList<T>> GetCodeItemBlocks<T>(IEnumerable<T> codeIt
         /// <returns>True if there is a region under the cursor, otherwise false.</returns>
         internal bool IsCodeRegionUnderCursor(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (textDocument != null && textDocument.Selection != null)
             {
                 var cursor = textDocument.GetEditPointAtCursor();
@@ -104,6 +106,7 @@ internal bool IsCodeRegionUnderCursor(TextDocument textDocument)
         /// <returns>An enumerable collection of regions.</returns>
         internal IEnumerable<CodeItemRegion> RetrieveCodeRegions(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var editPoints = TextDocumentHelper.FindMatches(textDocument, RegionPattern);
 
             return RetrieveCodeRegions(editPoints);
@@ -116,6 +119,7 @@ internal IEnumerable<CodeItemRegion> RetrieveCodeRegions(TextDocument textDocume
         /// <returns>An enumerable collection of regions.</returns>
         internal IEnumerable<CodeItemRegion> RetrieveCodeRegions(TextSelection textSelection)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var editPoints = TextDocumentHelper.FindMatches(textSelection, RegionPattern);
 
             return RetrieveCodeRegions(editPoints);
@@ -128,6 +132,7 @@ internal IEnumerable<CodeItemRegion> RetrieveCodeRegions(TextSelection textSelec
         /// <returns>The region under the cursor, otherwise null.</returns>
         internal CodeItemRegion RetrieveCodeRegionUnderCursor(TextDocument textDocument)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (IsCodeRegionUnderCursor(textDocument))
             {
                 var regions = RetrieveCodeRegions(textDocument);
@@ -159,6 +164,7 @@ internal CodeItemRegion RetrieveCodeRegionUnderCursor(TextDocument textDocument)
         /// <returns>An enumerable collection of regions.</returns>
         private static IEnumerable<CodeItemRegion> RetrieveCodeRegions(IEnumerable<EditPoint> editPoints)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var regionStack = new Stack<CodeItemRegion>();
             var codeItems = new List<CodeItemRegion>();
 
@@ -207,4 +213,4 @@ private static IEnumerable<CodeItemRegion> RetrieveCodeRegions(IEnumerable<EditP
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeModelManager.cs b/CodeMaidShared/Model/CodeModelManager.cs
index f9aaa2259..322854175 100644
--- a/CodeMaidShared/Model/CodeModelManager.cs
+++ b/CodeMaidShared/Model/CodeModelManager.cs
@@ -1,9 +1,10 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model
 {
@@ -69,6 +70,7 @@ internal static CodeModelManager GetInstance(CodeMaidPackage package)
         /// <param name="document">The document.</param>
         internal void OnDocumentChanged(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (document != null)
             {
                 _codeModelCache.StaleCodeModel(document);
@@ -81,6 +83,7 @@ internal void OnDocumentChanged(Document document)
         /// <param name="document">The document.</param>
         internal void OnDocumentClosing(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (document != null)
             {
                 _codeModelCache.RemoveCodeModel(document);
@@ -101,6 +104,7 @@ internal void OnDocumentClosing(Document document)
         /// <returns>The set of code items within the document.</returns>
         internal SetCodeItems RetrieveAllCodeItems(Document document, bool loadLazyInitializedValues = false)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (document == null)
             {
                 throw new ArgumentNullException(nameof(document));
@@ -144,7 +148,7 @@ internal SetCodeItems RetrieveAllCodeItems(Document document, bool loadLazyIniti
         /// <returns>
         /// The set of code items within the document if already available, otherwise null.
         /// </returns>
-        internal SetCodeItems RetrieveAllCodeItemsAsync(Document document, bool loadLazyInitializedValues = false)
+        internal SetCodeItems BeginRetrieveAllCodeItems(Document document, bool loadLazyInitializedValues = false)
         {
             if (document == null)
             {
@@ -158,7 +162,7 @@ internal SetCodeItems RetrieveAllCodeItemsAsync(Document document, bool loadLazy
             }
 
             OutputWindowHelper.DiagnosticWriteLine(
-                $"CodeModelManager.RetrieveAllCodeItemsAsync for '{document.FullName}'");
+                $"CodeModelManager.BeginRetrieveAllCodeItems for '{document.FullName}'");
 
             var codeModel = _codeModelCache.GetCodeModel(document);
             if (codeModel.IsBuilding)
@@ -170,7 +174,7 @@ internal SetCodeItems RetrieveAllCodeItemsAsync(Document document, bool loadLazy
             if (codeModel.IsStale)
             {
                 // Asynchronously build the code items then raise an event.
-                Task.Run(() =>
+                _ = Task.Run(() =>
                 {
                     BuildCodeItems(codeModel);
 
@@ -200,6 +204,7 @@ internal SetCodeItems RetrieveAllCodeItemsAsync(Document document, bool loadLazy
         /// <param name="codeModel">The code model.</param>
         private void BuildCodeItems(CodeModel codeModel)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 OutputWindowHelper.DiagnosticWriteLine(
@@ -238,6 +243,7 @@ private void BuildCodeItems(CodeModel codeModel)
         /// <param name="codeModel">The code model.</param>
         private void LoadLazyInitializedValues(CodeModel codeModel)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 OutputWindowHelper.DiagnosticWriteLine(
@@ -261,6 +267,7 @@ private void LoadLazyInitializedValues(CodeModel codeModel)
         /// <param name="codeModel">The code model.</param>
         private void RaiseCodeModelBuilt(CodeModel codeModel)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var codeModelBuilt = CodeModelBuilt;
             if (codeModelBuilt != null)
             {
@@ -273,4 +280,4 @@ private void RaiseCodeModelBuilt(CodeModel codeModel)
 
         #endregion Private Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Model/CodeTree/CodeTreeBuilderAsync.cs b/CodeMaidShared/Model/CodeTree/CodeTreeBuilderAsync.cs
index c1da7fc1e..fe80a723d 100644
--- a/CodeMaidShared/Model/CodeTree/CodeTreeBuilderAsync.cs
+++ b/CodeMaidShared/Model/CodeTree/CodeTreeBuilderAsync.cs
@@ -40,7 +40,7 @@ internal CodeTreeBuilderAsync(Action<SnapshotCodeItems> callback)
         /// Builds a code tree asynchronously from the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        internal void RetrieveCodeTreeAsync(CodeTreeRequest request)
+        internal void BeginRetrieveCodeTree(CodeTreeRequest request)
         {
             if (_bw.IsBusy)
             {
@@ -92,7 +92,7 @@ private void OnRunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
             if (_pendingRequest != null)
             {
-                RetrieveCodeTreeAsync(_pendingRequest);
+                BeginRetrieveCodeTree(_pendingRequest);
             }
             else if (e.Error == null)
             {
diff --git a/CodeMaidShared/Model/Comments/CodeComment.cs b/CodeMaidShared/Model/Comments/CodeComment.cs
index 708af41ca..177664c22 100644
--- a/CodeMaidShared/Model/Comments/CodeComment.cs
+++ b/CodeMaidShared/Model/Comments/CodeComment.cs
@@ -1,10 +1,11 @@
-using EnvDTE;
+using EnvDTE;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.Comments.Options;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.Model.Comments
 {
@@ -32,6 +33,7 @@ internal class CodeComment
         /// </summary>
         public CodeComment(TextPoint point, FormatterOptions options)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (point == null)
             {
                 throw new ArgumentNullException(nameof(point));
@@ -90,6 +92,7 @@ public static string Format(string text, string prefix = null, Action<FormatterO
         /// </summary>
         public TextPoint Format()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!IsValid)
             {
                 throw new InvalidOperationException("Cannot format comment, the comment is not valid.");
@@ -149,6 +152,7 @@ public TextPoint Format()
         /// <param name="point">The original text point to expand from.</param>
         private void Expand(TextPoint point)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var i = point.CreateEditPoint();
 
             // Look up to find the start of the comment.
@@ -183,12 +187,14 @@ private void Expand(TextPoint point)
         /// </returns>
         private EditPoint Expand(TextPoint point, Action<EditPoint> foundAction)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             EditPoint current = point.CreateEditPoint();
             EditPoint result = null;
             string prefix = null;
 
             do
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 var line = current.Line;
                 var text = current.GetLine();
 
@@ -242,4 +248,4 @@ private EditPoint Expand(TextPoint point, Action<EditPoint> foundAction)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/Properties/Resources.zh-Hant.resx b/CodeMaidShared/Properties/Resources.zh-Hant.resx
new file mode 100644
index 000000000..fcb77a6ac
--- /dev/null
+++ b/CodeMaidShared/Properties/Resources.zh-Hant.resx
@@ -0,0 +1,930 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+  -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="_UnableToImport" xml:space="preserve">
+    <value>無法匯入</value>
+  </data>
+  <data name="AccessLevelsShouldBeOrderedBy" xml:space="preserve">
+    <value>存取層級排序應依</value>
+  </data>
+  <data name="AccessThenType" xml:space="preserve">
+    <value>存取層級 優先於 類型</value>
+  </data>
+  <data name="AddSpaceInsideSelfClosingTags" xml:space="preserve">
+    <value>在自我關閉標籤中加入空格</value>
+  </data>
+  <data name="AddSpacingAroundXMLTags" xml:space="preserve">
+    <value>在 XML 標記周圍加入間距</value>
+  </data>
+  <data name="AfterAttributes" xml:space="preserve">
+    <value>屬性之後</value>
+  </data>
+  <data name="AfterOpeningBraces" xml:space="preserve">
+    <value>開啟大括號後</value>
+  </data>
+  <data name="AlertThreshold" xml:space="preserve">
+    <value>警示閾值</value>
+  </data>
+  <data name="AlignXMLParamTags" xml:space="preserve">
+    <value>對齊 XML param 標記</value>
+  </data>
+  <data name="All" xml:space="preserve">
+    <value>全部</value>
+  </data>
+  <data name="Alphabetical" xml:space="preserve">
+    <value>字母</value>
+  </data>
+  <data name="AlphabetizeMembersOfTheSameGroup" xml:space="preserve">
+    <value>按字母排序同一群組成員</value>
+  </data>
+  <data name="AlwaysSplitAllXMLTagsOntoMultipleLines" xml:space="preserve">
+    <value>始終將所有 XML 標記拆分為多行</value>
+  </data>
+  <data name="AlwaysSplitSummaryTagsOntoMultipleLines" xml:space="preserve">
+    <value>始終將 summary 標籤分到多行</value>
+  </data>
+  <data name="AreYouReadyForCodeMaidToCleanEverythingInTheSolution" xml:space="preserve">
+    <value>您準備好使用 CodeMaid 清理解決方案中的所有程式碼了嗎？</value>
+  </data>
+  <data name="AreYouSureYouWantAll" xml:space="preserve">
+    <value>您確定要所有</value>
+  </data>
+  <data name="Ask" xml:space="preserve">
+    <value>詢問</value>
+  </data>
+  <data name="AtBottomOfFile" xml:space="preserve">
+    <value>在檔案底部</value>
+  </data>
+  <data name="AtTopOfFile" xml:space="preserve">
+    <value>在檔案頂部</value>
+  </data>
+  <data name="AutoDetect" xml:space="preserve">
+    <value>自動偵測</value>
+  </data>
+  <data name="Automatic" xml:space="preserve">
+    <value>自動</value>
+  </data>
+  <data name="AutomaticallyRunCleanupOnFileSave" xml:space="preserve">
+    <value>在檔案儲存時自動清理</value>
+  </data>
+  <data name="AutomaticallySaveAndCloseDocumentsOpenedByCleanup" xml:space="preserve">
+    <value>自動儲存並關閉執行清理時開啟的文件</value>
+  </data>
+  <data name="AutomaticCleanupOnSave" xml:space="preserve">
+    <value>儲存時自動清理 - </value>
+  </data>
+  <data name="Batch" xml:space="preserve">
+    <value>批次</value>
+  </data>
+  <data name="BeforeClosingAngleBrackets" xml:space="preserve">
+    <value>關閉角括號前</value>
+  </data>
+  <data name="BeforeClosingBraces" xml:space="preserve">
+    <value>關閉大括號前</value>
+  </data>
+  <data name="BeforeClosingTags" xml:space="preserve">
+    <value>在結束標記之前</value>
+  </data>
+  <data name="BetweenChainedStatements" xml:space="preserve">
+    <value>在鏈結陳述式之間</value>
+  </data>
+  <data name="Building" xml:space="preserve">
+    <value>正在建置</value>
+  </data>
+  <data name="BuildProgress" xml:space="preserve">
+    <value>建置進度</value>
+  </data>
+  <data name="BuildProgressWindow" xml:space="preserve">
+    <value>「建置進度」視窗</value>
+  </data>
+  <data name="CacheFileCodeModels" xml:space="preserve">
+    <value>快取檔案程式碼模型</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="Canceling" xml:space="preserve">
+    <value>正在取消...</value>
+  </data>
+  <data name="Cleaning" xml:space="preserve">
+    <value>正在清理</value>
+  </data>
+  <data name="Cleaning_n" xml:space="preserve">
+    <value>清理</value>
+  </data>
+  <data name="CleaningFileTypesViewModel_FileTypes" xml:space="preserve">
+    <value>檔案類型</value>
+  </data>
+  <data name="CleaningUpdateViewModel_Update" xml:space="preserve">
+    <value>更新</value>
+  </data>
+  <data name="Cleanup" xml:space="preserve">
+    <value>清理</value>
+  </data>
+  <data name="CleanupActiveCode" xml:space="preserve">
+    <value>清理活動程式碼</value>
+  </data>
+  <data name="CleanupActiveDocument" xml:space="preserve">
+    <value>清理活動文件</value>
+  </data>
+  <data name="CleanupAllCode" xml:space="preserve">
+    <value>清理所有程式碼</value>
+  </data>
+  <data name="CleanupCannotRunWhileDebugging" xml:space="preserve">
+    <value>偵錯時無法執行清理。</value>
+  </data>
+  <data name="CleanupOpenCode" xml:space="preserve">
+    <value>清理已開啟的程式碼</value>
+  </data>
+  <data name="CleanupSelectedCode" xml:space="preserve">
+    <value>清理已選的程式碼</value>
+  </data>
+  <data name="ClearSolutionExplorerSearchFilteringToFindFilteredItems" xml:space="preserve">
+    <value>清除方案總管搜尋篩選以找出被篩選掉的項目</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>關閉</value>
+  </data>
+  <data name="CloseAllReadOnly" xml:space="preserve">
+    <value>關閉所有唯讀</value>
+  </data>
+  <data name="CodeMaidCleaned0" xml:space="preserve">
+    <value>CodeMaid 已清理「{0}」。</value>
+  </data>
+  <data name="CodeMaidCleanupAllCode" xml:space="preserve">
+    <value>CodeMaid：清理所有程式碼</value>
+  </data>
+  <data name="CodeMaidCleanupExternalFile" xml:space="preserve">
+    <value>CodeMaid：清理外部檔案</value>
+  </data>
+  <data name="CodeMaidCleanupFor0" xml:space="preserve">
+    <value>針對「{0}」的 CodeMaid 清理</value>
+  </data>
+  <data name="CodeMaidCleanupProgress" xml:space="preserve">
+    <value>CodeMaid：清理進度</value>
+  </data>
+  <data name="CodeMaidConfirmationForCleanupAllCode" xml:space="preserve">
+    <value>CodeMaid：確認清理所有程式碼</value>
+  </data>
+  <data name="CodeMaidConfirmationForReset" xml:space="preserve">
+    <value>CodeMaid：確認重設</value>
+  </data>
+  <data name="CodeMaidConfirmationToSavePendingChanges" xml:space="preserve">
+    <value>CodeMaid：確認儲存擱置中的變更</value>
+  </data>
+  <data name="CodeMaidDeleteItems" xml:space="preserve">
+    <value>CodeMaid 刪除項目</value>
+  </data>
+  <data name="CodeMaidDidNotFindANonCodeComment0ToReformat" xml:space="preserve">
+    <value>CodeMaid 未找到非程式碼註解 {0} 以重新格式化。</value>
+  </data>
+  <data name="CodeMaidExport" xml:space="preserve">
+    <value>CodeMaid：匯出</value>
+  </data>
+  <data name="CodeMaidFailedToLoadTheme0SeeOutputWindowForMoreDetails" xml:space="preserve">
+    <value>CodeMaid 無法載入主題「{0}」。如需詳細資訊，請參閱輸出視窗。</value>
+  </data>
+  <data name="CodeMaidFinishedFormattingTheComment" xml:space="preserve">
+    <value>CodeMaid 已完成此註解的格式化。</value>
+  </data>
+  <data name="CodeMaidFinishedFormattingTheComments0" xml:space="preserve">
+    <value>CodeMaid 已完成註解 {0} 的格式化。</value>
+  </data>
+  <data name="CodeMaidFormatComment" xml:space="preserve">
+    <value>CodeMaid 格式化註解</value>
+  </data>
+  <data name="CodeMaidHasSuccessfullyExported" xml:space="preserve">
+    <value>CodeMaid 已成功匯出</value>
+  </data>
+  <data name="CodeMaidHasSuccessfullyImported1From0" xml:space="preserve">
+    <value>CodeMaid 已成功從「{0}」匯入 {1}。</value>
+  </data>
+  <data name="CodeMaidHasSuccessfullyReset" xml:space="preserve">
+    <value>CodeMaid 已成功重設</value>
+  </data>
+  <data name="CodeMaidImport" xml:space="preserve">
+    <value>CodeMaid：匯入</value>
+  </data>
+  <data name="CodeMaidInsertRegion" xml:space="preserve">
+    <value>CodeMaid 插入區域</value>
+  </data>
+  <data name="CodeMaidIsCleaning0" xml:space="preserve">
+    <value>CodeMaid 正在清理「{0}」...</value>
+  </data>
+  <data name="CodeMaidJoin" xml:space="preserve">
+    <value>CodeMaid 連接</value>
+  </data>
+  <data name="CodeMaidMoveItemAbove" xml:space="preserve">
+    <value>CodeMaid 項目上移</value>
+  </data>
+  <data name="CodeMaidMoveItemBelow" xml:space="preserve">
+    <value>CodeMaid 項目下移</value>
+  </data>
+  <data name="CodeMaidMoveItemInto" xml:space="preserve">
+    <value>CodeMaid 將項目移入</value>
+  </data>
+  <data name="CodeMaidOptions" xml:space="preserve">
+    <value>CodeMaid 選項</value>
+  </data>
+  <data name="CodeMaidRemoveAllRegions" xml:space="preserve">
+    <value>CodeMaid 移除所有 #region</value>
+  </data>
+  <data name="CodeMaidRemoveRegion" xml:space="preserve">
+    <value>CodeMaid 移除 #region</value>
+  </data>
+  <data name="CodeMaidRemoveRegions" xml:space="preserve">
+    <value>CodeMaid 移除 #region</value>
+  </data>
+  <data name="CodeMaidRemoveSelectedRegions" xml:space="preserve">
+    <value>CodeMaid 移除選取的 #region</value>
+  </data>
+  <data name="CodeMaidReorganized0" xml:space="preserve">
+    <value>CodeMaid 已整理「{0}」。</value>
+  </data>
+  <data name="CodeMaidReorganizeFor0" xml:space="preserve">
+    <value>CodeMaid 針對「{0}」整理</value>
+  </data>
+  <data name="CodeMaidReorganizePreprocessorConditionals" xml:space="preserve">
+    <value>CodeMaid：整理前置處理器條件</value>
+  </data>
+  <data name="CodeMaidReset" xml:space="preserve">
+    <value>CodeMaid：重設</value>
+  </data>
+  <data name="CodeMaidSort" xml:space="preserve">
+    <value>CodeMaid 排序</value>
+  </data>
+  <data name="CodeMaidSpade" xml:space="preserve">
+    <value>CodeMaid Spade 視窗</value>
+  </data>
+  <data name="CodeMaidTurnedAutomaticCleanupOnSave" xml:space="preserve">
+    <value>CodeMaid 已開啟儲存時自動清理</value>
+  </data>
+  <data name="CodeMaidWasUnableToExport" xml:space="preserve">
+    <value>CodeMaid 無法匯出</value>
+  </data>
+  <data name="CodeMaidWasUnableToImport" xml:space="preserve">
+    <value>CodeMaid 無法匯入</value>
+  </data>
+  <data name="CodeMaidWasUnableToReset" xml:space="preserve">
+    <value>CodeMaid 無法重設</value>
+  </data>
+  <data name="CollapseAllSolutionExplorer" xml:space="preserve">
+    <value>收合所有方案總管</value>
+  </data>
+  <data name="CollapseSelectedSolutionExplorer" xml:space="preserve">
+    <value>收合選取的方案總管</value>
+  </data>
+  <data name="CollapseSolutionsWhenTheyAreOpened" xml:space="preserve">
+    <value>在開啟解決方案時將其收合</value>
+  </data>
+  <data name="CollapsingViewModel_Collapsing" xml:space="preserve">
+    <value>收合</value>
+  </data>
+  <data name="Complexity" xml:space="preserve">
+    <value>複雜度</value>
+  </data>
+  <data name="Conditions" xml:space="preserve">
+    <value>條件</value>
+  </data>
+  <data name="ConfigFilesConfigConfigAllFiles" xml:space="preserve">
+    <value>設定檔 (*.config)|*.config|所有檔案 (*.*)|*.*</value>
+  </data>
+  <data name="ContainsPreprocessorConditionalsEGIfPragmaWhichReorganizationDoesNotCurrentlySupportDoYouWantToReorganizeAnywaysDANGEROUS" xml:space="preserve">
+    <value>{0} 包含目前整理不支援的前置處理器條件 (例如 #if、#pragma)。是否仍要整理 (危險)？</value>
+  </data>
+  <data name="Dark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="Deploying" xml:space="preserve">
+    <value>正在部署</value>
+  </data>
+  <data name="Diagnostic" xml:space="preserve">
+    <value>診斷</value>
+  </data>
+  <data name="Diagnostics" xml:space="preserve">
+    <value>診斷</value>
+  </data>
+  <data name="DiagnosticsMode" xml:space="preserve">
+    <value>診斷模式</value>
+  </data>
+  <data name="Digging" xml:space="preserve">
+    <value>程式碼檢視</value>
+  </data>
+  <data name="DiggingViewModel_DiggingSpade" xml:space="preserve">
+    <value>Spade</value>
+  </data>
+  <data name="Display" xml:space="preserve">
+    <value>顯示</value>
+  </data>
+  <data name="DoYouWantToPerformAPartialCleanup" xml:space="preserve">
+    <value>是否要執行部分清理？</value>
+  </data>
+  <data name="DragToReorderDragOverToGroupRightClickToSplitDoubleClickToRename" xml:space="preserve">
+    <value>拖曳可重新排序，拖曳至另一項目上可分組，右鍵點擊可分割，雙擊可重新命名</value>
+  </data>
+  <data name="Empty" xml:space="preserve">
+    <value>空白</value>
+  </data>
+  <data name="EverythingElseExTxtREADME" xml:space="preserve">
+    <value>所有其他內容 (例如：.txt、README)</value>
+  </data>
+  <data name="Exclude" xml:space="preserve">
+    <value>排除</value>
+  </data>
+  <data name="ExEndregionMethods" xml:space="preserve">
+    <value>例如：#endregion 方法</value>
+  </data>
+  <data name="Export" xml:space="preserve">
+    <value>匯出</value>
+  </data>
+  <data name="ExRegionPublicMethodsRegionPrivateMethods" xml:space="preserve">
+    <value>例如：#region 公開方法、#region 私用方法</value>
+  </data>
+  <data name="External" xml:space="preserve">
+    <value>外部</value>
+  </data>
+  <data name="ExtraIndentForValuesInsideXMLComments" xml:space="preserve">
+    <value>XML 註解內部值的額外縮排</value>
+  </data>
+  <data name="FeaturesDataTemplate_AutomaticCleanupOnSave" xml:space="preserve">
+    <value>儲存時自動清理</value>
+  </data>
+  <data name="FeaturesSwitch" xml:space="preserve">
+    <value>功能開關</value>
+  </data>
+  <data name="FeaturesViewModel_Features" xml:space="preserve">
+    <value>功能</value>
+  </data>
+  <data name="FileHeader" xml:space="preserve">
+    <value>檔案頂端</value>
+  </data>
+  <data name="FileOrder" xml:space="preserve">
+    <value>檔案順序</value>
+  </data>
+  <data name="FindingViewModel_Finding" xml:space="preserve">
+    <value>尋找</value>
+  </data>
+  <data name="FindInSolutionExplorer" xml:space="preserve">
+    <value>在方案總管中尋找</value>
+  </data>
+  <data name="Font" xml:space="preserve">
+    <value>字型</value>
+  </data>
+  <data name="FormatComment" xml:space="preserve">
+    <value>格式化註解</value>
+  </data>
+  <data name="FormattingViewModel_Formatting" xml:space="preserve">
+    <value>格式化</value>
+  </data>
+  <data name="General" xml:space="preserve">
+    <value>一般</value>
+  </data>
+  <data name="HandledException" xml:space="preserve">
+    <value>處理例外</value>
+  </data>
+  <data name="HideBuildProgressWindowWhenABuildStops" xml:space="preserve">
+    <value>在建置停止時隱藏「建置進度」視窗</value>
+  </data>
+  <data name="Icons" xml:space="preserve">
+    <value>圖示</value>
+  </data>
+  <data name="IfThereIsOnlyOneProjectInASolutionKeepItExpandedButStillCollapseItsChildren" xml:space="preserve">
+    <value>如果解決方案中只有一個專案，保持展開但子項目仍然收合</value>
+  </data>
+  <data name="Import" xml:space="preserve">
+    <value>匯入</value>
+  </data>
+  <data name="Include" xml:space="preserve">
+    <value>包含</value>
+  </data>
+  <data name="IncludeAccessLevelInRegions" xml:space="preserve">
+    <value>在 #regions 中包含存取層級</value>
+  </data>
+  <data name="IndentationMargin" xml:space="preserve">
+    <value>縮排邊界</value>
+  </data>
+  <data name="Insert" xml:space="preserve">
+    <value>插入</value>
+  </data>
+  <data name="InsertBlankLinePaddingAfter" xml:space="preserve">
+    <value>在之後插入空行</value>
+  </data>
+  <data name="InsertBlankLinePaddingBefore" xml:space="preserve">
+    <value>在之前插入空行</value>
+  </data>
+  <data name="InsertBlankLinePaddingBetween" xml:space="preserve">
+    <value>在之間插入空行</value>
+  </data>
+  <data name="InsertBlankSpaceBefore" xml:space="preserve">
+    <value>在之前插入空格</value>
+  </data>
+  <data name="InsertEndOfFileTrailingNewLine" xml:space="preserve">
+    <value>在檔案結尾插入新行標記 (EOF)</value>
+  </data>
+  <data name="InsertExplicitAccessModifiersOn" xml:space="preserve">
+    <value>插入明確的存取修飾詞</value>
+  </data>
+  <data name="InsertKeepRegionsEvenIfTheyAreEmpty" xml:space="preserve">
+    <value>插入/保留 #regions (即使它們是空白的)</value>
+  </data>
+  <data name="InsertNewRegions" xml:space="preserve">
+    <value>插入新 #regions</value>
+  </data>
+  <data name="InTheSelection" xml:space="preserve">
+    <value>所選內容</value>
+  </data>
+  <data name="IsNotInTheSolutionSoSomeCleanupActionsMayBeUnavailable" xml:space="preserve">
+    <value>不在解決方案中，因此某些清理動作可能無法使用。</value>
+  </data>
+  <data name="JoinLines" xml:space="preserve">
+    <value>連接多行</value>
+  </data>
+  <data name="KeepMembersWithinRegions" xml:space="preserve">
+    <value>保留 #regions 內的成員</value>
+  </data>
+  <data name="KeepXMLTagsTogether" xml:space="preserve">
+    <value>將 XML 標記放在一起</value>
+  </data>
+  <data name="Light" xml:space="preserve">
+    <value>淺色</value>
+  </data>
+  <data name="Loading" xml:space="preserve">
+    <value>正在載入...</value>
+  </data>
+  <data name="LoadModelsAsynchronously" xml:space="preserve">
+    <value>非同步載入模型</value>
+  </data>
+  <data name="MemberTypeOrderGroupingAndPreferredNames" xml:space="preserve">
+    <value>成員類型順序、分組和慣用名稱</value>
+  </data>
+  <data name="Metadata" xml:space="preserve">
+    <value>中繼資料</value>
+  </data>
+  <data name="Miscellaneous" xml:space="preserve">
+    <value>其他</value>
+  </data>
+  <data name="MostComplex" xml:space="preserve">
+    <value>最複雜</value>
+  </data>
+  <data name="NameOnly" xml:space="preserve">
+    <value>僅名稱</value>
+  </data>
+  <data name="Namespace" xml:space="preserve">
+    <value>命名空間</value>
+  </data>
+  <data name="Navigation" xml:space="preserve">
+    <value>巡覽</value>
+  </data>
+  <data name="NewRegion" xml:space="preserve">
+    <value>新增 #region</value>
+  </data>
+  <data name="No" xml:space="preserve">
+    <value>否</value>
+  </data>
+  <data name="None" xml:space="preserve">
+    <value>無</value>
+  </data>
+  <data name="OptionsViewModel_OnResetToDefaultsCommandExecuted_ToBeResetToTheirDefaults" xml:space="preserve">
+    <value>重設為預設值？</value>
+  </data>
+  <data name="Other" xml:space="preserve">
+    <value>其他</value>
+  </data>
+  <data name="OtherCleaningCommandsExReSharperReSharper_SilentCleanupCode" xml:space="preserve">
+    <value>其他清理命令 (例如：ReSharper_SilentCleanupCode)</value>
+  </data>
+  <data name="Performance" xml:space="preserve">
+    <value>效能</value>
+  </data>
+  <data name="PerformPartialCleanupIfFileIsNotInTheSolution" xml:space="preserve">
+    <value>如果檔案不在解決方案中，則執行部分清理</value>
+  </data>
+  <data name="PerformReorganizationWhenPreprocessorConditionalsArePresent" xml:space="preserve">
+    <value>在存在前置處理器條件時執行整理</value>
+  </data>
+  <data name="PlaceEachCommandOnASeparateLine" xml:space="preserve">
+    <value>每個命令一行</value>
+  </data>
+  <data name="PlaceEachRegularExpressionOnASeparateLine" xml:space="preserve">
+    <value>每個規則運算式一行</value>
+  </data>
+  <data name="PlaceEachSetOnASeparateLine" xml:space="preserve">
+    <value>每個設定一行</value>
+  </data>
+  <data name="PlaceEachUsingStatementOnASeparateLine" xml:space="preserve">
+    <value>每個 Using 陳述式一行</value>
+  </data>
+  <data name="PlaceExplicitInterfaceMembersAtTheEndOfTheirGroup" xml:space="preserve">
+    <value>在其群組的結尾放置明確介面成員</value>
+  </data>
+  <data name="Preview" xml:space="preserve">
+    <value>預覽</value>
+  </data>
+  <data name="PrimaryOrderingShouldBeBy" xml:space="preserve">
+    <value>主要排序應依</value>
+  </data>
+  <data name="PrimarySortShouldBeBy" xml:space="preserve">
+    <value>主要排序應為</value>
+  </data>
+  <data name="ProgressingViewModel_Progressing" xml:space="preserve">
+    <value>進度</value>
+  </data>
+  <data name="ReadOnly" xml:space="preserve">
+    <value>唯讀</value>
+  </data>
+  <data name="ReadOnlyToggle" xml:space="preserve">
+    <value>唯讀切換</value>
+  </data>
+  <data name="Rebuilding" xml:space="preserve">
+    <value>正在重建</value>
+  </data>
+  <data name="Refreshing" xml:space="preserve">
+    <value>正在重新整理...</value>
+  </data>
+  <data name="Regions" xml:space="preserve">
+    <value>#regions</value>
+  </data>
+  <data name="RegularExpressionsThatMatchPathNamesToExcludeExResxOrLib" xml:space="preserve">
+    <value>排除符合下列規則運算式的路徑 (例如：\.resx$ 或 \\lib\\)</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>移除</value>
+  </data>
+  <data name="RemoveAllRegions" xml:space="preserve">
+    <value>移除全部 #regions(&amp;R)</value>
+  </data>
+  <data name="RemoveBlankLines" xml:space="preserve">
+    <value>移除空行</value>
+  </data>
+  <data name="RemoveBlankSpaces" xml:space="preserve">
+    <value>移除空格</value>
+  </data>
+  <data name="RemoveCurrentRegion" xml:space="preserve">
+    <value>移除目前 #region(&amp;R)</value>
+  </data>
+  <data name="RemoveEndOfFileTrailingNewLine" xml:space="preserve">
+    <value>移除檔案結尾新行標記 (EOF)</value>
+  </data>
+  <data name="RemoveEndOfLineWhitespace" xml:space="preserve">
+    <value>移除行尾空白</value>
+  </data>
+  <data name="RemoveExistingRegions" xml:space="preserve">
+    <value>移除現有的 #regions</value>
+  </data>
+  <data name="RemoveMultipleConsecutiveBlankLines" xml:space="preserve">
+    <value>移除多個連續的空行</value>
+  </data>
+  <data name="RemoveRegion" xml:space="preserve">
+    <value>移除 #region(s)</value>
+  </data>
+  <data name="RemoveRegions" xml:space="preserve">
+    <value>移除 #regions</value>
+  </data>
+  <data name="RemoveSelectedRegions" xml:space="preserve">
+    <value>移除已選 #regions(&amp;R)</value>
+  </data>
+  <data name="Reorganize_CodeMaidIsReorganizing0" xml:space="preserve">
+    <value>CodeMaid 正在整理「{0}」...</value>
+  </data>
+  <data name="ReorganizeActiveCode" xml:space="preserve">
+    <value>整理活動檔案</value>
+  </data>
+  <data name="ReorganizeActiveDocument" xml:space="preserve">
+    <value>整理活動文件</value>
+  </data>
+  <data name="Reorganizing" xml:space="preserve">
+    <value>整理</value>
+  </data>
+  <data name="ReorganizingTypesViewModel_Types" xml:space="preserve">
+    <value>類型</value>
+  </data>
+  <data name="ResetToDefaults" xml:space="preserve">
+    <value>重設為預設</value>
+  </data>
+  <data name="RunFormatCommentsDuringCleanup" xml:space="preserve">
+    <value>在清理過程中格式化註解</value>
+  </data>
+  <data name="RunFormatDocument" xml:space="preserve">
+    <value>執行「設定文件格式」</value>
+  </data>
+  <data name="RunJetBrainsReSharperCleanup" xml:space="preserve">
+    <value>執行 JetBrains ReSharper 清理</value>
+  </data>
+  <data name="RunRemoveAndSortUsingStatements" xml:space="preserve">
+    <value>執行「移除並排序 Using」</value>
+  </data>
+  <data name="RunReorganizeAtStartOfCleanup" xml:space="preserve">
+    <value>在清理開始時執行整理</value>
+  </data>
+  <data name="RunTelerikJustCodeCleanup" xml:space="preserve">
+    <value>執行 Telerik JustCode 清理</value>
+  </data>
+  <data name="RunXAMLStylerCleanup" xml:space="preserve">
+    <value>執行 XAML Styler 清理</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>儲存</value>
+  </data>
+  <data name="SearchCodeMaidSpadeCtrlM" xml:space="preserve">
+    <value>搜尋 Spade 視窗</value>
+  </data>
+  <data name="SeeOutputWindowForMoreDetails" xml:space="preserve">
+    <value>。如需詳細資訊，請參閱輸出視窗。</value>
+  </data>
+  <data name="SelectASubCategoryToSetOptions" xml:space="preserve">
+    <value>選擇子類別以設定選項。</value>
+  </data>
+  <data name="SetsOfRelatedFileExtensionsExCppH" xml:space="preserve">
+    <value>相關的副檔名 (例如：.cpp、.h)</value>
+  </data>
+  <data name="SettingCleanupOnSaveCommand_OFF" xml:space="preserve">
+    <value>關</value>
+  </data>
+  <data name="SettingCleanupOnSaveCommand_ON" xml:space="preserve">
+    <value>開</value>
+  </data>
+  <data name="ShowBuildProgressOnVisualStudioIconInWindowsTaskbar" xml:space="preserve">
+    <value>在 Windows 工作列的 Visual Studio 圖示中顯示建置進度</value>
+  </data>
+  <data name="ShowBuildProgressWindowWhenABuildStarts" xml:space="preserve">
+    <value>在建置開始時顯示「建置進度」視窗</value>
+  </data>
+  <data name="ShowItemComplexityMcCabe" xml:space="preserve">
+    <value>顯示項目複雜度 (McCabe)</value>
+  </data>
+  <data name="ShowItemMetadata" xml:space="preserve">
+    <value>顯示項目中繼資料</value>
+  </data>
+  <data name="ShowItemTypes" xml:space="preserve">
+    <value>顯示項目類型</value>
+  </data>
+  <data name="ShowMethodParameters" xml:space="preserve">
+    <value>顯示方法參數</value>
+  </data>
+  <data name="ShowStartPageWhenASolutionIsClosed" xml:space="preserve">
+    <value>關閉解決方案時顯示起始頁</value>
+  </data>
+  <data name="SkipDuringAutomaticCleanupOnSave" xml:space="preserve">
+    <value>自動清理時跳過</value>
+  </data>
+  <data name="SkipWrappingOnTheLastWord" xml:space="preserve">
+    <value>當最後一個字超出註解長度時不強制換行</value>
+  </data>
+  <data name="SolutionExplorer" xml:space="preserve">
+    <value>方案總管</value>
+  </data>
+  <data name="SolutionSpecificSettings" xml:space="preserve">
+    <value>解決方案特定設定</value>
+  </data>
+  <data name="Sort" xml:space="preserve">
+    <value>排序</value>
+  </data>
+  <data name="SortLines" xml:space="preserve">
+    <value>排序多行</value>
+  </data>
+  <data name="Spade" xml:space="preserve">
+    <value>Spade 視窗</value>
+  </data>
+  <data name="SpadeToolWindow" xml:space="preserve">
+    <value>Spade 視窗</value>
+  </data>
+  <data name="Split" xml:space="preserve">
+    <value>分割</value>
+  </data>
+  <data name="Successful" xml:space="preserve">
+    <value>成功</value>
+  </data>
+  <data name="SWitchFile" xml:space="preserve">
+    <value>切換檔案(&amp;W)</value>
+  </data>
+  <data name="SwitchFile_no_alt" xml:space="preserve">
+    <value>切換檔案</value>
+  </data>
+  <data name="SwitchingViewModel_Switching" xml:space="preserve">
+    <value>切換</value>
+  </data>
+  <data name="SWitchTo" xml:space="preserve">
+    <value>切換至(&amp;W)</value>
+  </data>
+  <data name="SynchronizeOutliningWithTheCodeFile" xml:space="preserve">
+    <value>將大綱與程式碼檔案同步</value>
+  </data>
+  <data name="T4GeneratedCode" xml:space="preserve">
+    <value>T4 產生的程式碼</value>
+  </data>
+  <data name="TemporarilyOpenSolutionFoldersToFindNestedItems" xml:space="preserve">
+    <value>暫時開啟解決方案資料夾以尋找巢狀項目</value>
+  </data>
+  <data name="Theme" xml:space="preserve">
+    <value>主題</value>
+  </data>
+  <data name="ThirdPartyViewModel_ThirdParty" xml:space="preserve">
+    <value>第三方</value>
+  </data>
+  <data name="ThisActionCannotBeUndone" xml:space="preserve">
+    <value>此動作無法復原。</value>
+  </data>
+  <data name="To0" xml:space="preserve">
+    <value>到「{0}」。</value>
+  </data>
+  <data name="ToolWindows" xml:space="preserve">
+    <value>工具視窗</value>
+  </data>
+  <data name="Type" xml:space="preserve">
+    <value>類型</value>
+  </data>
+  <data name="TypeThenAccess" xml:space="preserve">
+    <value>類型 優先於 存取層級</value>
+  </data>
+  <data name="UnableToExport" xml:space="preserve">
+    <value>無法匯出</value>
+  </data>
+  <data name="UnableToReset" xml:space="preserve">
+    <value>無法重設</value>
+  </data>
+  <data name="UnableToToggleReadOnlyStateOn" xml:space="preserve">
+    <value>無法切換唯讀狀態</value>
+  </data>
+  <data name="UnderTheCursor" xml:space="preserve">
+    <value>在游標下方</value>
+  </data>
+  <data name="Unsuccessful" xml:space="preserve">
+    <value>未成功</value>
+  </data>
+  <data name="UpdateAccessorsToBothBeSingleLineOrMultiLineSA1504" xml:space="preserve">
+    <value>將存取子更新為單行或多行 (SA1504)</value>
+  </data>
+  <data name="UpdateEndregionTagsWithRegionName" xml:space="preserve">
+    <value>使用 #region 名稱更新 #endregion 標記</value>
+  </data>
+  <data name="UpdateSingleLineMethodsByPlacingBracesOnSeparateLinesSA1502" xml:space="preserve">
+    <value>透過在個別的行上放置大括號來更新單行方法 (SA1502)</value>
+  </data>
+  <data name="UserSettings" xml:space="preserve">
+    <value>使用者設定</value>
+  </data>
+  <data name="UseUndoTransactions" xml:space="preserve">
+    <value>使用復原交易</value>
+  </data>
+  <data name="UsingStatementsToReInsertWhenRemovedExUsingSystem" xml:space="preserve">
+    <value>當被移除時，重新插入下列 Using 陳述式 (例如：using System;)</value>
+  </data>
+  <data name="Visuals" xml:space="preserve">
+    <value>視覺</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>警告</value>
+  </data>
+  <data name="WarningThreshold" xml:space="preserve">
+    <value>警告閾值</value>
+  </data>
+  <data name="WasStopped" xml:space="preserve">
+    <value>已停止</value>
+  </data>
+  <data name="WhenNavigatingCenterOn" xml:space="preserve">
+    <value>當巡覽中心在</value>
+  </data>
+  <data name="WhenSortingByTypeSecondarySortShouldBeBy" xml:space="preserve">
+    <value>按類型排序時，次要排序應為</value>
+  </data>
+  <data name="WhileCleaning" xml:space="preserve">
+    <value>清理時</value>
+  </data>
+  <data name="Whitespace" xml:space="preserve">
+    <value>空白</value>
+  </data>
+  <data name="WholeItem" xml:space="preserve">
+    <value>整個項目</value>
+  </data>
+  <data name="WindowsTaskbar" xml:space="preserve">
+    <value>Windows 工作列</value>
+  </data>
+  <data name="WrapCommentsAtColumn" xml:space="preserve">
+    <value>註解最大行寬 (到達時強制換行)</value>
+  </data>
+  <data name="Yes" xml:space="preserve">
+    <value>是</value>
+  </data>
+  <data name="YouHavePendingChangesDoYouWantToSaveThemBeforeContinuing" xml:space="preserve">
+    <value>您有擱置中的變更，是否要在繼續之前儲存？</value>
+  </data>
+  <data name="OnlyForMethods" xml:space="preserve">
+    <value>僅套用於方法</value>
+  </data>
+</root>
diff --git a/CodeMaidShared/UI/Converters/CodeItemToMetadataStringConverter.cs b/CodeMaidShared/UI/Converters/CodeItemToMetadataStringConverter.cs
index 1001e5aa1..1fff586f0 100644
--- a/CodeMaidShared/UI/Converters/CodeItemToMetadataStringConverter.cs
+++ b/CodeMaidShared/UI/Converters/CodeItemToMetadataStringConverter.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.UI.Converters
 {
@@ -48,6 +49,7 @@ public class CodeItemToMetadataStringConverter : IValueConverter
         /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var codeItem = value as BaseCodeItemElement;
             if (codeItem == null) return string.Empty;
 
@@ -181,6 +183,7 @@ private IEnumerable<string> GenerateMetadataStrings(CodeItemMethod method)
         /// <returns>The metadata strings.</returns>
         private IEnumerable<string> GenerateMetadataStrings(CodeItemProperty property)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var strings = new List<string>();
             var methodStrings = new List<string>();
 
@@ -207,4 +210,4 @@ private IEnumerable<string> GenerateMetadataStrings(CodeItemProperty property)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/Converters/NameParametersToTextBlockConverter.cs b/CodeMaidShared/UI/Converters/NameParametersToTextBlockConverter.cs
index abd03d068..4a927a4f1 100644
--- a/CodeMaidShared/UI/Converters/NameParametersToTextBlockConverter.cs
+++ b/CodeMaidShared/UI/Converters/NameParametersToTextBlockConverter.cs
@@ -1,4 +1,4 @@
-using SteveCadwallader.CodeMaid.Helpers;
+using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using SteveCadwallader.CodeMaid.Properties;
 using System;
@@ -8,6 +8,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.UI.Converters
 {
@@ -80,6 +81,7 @@ public NameParametersToTextBlockConverter()
         /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!(values[0] is ICodeItem codeItem))
             {
                 return null;
@@ -175,6 +177,7 @@ private IEnumerable<Inline> CreateInlinesForName(string text, string textToHighl
         /// <returns>The inlines representing the parameters.</returns>
         private IEnumerable<Inline> CreateInlinesForParameters(ICodeItemParameters codeItem)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var inlines = new List<Inline>();
 
             var opener = GetOpeningString(codeItem);
@@ -335,4 +338,4 @@ private static string GetClosingString(ICodeItemParameters codeItem)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/Dialogs/Options/Formatting/FormattingViewModel.cs b/CodeMaidShared/UI/Dialogs/Options/Formatting/FormattingViewModel.cs
index 34764fa5c..e4b23207a 100644
--- a/CodeMaidShared/UI/Dialogs/Options/Formatting/FormattingViewModel.cs
+++ b/CodeMaidShared/UI/Dialogs/Options/Formatting/FormattingViewModel.cs
@@ -2,6 +2,7 @@
 using SteveCadwallader.CodeMaid.Model.Comments.Options;
 using SteveCadwallader.CodeMaid.Properties;
 using System.Windows.Media;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.UI.Dialogs.Options.Formatting
 {
@@ -34,6 +35,7 @@ public class FormattingViewModel : OptionsPageViewModel
         public FormattingViewModel(CodeMaidPackage package, Settings activeSettings)
             : base(package, activeSettings)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Mappings = new SettingsToOptionsList(ActiveSettings, this)
             {
                 new SettingToOptionMapping<bool, bool>(x => ActiveSettings.Formatting_CommentRunDuringCleanup, x => CommentRunDuringCleanup),
@@ -205,6 +207,7 @@ public Brush CommentPreviewTextBackground
         {
             get
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 var color = System.Drawing.ColorTranslator.FromOle((int)_commentColors.Background);
 
                 return new SolidColorBrush(Color.FromArgb(color.A, color.R, color.G, color.B));
@@ -233,4 +236,4 @@ private void UpdatePreviewText()
 
         #endregion Preview Text and Helpers
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/Dialogs/Options/OptionsViewModel.cs b/CodeMaidShared/UI/Dialogs/Options/OptionsViewModel.cs
index 0019f6ac7..f2d2946d5 100644
--- a/CodeMaidShared/UI/Dialogs/Options/OptionsViewModel.cs
+++ b/CodeMaidShared/UI/Dialogs/Options/OptionsViewModel.cs
@@ -17,6 +17,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.UI.Dialogs.Options
 {
@@ -40,6 +41,7 @@ public class OptionsViewModel : Bindable
         /// <param name="initiallySelectedPageType">The type of the initially selected page.</param>
         public OptionsViewModel(CodeMaidPackage package, Type initiallySelectedPageType = null)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             _settingsContextHelper = SettingsContextHelper.GetInstance(package);
 
             ActiveSettings = (Settings)SettingsBase.Synchronized(new Settings());
@@ -375,6 +377,7 @@ private bool OnSaveCommandCanExecute(object parameter)
         /// <param name="parameter">The command parameter.</param>
         private void OnSaveCommandExecuted(object parameter)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Save();
             DialogResult = true;
         }
@@ -384,6 +387,7 @@ private void OnSaveCommandExecuted(object parameter)
         /// </summary>
         private void Save()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             foreach (var optionsPageViewModel in Pages.Flatten())
             {
                 optionsPageViewModel.SaveSettings();
@@ -443,6 +447,7 @@ private bool OnSwitchSettingsCommandCanExecute(object parameter)
         /// <param name="parameter">The command parameter.</param>
         private void OnSwitchSettingsCommandExecuted(object parameter)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (CheckToSavePendingChangesShouldCancelOperation())
             {
                 return;
@@ -473,6 +478,7 @@ private void OnSwitchSettingsCommandExecuted(object parameter)
         /// <returns>True if the operation should be canceled, otherwise false.</returns>
         private bool CheckToSavePendingChangesShouldCancelOperation()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (HasChanges)
             {
                 var result = MessageBox.Show(Resources.YouHavePendingChangesDoYouWantToSaveThemBeforeContinuing,
@@ -524,6 +530,7 @@ private void OnPagePropertyChanged(object sender, PropertyChangedEventArgs e)
         /// </remarks>
         private void RefreshPackageSettings()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Explicitly try to reload solution-specific settings in case they were newly created.
             if (!_settingsContextHelper.LoadSolutionSpecificSettings(Settings.Default))
             {
@@ -548,4 +555,4 @@ private void ReloadPagesFromSettings()
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/EditableTextBlock.xaml.cs b/CodeMaidShared/UI/EditableTextBlock.xaml.cs
index 1154983a2..243fb3c86 100644
--- a/CodeMaidShared/UI/EditableTextBlock.xaml.cs
+++ b/CodeMaidShared/UI/EditableTextBlock.xaml.cs
@@ -1,4 +1,6 @@
-using System;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
+using System;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Input;
@@ -67,11 +69,12 @@ private static void OnIsEditingChanged(DependencyObject obj, DependencyPropertyC
                 editableTextBlock._originalValue = editableTextBlock.Text;
 
                 // Focus and select all of the text.
-                editableTextBlock.Dispatcher.BeginInvoke(DispatcherPriority.Input, new Action(() =>
+                ThreadHelper.JoinableTaskFactory.Run(async () =>
                 {
+                    await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
                     editableTextBlock.TextBox.Focus();
                     editableTextBlock.TextBox.SelectAll();
-                }));
+                });
             }
         }
 
diff --git a/CodeMaidShared/UI/ThemeManager.cs b/CodeMaidShared/UI/ThemeManager.cs
index 0057b5e53..09d2b6fdc 100644
--- a/CodeMaidShared/UI/ThemeManager.cs
+++ b/CodeMaidShared/UI/ThemeManager.cs
@@ -1,4 +1,4 @@
-using EnvDTE80;
+using EnvDTE80;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Properties;
 using SteveCadwallader.CodeMaid.UI.Enumerations;
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.UI
 {
@@ -111,6 +112,7 @@ public void ApplyTheme()
         /// <returns>The resolved theme.</returns>
         private ThemeMode ResolveActiveTheme()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var theme = (ThemeMode)Settings.Default.General_Theme;
 
             return theme == ThemeMode.AutoDetect ? AutoDetectTheme() : theme;
@@ -121,6 +123,7 @@ private ThemeMode ResolveActiveTheme()
         /// </summary>
         private ThemeMode AutoDetectTheme()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             const int medianColor = 128 * 3;
             var bgColor = GetColorFromUInt(_package.IDE.GetThemeColor(vsThemeColors.vsThemeColorToolWindowBackground));
 
@@ -146,6 +149,7 @@ private static Color GetColorFromUInt(uint number)
         /// <param name="theme">The theme to apply.</param>
         private void ApplyThemeToElement(FrameworkElement element, ThemeMode theme)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (element == null) return;
 
             if (element.Resources == null)
@@ -184,6 +188,7 @@ private void ApplyThemeToElement(FrameworkElement element, ThemeMode theme)
         /// <returns>The loaded resource dictionary, otherwise null.</returns>
         private ResourceDictionary LoadResourceDictionary(Uri themeUri)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 var dictionary = (ResourceDictionary)Application.LoadComponent(themeUri);
@@ -202,4 +207,4 @@ private ResourceDictionary LoadResourceDictionary(Uri themeUri)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressToolWindow.cs b/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressToolWindow.cs
index 875c9eeda..64fd67e55 100644
--- a/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressToolWindow.cs
+++ b/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressToolWindow.cs
@@ -91,6 +91,7 @@ private double ProgressPercentage
 
         public void Close()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             (Frame as IVsWindowFrame).CloseFrame((uint)__FRAMECLOSE.FRAMECLOSE_NoSave);
         }
 
@@ -115,6 +116,7 @@ public override void OnToolWindowCreated()
         /// <param name="action">The action.</param>
         internal void NotifyBuildBegin(vsBuildScope scope, vsBuildAction action)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             BuildAction = action;
             BuildScope = scope;
             BuildingProjects = new List<string>();
@@ -243,6 +245,7 @@ private static string GetBuildTypeString(vsBuildScope buildScope, vsBuildAction
         /// </summary>
         private int GetNumberOfProjectsToBeBuilt()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var solutionContexts = Package.IDE.Solution.SolutionBuild.ActiveConfiguration.SolutionContexts;
             int count = 0;
 
@@ -286,4 +289,4 @@ private string GetToolWindowCaption()
             return $"{DefaultCaption}{progressString}: {buildString} {string.Join(", ", projectNames)}...";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressViewModel.cs b/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressViewModel.cs
index b3bd1539d..6678fd88c 100644
--- a/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressViewModel.cs
+++ b/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressViewModel.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Windows;
 using System.Windows.Shell;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.UI.ToolWindows.BuildProgress
 {
@@ -138,6 +139,7 @@ private bool OnCancelBuildCommandCanExecute(object parameter)
         /// <param name="parameter">The command parameter.</param>
         private void OnCancelBuildCommandExecuted(object parameter)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             try
             {
                 if (Package != null)
@@ -185,4 +187,4 @@ private void UpdateTaskbarStatus()
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/ToolWindows/Spade/MemberSearchTask.cs b/CodeMaidShared/UI/ToolWindows/Spade/MemberSearchTask.cs
index 028dd81da..d44fca5bc 100644
--- a/CodeMaidShared/UI/ToolWindows/Spade/MemberSearchTask.cs
+++ b/CodeMaidShared/UI/ToolWindows/Spade/MemberSearchTask.cs
@@ -1,4 +1,4 @@
-using Microsoft.VisualStudio;
+using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using System;
@@ -26,6 +26,7 @@ public MemberSearchTask(uint dwCookie, IVsSearchQuery pSearchQuery, IVsSearchCal
         /// </summary>
         protected override void OnStartSearch()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             ErrorCode = VSConstants.S_OK;
 
             try
@@ -40,4 +41,4 @@ protected override void OnStartSearch()
             base.OnStartSearch();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/ToolWindows/Spade/SpadeToolWindow.cs b/CodeMaidShared/UI/ToolWindows/Spade/SpadeToolWindow.cs
index 9b69fc7f8..5d15969a4 100644
--- a/CodeMaidShared/UI/ToolWindows/Spade/SpadeToolWindow.cs
+++ b/CodeMaidShared/UI/ToolWindows/Spade/SpadeToolWindow.cs
@@ -4,6 +4,7 @@
 using Microsoft.VisualStudio.Imaging.Interop;
 using Microsoft.VisualStudio.PlatformUI;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
 using Microsoft.VisualStudio.Shell.Interop;
 using SteveCadwallader.CodeMaid.Model;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
@@ -39,6 +40,7 @@ public sealed class SpadeToolWindow : ToolWindowPane, IVsWindowFrameNotify3
         public SpadeToolWindow()
             : base(null)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Set the tool window caption.
             Caption = Resources.CodeMaidSpade;
 
@@ -138,6 +140,7 @@ public override void ClearSearch()
 
         public void Close()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             (Frame as IVsWindowFrame).CloseFrame((uint)__FRAMECLOSE.FRAMECLOSE_NoSave);
         }
 
@@ -159,6 +162,7 @@ public void NotifyActiveDocument(Document document)
         /// <param name="document">The document.</param>
         public void NotifyDocumentSave(Document document)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (Document == document)
             {
                 // Refresh the document if active.
@@ -174,6 +178,7 @@ public void NotifyDocumentSave(Document document)
 
         public int OnShow(int fShow)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Track the visibility of this tool window.
             switch ((__FRAMESHOW)fShow)
             {
@@ -199,6 +204,7 @@ public int OnShow(int fShow)
         /// </summary>
         public override void OnToolWindowCreated()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.OnToolWindowCreated();
 
             // Register for events to this window.
@@ -210,7 +216,7 @@ public override void OnToolWindowCreated()
                 // Get an instance of the code model manager.
                 _codeModelManager = CodeModelManager.GetInstance(Package);
 
-                Package.JoinableTaskFactory.RunAsync(async () =>
+                _ = Package.JoinableTaskFactory.RunAsync(async () =>
                     await Package.SettingsMonitor.WatchAsync(s => s.Feature_SpadeToolWindow, on =>
                     {
                         if (on)
@@ -245,13 +251,18 @@ await Package.SettingsMonitor.WatchAsync(s => s.Feature_SpadeToolWindow, on =>
                 {
                     _viewModel.Dispatcher = spadeContent.Dispatcher;
 
-                    spadeContent.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(Package.ThemeManager.ApplyTheme));
+                    _ = Package.JoinableTaskFactory.RunAsync(async () =>
+                    {
+                        await Package.JoinableTaskFactory.SwitchToMainThreadAsync();
+                        Package.ThemeManager.ApplyTheme();
+                    });
                 }
             }
         }
 
         public override void ProvideSearchSettings(IVsUIDataSource pSearchSettings)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             base.ProvideSearchSettings(pSearchSettings);
 
             Utilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.ControlMinWidth, 200U);
@@ -264,6 +275,7 @@ public override void ProvideSearchSettings(IVsUIDataSource pSearchSettings)
         /// </summary>
         public void Refresh()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             Package?.ThemeManager.ApplyTheme();
 
             ConditionallyUpdateCodeModel(true);
@@ -275,6 +287,7 @@ public void Refresh()
         /// <param name="isRefresh">True if refreshing a document, otherwise false.</param>
         private void ConditionallyUpdateCodeModel(bool isRefresh)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!IsVisible) return;
 
             _viewModel.Document = Document;
@@ -298,7 +311,7 @@ private void ConditionallyUpdateCodeModel(bool isRefresh)
                     _viewModel.IsLoading = true;
                 }
 
-                var codeItems = _codeModelManager.RetrieveAllCodeItemsAsync(Document, true);
+                var codeItems = _codeModelManager.BeginRetrieveAllCodeItems(Document, true);
                 if (codeItems != null)
                 {
                     UpdateViewModelRawCodeItems(codeItems);
@@ -314,6 +327,7 @@ private void ConditionallyUpdateCodeModel(bool isRefresh)
         /// <param name="codeModel">The code model.</param>
         private void OnCodeModelBuilt(CodeModel codeModel)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (Document == codeModel.Document)
             {
                 UpdateViewModelRawCodeItems(codeModel.CodeItems);
@@ -348,4 +362,4 @@ private void UpdateViewModelRawCodeItems(SetCodeItems codeItems)
             _viewModel.IsRefreshing = false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/ToolWindows/Spade/SpadeView.xaml.cs b/CodeMaidShared/UI/ToolWindows/Spade/SpadeView.xaml.cs
index cc2debe43..00dce5119 100644
--- a/CodeMaidShared/UI/ToolWindows/Spade/SpadeView.xaml.cs
+++ b/CodeMaidShared/UI/ToolWindows/Spade/SpadeView.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
 using SteveCadwallader.CodeMaid.Helpers;
 using SteveCadwallader.CodeMaid.Logic.Reorganizing;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
@@ -152,6 +153,7 @@ private void OnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
         /// </param>
         private void OnTreeViewItemKeyDown(object sender, KeyEventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var treeViewItem = e.Source as TreeViewItem;
             if (treeViewItem == null || Keyboard.Modifiers != ModifierKeys.None) return;
 
@@ -252,6 +254,7 @@ private void OnTreeViewItemHeaderMouseMove(object sender, MouseEventArgs e)
         /// </param>
         private void OnTreeViewItemHeaderMouseUp(object sender, MouseButtonEventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             _dragCandidate = null;
             _dragStartPoint = null;
 
@@ -364,6 +367,7 @@ private void OnTreeViewItemHeaderDragLeave(object sender, DragEventArgs e)
         /// </param>
         private void OnTreeViewItemHeaderDrop(object sender, DragEventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!e.Data.GetDataPresent(typeof(IList<BaseCodeItem>))) return;
 
             var treeViewItem = FindParentTreeViewItem(sender);
@@ -528,8 +532,11 @@ private void JumpToCodeItem(BaseCodeItem codeItem)
             var viewModel = ViewModel;
             if (codeItem == null || viewModel == null || codeItem.StartOffset <= 0) return;
 
-            Dispatcher.BeginInvoke(
-                new Action(() => TextDocumentHelper.MoveToCodeItem(viewModel.Document, codeItem, Settings.Default.Digging_CenterOnWhole)));
+            _ = viewModel.Package?.JoinableTaskFactory.RunAsync(async () =>
+            {
+                await viewModel.Package.JoinableTaskFactory.SwitchToMainThreadAsync();
+                TextDocumentHelper.MoveToCodeItem(viewModel.Document, codeItem, Settings.Default.Digging_CenterOnWhole);
+            });
         }
 
         /// <summary>
@@ -549,8 +556,11 @@ private void SelectCodeItem(BaseCodeItem codeItem)
             var viewModel = ViewModel;
             if (codeItem == null || viewModel == null || codeItem.StartOffset <= 0) return;
 
-            Dispatcher.BeginInvoke(
-                new Action(() => TextDocumentHelper.SelectCodeItem(viewModel.Document, codeItem)));
+            _ = viewModel.Package?.JoinableTaskFactory.RunAsync(async () =>
+            {
+                await viewModel.Package.JoinableTaskFactory.SwitchToMainThreadAsync();
+                TextDocumentHelper.SelectCodeItem(viewModel.Document, codeItem);
+            });
         }
 
         /// <summary>
@@ -561,7 +571,7 @@ private void ShowContextMenu(Point point)
         {
             if (ViewModel?.Package is var package)
             {
-                package.JoinableTaskFactory.RunAsync(async () =>
+                _ = package.JoinableTaskFactory.RunAsync(async () =>
                 {
                     if (await package.GetServiceAsync(typeof(IMenuCommandService)) is OleMenuCommandService menuCommandService)
                     {
@@ -575,4 +585,4 @@ private void ShowContextMenu(Point point)
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/CodeMaidShared/UI/ToolWindows/Spade/SpadeViewModel.cs b/CodeMaidShared/UI/ToolWindows/Spade/SpadeViewModel.cs
index 6894395cf..cad74354c 100644
--- a/CodeMaidShared/UI/ToolWindows/Spade/SpadeViewModel.cs
+++ b/CodeMaidShared/UI/ToolWindows/Spade/SpadeViewModel.cs
@@ -1,4 +1,5 @@
 using EnvDTE;
+using Microsoft.VisualStudio.Threading;
 using SteveCadwallader.CodeMaid.Logic.Digging;
 using SteveCadwallader.CodeMaid.Model.CodeItems;
 using SteveCadwallader.CodeMaid.Model.CodeTree;
@@ -6,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Threading;
+using Microsoft.VisualStudio.Shell;
 
 namespace SteveCadwallader.CodeMaid.UI.ToolWindows.Spade
 {
@@ -180,7 +182,7 @@ public void RequestRefresh()
         /// </summary>
         private void RequestUpdatedOrganizedCodeItems()
         {
-            _codeTreeBuilderAsync.RetrieveCodeTreeAsync(new CodeTreeRequest(Document, RawCodeItems, SortOrder, NameFilter));
+            _codeTreeBuilderAsync.BeginRetrieveCodeTree(new CodeTreeRequest(Document, RawCodeItems, SortOrder, NameFilter));
         }
 
         /// <summary>
@@ -189,9 +191,13 @@ private void RequestUpdatedOrganizedCodeItems()
         /// <param name="snapshot">The code items snapshot.</param>
         private void UpdateOrganizedCodeItems(SnapshotCodeItems snapshot)
         {
-            if (Document == snapshot.Document)
+            if (Document == snapshot.Document && Package != null)
             {
-                Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => OrganizedCodeItems = snapshot.CodeItems));
+                _ = Package.JoinableTaskFactory.RunAsync(async () =>
+                {
+                    await Package.JoinableTaskFactory.SwitchToMainThreadAsync();
+                    OrganizedCodeItems = snapshot.CodeItems;
+                });
             }
         }
 
@@ -200,6 +206,7 @@ private void UpdateOrganizedCodeItems(SnapshotCodeItems snapshot)
         /// </summary>
         private void UpdateOutliningSynchronization()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (Settings.Default.Digging_SynchronizeOutlining)
             {
                 if (_outliningSynchronizationManager == null)
@@ -219,4 +226,4 @@ private void UpdateOutliningSynchronization()
 
         #endregion Methods
     }
-}
\ No newline at end of file
+}
diff --git a/appveyor.yml b/appveyor.yml
index 5892559a4..79bdd7b7a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ build_script:
   - msbuild /p:configuration=Release /p:DeployExtension=false /p:ZipPackageCompressionLevel=normal /v:m
 
 test:
-  assemblies: SteveCadwallader.CodeMaid.UnitTests.dll
+  assemblies: SteveCadwallader.CodeMaid.UnitTests.exe
 
 after_test:
   - ps: if ($env:APPVEYOR_REPO_BRANCH -eq 'dev' -or $env:APPVEYOR_REPO_BRANCH -eq 'release') { Vsix-PushArtifacts | Vsix-PublishToGallery }