diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index b44eabf..53b18e4 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -19,10 +19,11 @@ jobs:
 
     env:
       Solution_Name: Acrolinx.Demo.Sidebar.Net.sln
+      NUGET_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -37,7 +38,7 @@ jobs:
 
       # Install the .NET Core workload
       - name: Install .NET Core
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 5.0.x
 
@@ -51,10 +52,11 @@ jobs:
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
-      - name: Set up JDK 11 - required by sonar
-        uses: actions/setup-java@v1
+      - name: Setup Java - required by sonar
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          java-version: '17'
+          distribution: 'temurin'
 
       - name: Set version from tag name
         if: startsWith(github.ref,'refs/tags/v')
@@ -63,7 +65,6 @@ jobs:
 
       - name: begin sonar
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
         run: sonar-msbuild\SonarScanner.MSBuild.exe begin /o:"acrolinx" /k:"acrolinx_acrolinx-sidebar-demo-dotnet" /d:sonar.token=$env:SONAR_TOKEN /d:sonar.host.url="https://sonarcloud.io"
 
@@ -77,7 +78,6 @@ jobs:
 
       - name: end sonar
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
         run: sonar-msbuild\SonarScanner.MSBuild.exe end /d:sonar.token=$env:SONAR_TOKEN
 
diff --git a/.gitignore b/.gitignore
index 9977ba3..31f7e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ download
 
 # Eclipse
 .project
+Acrolinx.Demo.Sidebar/runtimes/
diff --git a/Acrolinx.Demo.Sidebar.Net.sln b/Acrolinx.Demo.Sidebar.Net.sln
index 031216f..de2ac37 100644
--- a/Acrolinx.Demo.Sidebar.Net.sln
+++ b/Acrolinx.Demo.Sidebar.Net.sln
@@ -8,13 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Debug|x86.Build.0 = Debug|Any CPU
 		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{41FA1FDD-2E94-45D4-808F-DC8E611F3DEE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Acrolinx.Demo.Sidebar/Acrolinx.Demo.Sidebar.csproj b/Acrolinx.Demo.Sidebar/Acrolinx.Demo.Sidebar.csproj
index a31c9b3..e6f9acd 100644
--- a/Acrolinx.Demo.Sidebar/Acrolinx.Demo.Sidebar.csproj
+++ b/Acrolinx.Demo.Sidebar/Acrolinx.Demo.Sidebar.csproj
@@ -9,10 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Acrolinx.Demo.Sidebar</RootNamespace>
     <AssemblyName>Acrolinx.Demo.Sidebar</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -81,24 +83,39 @@
     <ApplicationIcon>acrolinx.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Acrolinx.Sidebar, Version=1.1.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Acrolinx.Sidebar.1.1.8.1220\lib\net45\Acrolinx.Sidebar.dll</HintPath>
+    <Reference Include="Acrolinx.Sidebar, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Acrolinx.Sidebar.2.0.0.1380\lib\net472\Acrolinx.Sidebar.dll</HintPath>
     </Reference>
-    <Reference Include="Diff.Match.Patch, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Diff.Match.Patch.2.1.0\lib\net45\Diff.Match.Patch.dll</HintPath>
+    <Reference Include="Diff.Match.Patch, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Diff.Match.Patch.3.0.1\lib\netstandard2.0\Diff.Match.Patch.dll</HintPath>
     </Reference>
-    <Reference Include="FSharp.Core, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FSharp.Core.4.7.2\lib\net45\FSharp.Core.dll</HintPath>
+    <Reference Include="FSharp.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FSharp.Core.5.0.0\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.2151.40, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.2151.40\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.2151.40, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.2151.40\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.2151.40, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.2151.40\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -134,6 +151,7 @@
     <Compile Include="TextBoxAdapter.cs" />
     <EmbeddedResource Include="MultiSample.resx">
       <DependentUpon>MultiSample.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -150,6 +168,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="SimpleSample.resx">
       <DependentUpon>SimpleSample.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="packages.config">
       <SubType>Designer</SubType>
@@ -170,13 +189,20 @@
   <ItemGroup>
     <Content Include="acrolinx.ico" />
     <Content Include="Acrolinx.Sidebar.log4net.xml" />
-    <Content Include="Acrolinx.Startpage.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Config.Resource.log4net.xml" />
+    <Content Include="runtimes\win-arm64\native\WebView2Loader.dll" />
+    <Content Include="runtimes\win-x64\native\WebView2Loader.dll" />
+    <Content Include="runtimes\win-x86\native\WebView2Loader.dll" />
     <None Include="Resources\loading.bmp" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.Web.WebView2.1.0.2151.40\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2151.40\build\Microsoft.Web.WebView2.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2151.40\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2151.40\build\Microsoft.Web.WebView2.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Acrolinx.Demo.Sidebar/Acrolinx.Startpage.dll b/Acrolinx.Demo.Sidebar/Acrolinx.Startpage.dll
deleted file mode 100644
index 330d910..0000000
Binary files a/Acrolinx.Demo.Sidebar/Acrolinx.Startpage.dll and /dev/null differ
diff --git a/Acrolinx.Demo.Sidebar/App.config b/Acrolinx.Demo.Sidebar/App.config
index 9dd9317..8ee4052 100644
--- a/Acrolinx.Demo.Sidebar/App.config
+++ b/Acrolinx.Demo.Sidebar/App.config
@@ -7,7 +7,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
     <applicationSettings>
         <Acrolinx.Demo.Sidebar.Properties.Settings>
@@ -170,7 +170,15 @@ CAUTION: Don't lift the 360 chassis by the front (bezel end) and back (service e
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.14.0" newVersion="2.0.14.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.15.0" newVersion="2.0.15.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Web.WebView2.WinForms" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.2151.40" newVersion="1.0.2151.40" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Web.WebView2.Core" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.2151.40" newVersion="1.0.2151.40" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Acrolinx.Demo.Sidebar/Integration.cs b/Acrolinx.Demo.Sidebar/Integration.cs
index 2a44e4e..7f48ce6 100644
--- a/Acrolinx.Demo.Sidebar/Integration.cs
+++ b/Acrolinx.Demo.Sidebar/Integration.cs
@@ -36,8 +36,7 @@ public Integration(AcrolinxSidebar sidebar)
             //This allows you to talk to the server without configuring CORS.
             //Ensure the SidebarSourceLocation uses the same host as ServerAddress.
             //Ensure the external name of the Acrolinx Server equals the host name you are talking to.
-            //sidebar.SidebarSourceLocation = "http://yourlocalserver:8031/sidebar/v14/index.html";
-            //sidebar.ServerAddress = "http://yourlocalserver:8031";
+            //sidebar.ServerAddress = "https://company.acrolinx.cloud";
             //sidebar.ShowServerSelector = false;
             //Make sure to call sidebar.Start() instead of sidebar.Start(serverAddress), if you uncomment one of these options.
 
@@ -52,9 +51,12 @@ public Integration(AcrolinxSidebar sidebar)
             //Set version information. This is used for support and Acrolinx Analytics.
             //sidebar.RegisterClientComponent(typeof(Integration).Assembly, "Acrolinx for " + Application.ProductName, AcrolinxSidebar.SoftwareComponentCategory.MAIN);
             //sidebar.RegisterClientComponent(Assembly.GetEntryAssembly(), Application.ProductName, AcrolinxSidebar.SoftwareComponentCategory.DEFAULT);
+        }
 
