diff --git a/src/SnippetDesigner/Guids.cs b/src/SnippetDesigner/Guids.cs
index 1dbeab3..c4ea5a7 100644
--- a/src/SnippetDesigner/Guids.cs
+++ b/src/SnippetDesigner/Guids.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.VisualStudio;
+using System;
 
 namespace Microsoft.SnippetDesigner
 {
@@ -22,9 +23,6 @@ public static class GuidList
 
         internal const string markerServiceString = "BD9FE285-9066-4553-9C6A-C2F49A24777E";
 
-        internal const string autoLoadOnSolutionExists = "f1536ef8-92ec-443c-9ed7-fdadf150da82";
-        internal const string autoLoadOnNoSolution = "adfc4e64-0397-11d1-9f4e-00a0c911004f";
-
         internal const string editorFactoryLogicalView = "{7651a703-06e5-11d1-8ebd-00a0c90f26ea}";
 
         internal const string miscellaneousFilesProject = "{A2FE74E1-B743-11d0-AE1A-00A0C90FFFC3}";
diff --git a/src/SnippetDesigner/Properties/AssemblyInfo.cs b/src/SnippetDesigner/Properties/AssemblyInfo.cs
index ef44e1c..d3c82fe 100644
--- a/src/SnippetDesigner/Properties/AssemblyInfo.cs
+++ b/src/SnippetDesigner/Properties/AssemblyInfo.cs
@@ -23,4 +23,4 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.6.*")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.8.*")]
\ No newline at end of file
diff --git a/src/SnippetDesigner/SnippetDesigner.csproj b/src/SnippetDesigner/SnippetDesigner.csproj
index 3d8afcb..aa8da31 100644
--- a/src/SnippetDesigner/SnippetDesigner.csproj
+++ b/src/SnippetDesigner/SnippetDesigner.csproj
@@ -2,10 +2,13 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <Import Project="..\..\..\..\CxCache\Microsoft.VSSDK.BuildTools.16.4.17\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\..\..\CxCache\Microsoft.VSSDK.BuildTools.16.4.17\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <OldToolsVersion>14.0</OldToolsVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <OldToolsVersion>15.0</OldToolsVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
@@ -43,6 +46,9 @@
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <StartAction>Program</StartAction>
+    <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix Exp</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,6 +78,9 @@
       <HintPath>..\..\..\..\CxCache\VSSDK.CoreUtility.12.0.4\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.DpiAwareness, Version=6.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\CxCache\Microsoft.VisualStudio.DpiAwareness.6.5.29903\lib\net46\Microsoft.VisualStudio.DpiAwareness.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Editor, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\CxCache\VSSDK.Editor.12.0.4\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>
       <Private>True</Private>
