diff --git a/Addin.SSMS2018/Addin.SSMS2018.vbproj b/Addin.SSMS2018/Addin.SSMS2018.vbproj
index 98a55fc..337964b 100644
--- a/Addin.SSMS2018/Addin.SSMS2018.vbproj
+++ b/Addin.SSMS2018/Addin.SSMS2018.vbproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
@@ -10,6 +11,9 @@
   <PropertyGroup>
     <OptionCompare>Binary</OptionCompare>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -20,7 +24,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SSMS2018Addin</RootNamespace>
     <AssemblyName>SSMS2018Addin</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <UseCodebase>true</UseCodebase>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -44,7 +48,7 @@
     <ErrorReport>prompt</ErrorReport>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
     <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
-    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\</CopyVsixExtensionLocation>
+    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 19\Common7\IDE\Extensions\</CopyVsixExtensionLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -90,7 +94,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom">
-      <HintPath>..\..\..\..\Program Files (x86)\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\Application\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft SQL Server Management Studio 19\Common7\IDE\Extensions\Application\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
     <Reference Include="PoorMansTSqlFormatterLib35, Version=1.6.13.31433, Culture=neutral, PublicKeyToken=fb9a6042fd921db9, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/Addin.SSMS2018/My Project/AssemblyInfo.vb b/Addin.SSMS2018/My Project/AssemblyInfo.vb
index ba9a361..60dde18 100644
--- a/Addin.SSMS2018/My Project/AssemblyInfo.vb	
+++ b/Addin.SSMS2018/My Project/AssemblyInfo.vb	
@@ -8,13 +8,13 @@ Imports System.Runtime.InteropServices
 ' associated with an assembly.
 <Assembly: AssemblyTitle("DBA-Helper.SSMS2018")>
 <Assembly: AssemblyDescription("This tool is opensource and free!
-Please submit your feedback / ideas / found issues at github - https://github.com/alekseybochkov/ssms-addin/
+Please submit your feedback / ideas / found issues at github - https://github.com/alex-bochkov/ssms-addin/
 
 ---
 Need SQL Server help with a large db? 
 Contact me at albochkov03@gmail.com!")>
 <Assembly: AssemblyConfiguration("")>
-<Assembly: AssemblyCompany("https://github.com/alekseybochkov/")>
+<Assembly: AssemblyCompany("https://github.com/alex-bochkov/")>
 <Assembly: AssemblyProduct("DBA-Helper.SSMS2018")>
 <Assembly: AssemblyCopyright("Alex Bochkov")>
 <Assembly: AssemblyTrademark("")>
diff --git a/Addin.SSMS2018/SettingForm.Designer.vb b/Addin.SSMS2018/SettingForm.Designer.vb
index 4484a5e..9995104 100644
--- a/Addin.SSMS2018/SettingForm.Designer.vb
+++ b/Addin.SSMS2018/SettingForm.Designer.vb
@@ -77,7 +77,7 @@ Partial Class SettingForm
         'ComboBoxParserVersion
         '
         Me.ComboBoxParserVersion.FormattingEnabled = True
-        Me.ComboBoxParserVersion.Items.AddRange(New Object() {"SQL Server 2008", "SQL Server 2012", "SQL Server 2014", "SQL Server 2016", "SQL Server 2017", "SQL Server 2019"})
+        Me.ComboBoxParserVersion.Items.AddRange(New Object() {"SQL Server 2008", "SQL Server 2012", "SQL Server 2014", "SQL Server 2016", "SQL Server 2017", "SQL Server 2019", "SQL Server 2022"})
         Me.ComboBoxParserVersion.Location = New System.Drawing.Point(136, 30)
         Me.ComboBoxParserVersion.Name = "ComboBoxParserVersion"
         Me.ComboBoxParserVersion.Size = New System.Drawing.Size(316, 21)
diff --git a/Addin.SSMS2018/ToolWindow1Control.xaml.vb b/Addin.SSMS2018/ToolWindow1Control.xaml.vb
index f1e4e7b..e02868e 100644
--- a/Addin.SSMS2018/ToolWindow1Control.xaml.vb
+++ b/Addin.SSMS2018/ToolWindow1Control.xaml.vb
@@ -201,8 +201,10 @@ Partial Public Class ToolWindow1Control
             SqlParser = New TSql140Parser(False)
         ElseIf TargetVersion = "SQL Server 2019" Then
             SqlParser = New TSql150Parser(False)
+        ElseIf TargetVersion = "SQL Server 2022" Then
+            SqlParser = New TSql160Parser(False)
         Else
-            SqlParser = New TSql140Parser(False)
+            SqlParser = New TSql150Parser(False)
         End If
 
         Dim parseErrors As IList(Of ParseError) = New List(Of ParseError)
@@ -221,26 +223,33 @@ Partial Public Class ToolWindow1Control
 
 
 
-        Dim StrAdd2 = ""
         Dim Gen As SqlScriptGenerator = Nothing
 
         If TargetVersion = "SQL Server 2008" Then
             Gen = New Sql100ScriptGenerator
+            Gen.Options.SqlVersion = SqlVersion.Sql100
         ElseIf TargetVersion = "SQL Server 2012" Then
             Gen = New Sql110ScriptGenerator
+            Gen.Options.SqlVersion = SqlVersion.Sql110
         ElseIf TargetVersion = "SQL Server 2014" Then
             Gen = New Sql120ScriptGenerator
+            Gen.Options.SqlVersion = SqlVersion.Sql120
         ElseIf TargetVersion = "SQL Server 2016" Then
             Gen = New Sql130ScriptGenerator
+            Gen.Options.SqlVersion = SqlVersion.Sql130
         ElseIf TargetVersion = "SQL Server 2017" Then
             Gen = New Sql140ScriptGenerator
+            Gen.Options.SqlVersion = SqlVersion.Sql140
         ElseIf TargetVersion = "SQL Server 2019" Then
             Gen = New Sql150ScriptGenerator
+            Gen.Options.SqlVersion = SqlVersion.Sql150
+        ElseIf TargetVersion = "SQL Server 2022" Then
+            Gen = New Sql160ScriptGenerator
+            Gen.Options.SqlVersion = SqlVersion.Sql160
         Else
-            Gen = New Sql140ScriptGenerator
+            Gen = New Sql150ScriptGenerator
         End If
 
-        Gen.Options.IncludeSemicolons = False
         Gen.Options.AlignClauseBodies = False
         Gen.GenerateScript(result, ResultCode)