+        public async Task Start()
+        {
             //Start the Sidebar, which connects to an Acrolinx Server.
-            sidebar.Start();
+            await sidebar.Start();
         }
 
         public void RegisterTextBox(TextBox textBox)
@@ -79,14 +81,14 @@ public void RegisterXmlTextBox(TextBox textBox)
         private MultiAdapter current = new MultiAdapter("", new UniversalAdapter[0], Format.Auto);
         private MultiAdapter request = new MultiAdapter("", new UniversalAdapter[0], Format.Auto);
 
-        private void RequestCheck(object sender, EventArgs e)
+        private async void RequestCheck(object sender, EventArgs e)
         {
             Logger.AcroLog.Info("RequestCheck");
 
             request = new MultiAdapter("DotNetSampleXML", adapterList, Format.Auto);
             request.DocumentReference = "dotnetSample/topspin.xml"; //Document reference should be set to path, uri or unique id of the current document
 
-            var checkId = sidebar.Check(request.Document);
+            var checkId = await sidebar.Check(request.Document);
 
             Logger.AcroLog.Debug("Check submitted with id: " + checkId);
         }
@@ -99,7 +101,7 @@ private void Checked(object sender, CheckedEventArgs e)
         }
 
 
-        private void SelectRanges(object sender, MatchesEventArgs e)
+        private async void SelectRanges(object sender, MatchesEventArgs e)
         {
             Contract.Requires(e.Matches.All(m => (0 <= m.Range.Start && m.Range.End <= current.Document.Content.Length)));
 
@@ -112,11 +114,11 @@ private void SelectRanges(object sender, MatchesEventArgs e)
             catch (Exception err)
             {
                 Logger.AcroLog.Error(err);
-                sidebar.InvalidateRanges(e.CheckId, e.Matches);
+                await sidebar.InvalidateRanges(e.CheckId, e.Matches);
             }
         }
 
-        private void ReplaceRanges(object sender, MatchesWithReplacementEventArgs e)
+        private async void ReplaceRanges(object sender, MatchesWithReplacementEventArgs e)
         {
             Contract.Requires(e.Matches.All(m => m.Range.Start >= 0 && m.Range.End <= current.Document.Content.Length));
             Logger.AcroLog.Info("ReplaceRanges: " + e.Matches);
@@ -127,7 +129,7 @@ private void ReplaceRanges(object sender, MatchesWithReplacementEventArgs e)
             catch (Exception err)
             {
                 Logger.AcroLog.Error(err);
-                sidebar.InvalidateRanges(e.CheckId, e.Matches);
+                await sidebar.InvalidateRanges(e.CheckId, e.Matches);
             }
         }
     }