diff --git a/src/SnippetDesigner/SnippetDesigner.pkgdef b/src/SnippetDesigner/SnippetDesigner.pkgdef
index 3c25898..8dc1f00 100644
Binary files a/src/SnippetDesigner/SnippetDesigner.pkgdef and b/src/SnippetDesigner/SnippetDesigner.pkgdef differ
diff --git a/src/SnippetDesigner/SnippetDesignerPackage.cs b/src/SnippetDesigner/SnippetDesignerPackage.cs
index ba74ed3..663e4c9 100644
--- a/src/SnippetDesigner/SnippetDesignerPackage.cs
+++ b/src/SnippetDesigner/SnippetDesignerPackage.cs
@@ -36,15 +36,15 @@ namespace Microsoft.SnippetDesigner
     // This attribute tells the registration utility (regpkg.exe) that this class needs
     // to be registered as package.
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#100", "#102", "1.6.5", IconResourceID = 404)]
+    [InstalledProductRegistration("#100", "#102", "1.8.1", IconResourceID = 404)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     // This attribute registers a tool window exposed by this package.
     [ProvideToolWindow(typeof(SnippetExplorerToolWindow))]
     // Options pages
     [ProvideOptionPage(typeof(SnippetDesignerOptions), "Snippet Designer", "General Options", 14340, 17770, true)]
     [ProvideOptionPage(typeof(ResetOptions), "Snippet Designer", "Reset", 14340, 17771, true)]
-    [ProvideAutoLoad(GuidList.autoLoadOnNoSolution, PackageAutoLoadFlags.BackgroundLoad)]
-    [ProvideAutoLoad(GuidList.autoLoadOnSolutionExists, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExistsAndFullyLoaded_string, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(VSConstants.UICONTEXT.NoSolution_string, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideEditorExtension(typeof(EditorFactory), StringConstants.SnippetExtension, 70,
         ProjectGuid = GuidList.miscellaneousFilesProject,
         DefaultName = "Snippet Designer",
@@ -148,7 +148,12 @@ public bool IsVisualStudio2013
 
         public bool IsVisualStudio2017
         {
-            get { return VSVersion.Equals("15.0"); }
+            get { return VSVersion.StartsWith("15."); }
+        }
+
+        public bool IsVisualStudio2019
+        {
+            get { return VSVersion.StartsWith("16."); }
         }
 
         /// <summary>
@@ -249,7 +254,6 @@ private void ShowSnippetExplorer(object sender, EventArgs e)
             {
                 throw new COMException(Resources.CanNotCreateWindow);
             }
-            Guid textEditor = GuidList.textEditorFactory;
             var windowFrame = (IVsWindowFrame)window.Frame;
             ErrorHandler.ThrowOnFailure(windowFrame.Show());
         }
diff --git a/src/SnippetDesigner/SnippetDirectories.cs b/src/SnippetDesigner/SnippetDirectories.cs
index 7586ecf..e90f4b4 100644
--- a/src/SnippetDesigner/SnippetDirectories.cs
+++ b/src/SnippetDesigner/SnippetDirectories.cs
@@ -72,6 +72,11 @@ private void AddPathsFromRegistryKey(RegistryKey key, string subKeyName)
             {
                 using (RegistryKey subKey = key.OpenSubKey(subKeyName))
                 {
+                    if (subKey == null)
+                    {
+                        return;
+                    }
+
                     foreach (string name in subKey.GetValueNames())
                     {
                         string possiblePathString = subKey.GetValue(name) as string;
diff --git a/src/SnippetDesigner/SnippetEditor/SnippetEditor.cs b/src/SnippetDesigner/SnippetEditor/SnippetEditor.cs
index fef1b20..d3aad92 100644
--- a/src/SnippetDesigner/SnippetEditor/SnippetEditor.cs
+++ b/src/SnippetDesigner/SnippetEditor/SnippetEditor.cs
@@ -143,41 +143,31 @@ public SnippetEditor(SnippetDesignerPackage package)
         public void SetPropertyGridColors()
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            IVsUIShell5 shell = (IVsUIShell5)GetVsService(typeof(SVsUIShell)); 
-             var backgroundColor2 = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemBackgroundColorKey);
-            var backgroundColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowBackgroundColorKey);
+            IVsUIShell5 shell = (IVsUIShell5)GetVsService(typeof(SVsUIShell));
+            var searchBoxBackgroundColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SearchBoxBackgroundColorKey);
+            var backgroundColorLighter = VsColors.GetThemedGDIColor(shell, EnvironmentColors.BrandedUIBackgroundColorKey);
+            var backgroundColorDarker = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowBackgroundColorKey);
             var foregroundColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowTextColorKey);
-            var lineColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowContentGridColorKey);
-            var disabledColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemGrayTextColorKey);
-            var highlightColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemHighlightColorKey);
-            var highlightTextColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemHighlightTextColorKey);
-            var hyperLinkColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ControlLinkTextColorKey);
-            var hyperLinkActiveColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ControlLinkTextPressedColorKey);
-            var buttonFaceColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemButtonFaceBrushKey);
-            var buttonTextColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemButtonTextColorKey);
-            var toolWindowContentGridColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowContentGridColorKey);
-            var gridHeadingBackgroundColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.GridHeadingBackgroundColorKey);
-            var gridHeadingTextColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.GridHeadingTextColorKey);
-
-            this.codeReplacementsSplitter.BackColor = backgroundColor;
-            this.languageLabel.BackColor = backgroundColor;
+
+            this.codeReplacementsSplitter.BackColor = backgroundColorDarker;
+            this.languageLabel.BackColor = backgroundColorLighter;
             this.languageLabel.ForeColor = foregroundColor;
-            this.replacementLabel.BackColor = backgroundColor;
+            this.replacementLabel.BackColor = backgroundColorLighter;
             this.replacementLabel.ForeColor = foregroundColor;
             this.replacementTable.CellBorderStyle = TableLayoutPanelCellBorderStyle.None;
-            this.shortcutLabel.BackColor = backgroundColor;
+            this.shortcutLabel.BackColor = backgroundColorLighter;
             this.shortcutLabel.ForeColor = foregroundColor;
-            this.shortcutTextBox.BackColor = backgroundColor;
+            this.shortcutTextBox.BackColor = searchBoxBackgroundColorKey;
             this.shortcutTextBox.ForeColor = foregroundColor;
