diff --git a/OpusCatEngineAndPlugins.sln b/OpusCatEngineAndPlugins.sln
index 7b624f6..126c123 100644
--- a/OpusCatEngineAndPlugins.sln
+++ b/OpusCatEngineAndPlugins.sln
@@ -35,6 +35,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpusCatMTEngineTests", "Opu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "memoqPluginTest", "memoqPluginTest\memoqPluginTest.csproj", "{240B57C5-5B97-473C-8B79-D3E440755402}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpusCatTranslationProvider2022", "Trados2022Plugin\OpusCatTranslationProvider2022.csproj", "{4B5B9E7A-FC62-443B-A002-10C9397461C7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -201,6 +203,18 @@ Global
 		{240B57C5-5B97-473C-8B79-D3E440755402}.Release|x64.Build.0 = Release|Any CPU
 		{240B57C5-5B97-473C-8B79-D3E440755402}.Release|x86.ActiveCfg = Release|Any CPU
 		{240B57C5-5B97-473C-8B79-D3E440755402}.Release|x86.Build.0 = Release|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Debug|x64.ActiveCfg = Debug|x64
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Debug|x64.Build.0 = Debug|x64
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Release|x64.ActiveCfg = Release|x64
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Release|x64.Build.0 = Release|x64
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -219,6 +233,7 @@ Global
 		{7835C453-B4A0-45C4-BDB8-7888D26561FC} = {7A01F5CB-2378-473E-AF22-69ED318A6235}
 		{E28EC7F7-29A2-4BAD-8C86-95DFE0FBE364} = {05D6D17C-DFCC-4E76-AE07-0F22FD38F3B7}
 		{240B57C5-5B97-473C-8B79-D3E440755402} = {AFE9D936-9C76-46D3-85DB-DB68EAD8B353}
+		{4B5B9E7A-FC62-443B-A002-10C9397461C7} = {7A01F5CB-2378-473E-AF22-69ED318A6235}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8F143A32-2D24-488F-AD4C-CD6D074641C6}
diff --git a/Trados2017Plugin/OpusCatTranslationProvider2017.csproj b/Trados2017Plugin/OpusCatTranslationProvider2017.csproj
index f5b1f1d..e7c07a2 100644
--- a/Trados2017Plugin/OpusCatTranslationProvider2017.csproj
+++ b/Trados2017Plugin/OpusCatTranslationProvider2017.csproj
@@ -48,10 +48,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Sdl.Core.PluginFramework, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c28cdb26c445c888, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sdl.Core.PluginFramework.2.0.0\lib\net45\Sdl.Core.PluginFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Sdl.Core.PluginFramework.PackageSupport, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c28cdb26c445c888, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sdl.Core.PluginFramework.2.0.0\lib\net45\Sdl.Core.PluginFramework.PackageSupport.dll</HintPath>
+      <HintPath>..\packages\Sdl.Core.PluginFramework.2.1.0\lib\netstandard2.0\Sdl.Core.PluginFramework.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.Core.Settings">
       <HintPath>..\..\..\..\..\..\Program Files (x86)\SDL\SDL Trados Studio\Studio5\Sdl.Core.Settings.dll</HintPath>
@@ -217,7 +214,10 @@
     </Compile>
     <Compile Include="..\Trados2019Plugin\OpusCatTpSettings.Designer.cs">
       <Link>OpusCatTpSettings.Designer.cs</Link>
-    </Compile>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>OpusCatTpSettings.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+    </Compile>  
     <Compile Include="..\Trados2019Plugin\OpusCatMTServiceHelper.cs">
       <Link>OpusCatMTServiceHelper.cs</Link>
     </Compile>
@@ -283,6 +283,11 @@
     <None Include="Resources\opus_mt.png" />
     <None Include="App.config" />
     <None Include="Resources\opus.ico" />
+    <None Include="..\Trados2019Plugin\OpusCatTpSettings.settings">
+      <Link>OpusCatTpSettings.settings</Link>
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>OpusCatTpSettings.Designer.cs</LastGenOutput>
+    </None>
     <EmbeddedResource Include="..\Trados2019Plugin\stopwords-iso.json">
       <Link>stopwords-iso.json</Link>
     </EmbeddedResource>