diff --git a/Acrolinx.Demo.Sidebar/MultiSample.Designer.cs b/Acrolinx.Demo.Sidebar/MultiSample.Designer.cs
index c7efa5b..3e91a28 100644
--- a/Acrolinx.Demo.Sidebar/MultiSample.Designer.cs
+++ b/Acrolinx.Demo.Sidebar/MultiSample.Designer.cs
@@ -141,13 +141,17 @@ private void InitializeComponent()
             // 
             // acrolinxSidebar
             // 
+            this.acrolinxSidebar.ClientLocale = "";
             this.acrolinxSidebar.ClientSignature = "SW50ZWdyYXRpb25EZXZlbG9wbWVudERlbW9Pbmx5";
             this.acrolinxSidebar.Dock = System.Windows.Forms.DockStyle.Right;
             this.acrolinxSidebar.Location = new System.Drawing.Point(816, 0);
+            this.acrolinxSidebar.Margin = new System.Windows.Forms.Padding(4);
             this.acrolinxSidebar.MaximumSize = new System.Drawing.Size(300, 0);
+            this.acrolinxSidebar.MinimumSidebarVersion = "14.5.0";
             this.acrolinxSidebar.MinimumSize = new System.Drawing.Size(300, 0);
             this.acrolinxSidebar.Name = "acrolinxSidebar";
             this.acrolinxSidebar.Size = new System.Drawing.Size(300, 513);
+            this.acrolinxSidebar.SupportCheckSelection = false;
             this.acrolinxSidebar.TabIndex = 2;
             // 
             // MultiSample
@@ -160,6 +164,7 @@ private void InitializeComponent()
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "MultiSample";
             this.Text = "Acrolinx Sidebar .NET Multi";
+            this.Load += new System.EventHandler(this.MultiSample_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.panel2.ResumeLayout(false);
diff --git a/Acrolinx.Demo.Sidebar/MultiSample.cs b/Acrolinx.Demo.Sidebar/MultiSample.cs
index a875b82..cab52a1 100644
--- a/Acrolinx.Demo.Sidebar/MultiSample.cs
+++ b/Acrolinx.Demo.Sidebar/MultiSample.cs
@@ -29,7 +29,6 @@ public MultiSample()
 
             integration = new Integration(acrolinxSidebar);
 
-
             integration.RegisterTitleTextBox(textBoxTitle); //Deal with plain text
             integration.RegisterXmlTextBox(textBoxPlainXML); //Deal with xml content
 
@@ -37,8 +36,6 @@ public MultiSample()
             {
                 addTextSnippet();
             }
-
-
         }
 
          private void addTextSnippetToolStripMenuItem_Click(object sender, EventArgs e)
@@ -64,5 +61,10 @@ private void addTextSnippet()
 
              integration.RegisterTextBox(newTextBox);
          }
+
+        private async void MultiSample_Load(object sender, EventArgs e)
+        {
+           await integration.Start();
+        }
     }
 }
diff --git a/Acrolinx.Demo.Sidebar/Properties/Resources.Designer.cs b/Acrolinx.Demo.Sidebar/Properties/Resources.Designer.cs
index 230a1cd..b5602b2 100644
--- a/Acrolinx.Demo.Sidebar/Properties/Resources.Designer.cs
+++ b/Acrolinx.Demo.Sidebar/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Acrolinx.Demo.Sidebar.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -61,12 +61,11 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Looks up a localized string similar to (Translation placeholder, please remove from source file.).
         /// </summary>