-            this.snippetCodeWindow.BackColor = backgroundColor;
+            this.snippetCodeWindow.BackColor = backgroundColorDarker;
             this.snippetCodeWindow.ForeColor = foregroundColor;
-            this.snippetsLabel.BackColor = backgroundColor;
+            this.snippetsLabel.BackColor = backgroundColorLighter;
             this.snippetsLabel.ForeColor = foregroundColor;
-            this.toolStripLanguageBox.BackColor = backgroundColor;
+            this.toolStripLanguageBox.BackColor = searchBoxBackgroundColorKey;
             this.toolStripLanguageBox.ForeColor = foregroundColor;
-            this.toolStripSnippetTitles.BackColor = backgroundColor;
+            this.toolStripSnippetTitles.BackColor = searchBoxBackgroundColorKey;
             this.toolStripSnippetTitles.ForeColor = foregroundColor;
-            this.topCommandBar.BackColor = backgroundColor;
+            this.topCommandBar.BackColor = backgroundColorLighter;
             this.topCommandBar.ForeColor = foregroundColor;
         }
 
diff --git a/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.Designer.cs b/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.Designer.cs
index 50f9b15..1445c51 100644
--- a/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.Designer.cs
+++ b/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.Designer.cs
@@ -38,7 +38,6 @@ public void InitializeComponent()
             this.shortcutLabel = new System.Windows.Forms.ToolStripLabel();
             this.shortcutTextBox = new System.Windows.Forms.ToolStripTextBox();
             this.codeReplacementsSplitter = new System.Windows.Forms.SplitContainer();
-            this.snippetCodeWindow = new Microsoft.SnippetDesigner.CodeWindow();
             this.replacementTable = new System.Windows.Forms.TableLayoutPanel();
             this.replacementGridView = new System.Windows.Forms.DataGridView();
             this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -51,6 +50,7 @@ public void InitializeComponent()
             this.replacementGridMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.removeReplacementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.replacementLabel = new System.Windows.Forms.Label();
+            this.snippetCodeWindow = new Microsoft.SnippetDesigner.CodeWindow();
             this.topCommandBar.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.codeReplacementsSplitter)).BeginInit();
             this.codeReplacementsSplitter.Panel1.SuspendLayout();
@@ -63,6 +63,8 @@ public void InitializeComponent()
             // 
             // topCommandBar
             // 
+            resources.ApplyResources(this.topCommandBar, "topCommandBar");
+            this.topCommandBar.GripMargin = new System.Windows.Forms.Padding(1);
             this.topCommandBar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
             this.topCommandBar.ImageScalingSize = new System.Drawing.Size(32, 32);
             this.topCommandBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -72,7 +74,6 @@ public void InitializeComponent()
             this.toolStripLanguageBox,
             this.shortcutLabel,
             this.shortcutTextBox});
-            resources.ApplyResources(this.topCommandBar, "topCommandBar");
             this.topCommandBar.Name = "topCommandBar";
             this.topCommandBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
             this.topCommandBar.Paint += new System.Windows.Forms.PaintEventHandler(this.mainObjectsRepaiont_Paint);
@@ -110,8 +111,8 @@ public void InitializeComponent()
             // 
             // shortcutTextBox
             // 
-            this.shortcutTextBox.Name = "shortcutTextBox";
             resources.ApplyResources(this.shortcutTextBox, "shortcutTextBox");
+            this.shortcutTextBox.Name = "shortcutTextBox";
             this.shortcutTextBox.TextChanged += new System.EventHandler(this.shortcutTextBox_TextChanged);
             // 
             // codeReplacementsSplitter
@@ -127,13 +128,6 @@ public void InitializeComponent()
             // 
             this.codeReplacementsSplitter.Panel2.Controls.Add(this.replacementTable);
             // 
-            // snippetCodeWindow
-            // 
-            resources.ApplyResources(this.snippetCodeWindow, "snippetCodeWindow");
-            this.snippetCodeWindow.CodeText = "";
-            this.snippetCodeWindow.Name = "snippetCodeWindow";
-            this.snippetCodeWindow.Paint += new System.Windows.Forms.PaintEventHandler(this.mainObjectsRepaiont_Paint);
-            // 
             // replacementTable
             // 
             resources.ApplyResources(this.replacementTable, "replacementTable");
@@ -234,6 +228,13 @@ public void InitializeComponent()
             resources.ApplyResources(this.replacementLabel, "replacementLabel");
             this.replacementLabel.Name = "replacementLabel";
             // 