@@ -349,12 +354,12 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Sdl.Core.PluginFramework.Build.16.0.1\build\Sdl.Core.PluginFramework.Build.targets" Condition="Exists('..\packages\Sdl.Core.PluginFramework.Build.16.0.1\build\Sdl.Core.PluginFramework.Build.targets')" />
+  <Import Project="..\packages\Sdl.Core.PluginFramework.Build.17.0.0\build\Sdl.Core.PluginFramework.Build.targets" Condition="Exists('..\packages\Sdl.Core.PluginFramework.Build.17.0.0\build\Sdl.Core.PluginFramework.Build.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\Sdl.Core.PluginFramework.Build.16.0.1\build\Sdl.Core.PluginFramework.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Core.PluginFramework.Build.16.0.1\build\Sdl.Core.PluginFramework.Build.targets'))" />
+    <Error Condition="!Exists('..\packages\Sdl.Core.PluginFramework.Build.17.0.0\build\Sdl.Core.PluginFramework.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Core.PluginFramework.Build.17.0.0\build\Sdl.Core.PluginFramework.Build.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.
diff --git a/Trados2017Plugin/packages.config b/Trados2017Plugin/packages.config
index 84e7e3d..c2b9d0e 100644
--- a/Trados2017Plugin/packages.config
+++ b/Trados2017Plugin/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net471" />
   <package id="RestSharp" version="106.12.0" targetFramework="net471" />
-  <package id="Sdl.Core.PluginFramework" version="2.0.0" targetFramework="net471" />
-  <package id="Sdl.Core.PluginFramework.Build" version="16.0.1" targetFramework="net471" />
+  <package id="Sdl.Core.PluginFramework" version="2.1.0" targetFramework="net471" />
+  <package id="Sdl.Core.PluginFramework.Build" version="17.0.0" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/Trados2019Plugin/ConnectionControl.xaml.cs b/Trados2019Plugin/ConnectionControl.xaml.cs
index 6050316..00159ae 100644
--- a/Trados2019Plugin/ConnectionControl.xaml.cs
+++ b/Trados2019Plugin/ConnectionControl.xaml.cs
@@ -269,7 +269,7 @@ private void StartFetch()
             //If connection details are custom, check the custom checkbox, this is for start-up
             this.UseCustomConnection.IsChecked =
                 host != OpusCatTpSettings.Default.MtServiceAddress ||
-                port != OpusCatTpSettings.Default.MtServicePort;
+                port != OpusCatTpSettings.Default.MtServicePortHttp;
 
             var modeltag = this.options.modelTag;
             Task.Run(() => this.FetchServiceData(host, port, modeltag));
@@ -284,7 +284,7 @@ private void RetryConnection_Click(object sender, RoutedEventArgs e)
 
         private void SaveAsDefault_Click(object sender, RoutedEventArgs e)
         {
-            OpusCatTpSettings.Default.MtServicePort = this.ServicePortBoxElement.Text;
+            OpusCatTpSettings.Default.MtServicePortHttp = this.ServicePortBoxElement.Text;
             OpusCatTpSettings.Default.MtServiceAddress = this.ServiceAddressBoxElement.Text;
             OpusCatTpSettings.Default.Save();
         }
@@ -297,7 +297,7 @@ public void TagBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
 
         private void UseCustomConnection_Unchecked(object sender, RoutedEventArgs e)
         {
-            this.ServicePortBoxElement.Text = OpusCatTpSettings.Default.MtServicePort;
+            this.ServicePortBoxElement.Text = OpusCatTpSettings.Default.MtServicePortHttp;
             this.ServiceAddressBoxElement.Text = OpusCatTpSettings.Default.MtServiceAddress;
         }
     }