-        internal static System.Drawing.Bitmap loading {
+        internal static string PLACEHOLDER {
             get {
-                object obj = ResourceManager.GetObject("loading", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
+                return ResourceManager.GetString("PLACEHOLDER", resourceCulture);
             }
         }
     }
diff --git a/Acrolinx.Demo.Sidebar/Properties/Settings.Designer.cs b/Acrolinx.Demo.Sidebar/Properties/Settings.Designer.cs
index cf5bed9..8807932 100644
--- a/Acrolinx.Demo.Sidebar/Properties/Settings.Designer.cs
+++ b/Acrolinx.Demo.Sidebar/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Acrolinx.Demo.Sidebar.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -25,49 +25,48 @@ public static Settings Default {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Topspin 360 Quick Start\r\n\r\nThis document will describe the basic steps required t" +
-            "o install and configure the Topspin 360 system.\r\nRequirements\r\nTo install the To" +
-            "pspin 360 into a rack, you require the following:\r\n\r\n - one #1 and one #2 Philli" +
-            "ps-head screwdriver for fitting\r\n - one managment workstation, such as a PC runn" +
-            "ing terminal-emulation software\r\n - the chasis cable kit (included)\r\n - two peop" +
-            "le to safely lift the unit into the rack\r\n- TEST_CONTAINER\r\n\r\nTopspin 360 Packag" +
-            "e Contents\r\n\r\nYou will find the following items in your Topspin package:\r\n\r\n - 1" +
-            " Topspin 360 Server Switch\r\n - 1 or 2 12-port InfiniBand switch blades\r\n - 1 or " +
-            "2 power supplies\r\n - 1 or 2 fan trays \r\n - 1 or 2 system controllers \r\n - 2 rack" +
-            "-mount brackets and mounting screws\r\n - 1 power-supply blanking panel\r\n - 1 expa" +
-            "nsion card blanking panel\r\n - 1 console-cable kit, which includes a DB-9 M/F ser" +
-            "ial cable\r\n - 1 or 2 6-foot (1.8-meter) AC power cables\r\n - 1 CD-ROM containing " +
-            "software and user documentation\r\n - 1 Quick Start Guide\r\n - 1 warranty card\r\n\r\nP" +
-            "reparing the Site\r\n\r\nTo prepare the site for the Topspin 360, perform the follow" +
-            "ing steps:\r\n\r\n1.\tRead the cautionary statements in \"Safety Information\" on page " +
-            "5.\r\n2.\tFill the Topspin registration form out online. Go to http://www.topspin.c" +
-            "om/support/prodreg.cfm.\r\n3.\tVerify that the rack environment provides sufficient" +
-            " ventilation. \r\n4.\tUnpack the Topspin 360 package.\r\n5.\tVerify that you have all " +
-            "of the items on the Requirements list. Refer to \"Requirements\" on page 1.\r\n\r\nIns" +
-            "tall Topspin 360 FRUs\r\n\r\nInstall gateways and switch cards to increase the port " +
-            "count of your switch.\r\nNote: whenever possible install all FRUs before you rack " +
-            "your Topspin 360. You can continue to add or replace FRUs after you rack your de" +
-            "vice.\r\n\r\nTo install field replaceable units (FRUs), perform the following steps:" +
-            "\r\n\r\n1.\tInstall any expansion modules (Fibre Channel gateways or Ethernet gateway" +
-            "s):\r\na.\tRemove any filler panels from slots that will have a card installed. Beg" +
-            "in by filling the first gateway slot (slot 2).\r\nb.\tInstall Ethernet and/or Fibre" +
-            " Channel gateways, as appropriate to your Topspin system. For more information, " +
-            "see \"Install an Ethernet or Fibre Channel Gateway\" in the Topspin 360 Hardware G" +
-            "uide.\r\n2.\tInstall a additional InfiniBand switch card:\r\n\ta.\tRemove the blanking " +
-            "panel from the slot.\r\n\tb.\tSlide the IB switch card firmly into place. \r\n\tc.\tTigh" +
-            "ten the screws to the on the left and right-hand sides of the IB switch card.\r\n\r" +
-            "\nRack the Topspin 360\r\n\r\nTo mount the Topspin 360 in a rack, perform the followi" +
-            "ng steps:\r\n\r\n1.\tOpen the Topspin box.\r\n2.\tRemove the chassis, rack brackets, CD-" +
-            "ROM, parts bag, and documentation.\r\n\r\nCAUTION: Don\'t lift the 360 chassis by the" +
-            " front (bezel end) and back (service end). Lift the unit by the sides to prevent" +
-            " damage.\r\n\r\n1.\tPlace the chassis on a secure, clean surface.\r\n2.\tOpen the plasti" +
-            "c bag that contains the mounting hardware.\r\n3.\tVerify that the rack will provide" +
-            " sufficient clearance for the Topspin 360.\r\n4.\tLoosen the nuts on the sides of t" +
-            "he rack brackets, then adjust the length of your brackets to fit your rack. Tigh" +
-            "ten the bracket screws when the brackets fit the rack. Extend the brackets to 29" +
-            " inches or contract them to 24 inches.\r\n5.\tAttach the side flanges to the sides " +
-            "of the chassis with the screws provided, as shown in Figure 1-1 and Figure 1-2.\r" +
-            "\n")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Topspin 360 Quick Start\n\nThis document will describe the basic steps required to " +
+            "install and configure the Topspin 360 system.\nRequirements\nTo install the Topspi" +
+            "n 360 into a rack, you require the following:\n\n - one #1 and one #2 Phillips-hea" +
+            "d screwdriver for fitting\n - one managment workstation, such as a PC running ter" +
+            "minal-emulation software\n - the chasis cable kit (included)\n - two people to saf" +
+            "ely lift the unit into the rack\n- TEST_CONTAINER\n\nTopspin 360 Package Contents\n\n" +
+            "You will find the following items in your Topspin package:\n\n - 1 Topspin 360 Ser" +
+            "ver Switch\n - 1 or 2 12-port InfiniBand switch blades\n - 1 or 2 power supplies\n " +
+            "- 1 or 2 fan trays \n - 1 or 2 system controllers \n - 2 rack-mount brackets and m" +
+            "ounting screws\n - 1 power-supply blanking panel\n - 1 expansion card blanking pan" +
+            "el\n - 1 console-cable kit, which includes a DB-9 M/F serial cable\n - 1 or 2 6-fo" +
+            "ot (1.8-meter) AC power cables\n - 1 CD-ROM containing software and user document" +
+            "ation\n - 1 Quick Start Guide\n - 1 warranty card\n\nPreparing the Site\n\nTo prepare " +
+            "the site for the Topspin 360, perform the following steps:\n\n1.\tRead the cautiona" +
+            "ry statements in \"Safety Information\" on page 5.\n2.\tFill the Topspin registratio" +
+            "n form out online. Go to http://www.topspin.com/support/prodreg.cfm.\n3.\tVerify t" +
+            "hat the rack environment provides sufficient ventilation. \n4.\tUnpack the Topspin" +
+            " 360 package.\n5.\tVerify that you have all of the items on the Requirements list." +
+            " Refer to \"Requirements\" on page 1.\n\nInstall Topspin 360 FRUs\n\nInstall gateways " +
+            "and switch cards to increase the port count of your switch.\nNote: whenever possi" +
+            "ble install all FRUs before you rack your Topspin 360. You can continue to add o" +
+            "r replace FRUs after you rack your device.\n\nTo install field replaceable units (" +
+            "FRUs), perform the following steps:\n\n1.\tInstall any expansion modules (Fibre Cha" +
+            "nnel gateways or Ethernet gateways):\na.\tRemove any filler panels from slots that" +
+            " will have a card installed. Begin by filling the first gateway slot (slot 2).\nb" +
+            ".\tInstall Ethernet and/or Fibre Channel gateways, as appropriate to your Topspin" +
+            " system. For more information, see \"Install an Ethernet or Fibre Channel Gateway" +
+            "\" in the Topspin 360 Hardware Guide.\n2.\tInstall a additional InfiniBand switch c" +
+            "ard:\n\ta.\tRemove the blanking panel from the slot.\n\tb.\tSlide the IB switch card f" +
+            "irmly into place. \n\tc.\tTighten the screws to the on the left and right-hand side" +
+            "s of the IB switch card.\n\nRack the Topspin 360\n\nTo mount the Topspin 360 in a ra" +
+            "ck, perform the following steps:\n\n1.\tOpen the Topspin box.\n2.\tRemove the chassis" +
+            ", rack brackets, CD-ROM, parts bag, and documentation.\n\nCAUTION: Don\'t lift the " +
+            "360 chassis by the front (bezel end) and back (service end). Lift the unit by th" +
+            "e sides to prevent damage.\n\n1.\tPlace the chassis on a secure, clean surface.\n2.\t" +
+            "Open the plastic bag that contains the mounting hardware.\n3.\tVerify that the rac" +
+            "k will provide sufficient clearance for the Topspin 360.\n4.\tLoosen the nuts on t" +
+            "he sides of the rack brackets, then adjust the length of your brackets to fit yo" +
+            "ur rack. Tighten the bracket screws when the brackets fit the rack. Extend the b" +
+            "rackets to 29 inches or contract them to 24 inches.\n5.\tAttach the side flanges t" +
+            "o the sides of the chassis with the screws provided, as shown in Figure 1-1 and " +
+            "Figure 1-2.\n")]
         public string topspin {
             get {
                 return ((string)(this["topspin"]));
diff --git a/Acrolinx.Demo.Sidebar/SimpleSample.Designer.cs b/Acrolinx.Demo.Sidebar/SimpleSample.Designer.cs
index a920a3a..14ea894 100644
--- a/Acrolinx.Demo.Sidebar/SimpleSample.Designer.cs
+++ b/Acrolinx.Demo.Sidebar/SimpleSample.Designer.cs
@@ -33,6 +33,7 @@ private void InitializeComponent()
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SimpleSample));
             this.textBox = new System.Windows.Forms.TextBox();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.showMessage = new System.Windows.Forms.Button();
             this.documentReferenceTextBox = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.labelWarning = new System.Windows.Forms.Label();