+            // snippetCodeWindow
+            // 
+            resources.ApplyResources(this.snippetCodeWindow, "snippetCodeWindow");
+            this.snippetCodeWindow.CodeText = "";
+            this.snippetCodeWindow.Name = "snippetCodeWindow";
+            this.snippetCodeWindow.Paint += new System.Windows.Forms.PaintEventHandler(this.mainObjectsRepaiont_Paint);
+            // 
             // SnippetEditorForm
             // 
             resources.ApplyResources(this, "$this");
@@ -253,7 +254,6 @@ public void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.replacementGridView)).EndInit();
             this.replacementGridMenu.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
diff --git a/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.resx b/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.resx
index 77d6219..cc9abc6 100644
--- a/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.resx
+++ b/src/SnippetDesigner/SnippetEditor/SnippetEditorForm.resx
@@ -120,25 +120,29 @@
   <metadata name="topCommandBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>0, 0</value>
   </metadata>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="topCommandBar.AutoSize" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="snippetsLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>102, 37</value>
+    <value>50, 25</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="toolStripSnippetTitles.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
   </data>
   <data name="toolStripSnippetTitles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>238, 40</value>
+    <value>121, 23</value>
   </data>
   <data name="languageLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 37</value>
+    <value>65, 20</value>
   </data>
   <data name="toolStripLanguageBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>238, 40</value>
+    <value>121, 23</value>
   </data>
   <data name="shortcutLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>110, 37</value>
+    <value>55, 20</value>
   </data>
   <data name="shortcutLabel.Text" xml:space="preserve">
     <value>Shortcut:</value>
@@ -146,19 +150,21 @@
   <data name="shortcutLabel.ToolTipText" xml:space="preserve">
     <value>Keyboard shortcut to insert this snippet</value>
   </data>
+  <data name="shortcutTextBox.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="shortcutTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 40</value>
+    <value>100, 23</value>
   </data>
   <data name="topCommandBar.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="topCommandBar.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 2, 0</value>
+    <value>1, 2, 2, 0</value>
   </data>
   <data name="topCommandBar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1690, 40</value>
+    <value>845, 30</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="topCommandBar.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
@@ -181,10 +187,7 @@
     <value>Fill</value>
   </data>
   <data name="codeReplacementsSplitter.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 40</value>
-  </data>
-  <data name="codeReplacementsSplitter.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 6, 6, 6</value>
+    <value>0, 30</value>
   </data>
   <data name="codeReplacementsSplitter.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
     <value>Horizontal</value>
@@ -198,14 +201,11 @@
   <data name="snippetCodeWindow.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="snippetCodeWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 6, 6, 6</value>
-  </data>
   <data name="snippetCodeWindow.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>500, 192</value>
+    <value>250, 100</value>
   </data>
   <data name="snippetCodeWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1690, 995</value>
+    <value>845, 511</value>
   </data>
   <data name="snippetCodeWindow.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -214,7 +214,7 @@
     <value>snippetCodeWindow</value>
   </data>
   <data name="&gt;&gt;snippetCodeWindow.Type" xml:space="preserve">
-    <value>Microsoft.SnippetDesigner.CodeWindow, SnippetDesigner, Version=1.6.6287.20653, Culture=neutral, PublicKeyToken=8cfc085d5269c705</value>
+    <value>Microsoft.SnippetDesigner.CodeWindow, SnippetDesigner, Version=1.8.7422.18551, Culture=neutral, PublicKeyToken=8cfc085d5269c705</value>
   </data>
   <data name="&gt;&gt;snippetCodeWindow.Parent" xml:space="preserve">
     <value>codeReplacementsSplitter.Panel1</value>
@@ -261,14 +261,8 @@
   <metadata name="replacementGridMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>130, 5</value>
   </metadata>
-  <data name="removeReplacementToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>346, 38</value>
-  </data>
-  <data name="removeReplacementToolStripMenuItem.Text" xml:space="preserve">
-    <value>Remove Replacement</value>
-  </data>
   <data name="replacementGridMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>347, 42</value>
+    <value>190, 26</value>
   </data>
   <data name="&gt;&gt;replacementGridMenu.Name" xml:space="preserve">
     <value>replacementGridMenu</value>
@@ -280,13 +274,10 @@
     <value>Fill</value>
   </data>
   <data name="replacementGridView.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 31</value>
-  </data>
-  <data name="replacementGridView.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 6, 6, 6</value>
+    <value>3, 16</value>
   </data>
   <data name="replacementGridView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1678, 483</value>
