diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0a4cf9e28..76a173ee5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -47,7 +47,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.205">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.240">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Base/Core/CoreConfiguration.cs b/src/Greenshot.Base/Core/CoreConfiguration.cs
index 9c1fbd913..3b3484afc 100644
--- a/src/Greenshot.Base/Core/CoreConfiguration.cs
+++ b/src/Greenshot.Base/Core/CoreConfiguration.cs
@@ -559,11 +559,6 @@ namespace Greenshot.Base.Core
                 {
                     ExcludeDestinations.Remove("OneNote");
                 }
-                else
-                {
-                    // TODO: Remove with the release
-                    ExcludeDestinations.Remove("OneNote");
-                }
             }
 
             if (OutputDestinations == null)
diff --git a/src/Greenshot.Base/Greenshot.Base.csproj b/src/Greenshot.Base/Greenshot.Base.csproj
index c0bb88aff..1726e831e 100644
--- a/src/Greenshot.Base/Greenshot.Base.csproj
+++ b/src/Greenshot.Base/Greenshot.Base.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="1.0.10" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.33" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="1.0.11" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
     <PackageReference Include="log4net" version="2.0.12" />
-    <PackageReference Include="Svg" Version="3.2.3" />
+    <PackageReference Include="Svg" Version="3.3.0" />
     <Reference Include="Accessibility" />
     <Reference Include="CustomMarshalers" />
   </ItemGroup>
diff --git a/src/Greenshot.Base/IniFile/IniConfig.cs b/src/Greenshot.Base/IniFile/IniConfig.cs
index 08bcd1217..cbe04e11b 100644
--- a/src/Greenshot.Base/IniFile/IniConfig.cs
+++ b/src/Greenshot.Base/IniFile/IniConfig.cs
@@ -137,7 +137,7 @@ namespace Greenshot.Base.IniFile
         {
             AssemblyProductAttribute[] assemblyProductAttributes =
                 Assembly.GetEntryAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), false) as AssemblyProductAttribute[];
-            if (assemblyProductAttributes != null && assemblyProductAttributes.Length > 0)
+            if (assemblyProductAttributes is { Length: > 0 })
             {
                 string productName = assemblyProductAttributes[0].Product;
                 Log.InfoFormat("Using ProductName {0}", productName);
diff --git a/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj b/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj
index 349b4d79e..b7e629dd1 100644
--- a/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj
+++ b/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" version="7.0.2" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" version="7.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Greenshot.Base\Greenshot.Base.csproj" />
diff --git a/src/Greenshot/Forms/MainForm.Designer.cs b/src/Greenshot/Forms/MainForm.Designer.cs
index eed646231..015e0060b 100644
--- a/src/Greenshot/Forms/MainForm.Designer.cs
+++ b/src/Greenshot/Forms/MainForm.Designer.cs
@@ -223,7 +223,7 @@ namespace Greenshot.Forms {
 			this.contextmenu_help.Image = ((System.Drawing.Image)(resources.GetObject("contextmenu_help.Image")));
 			this.contextmenu_help.Name = "contextmenu_help";
 			this.contextmenu_help.Size = new System.Drawing.Size(170, 22);
-			this.contextmenu_help.Click += new System.EventHandler(this.Contextmenu_helpClick);
+			this.contextmenu_help.Click += new System.EventHandler(this.Contextmenu_HelpClick);
 			// 
 			// contextmenu_donate
 			// 
@@ -248,7 +248,7 @@ namespace Greenshot.Forms {
 			this.contextmenu_exit.Image = ((System.Drawing.Image)(resources.GetObject("contextmenu_exit.Image")));
 			this.contextmenu_exit.Name = "contextmenu_exit";
 			this.contextmenu_exit.Size = new System.Drawing.Size(170, 22);
-			this.contextmenu_exit.Click += new System.EventHandler(this.Contextmenu_exitClick);
+			this.contextmenu_exit.Click += new System.EventHandler(this.Contextmenu_ExitClick);
 			// 
 			// notifyIcon
 			// 
diff --git a/src/Greenshot/Forms/MainForm.cs b/src/Greenshot/Forms/MainForm.cs
index f00174843..f1c4f8bbc 100644
--- a/src/Greenshot/Forms/MainForm.cs
+++ b/src/Greenshot/Forms/MainForm.cs
@@ -1122,12 +1122,18 @@ namespace Greenshot.Forms
                 Rectangle allScreensBounds = WindowCapture.GetScreenBounds();
 
                 var captureScreenItem = new ToolStripMenuItem(Language.GetString(LangKey.contextmenu_capturefullscreen_all));
-                captureScreenItem.Click += delegate { BeginInvoke((MethodInvoker) delegate { CaptureHelper.CaptureFullscreen(false, ScreenCaptureMode.FullScreen); }); };
+                captureScreenItem.Click += delegate {
+                    BeginInvoke((MethodInvoker) delegate {
+                        CaptureHelper.CaptureFullscreen(false, ScreenCaptureMode.FullScreen);
+                    });
+                };
+
                 captureScreenMenuItem.DropDownItems.Add(captureScreenItem);
                 foreach (Screen screen in Screen.AllScreens)
                 {
                     Screen screenToCapture = screen;
-                    string deviceAlignment = string.Empty;
+                    string deviceAlignment = screenToCapture.DeviceName;
+                    
                     if (screen.Bounds.Top == allScreensBounds.Top && screen.Bounds.Bottom != allScreensBounds.Bottom)
                     {
                         deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_top);
@@ -1147,7 +1153,13 @@ namespace Greenshot.Forms
                     }
 
                     captureScreenItem = new ToolStripMenuItem(deviceAlignment);
-                    captureScreenItem.Click += delegate { BeginInvoke((MethodInvoker) delegate { CaptureHelper.CaptureRegion(false, screenToCapture.Bounds); }); };
+                    captureScreenItem.Click += delegate
+                    {
+                        BeginInvoke((MethodInvoker) delegate
+                        {
+                            CaptureHelper.CaptureRegion(false, screenToCapture.Bounds);
+                        });
+                    };
                     captureScreenMenuItem.DropDownItems.Add(captureScreenItem);
                 }
             }
@@ -1426,7 +1438,7 @@ namespace Greenshot.Forms
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void Contextmenu_helpClick(object sender, EventArgs e)
+        private void Contextmenu_HelpClick(object sender, EventArgs e)
         {
             HelpFileLoader.LoadHelp();
         }
@@ -1436,7 +1448,7 @@ namespace Greenshot.Forms
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void Contextmenu_exitClick(object sender, EventArgs e)
+        private void Contextmenu_ExitClick(object sender, EventArgs e)
         {
             Exit();
         }
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 757714790..78fa3f6c6 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tools.InnoSetup" version="6.1.2" GeneratePathProperty="true" />
+    <PackageReference Include="Tools.InnoSetup" version="6.2.0" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>