@@ -52,15 +53,17 @@ private void InitializeComponent()
             // 
             this.textBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.textBox.Location = new System.Drawing.Point(0, 0);
+            this.textBox.Margin = new System.Windows.Forms.Padding(4);
             this.textBox.MaxLength = 0;
             this.textBox.Multiline = true;
             this.textBox.Name = "textBox";
             this.textBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBox.Size = new System.Drawing.Size(618, 373);
+            this.textBox.Size = new System.Drawing.Size(824, 459);
             this.textBox.TabIndex = 1;
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.showMessage);
             this.panel1.Controls.Add(this.documentReferenceTextBox);
             this.panel1.Controls.Add(this.label2);
             this.panel1.Controls.Add(this.labelWarning);
@@ -69,25 +72,39 @@ private void InitializeComponent()
             this.panel1.Controls.Add(this.formatComboBox);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(908, 68);
+            this.panel1.Size = new System.Drawing.Size(1211, 84);
             this.panel1.TabIndex = 3;
             // 
+            // showMessage
+            // 
+            this.showMessage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.showMessage.Location = new System.Drawing.Point(829, 41);
+            this.showMessage.Name = "showMessage";
+            this.showMessage.Size = new System.Drawing.Size(195, 32);
+            this.showMessage.TabIndex = 9;
+            this.showMessage.Text = "Show Message Demo";
+            this.showMessage.UseVisualStyleBackColor = true;
+            this.showMessage.Click += new System.EventHandler(this.showMessage_Click);
+            // 
             // documentReferenceTextBox
             // 
             this.documentReferenceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.documentReferenceTextBox.Location = new System.Drawing.Point(320, 3);