+    <value>839, 249</value>
   </data>
   <data name="replacementGridView.TabIndex" type="System.Int32, mscorlib">
     <value>26</value>
@@ -313,13 +304,10 @@
     <value>NoControl</value>
   </data>
   <data name="replacementLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 0</value>
-  </data>
-  <data name="replacementLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 0, 6, 0</value>
+    <value>3, 0</value>
   </data>
   <data name="replacementLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 25</value>
+    <value>75, 13</value>
   </data>
   <data name="replacementLabel.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -345,14 +333,11 @@
   <data name="replacementTable.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="replacementTable.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 6, 6, 6</value>
-  </data>
   <data name="replacementTable.RowCount" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="replacementTable.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1690, 520</value>
+    <value>845, 268</value>
   </data>
   <data name="replacementTable.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -385,13 +370,10 @@
     <value>1</value>
   </data>
   <data name="codeReplacementsSplitter.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1690, 1523</value>
+    <value>845, 783</value>
   </data>
   <data name="codeReplacementsSplitter.SplitterDistance" type="System.Int32, mscorlib">
-    <value>995</value>
-  </data>
-  <data name="codeReplacementsSplitter.SplitterWidth" type="System.Int32, mscorlib">
-    <value>8</value>
+    <value>511</value>
   </data>
   <data name="codeReplacementsSplitter.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -408,6 +390,12 @@
   <data name="&gt;&gt;codeReplacementsSplitter.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="removeReplacementToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>189, 22</value>
+  </data>
+  <data name="removeReplacementToolStripMenuItem.Text" xml:space="preserve">
+    <value>Remove Replacement</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -415,7 +403,7 @@
     <value>339</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>12, 25</value>
+    <value>6, 13</value>
   </data>
   <data name="$this.AutoScroll" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -423,11 +411,8 @@
   <data name="$this.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 6, 6, 6</value>
-  </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1690, 1563</value>
+    <value>845, 813</value>
   </data>
   <data name="&gt;&gt;snippetsLabel.Name" xml:space="preserve">
     <value>snippetsLabel</value>
diff --git a/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.cs b/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.cs
index dc4d316..f3113ca 100644
--- a/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.cs
+++ b/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.cs
@@ -35,6 +35,7 @@ public partial class SnippetExplorerForm : UserControl, ICodeWindowHost
         /// </summary>
         public SnippetExplorerForm()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             InitializeComponent();
             previewCodeWindow.CodeWindowHost = this;
 
@@ -55,48 +56,42 @@ public void SetPropertyGridColors()
         {
             ThreadHelper.ThrowIfNotOnUIThread();
             IVsUIShell5 shell = (IVsUIShell5)GetVsService(typeof(SVsUIShell));
-            var backgroundColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowBackgroundColorKey);
+            
+            var backgroundColorDarker = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowBackgroundColorKey);
+            var backgroundColorLighter = VsColors.GetThemedGDIColor(shell, EnvironmentColors.BrandedUIBackgroundColorKey);
+            var searchBoxBackgroundColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SearchBoxBackgroundColorKey);
             var foregroundColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowTextColorKey);
-            var lineColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowContentGridColorKey);
-            var disabledColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemGrayTextColorKey);
-            var highlightColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemHighlightColorKey);
-            var highlightTextColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemHighlightTextColorKey);
-            var hyperLinkColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ControlLinkTextColorKey);
-            var hyperLinkActiveColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ControlLinkTextPressedColorKey);
             var buttonFaceColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemButtonFaceBrushKey);
             var buttonTextColor = VsColors.GetThemedGDIColor(shell, EnvironmentColors.SystemButtonTextColorKey);
-            var toolWindowContentGridColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.ToolWindowContentGridColorKey);
-            var gridHeadingBackgroundColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.GridHeadingBackgroundColorKey);
-            var gridHeadingTextColorKey = VsColors.GetThemedGDIColor(shell, EnvironmentColors.GridHeadingTextColorKey);
 
 
             this.searchButton.BackColor = buttonFaceColor;
             this.searchButton.ForeColor = buttonTextColor;
-            this.searchOptionBar.BackColor = backgroundColor;
+            this.searchOptionBar.BackColor = backgroundColorLighter;
             this.searchOptionBar.ForeColor = foregroundColor;
-            this.searchBox.BackColor = backgroundColor;
+            this.searchBox.BackColor = searchBoxBackgroundColorKey;
             this.searchBox.ForeColor = foregroundColor;