diff --git a/Trados2019Plugin/FinetuneBatchTaskControl.Designer.cs b/Trados2019Plugin/FinetuneBatchTaskControl.Designer.cs
index 883d608..40f09c2 100644
--- a/Trados2019Plugin/FinetuneBatchTaskControl.Designer.cs
+++ b/Trados2019Plugin/FinetuneBatchTaskControl.Designer.cs
@@ -1,6 +1,6 @@
 namespace OpusCatTranslationProvider
 {
-    partial class FinetuneBatchTaskControl
+    partial class FinetuneBatchTaskControl 
     {
         /// <summary> 
         /// Required designer variable.
diff --git a/Trados2019Plugin/FinetuneBatchTaskControl.cs b/Trados2019Plugin/FinetuneBatchTaskControl.cs
index 9667512..900117e 100644
--- a/Trados2019Plugin/FinetuneBatchTaskControl.cs
+++ b/Trados2019Plugin/FinetuneBatchTaskControl.cs
@@ -13,7 +13,7 @@
 namespace OpusCatTranslationProvider
 {
     public partial class FinetuneBatchTaskControl : UserControl, ISettingsAware<FinetuneBatchTaskSettings>
-    #if TRADOS21
+    #if (TRADOS21 || TRADOS22)
     , IUISettingsControl
     #endif
     {
diff --git a/Trados2019Plugin/OpusCatOptions.cs b/Trados2019Plugin/OpusCatOptions.cs
index 797a184..152d031 100644
--- a/Trados2019Plugin/OpusCatOptions.cs
+++ b/Trados2019Plugin/OpusCatOptions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Configuration;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Windows.Input;
@@ -117,8 +118,8 @@ public string mtServicePort
                 if (parameter == "" || parameter == null)
                 {
                     //Add default to URI
-                    SetStringParameter("mtServicePort", OpusCatTpSettings.Default.MtServicePort);
-                    return OpusCatTpSettings.Default.MtServicePort;
+                    SetStringParameter("mtServicePort", OpusCatTpSettings.Default.MtServicePortHttp);
+                    return OpusCatTpSettings.Default.MtServicePortHttp;
                 }
                 else
                 {
@@ -128,6 +129,8 @@ public string mtServicePort
             set { SetStringParameter("mtServicePort", value); NotifyPropertyChanged(); }
         }
 
+        
+
         public string mtServiceAddress
         {
             get
diff --git a/Trados2019Plugin/OpusCatProvider.cs b/Trados2019Plugin/OpusCatProvider.cs
index e77f5d4..e744779 100644
--- a/Trados2019Plugin/OpusCatProvider.cs
+++ b/Trados2019Plugin/OpusCatProvider.cs
@@ -28,7 +28,7 @@ public OpusCatOptions Options
             set;
         }
 
-#if TRADOS21
+#if (TRADOS21 || TRADOS22)
         private static IStudioDocument activeDocument;
 #else
         private static Document activeDocument;
@@ -93,7 +93,7 @@ private static void ClearSegmentHandlers()
             }
         }
 
-#if TRADOS21
+#if (TRADOS21 || TRADOS22)
         private static void UpdateSegmentHandler(IStudioDocument doc)
 #else
         private static void UpdateSegmentHandler(Document doc)
diff --git a/Trados2019Plugin/OpusCatProviderLanguageDirection.cs b/Trados2019Plugin/OpusCatProviderLanguageDirection.cs
index 1cbc07f..acc8819 100644
--- a/Trados2019Plugin/OpusCatProviderLanguageDirection.cs
+++ b/Trados2019Plugin/OpusCatProviderLanguageDirection.cs
@@ -217,7 +217,7 @@ private SearchResult CreateSearchResult(Segment searchSegment, Segment translati
             
             if (this._options.showMtAsOrigin)
             {
-#if TRADOS21
+#if (TRADOS21 || TRADOS22)
                 tu.Origin = TranslationUnitOrigin.Nmt;
 #else
                 tu.Origin = TranslationUnitOrigin.MachineTranslation;
diff --git a/Trados2019Plugin/OpusCatTpSettings.Designer.cs b/Trados2019Plugin/OpusCatTpSettings.Designer.cs
index 99d535d..c6142aa 100644
--- a/Trados2019Plugin/OpusCatTpSettings.Designer.cs
+++ b/Trados2019Plugin/OpusCatTpSettings.Designer.cs
@@ -23,18 +23,6 @@ public static OpusCatTpSettings Default {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("8477")]
-        public string MtServicePort {
-            get {
-                return ((string)(this["MtServicePort"]));
-            }
-            set {
-                this["MtServicePort"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
@@ -190,5 +178,17 @@ public bool RestoreTags {
                 this["RestoreTags"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("8500")]
+        public string MtServicePortHttp {
+            get {
+                return ((string)(this["MtServicePortHttp"]));
+            }
+            set {
+                this["MtServicePortHttp"] = value;
+            }
+        }
     }
 }
diff --git a/Trados2019Plugin/OpusCatTpSettings.settings b/Trados2019Plugin/OpusCatTpSettings.settings
index 0bec3e9..483e469 100644
--- a/Trados2019Plugin/OpusCatTpSettings.settings
+++ b/Trados2019Plugin/OpusCatTpSettings.settings
@@ -2,9 +2,6 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="OpusCatTranslationProvider" GeneratedClassName="OpusCatTpSettings">
   <Profiles />
   <Settings>
-    <Setting Name="MtServicePort" Type="System.String" Scope="User">
-      <Value Profile="(Default)">8477</Value>
-    </Setting>
     <Setting Name="SupportAllLanguagePairs" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
@@ -44,5 +41,8 @@
     <Setting Name="RestoreTags" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="MtServicePortHttp" Type="System.String" Scope="User">
+      <Value Profile="(Default)">8500</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Trados2019Plugin/OpusCatTranslationProvider.csproj b/Trados2019Plugin/OpusCatTranslationProvider.csproj
index 928060b..c06629d 100644
--- a/Trados2019Plugin/OpusCatTranslationProvider.csproj
+++ b/Trados2019Plugin/OpusCatTranslationProvider.csproj
@@ -115,6 +115,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
diff --git a/Trados2019Plugin/ThirdPartyNotices.txt b/Trados2019Plugin/ThirdPartyNotices.txt
index df3eb26..b1404ec 100644
--- a/Trados2019Plugin/ThirdPartyNotices.txt
+++ b/Trados2019Plugin/ThirdPartyNotices.txt
@@ -34,4 +34,73 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
+
+3. RestSharp library. Copyright © 2009-2022 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community.
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
diff --git a/Trados2019Plugin/app.config b/Trados2019Plugin/app.config
index 761851e..9d64aab 100644
--- a/Trados2019Plugin/app.config
+++ b/Trados2019Plugin/app.config
@@ -8,9 +8,6 @@
 </configSections>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup><userSettings>
         <OpusCatTranslationProvider.OpusCatTpSettings>
-            <setting name="MtServicePort" serializeAs="String">
-                <value>8477</value>
-            </setting>
             <setting name="SupportAllLanguagePairs" serializeAs="String">
                 <value>True</value>
             </setting>
@@ -50,6 +47,9 @@
             <setting name="RestoreTags" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="MtServicePortHttp" serializeAs="String">
+                <value>8500</value>
+            </setting>
         </OpusCatTranslationProvider.OpusCatTpSettings>
     </userSettings>
 </configuration>
diff --git a/Trados2021Plugin/OpusCatTranslationProvider2021.csproj b/Trados2021Plugin/OpusCatTranslationProvider2021.csproj
index 770beab..0be0f0d 100644
--- a/Trados2021Plugin/OpusCatTranslationProvider2021.csproj
+++ b/Trados2021Plugin/OpusCatTranslationProvider2021.csproj
@@ -206,6 +206,9 @@
     </Compile>
     <Compile Include="..\Trados2019Plugin\OpusCatTpSettings.Designer.cs">
       <Link>OpusCatTpSettings.Designer.cs</Link>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>OpusCatTpSettings.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
     </Compile>
     <Compile Include="..\Trados2019Plugin\OpusCatMTServiceHelper.cs">
       <Link>OpusCatMTServiceHelper.cs</Link>
@@ -271,6 +274,11 @@
     </None>
     <None Include="Resources\opus_mt.png" />
     <None Include="App.config" />
+    <None Include="..\Trados2019Plugin\OpusCatTpSettings.settings">
+      <Link>OpusCatTpSettings.settings</Link>
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>OpusCatTpSettings.Designer.cs</LastGenOutput>
+    </None>
     <None Include="Resources\opus.ico" />
     <EmbeddedResource Include="..\Trados2019Plugin\stopwords-iso.json">
       <Link>stopwords-iso.json</Link>
@@ -329,7 +337,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TRADOS21</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
@@ -338,7 +346,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;TRADOS21</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>