+            this.documentReferenceTextBox.Location = new System.Drawing.Point(427, 4);
+            this.documentReferenceTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.documentReferenceTextBox.Name = "documentReferenceTextBox";
-            this.documentReferenceTextBox.Size = new System.Drawing.Size(576, 20);
+            this.documentReferenceTextBox.Size = new System.Drawing.Size(767, 22);
             this.documentReferenceTextBox.TabIndex = 8;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(202, 6);
+            this.label2.Location = new System.Drawing.Point(269, 7);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(112, 13);
+            this.label2.Size = new System.Drawing.Size(137, 16);
             this.label2.TabIndex = 7;
             this.label2.Text = "Document Reference:";
             // 
@@ -95,9 +112,10 @@ private void InitializeComponent()
             // 
             this.labelWarning.AutoSize = true;
             this.labelWarning.ForeColor = System.Drawing.Color.Red;
-            this.labelWarning.Location = new System.Drawing.Point(12, 33);
+            this.labelWarning.Location = new System.Drawing.Point(16, 41);
+            this.labelWarning.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelWarning.Name = "labelWarning";
-            this.labelWarning.Size = new System.Drawing.Size(33, 13);
+            this.labelWarning.Size = new System.Drawing.Size(39, 16);
             this.labelWarning.TabIndex = 6;
             this.labelWarning.Text = "Note:";
             // 
@@ -105,18 +123,20 @@ private void InitializeComponent()
             // 
             this.labelMessage.AutoSize = true;
             this.labelMessage.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.labelMessage.Location = new System.Drawing.Point(57, 33);
+            this.labelMessage.Location = new System.Drawing.Point(76, 41);
+            this.labelMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelMessage.Name = "labelMessage";
-            this.labelMessage.Size = new System.Drawing.Size(546, 26);
+            this.labelMessage.Size = new System.Drawing.Size(676, 32);
             this.labelMessage.TabIndex = 5;
             this.labelMessage.Text = resources.GetString("labelMessage.Text");
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 6);
+            this.label1.Location = new System.Drawing.Point(16, 7);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(42, 13);
+            this.label1.Size = new System.Drawing.Size(52, 16);
             this.label1.TabIndex = 4;
             this.label1.Text = "Format:";
             // 
@@ -124,15 +144,17 @@ private void InitializeComponent()
             // 
             this.formatComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.formatComboBox.FormattingEnabled = true;
-            this.formatComboBox.Location = new System.Drawing.Point(60, 3);
+            this.formatComboBox.Location = new System.Drawing.Point(80, 4);
+            this.formatComboBox.Margin = new System.Windows.Forms.Padding(4);
             this.formatComboBox.Name = "formatComboBox";
-            this.formatComboBox.Size = new System.Drawing.Size(136, 21);
+            this.formatComboBox.Size = new System.Drawing.Size(180, 24);
             this.formatComboBox.TabIndex = 3;
             // 
             // splitContainer
             // 
             this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer.Location = new System.Drawing.Point(0, 68);
+            this.splitContainer.Location = new System.Drawing.Point(0, 84);
+            this.splitContainer.Margin = new System.Windows.Forms.Padding(4);
             this.splitContainer.Name = "splitContainer";
             // 
             // splitContainer.Panel1
@@ -142,8 +164,9 @@ private void InitializeComponent()
             // splitContainer.Panel2
             // 
             this.splitContainer.Panel2.Controls.Add(this.acrolinxSidebar);
-            this.splitContainer.Size = new System.Drawing.Size(908, 373);
-            this.splitContainer.SplitterDistance = 618;
+            this.splitContainer.Size = new System.Drawing.Size(1211, 459);
+            this.splitContainer.SplitterDistance = 824;
+            this.splitContainer.SplitterWidth = 5;
             this.splitContainer.TabIndex = 7;
             // 
             // acrolinxSidebar
@@ -152,9 +175,10 @@ private void InitializeComponent()
             this.acrolinxSidebar.ClientSignature = "SW50ZWdyYXRpb25EZXZlbG9wbWVudERlbW9Pbmx5";
             this.acrolinxSidebar.Dock = System.Windows.Forms.DockStyle.Fill;
             this.acrolinxSidebar.Location = new System.Drawing.Point(0, 0);
+            this.acrolinxSidebar.Margin = new System.Windows.Forms.Padding(5);
             this.acrolinxSidebar.MinimumSidebarVersion = "14.4.3";
             this.acrolinxSidebar.Name = "acrolinxSidebar";
-            this.acrolinxSidebar.Size = new System.Drawing.Size(286, 373);
+            this.acrolinxSidebar.Size = new System.Drawing.Size(382, 459);
             this.acrolinxSidebar.SupportCheckSelection = true;
             this.acrolinxSidebar.TabIndex = 0;
             this.acrolinxSidebar.InitFinished += new Acrolinx.Sdk.Sidebar.SidebarInitFinishedEventHandler(this.acrolinxSidebar_InitFinished);