-            this.showCountComboBox.BackColor = backgroundColor;
+            this.showCountComboBox.BackColor = searchBoxBackgroundColorKey;
             this.showCountComboBox.ForeColor = foregroundColor;
-            this.showCountLabel.BackColor = backgroundColor;
+            this.showCountLabel.BackColor = backgroundColorLighter;
             this.showCountLabel.ForeColor = foregroundColor;
-            this.languageLabel.BackColor = backgroundColor;
+            this.languageLabel.BackColor = backgroundColorLighter;
             this.languageLabel.ForeColor = foregroundColor;
-            this.languageFilters.BackColor = backgroundColor;
+            this.languageFilters.BackColor = backgroundColorLighter;
             this.languageFilters.ForeColor = foregroundColor;
 
-            this.panel1.BackColor = backgroundColor;
+            this.panel1.BackColor = backgroundColorLighter;
             this.panel1.ForeColor = foregroundColor;
-            this.panel2.BackColor = backgroundColor;
+            this.panel2.BackColor = backgroundColorLighter;
             this.panel2.ForeColor = foregroundColor;
-            this.tableLayoutPanel1.BackColor = backgroundColor;
+            this.tableLayoutPanel1.BackColor = backgroundColorLighter;
             //this.tableLayoutPanel1.ForeColor = foregroundColor;
             this.tableLayoutPanel1.CellBorderStyle = TableLayoutPanelCellBorderStyle.None;
-            this.toolStripSeparator1.BackColor = backgroundColor;
+            this.toolStripSeparator1.BackColor = backgroundColorLighter;
             this.toolStripSeparator1.ForeColor = foregroundColor;
-            this.snippetExplorerSplitter.BackColor = backgroundColor;
+            this.snippetExplorerSplitter.BackColor = backgroundColorLighter;
             this.previewCodeWindow.ForeColor = foregroundColor;
-            this.previewCodeWindow.BackColor = backgroundColor;
+            this.previewCodeWindow.BackColor = backgroundColorDarker;
         }
 
         /// <summary>
diff --git a/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.resx b/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.resx
index e549534..3324714 100644
--- a/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.resx
+++ b/src/SnippetDesigner/SnippetExplorer/SnippetExplorerForm.resx
@@ -125,6 +125,9 @@
   <data name="snippetExplorerSplitter.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="snippetExplorerSplitter.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
+  </data>
   <data name="snippetExplorerSplitter.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
     <value>Horizontal</value>
   </data>
@@ -135,17 +138,20 @@
   <data name="panel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
+  <data name="languageFilters.ColumnWidth" type="System.Int32, mscorlib">
+    <value>150</value>
+  </data>
   <data name="languageFilters.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <data name="languageFilters.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 17</value>
+    <value>6, 33</value>
   </data>
   <data name="languageFilters.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 10, 3, 0</value>
+    <value>6, 18, 6, 0</value>
   </data>
   <data name="languageFilters.Size" type="System.Drawing.Size, System.Drawing">
-    <value>331, 46</value>
+    <value>607, 82</value>
   </data>
   <data name="languageFilters.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -175,16 +181,16 @@
     <value>NoControl</value>
   </data>
   <data name="languageLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 0</value>
+    <value>6, 1</value>
   </data>
   <data name="languageLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 3, 5</value>
+    <value>0, 0, 6, 9</value>
   </data>
   <data name="languageLabel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 4</value>
+    <value>0, 0, 0, 7</value>
   </data>
   <data name="languageLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 17</value>
+    <value>126, 32</value>
   </data>
   <data name="languageLabel.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -208,13 +214,16 @@
     <value>Fill</value>
   </data>
   <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 35</value>
+    <value>6, 50</value>
+  </data>
+  <data name="panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="panel1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 0, 0, 0</value>
+    <value>6, 1, 0, 1</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>336, 65</value>
+    <value>615, 118</value>
   </data>
   <data name="panel1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -238,28 +247,31 @@
     <value>Fill</value>
   </data>
   <data name="showCountLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>42, 22</value>
+    <value>74, 36</value>
   </data>
   <data name="showCountLabel.Text" xml:space="preserve">
     <value>Show: </value>
   </data>
   <data name="showCountComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 25</value>
+    <value>219, 42</value>
   </data>
   <data name="statusLabel.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt</value>
   </data>
   <data name="statusLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 22</value>
+    <value>0, 36</value>
   </data>
   <data name="searchOptionBar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 103</value>
+    <value>0, 174</value>
   </data>
   <data name="searchOptionBar.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 3</value>
+    <value>0, 0, 0, 6</value>
+  </data>
+  <data name="searchOptionBar.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>0, 1, 4, 1</value>
   </data>
   <data name="searchOptionBar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>342, 25</value>
+    <value>627, 44</value>
   </data>
   <data name="searchOptionBar.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -282,8 +294,11 @@
   <data name="Icon.HeaderText" xml:space="preserve">
     <value />
   </data>
+  <data name="Icon.MinimumWidth" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
   <data name="Icon.Width" type="System.Int32, mscorlib">
-    <value>19</value>
+    <value>33</value>
   </data>
   <metadata name="Title.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -291,6 +306,9 @@
   <data name="Title.HeaderText" xml:space="preserve">
     <value>Title</value>
   </data>
+  <data name="Title.MinimumWidth" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
   <data name="Title.Width" type="System.Int32, mscorlib">
     <value>52</value>
   </data>
@@ -300,6 +318,9 @@
   <data name="Description.HeaderText" xml:space="preserve">
     <value>Description</value>
   </data>
+  <data name="Description.MinimumWidth" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
   <data name="Description.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
@@ -312,8 +333,11 @@
   <data name="Language.HeaderText" xml:space="preserve">
     <value>Language</value>
   </data>
+  <data name="Language.MinimumWidth" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
   <data name="Language.Width" type="System.Int32, mscorlib">
-    <value>81</value>
+    <value>105</value>
   </data>
   <metadata name="Path.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -321,29 +345,32 @@
   <data name="Path.HeaderText" xml:space="preserve">
     <value>Path</value>
   </data>
+  <data name="Path.MinimumWidth" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
   <data name="Path.Width" type="System.Int32, mscorlib">
-    <value>55</value>
+    <value>74</value>
   </data>
   <metadata name="snippetExplorerContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>107, 22</value>
+    <value>146, 36</value>
   </data>
   <data name="openToolStripMenuItem.Text" xml:space="preserve">
     <value>Open</value>
   </data>
   <data name="deleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>107, 22</value>
+    <value>146, 36</value>
   </data>
   <data name="deleteToolStripMenuItem.Text" xml:space="preserve">
     <value>Delete</value>
   </data>
   <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>104, 6</value>
+    <value>143, 6</value>
   </data>
   <data name="snippetExplorerContextMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 54</value>
+    <value>147, 82</value>
   </data>
   <data name="&gt;&gt;snippetExplorerContextMenu.Name" xml:space="preserve">
     <value>snippetExplorerContextMenu</value>
@@ -355,10 +382,16 @@
     <value>Fill</value>
   </data>
   <data name="searchResultView.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 134</value>
+    <value>6, 230</value>
+  </data>
+  <data name="searchResultView.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
+  </data>
+  <data name="searchResultView.RowHeadersWidth" type="System.Int32, mscorlib">
+    <value>72</value>
   </data>
   <data name="searchResultView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>336, 212</value>
+    <value>615, 408</value>
   </data>
   <data name="searchResultView.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -382,13 +415,13 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="searchBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>6, 6</value>
   </data>
   <data name="searchBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 10, 3, 3</value>
+    <value>6, 18, 6, 6</value>
   </data>
   <data name="searchBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 20</value>
+    <value>459, 20</value>
   </data>
   <data name="searchBox.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -415,10 +448,13 @@
     <value>NoControl</value>
   </data>
   <data name="searchButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>261, 0</value>
+    <value>477, 0</value>
+  </data>
+  <data name="searchButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="searchButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 26</value>
+    <value>138, 32</value>
   </data>
   <data name="searchButton.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -442,10 +478,13 @@
     <value>Fill</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>6, 6</value>
+  </data>
+  <data name="panel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>336, 26</value>
+    <value>615, 32</value>
   </data>
   <data name="panel2.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -475,7 +514,7 @@
     <value>5</value>
   </data>
   <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>342, 349</value>
+    <value>627, 644</value>
   </data>
   <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -514,10 +553,10 @@
     <value>0, 0</value>
   </data>
   <data name="previewCodeWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>5, 5, 5, 5</value>
+    <value>9, 9, 9, 9</value>
   </data>
   <data name="previewCodeWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>342, 221</value>
+    <value>627, 409</value>
   </data>
   <data name="previewCodeWindow.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -526,7 +565,7 @@
     <value>previewCodeWindow</value>
   </data>
   <data name="&gt;&gt;previewCodeWindow.Type" xml:space="preserve">