@@ -166,14 +190,17 @@ private void InitializeComponent()
             // 
             // SimpleSample
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(908, 441);
+            this.ClientSize = new System.Drawing.Size(1211, 543);
             this.Controls.Add(this.splitContainer);
             this.Controls.Add(this.panel1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.KeyPreview = true;
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "SimpleSample";
             this.Text = "Acrolinx Sidebar .NET Simple";
+            this.Load += new System.EventHandler(this.SimpleSample_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.splitContainer.Panel1.ResumeLayout(false);
@@ -197,5 +224,6 @@ private void InitializeComponent()
         private System.Windows.Forms.SplitContainer splitContainer;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.TextBox documentReferenceTextBox;
+        private System.Windows.Forms.Button showMessage;
     }
 }
\ No newline at end of file
diff --git a/Acrolinx.Demo.Sidebar/SimpleSample.cs b/Acrolinx.Demo.Sidebar/SimpleSample.cs
index 005a757..1af3d87 100644
--- a/Acrolinx.Demo.Sidebar/SimpleSample.cs
+++ b/Acrolinx.Demo.Sidebar/SimpleSample.cs
@@ -38,9 +38,10 @@ public SimpleSample(Format format, string documentReference, string text)
             this.textBox.Text = text;
             this.Text += " - " + documentReference;
 
-            acrolinxSidebar.Start();
         }
 
+        
+
         private void FillFormatList()
         {
             foreach (Format f in Enum.GetValues(typeof(Format)))
@@ -49,7 +50,7 @@ private void FillFormatList()
             }
         }
 
-        private void acrolinxSidebar_RequestCheck(object sender, CheckRequestedEventArgs e)
+        private async void acrolinxSidebar_RequestCheck(object sender, CheckRequestedEventArgs e)
         {
             Logger.AcroLog.Info("acrolinxSidebar_RequestCheck");
 
@@ -63,7 +64,7 @@ private void acrolinxSidebar_RequestCheck(object sender, CheckRequestedEventArgs
                 document.Selections = GetSelection();
             }
 
-            acrolinxSidebar.Check(document);
+            await acrolinxSidebar.Check(document);
         }
 
         private IReadOnlyList<IRange> GetSelection()
@@ -83,11 +84,11 @@ private void acrolinxSidebar_Checked(object sender, Sdk.Sidebar.CheckedEventArgs
             Logger.AcroLog.Info("acrolinxSidebar_Checked");
         }
 
-        private void acrolinxSidebar_SidebarSourceNotReachable(object sender, EventArgs e)
+        private async void acrolinxSidebar_SidebarSourceNotReachable(object sender, EventArgs e)
         {
             Logger.AcroLog.Info("acrolinxSidebar_SidebarSourceNotReachable");
 
-            acrolinxSidebar.Start(); //retry
+            await acrolinxSidebar.Start(); //retry
         }
 
         private void acrolinxSidebar_SelectRanges(object sender, Sdk.Sidebar.MatchesEventArgs e)
@@ -127,5 +128,18 @@ private void acrolinxSidebar_ReplaceRanges(object sender, Sdk.Sidebar.MatchesWit
                 textBox.SelectedText = string.Join("", e.Matches.Select(m => m.Replacement));
             }
         }
+
+        // Acrolinx Sidebar works asynchronously with webview2.
+        // Acrolinx Sidebar can be used only after initilization is complete.
+        private async void SimpleSample_Load(object sender, EventArgs e)
+        {
+           await acrolinxSidebar.Start();
+        }
+
+        private async void showMessage_Click(object sender, EventArgs e)
+        {
+            var message = new Sdk.Sidebar.Util.Message.Message(Sdk.Sidebar.Util.Message.MessageType.Warning, "Sample Message", "This is sample message!");
+            await acrolinxSidebar.ShowMessage(message);
+        }
     }
 }
diff --git a/Acrolinx.Demo.Sidebar/packages.config b/Acrolinx.Demo.Sidebar/packages.config
index caed07e..7f7c20e 100644
--- a/Acrolinx.Demo.Sidebar/packages.config
+++ b/Acrolinx.Demo.Sidebar/packages.config
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Acrolinx.Sidebar" version="1.1.8.1220" targetFramework="net45" />
-  <package id="Acrolinx.Sidebar.Startpage.Dll" version="3.1.1.191" targetFramework="net45" />
-  <package id="Diff.Match.Patch" version="2.1.0" targetFramework="net45" />
-  <package id="FSharp.Core" version="4.7.2" targetFramework="net45" />
-  <package id="log4net" version="2.0.14" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
+  <package id="Acrolinx.Sidebar" version="2.0.0.1380" targetFramework="net48" />
+  <package id="Diff.Match.Patch" version="3.0.1" targetFramework="net48" />
+  <package id="FSharp.Core" version="5.0.0" targetFramework="net48" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2151.40" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 0000000..a1275f5
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+	<add key="github" value="https://nuget.pkg.github.com/acrolinx/index.json" />
+  </packageSources>
+  <packageSourceCredentials>
+        <github>
+            <add key="Username" value="%NUGET_USERNAME%" />
+            <add key="ClearTextPassword" value="%NUGET_TOKEN%" />
+        </github>
+    </packageSourceCredentials>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <bindingRedirects>
+    <add key="skip" value="False" />
+  </bindingRedirects>
+  <packageManagement>
+    <add key="format" value="0" />
+    <add key="disabled" value="False" />
+  </packageManagement>
+</configuration>
\ No newline at end of file
diff --git a/README.md b/README.md
index 2ea5f1c..6a8ce26 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This is a showcase for integrating the [Acrolinx](https://www.acrolinx.com/) Sidebar into a .NET application.
 
-See: [Getting Started with Custom Integrations](https://docs.acrolinx.com/customintegrations)
+See: [Build With Acrolinx](https://support.acrolinx.com/hc/en-us/categories/10209837818770-Build-With-Acrolinx)
 
 ## Live Demo
 
@@ -15,7 +15,7 @@ A downloadable build of the .NET Sidebar Sample can be found in the [release sec
 The Acrolinx Sidebar is designed to show up beside the window where you edit your content.
 You use it for checking, reviewing, and correcting your content.
 To get an impression what the Sidebar looks like in existing integrations, have a look at
-[Get Started With the Sidebar](https://docs.acrolinx.com/coreplatform/latest/en/the-sidebar).
+[Sidebar Quick Start](https://support.acrolinx.com/hc/en-us/articles/10252588984594-Sidebar-Quick-Start).
 
 ## Prerequisites
 
@@ -29,16 +29,26 @@ Acrolinx offers different other SDKs, and examples for developing integrations.
 
 Before you start developing your own integration, you might benefit from looking into:
 
-* [Getting Started with Custom Integrations](https://docs.acrolinx.com/customintegrations),
+* [Build With Acrolinx](https://support.acrolinx.com/hc/en-us/categories/10209837818770-Build-With-Acrolinx),
 * the [Guidance for the Development of Acrolinx Integrations](https://github.com/acrolinx/acrolinx-coding-guidance),
 * the [Acrolinx SDKs](https://github.com/acrolinx?q=sdk), and
 * the [Acrolinx Demo Projects](https://github.com/acrolinx?q=demo).
 
+## Requirements
+
+The SDK uses Microsoft Web View 2 as browser control to render the Sidebar.
+
+WebView 2 comes preinstalled with Windows 11 and above.
+
+Windows 10 and 7 users are recommended to install WebVew 2 evergreen installer from Microsoft.
+
+Link to download evergreen installer for webview 2 from Microsoft: https://developer.microsoft.com/en-us/microsoft-edge/webview2/ 
+
 ## Getting Started
 
 ## Run Locally
 
-1. Make sure that you have installed Microsoft Visual Studio with C# support version 2015 or later.
+1. Make sure that you have installed Microsoft Visual Studio with C# support version 2019 or later.
 2. Since the Acrolinx Sidebar performs static code analysis to improve quality,
    you also have to install [Code Contracts for .NET](https://visualstudiogallery.msdn.microsoft.com/1ec7db13-3363-46c9-851f-1ce455f66970).
 3. Open the solution file [`Acrolinx.Demo.Sidebar.Net.sln`](Acrolinx.Demo.Sidebar.Net.sln) with Visual Studio.
@@ -70,11 +80,13 @@ Visual Studio downloads the required dependencies and compiles the Acrolinx .NET
 5. Somewhere in your initialization code, tell the Sidebar to start:
 
    ```csharp
-   acrolinxSidebar1.Start();
+   await acrolinxSidebar1.Start();
    ```
 
    ![Start Sidebar](/doc/start.png)
 
+   As the Sidebar uses Microsoft's WebView 2 control, which is asynchronous in nature, make sure you handle asynchronous code by appropriately using async/await keywords.
+
 6. Run the application. If you see the Acrolinx Sidebar, then everything went well.
 
 7. The next step is to implement the extraction and the events of the Sidebar:
@@ -95,8 +107,7 @@ To configure the Sidebar, use the properties window:
 2. **Start page**: Provides an interactive way to sign in to Acrolinx with built-in error handling.
 3. **Logger**: Provides [logging](https://github.com/acrolinx/sidebar-sdk-dotnet/blob/master/Acrolinx.Sidebar/Util/Logging/Logger.cs)
    using Log4net.
-4. **Acrolinx Storage**: Applications using the Internet Explorer web browser control may be denied to access LocalStorage.
-   The SDK uses its own [storage](https://github.com/acrolinx/sidebar-sdk-dotnet/blob/master/Acrolinx.Sidebar/Storage/RegistryAcrolinxStorage.cs)
+4. **Acrolinx Storage**: The SDK uses its own [storage](https://github.com/acrolinx/sidebar-sdk-dotnet/blob/master/Acrolinx.Sidebar/Storage/RegistryAcrolinxStorage.cs)
    mechanism using the Windows registry:
    + **Registry path**: `HKCU\Software\Acrolinx\Plugins\Storage\[KEY]`
    + **Fallback path**: `HKLM\Software\Acrolinx\Plugins\Storage\[KEY]`
diff --git a/doc/sample.png b/doc/sample.png
index 513d184..05fc854 100644
Binary files a/doc/sample.png and b/doc/sample.png differ
diff --git a/doc/start.png b/doc/start.png
index 7b5f944..7b6015d 100644
Binary files a/doc/start.png and b/doc/start.png differ