-    <value>Microsoft.SnippetDesigner.CodeWindow, SnippetDesigner, Version=1.6.7418.27765, Culture=neutral, PublicKeyToken=8cfc085d5269c705</value>
+    <value>Microsoft.SnippetDesigner.CodeWindow, SnippetDesigner, Version=1.8.7424.17259, Culture=neutral, PublicKeyToken=8cfc085d5269c705</value>
   </data>
   <data name="&gt;&gt;previewCodeWindow.Parent" xml:space="preserve">
     <value>snippetExplorerSplitter.Panel2</value>
@@ -547,10 +586,13 @@
     <value>1</value>
   </data>
   <data name="snippetExplorerSplitter.Size" type="System.Drawing.Size, System.Drawing">
-    <value>342, 574</value>
+    <value>627, 1060</value>
   </data>
   <data name="snippetExplorerSplitter.SplitterDistance" type="System.Int32, mscorlib">
-    <value>349</value>
+    <value>644</value>
+  </data>
+  <data name="snippetExplorerSplitter.SplitterWidth" type="System.Int32, mscorlib">
+    <value>7</value>
   </data>
   <data name="snippetExplorerSplitter.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -571,10 +613,13 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>11, 24</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>342, 574</value>
+    <value>627, 1060</value>
   </data>
   <data name="&gt;&gt;showCountLabel.Name" xml:space="preserve">
     <value>showCountLabel</value>
diff --git a/src/SnippetDesigner/SnippetExplorer/SnippetExplorerToolWindow.cs b/src/SnippetDesigner/SnippetExplorer/SnippetExplorerToolWindow.cs
index 98893e4..4e29b58 100644
--- a/src/SnippetDesigner/SnippetExplorer/SnippetExplorerToolWindow.cs
+++ b/src/SnippetDesigner/SnippetExplorer/SnippetExplorerToolWindow.cs
@@ -4,7 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Microsoft.VisualStudio.Shell;
-
+using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.SnippetDesigner.SnippetExplorer
 {
@@ -44,8 +44,6 @@ public SnippetExplorerToolWindow()
             // the strip being 16x16.
             this.BitmapResourceID = 301;
             this.BitmapIndex = 2;
-
-            snippetExplorerForm = new SnippetExplorerForm();
         }
 
 
@@ -57,7 +55,15 @@ override public IWin32Window Window
         {
             get
             {
-                return (IWin32Window)snippetExplorerForm;
+
+                using (DpiAwareness.EnterDpiScope(DpiAwarenessContext.SystemAware))
+                {
+                    if (snippetExplorerForm == null)
+                    {
+                        snippetExplorerForm = new SnippetExplorerForm();
+                    }
+                    return snippetExplorerForm;
+                }
             }
         }
     }
diff --git a/src/SnippetDesigner/packages.config b/src/SnippetDesigner/packages.config
index 4ce3406..91df21f 100644
--- a/src/SnippetDesigner/packages.config
+++ b/src/SnippetDesigner/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.VisualStudio.DpiAwareness" version="6.5.29903" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.SDK.Analyzers" version="16.5.5" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.8.122" targetFramework="net46" />
   <package id="Microsoft.VSSDK.BuildTools" version="16.4.17" targetFramework="net46" developmentDependency="true" />
diff --git a/src/SnippetDesigner/source.extension.vsixmanifest b/src/SnippetDesigner/source.extension.vsixmanifest
index 78aa180..6bfb914 100644
--- a/src/SnippetDesigner/source.extension.vsixmanifest
+++ b/src/SnippetDesigner/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="d21b0d98-7dad-421e-895e-424a0a4e6f0e" Version="1.8.0" Language="en-US" Publisher="Matthew Manela" />
+        <Identity Id="d21b0d98-7dad-421e-895e-424a0a4e6f0e" Version="1.8.1" Language="en-US" Publisher="Matthew Manela" />
         <DisplayName>Snippet Designer</DisplayName>
         <Description xml:space="preserve">Snippet Designer is a Visual Studio plug in which allows you to create and search for snippets inside the IDE</Description>
         <MoreInfo>https://github.com/mmanela/SnippetDesigner</MoreInfo>
@@ -11,11 +11,11 @@
         <Tags>snippet languages editor</Tags>
     </Metadata>
     <Installation InstalledByMsi="false">
-        <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.Pro" />
-        <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.IntegratedShell" />
-        <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.Premium" />
-        <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.Ultimate" />
-        <InstallationTarget Version="[15.0,]" Id="Microsoft.VisualStudio.Community" />
+        <InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.Pro" />
+        <InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.IntegratedShell" />
+        <InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.Premium" />
+        <InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.Ultimate" />
+        <InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.Community" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />