open credential manager from connection tree window

hide password/username/domain fields in connection properties
merged from develop
2026-02-19 15:19:20 +08:00 · 2021-09-04 00:52:04 +02:00 · 2021-09-04 00:27:42 +02:00 · 2021-09-01 01:26:21 +02:00 · 2019-05-19 16:23:00 -05:00 · 2019-05-19 16:19:18 -05:00
813 changed files with 40687 additions and 182775 deletions
--- a/.github/workflows/build-x86_64.yml
+++ b/.github/workflows/build-x86_64.yml
@@ -1,130 +0,0 @@
-name: Build x86_64
-
-on:
-  push:
-    branches:
-      - v1.77.3-dev
-
-jobs:
-  Build-Debug-MSI:
-    runs-on: windows-2022
-    steps:
-      - name: 01. Copy repository
-        uses: actions/checkout@v4
-
-      - name: 02. Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.3.1  # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-        with:
-          vs-version: '17.12.4'
-
-      - name: 03. Restore nuget packages for solution
-        shell: pwsh
-        run: |
-          dotnet restore
-
-      - name: 04. Compile mRemoteNG
-        shell: pwsh
-        run: |
-          msbuild "$Env:GITHUB_WORKSPACE\mRemoteNG.sln" -p:Configuration="Debug Installer" -p:Platform=x64 /verbosity:normal
-
-      - name: 05. Publish MSI as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: debug-msi-x86_64
-          path: ${{ github.workspace }}\mRemoteNGInstaller\Installer\bin\x64\Debug\en-US\
-          if-no-files-found: error
-
-  Build-Debug-Portable:
-    runs-on: windows-2022
-    steps:
-      - name: 01. Copy repository
-        uses: actions/checkout@v4
-
-      - name: 02. Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.3.1  # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-        with:
-          vs-version: '17.8.3'
-
-      - name: 03. Restore nuget packages for solution
-        shell: pwsh
-        run: |
-          dotnet restore
-
-      - name: 04. Compile mRemoteNG
-        shell: pwsh
-        run: |
-          msbuild "$Env:GITHUB_WORKSPACE\mRemoteNG.sln" -p:Configuration="Debug Portable" -p:Platform=x64 /verbosity:normal
-
-      - name: 05. Publish Portable Binary as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: debug-portable-x86_64
-          path: ${{ github.workspace }}\mRemoteNG\bin\x64\Debug Portable\
-          if-no-files-found: error
-
-  Build-Release:
-    runs-on: windows-2022
-    steps:
-      - name: 01. Copy repository
-        uses: actions/checkout@v4
-
-      - name: 02. Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.3.1  # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-        with:
-          vs-version: '17.12.4'
-
-      - name: 03. Restore nuget packages for solution
-        shell: pwsh
-        run: |
-          dotnet restore
-
-      - name: 04. Compile mRemoteNG
-        shell: pwsh
-        run: |
-          msbuild "$Env:GITHUB_WORKSPACE\mRemoteNG.sln" -p:Configuration="Release Installer and Portable" -p:Platform=x64 /verbosity:normal
-
-      - name: 05. Publish MSI Binary as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-         name: release-msi-x86_64
-         path: ${{ github.workspace }}\mRemoteNGInstaller\Installer\bin\x64\Release\en-US\
-         if-no-files-found: error
-
-      - name: 06. Publish Portable Binary as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-portable-x86_64
-          path: ${{ github.workspace }}\mRemoteNG\bin\x64\Release
-          if-no-files-found: error
-
-  Create-Release:
-    needs: [Build-Debug-MSI, Build-Debug-Portable, Build-Release]
-    runs-on: ubuntu-22.04
-    steps:
-      - name: 01. Copy repository
-        uses: actions/checkout@v4
-
-      - name: 02. Download Artifacts
-        uses: actions/download-artifact@v4
-
-      - name: 03. Create compressed archives # Needs to be done because "actions/download-artifact@v4" is extracting the zipped Artifacts
-        shell: bash
-        run: |
-          zip -r debug-msi-x86_64.zip debug-msi-x86_64/
-          zip -r debug-portable-x86_64.zip debug-portable-x86_64/
-          zip -r release-msi-x86_64.zip release-msi-x86_64/
-          zip -r release-portable-x86_64.zip release-portable-x86_64/
-
-      - name: 04. Create Release
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh release create "v1.77.3-dev-${GITHUB_RUN_NUMBER}" \
-                            --title "v1.77.3-dev-${GITHUB_RUN_NUMBER}" \
-                            --prerelease \
-                            --generate-notes \
-                            $GITHUB_WORKSPACE/debug-msi-x86_64.zip \
-                            $GITHUB_WORKSPACE/debug-portable-x86_64.zip \
-                            $GITHUB_WORKSPACE/release-msi-x86_64.zip \
-                            $GITHUB_WORKSPACE/release-portable-x86_64.zip
--- a/.gitignore
+++ b/.gitignore
@@ -283,6 +283,6 @@ Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
 InstallerProjects/Installer/Fragments/FilesFragment.wxs
 InstallerProjects/Installer/Resources/License.rtf

-# mRemoteNG
-**/mRemoteNG/Properties/AssemblyInfo.tt
-**/mRemoteNG/Properties/AssemblyInfo.cs
+# gh-pages info
+runlocal.bat
+/_site
--- a/Add-ons/README.md
+++ b/Add-ons/README.md
@@ -1,11 +0,0 @@
-## Add-ons library by 3rd party 
-This is a list of add-ons, plugins and extentions what could be used with mRemoteNG, if you wish to add yours to this list - just drop me a line: <a href="mailto:support@mremoteng.org">support@mremoteng.org</a>
-<br>
-
-| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Date&nbsp;added</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Author</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | <b>Type</b> | <b>Name</b> | <b>Description</b> | <b>Repository</b> |
-| :---------------------------------------------------------:|:-------------------------------------------------:| :---------: |-------------|--------------------|:-----------------:|
-| 02-08-2022 | <a href="https://github.com/JustBeta"><img align="left" src="https://avatars.githubusercontent.com/u/25150896?v=4" alt="JustBeta" width="30px"/>JustBeta</a> | script | Export-MobaXterm2mRemoteNG | Conversion of MobaXterm's ini file to mRemoteNG format. | [GITHUB Repository](https://github.com/JustBeta/Export-MobaXtern2mRemoteNG/tree/main) |
-
-<br>
-
-For a detailed usage examples and documentation please reach out authors.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,54 +2,18 @@
 All notable changes to this project will be documented in this file.

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [1.77.3.1784]
-### Fixed
- #2362: Fix use of sql database
- #2356: Improve speed for the display of the options page
- #2352: SSH.NET Update
- #2346: Modify "auto reconnect" to have the ability to really auto-reconnect
- #2340: Set the default theme setting
- #2339: Add 2 missing settings
- #2261: Implement Show/Hide file menu in view menu
- #2244: Save RCG and RestrictedAdmin fields correctly in connections file
- #2195: Fix crafted XML File Code Execution vulnerability
- #304: use pwfile instead of cleartext password for puttyng

+## [Unreleased]
 ### Added
- #2285: Support extraction of SSH private keys from external cred prov
- #2268: Postregsql database support
-
-### Updated
- #2295: Updates hyperlink style to make links more visible to end users
- #2337: Set language.resx to auto generate the designer class
-
-## [1.77.3]
-### Added
- #1736: Update of SSH.NET to 2020.0.2 to allow File Transfer again
- #2138: Improve compatibility with Remote Desktop Connection Manager v2.83
- #2123: Thycotic Secret Server - Added 2FA OTP support
-### Changed
- #1546: Enable resize without reconnect for RDP Version Rdc9 or higher
- 
-## [1.77.2]
-### Added
- #2086: Replace WebClient with async HttpClient for updater.
- #1850: Minify config xml
- #1770: Added missing RDP performance settings
- #1516: added API to access credential vault (Thycotic Secret Server) by specifying SSAPI:ID as username
- #1476: Configurable backups. Can now edit/set backup frequency, backup path, and max number of backup files.
 - #1427: Fix RDP local desktop scale not taking effect on remote
+- #1770: Added missing RDP performance settings
 - #1332: Added option to hide menu strip container
- #870: Added option to push inheritance settings to child nodes recursively
 - #545: Option to minimize to system tray on closing
- #503: SSH Execute a single command after login
 - #420: SSH tunneling implemented
- #327: Added Alternative Shell for RDP settings
 - #319: Override quick connect username when using user@domain
 - #283: Support for native PowerShell remoting as new protocol
- #xxx: Add external connector to retrieve ip address from Amazon EC2 Instance IDs
+- #1850: Minify config xml
 ### Changed
- #2102: Extended the field RenderingEngine from 10 chars to 16
 - #2022: Replaced CefSharp with WebView2
 - #2014: Revised icons
 - #2013: Removed components check
@@ -60,33 +24,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - #1767: Turned about window into a simple popup form
 - #1690: Replaced GeckoFX (Firefox) with CefSharp (Chromium)
 - #1325: Language resource files cleanup
- #xxxx: Secret Server connector via new field "API User ID" instead of SSAPI: prefix
 ### Fixed
- #2125: Fixed string parsing logic for Quick Connect toolbar.
- #2122: Fix to avoid throwing exception incase if not able decrypt connections and ask to open another one or create a new. 
- #2117: Fix of broken Links due migration to .NET 6 and branch renaming
- #2098: Fix failed BinaryFileTest
- #2097: Fix failed tests related to mRemoteNGTests.UI.Window.ConfigWindowTests
- #2096: Corrected encryption code of LegacyRijndaelCryptographyProvider
- #2089: Fixed the exception thrown by menu buttons "Documentation" and "Website"
- #2087: Fixed application crash, when the update file is launched from the application
- #2079: Fixed theme files not being copied to output directory
- #2012: Updated PuTTYNG to v0.76
 - #1884: Allow setting Port when using MSSQL
 - #1783: Added missing inheritance properties to SQL scripts
- #1773: Connection issue with MySql - Missing fields in
+- #1773: Connection issue with mysql - Missing fields in 
 - #1756: Cannot type any character on MultiSSH toolbar 
 - #1720: Show configuration file name in title of password prompt form
 - #1713: Sound redirection does not work if Clipboard redirection is set to No
 - #1632: 1.77.1 breaks RDP drive and sound redirection
- #1610: Menu bar changes to English when canceling options form
+- #1610: Menu bar changes to english when cancelling options form
 - #1595: Unhandled exception when trying to browse through non existent multi ssh history with keyboard key strokes
 - #1589: Update SQL tables instead of rewriting them
 - #1465: REGRESSION: Smart Cards redirection to Remote Desktop not working
- #1363: Don't show "Disk Usage" button in installer
 - #1337: Unhandled exception after closing mRemoteNG
 - #359: Making a VNC connection to an unreachable host causes the application to not respond for 20-30 seconds
- #618: Do not break the Windows Clipboard Chain when exiting.

 ## [1.77.1] - 2019-09-02
 ### Added
--- a/COPYING.TXT
+++ b/COPYING.TXT
@@ -278,3 +278,62 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -90,10 +90,6 @@ Copyright © 2004 Marc Merritt © 2008 Felix Deimel

 # Included Components

-**[CefSharp](https://github.com/cefsharp/CefSharp)**  
-Copyright © The CefSharp Authors  
-MIT License
-
 **[DockPanel Suite](https://github.com/dockpanelsuite/dockpanelsuite)**  
 Copyright © 2018 @roken and @lextm (formerly Weifen Luo)  
 MIT License
--- a/ExternalConnectors/AWS/AWSConnectionForm.Designer.cs
+++ b/ExternalConnectors/AWS/AWSConnectionForm.Designer.cs
@@ -1,180 +0,0 @@
-namespace ExternalConnectors.AWS
-{
-    partial class AWSConnectionForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tbAccesKeyID = new System.Windows.Forms.TextBox();
-            this.tbAccesKey = new System.Windows.Forms.TextBox();
-            this.btnOK = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tbAccesKeyID
-            // 
-            this.tbAccesKeyID.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbAccesKeyID.Location = new System.Drawing.Point(152, 4);
-            this.tbAccesKeyID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tbAccesKeyID.Name = "tbAccesKeyID";
-            this.tbAccesKeyID.Size = new System.Drawing.Size(490, 23);
-            this.tbAccesKeyID.TabIndex = 0;
-            // 
-            // tbAccesKey
-            // 
-            this.tbAccesKey.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbAccesKey.Location = new System.Drawing.Point(152, 43);
-            this.tbAccesKey.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tbAccesKey.Name = "tbAccesKey";
-            this.tbAccesKey.Size = new System.Drawing.Size(490, 23);
-            this.tbAccesKey.TabIndex = 2;
-            // 
-            // btnOK
-            // 
-            this.btnOK.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.btnOK.Location = new System.Drawing.Point(219, 12);
-            this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(88, 26);
-            this.btnOK.TabIndex = 10;
-            this.btnOK.Text = "OK";
-            this.btnOK.UseVisualStyleBackColor = true;
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(338, 12);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(88, 26);
-            this.btnCancel.TabIndex = 11;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.92994F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 77.07006F));
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.tbAccesKeyID, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.tbAccesKey, 1, 1);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(646, 102);
-            this.tableLayoutPanel1.TabIndex = 12;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Location = new System.Drawing.Point(4, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(140, 39);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Access Key ID";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(4, 39);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(140, 39);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "Access Key";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.ColumnCount = 5;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93F));
-            this.tableLayoutPanel2.Controls.Add(this.btnOK, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.btnCancel, 3, 0);
-            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 112);
-            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(646, 50);
-            this.tableLayoutPanel2.TabIndex = 13;
-            // 
-            // AWSConnectionForm
-            // 
-            this.AcceptButton = this.btnOK;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(646, 162);
-            this.Controls.Add(this.tableLayoutPanel2);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Name = "AWSConnectionForm";
-            this.Text = "AWS EC2 API Login Data";
-            this.Activated += new System.EventHandler(this.AWSConnectionForm_Activated);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        public System.Windows.Forms.TextBox tbAccesKeyID;
-        public System.Windows.Forms.TextBox tbAccesKey;
-        private System.Windows.Forms.Button btnOK;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-    }
-}
--- a/ExternalConnectors/AWS/AWSConnectionForm.cs
+++ b/ExternalConnectors/AWS/AWSConnectionForm.cs
@@ -1,16 +0,0 @@
-namespace ExternalConnectors.AWS
-{
-    public partial class AWSConnectionForm : Form
-    {
-        public AWSConnectionForm()
-        {
-            InitializeComponent();
-
-        }
-
-        private void AWSConnectionForm_Activated(object sender, EventArgs e)
-        {
-            tbAccesKeyID.Focus();
-        }
-    }
-}
--- a/ExternalConnectors/AWS/AWSConnectionForm.resx
+++ b/ExternalConnectors/AWS/AWSConnectionForm.resx
@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/ExternalConnectors/AWS/EC2FetchDataService.cs
+++ b/ExternalConnectors/AWS/EC2FetchDataService.cs
@@ -1,119 +0,0 @@
-using Amazon;
-using Amazon.EC2;
-using Amazon.EC2.Model;
-using Microsoft.Win32;
-
-namespace ExternalConnectors.AWS
-{
-    public class EC2FetchDataService
-    {
-        private static DateTime lastFetch;
-        private static List<InstanceInfo>? lastData;
-
-        // input must be in format "AWSAPI:instanceid" where instanceid is the ec2 instance id, e.g. i-066f750a76c97583d
-        public static async Task<string> GetEC2InstanceDataAsync(string input, string region)
-        {
-            // get secret id
-            if (!input.StartsWith("AWSAPI:"))
-                throw new Exception("calling this function requires AWSAPI: input");
-            string InstanceID = input[7..];
-
-            // init connection credentials, display popup if necessary
-            AWSConnectionData.Init();
-            var alldata = await GetEC2IPDataAsync(region);
-            var found = alldata.Where(x => x.InstanceId == InstanceID).SingleOrDefault();
-            return (found == null) ? "" : found.PublicIP;
-        }
-
-        private static async Task<List<InstanceInfo>> GetEC2IPDataAsync(string region)
-        {
-            // caching
-            TimeSpan timeSpan = DateTime.Now - lastFetch;
-            if (timeSpan.TotalMinutes < 1 && lastData != null)
-                return lastData;
-
-            //AWSConfigs.AWSRegion = AWSConnectionData.region;
-            AWSConfigs.AWSRegion = region;
-            string awsAccessKeyId = AWSConnectionData.awsKeyID;
-            string awsSecretAccessKey = AWSConnectionData.awsKey;
-
-            var _client = new AmazonEC2Client(awsAccessKeyId, awsSecretAccessKey, RegionEndpoint.EUCentral1);
-            bool done = false;
-
-            List<InstanceInfo> instanceList = new();
-            var request = new DescribeInstancesRequest();
-            while (!done)
-            {
-                DescribeInstancesResponse response = await _client.DescribeInstancesAsync(request);
-
-                foreach (var reservation in response.Reservations)
-                {
-                    foreach (var instance in reservation.Instances)
-                    {
-                        string vmname = "";
-                        foreach (var tag in instance.Tags)
-                        {
-                            if (tag.Key == "Name")
-                            {
-                                vmname = tag.Value;
-                            }
-                        }
-                        InstanceInfo inf = new(instance, vmname);
-                        instanceList.Add(inf);
-                    }
-                }
-
-                request.NextToken = response.NextToken;
-
-                if (response.NextToken == null)
-                {
-                    done = true;
-                }
-            }
-
-            lastData = instanceList.OrderBy(x => x.Name).ToList();
-            lastFetch = DateTime.Now;
-            return lastData;
-        }
-
-
-        public static class AWSConnectionData
-        {
-            private static readonly RegistryKey key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\mRemoteAWSInterface");
-
-            public static string awsKeyID = "";
-            public static string awsKey = "";
-            //public static string _region = "eu-central-1";
-
-            public static void Init()
-            {
-                if (awsKey != "")
-                    return;
-                // display gui and ask for data
-                AWSConnectionForm f = new();
-                f.tbAccesKeyID.Text = "" + key.GetValue("KeyID");
-                f.tbAccesKey.Text = "" + key.GetValue("Key");
-                //f.tbRegion.Text = "" + key.GetValue("Region");
-                //if (f.tbRegion.Text == null || f.tbRegion.Text.Length < 2)
-                //    f.tbRegion.Text = region;
-                _ = f.ShowDialog();
-
-                if (f.DialogResult != DialogResult.OK)
-                    return;
-
-                // store values to memory
-                awsKeyID = f.tbAccesKeyID.Text;
-                awsKey = f.tbAccesKey.Text;
-                //region = f.tbRegion.Text;
-
-
-                // write values to registry
-                key.SetValue("KeyID", awsKeyID);
-                key.SetValue("Key", awsKey);
-                //key.SetValue("Region", region);
-                key.Close();
-            }
-        }
-
-    }
-}
--- a/ExternalConnectors/AWS/InstanceInfo.cs
+++ b/ExternalConnectors/AWS/InstanceInfo.cs
@@ -1,34 +0,0 @@
-using Amazon.EC2.Model;
-using System;
-
-namespace ExternalConnectors.AWS
-{
-    public class InstanceInfo
-    {
-        public string InstanceId { get; }
-        public string Name { get; }
-        public string Status { get; }
-        public string PublicIP { get; }
-        public string PrivateIP { get; }
-        public InstanceInfo(Instance instance, string name)
-        {
-            InstanceId = instance.InstanceId;
-            Name = name;
-
-            switch(instance.State.Code)
-            {
-                case 0: Status = "Pending"; break;
-                case 16: Status = "Running"; break;
-                case 32: Status = "Shutdown"; break;
-                case 48: Status = "Terminated"; break;
-                case 64: Status = "Stopping"; break;
-                case 80: Status = "Stopped"; break;
-                default: Status = "Unknown"; break;
-            };
-
-            PublicIP = instance.PublicIpAddress ?? "";
-            PrivateIP = instance.PrivateIpAddress ?? "";
-
-        }
-    }
-}
--- a/ExternalConnectors/CPS/CPS.ico
+++ b/ExternalConnectors/CPS/CPS.ico
--- a/ExternalConnectors/CPS/CPSConnectionForm.Designer.cs
+++ b/ExternalConnectors/CPS/CPSConnectionForm.Designer.cs
@@ -1,241 +0,0 @@
-namespace ExternalConnectors.CPS
-{
-    partial class CPSConnectionForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CPSConnectionForm));
-            tbServerURL = new TextBox();
-            label3 = new Label();
-            tbAPIKey = new TextBox();
-            btnOK = new Button();
-            btnCancel = new Button();
-            tableLayoutPanel1 = new TableLayoutPanel();
-            label1 = new Label();
-            label6 = new Label();
-            tbOTP = new TextBox();
-            cbUseSSO = new CheckBox();
-            tableLayoutPanel2 = new TableLayoutPanel();
-            label4 = new Label();
-            tableLayoutPanel1.SuspendLayout();
-            tableLayoutPanel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // tbServerURL
-            // 
-            tbServerURL.Dock = DockStyle.Fill;
-            tbServerURL.Location = new Point(298, 5);
-            tbServerURL.Margin = new Padding(5);
-            tbServerURL.Name = "tbServerURL";
-            tbServerURL.Size = new Size(611, 27);
-            tbServerURL.TabIndex = 0;
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Dock = DockStyle.Fill;
-            label3.Location = new Point(5, 84);
-            label3.Margin = new Padding(5, 0, 5, 0);
-            label3.Name = "label3";
-            label3.Size = new Size(283, 42);
-            label3.TabIndex = 5;
-            label3.Text = "API Key";
-            label3.TextAlign = ContentAlignment.MiddleLeft;
-            // 
-            // tbAPIKey
-            // 
-            tbAPIKey.Dock = DockStyle.Fill;
-            tbAPIKey.Location = new Point(298, 89);
-            tbAPIKey.Margin = new Padding(5);
-            tbAPIKey.Name = "tbAPIKey";
-            tbAPIKey.Size = new Size(611, 27);
-            tbAPIKey.TabIndex = 4;
-            tbAPIKey.UseSystemPasswordChar = true;
-            // 
-            // btnOK
-            // 
-            btnOK.Anchor = AnchorStyles.Right;
-            btnOK.DialogResult = DialogResult.OK;
-            btnOK.Location = new Point(337, 16);
-            btnOK.Margin = new Padding(5);
-            btnOK.Name = "btnOK";
-            btnOK.Size = new Size(101, 35);
-            btnOK.TabIndex = 6;
-            btnOK.Text = "OK";
-            btnOK.UseVisualStyleBackColor = true;
-            // 
-            // btnCancel
-            // 
-            btnCancel.Anchor = AnchorStyles.Left;
-            btnCancel.DialogResult = DialogResult.Cancel;
-            btnCancel.Location = new Point(474, 16);
-            btnCancel.Margin = new Padding(5);
-            btnCancel.Name = "btnCancel";
-            btnCancel.Size = new Size(101, 35);
-            btnCancel.TabIndex = 11;
-            btnCancel.Text = "Cancel";
-            btnCancel.UseVisualStyleBackColor = true;
-            // 
-            // tableLayoutPanel1
-            // 
-            tableLayoutPanel1.ColumnCount = 2;
-            tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 32.06997F));
-            tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 67.93003F));
-            tableLayoutPanel1.Controls.Add(label1, 0, 0);
-            tableLayoutPanel1.Controls.Add(label3, 0, 2);
-            tableLayoutPanel1.Controls.Add(tbServerURL, 1, 0);
-            tableLayoutPanel1.Controls.Add(tbAPIKey, 1, 2);
-            tableLayoutPanel1.Controls.Add(label6, 0, 3);
-            tableLayoutPanel1.Controls.Add(tbOTP, 1, 3);
-            tableLayoutPanel1.Controls.Add(cbUseSSO, 0, 1);
-            tableLayoutPanel1.Dock = DockStyle.Top;
-            tableLayoutPanel1.Location = new Point(0, 0);
-            tableLayoutPanel1.Margin = new Padding(5);
-            tableLayoutPanel1.Name = "tableLayoutPanel1";
-            tableLayoutPanel1.RowCount = 5;
-            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 20F));
-            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 20F));
-            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 20F));
-            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 20F));
-            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 20F));
-            tableLayoutPanel1.Size = new Size(914, 212);
-            tableLayoutPanel1.TabIndex = 12;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Dock = DockStyle.Fill;
-            label1.Location = new Point(5, 0);
-            label1.Margin = new Padding(5, 0, 5, 0);
-            label1.Name = "label1";
-            label1.Size = new Size(283, 42);
-            label1.TabIndex = 2;
-            label1.Text = "Passwordstate URL";
-            label1.TextAlign = ContentAlignment.MiddleLeft;
-            // 
-            // label6
-            // 
-            label6.AutoSize = true;
-            label6.Dock = DockStyle.Fill;
-            label6.Location = new Point(3, 126);
-            label6.Name = "label6";
-            label6.Size = new Size(287, 42);
-            label6.TabIndex = 15;
-            label6.Text = "2FA OTP (Optional)";
-            // 
-            // tbOTP
-            // 
-            tbOTP.Dock = DockStyle.Fill;
-            tbOTP.Location = new Point(298, 131);
-            tbOTP.Margin = new Padding(5);
-            tbOTP.Name = "tbOTP";
-            tbOTP.Size = new Size(611, 27);
-            tbOTP.TabIndex = 5;
-            // 
-            // cbUseSSO
-            // 
-            cbUseSSO.Anchor = AnchorStyles.Left;
-            cbUseSSO.AutoSize = true;
-            cbUseSSO.Location = new Point(5, 53);
-            cbUseSSO.Margin = new Padding(5, 5, 5, 0);
-            cbUseSSO.Name = "cbUseSSO";
-            cbUseSSO.Size = new Size(157, 24);
-            cbUseSSO.TabIndex = 14;
-            cbUseSSO.Text = "Use SSO / WinAuth";
-            cbUseSSO.UseVisualStyleBackColor = true;
-            cbUseSSO.CheckedChanged += cbUseSSO_CheckedChanged;
-            // 
-            // tableLayoutPanel2
-            // 
-            tableLayoutPanel2.ColumnCount = 5;
-            tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 106F));
-            tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
-            tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 26F));
-            tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
-            tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 107F));
-            tableLayoutPanel2.Controls.Add(btnOK, 1, 0);
-            tableLayoutPanel2.Controls.Add(btnCancel, 3, 0);
-            tableLayoutPanel2.Dock = DockStyle.Bottom;
-            tableLayoutPanel2.Location = new Point(0, 300);
-            tableLayoutPanel2.Margin = new Padding(5);
-            tableLayoutPanel2.Name = "tableLayoutPanel2";
-            tableLayoutPanel2.RowCount = 1;
-            tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
-            tableLayoutPanel2.Size = new Size(914, 67);
-            tableLayoutPanel2.TabIndex = 13;
-            // 
-            // label4
-            // 
-            label4.AutoSize = true;
-            label4.Dock = DockStyle.Fill;
-            label4.Location = new Point(0, 212);
-            label4.Margin = new Padding(5, 0, 5, 0);
-            label4.Name = "label4";
-            label4.Size = new Size(345, 20);
-            label4.TabIndex = 14;
-            label4.Text = "URL is the base URL, like https://pass.domain.local/";
-            label4.TextAlign = ContentAlignment.MiddleLeft;
-            // 
-            // CPSConnectionForm
-            // 
-            AcceptButton = btnOK;
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(914, 367);
-            Controls.Add(label4);
-            Controls.Add(tableLayoutPanel2);
-            Controls.Add(tableLayoutPanel1);
-            Icon = (Icon)resources.GetObject("$this.Icon");
-            Margin = new Padding(5);
-            Name = "CPSConnectionForm";
-            Text = "Passwordstate API Login Data";
-            Activated += CPSConnectionForm_Activated;
-            tableLayoutPanel1.ResumeLayout(false);
-            tableLayoutPanel1.PerformLayout();
-            tableLayoutPanel2.ResumeLayout(false);
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-        private System.Windows.Forms.Label label3;
-
-        public System.Windows.Forms.TextBox tbServerURL;
-        //public System.Windows.Forms.TextBox tbUsername;
-        public System.Windows.Forms.TextBox tbAPIKey;
-        private System.Windows.Forms.Button btnOK;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        public System.Windows.Forms.CheckBox cbUseSSO;
-        private System.Windows.Forms.Label label4;
-        private Label label6;
-        public TextBox tbOTP;
-    }
-}
--- a/ExternalConnectors/CPS/CPSConnectionForm.cs
+++ b/ExternalConnectors/CPS/CPSConnectionForm.cs
@@ -1,41 +0,0 @@
-namespace ExternalConnectors.CPS
-{
-    public partial class CPSConnectionForm : Form
-    {
-        public CPSConnectionForm()
-        {
-            InitializeComponent();
-        }
-
-        private void CPSConnectionForm_Activated(object sender, EventArgs e)
-        {
-            SetVisibility();
-            if (cbUseSSO.Checked)
-                btnOK.Focus();
-            else
-            {
-                if (tbAPIKey.Text.Length == 0)
-                    tbAPIKey.Focus(); 
-                else
-                    tbOTP.Focus();
-            }
-
-            tbAPIKey.Focus();
-            if (!string.IsNullOrEmpty(tbAPIKey.Text) || cbUseSSO.Checked == true)
-                tbOTP.Focus();
-
-
-        }
-
-        private void cbUseSSO_CheckedChanged(object sender, EventArgs e)
-        {
-            SetVisibility();
-        }
-        private void SetVisibility()
-        {
-            bool ch = cbUseSSO.Checked;
-            tbAPIKey.Enabled = !ch;
-            //tbUsername.Enabled = !ch;
-        }
-    }
-}
--- a/ExternalConnectors/CPS/PasswordstateInterface.cs
+++ b/ExternalConnectors/CPS/PasswordstateInterface.cs
@@ -1,301 +0,0 @@
-using Microsoft.Win32;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.OpenSsl;
-using Org.BouncyCastle.Security;
-using System.Security.Cryptography;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
-namespace ExternalConnectors.CPS;
-
-public class PasswordstateInterface
-{
-    private static class CPSConnectionData
-    {
-        public static string ssUsername = "";
-        public static string ssPassword = "";
-        public static string ssUrl = "";
-        public static string ssOTP = "";
-        public static DateTime ssOTPTimeStampExpiration;
-
-        public static bool ssSSO = false;
-        public static bool initdone = false;
-
-        //token 
-        //public static string ssTokenBearer = "";
-        //public static DateTime ssTokenExpiresOn = DateTime.UtcNow;
-        //public static string ssTokenRefresh = "";
-
-        public static void Init()
-        {
-            // 2024-05-04 passwordstate currently does not support auth tokens, so we need to re-enter otp codes frequently
-            if (!string.IsNullOrEmpty(ssOTP) && DateTime.Now > ssOTPTimeStampExpiration)
-            {
-                ssOTP = "";
-                initdone = false;
-            }
-
-            if (initdone == true)
-                return;
-
-            RegistryKey key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\mRemoteCPSInterface");
-            try
-            {
-                // display gui and ask for data
-                CPSConnectionForm f = new CPSConnectionForm();
-                //string? un = key.GetValue("Username") as string;
-                //f.tbUsername.Text = un ?? "";
-                f.tbAPIKey.Text = CPSConnectionData.ssPassword;    // in OTP refresh cases, this value might already be filled
-
-                string? url = key.GetValue("URL") as string;
-                if (url == null || !url.Contains("://"))
-                    url = "https://cred.domain.local/SecretServer";
-                f.tbServerURL.Text = url;
-
-                var b = key.GetValue("SSO");
-                if (b == null || (string)b != "True")
-                    ssSSO = false;
-                else
-                    ssSSO = true;
-                f.cbUseSSO.Checked = ssSSO;
-                
-                // show dialog
-                while (true)
-                {
-                    _ = f.ShowDialog();
-
-                    if (f.DialogResult != DialogResult.OK)
-                        return;
-
-                    // store values to memory
-                    //ssUsername = f.tbUsername.Text;
-                    ssPassword = f.tbAPIKey.Text;
-                    ssUrl = f.tbServerURL.Text;
-                    ssSSO = f.cbUseSSO.Checked;
-                    ssOTP = f.tbOTP.Text;
-                    ssOTPTimeStampExpiration = DateTime.Now.AddSeconds(30);
-                    // check connection first
-                    try
-                    {
-                        if (TestCredentials() == true)
-                        {
-                            initdone = true;
-                            break;
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        MessageBox.Show("Test Credentials failed - please check your credentials");
-                    }
-                }
-
-
-                // write values to registry
-                //key.SetValue("Username", ssUsername);
-                key.SetValue("URL", ssUrl);
-                key.SetValue("SSO", ssSSO);
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-            finally
-            {
-                key.Close();
-            }
-        }
-    }
-
-    private static bool TestCredentials()
-    {
-        return ConnectionTest();
-    }
-    private static bool ConnectionTest()
-    {
-        if (CPSConnectionData.ssSSO)
-        {
-            string url = $"{CPSConnectionData.ssUrl}/winapi/passwordlists/";
-
-            using HttpClient client = new HttpClient(new HttpClientHandler() { UseDefaultCredentials = true });
-            client.DefaultRequestHeaders.Accept.Clear();
-            client.DefaultRequestHeaders.Add("User-Agent", "mRemote");
-            client.DefaultRequestHeaders.Add("OTP", CPSConnectionData.ssOTP);
-
-            var json = client.GetStringAsync(url).Result;
-            JsonNode? data = JsonSerializer.Deserialize<JsonNode>(json);
-            if (data == null)
-                return false;
-            return true;
-        }
-        else
-        {
-            string url = $"{CPSConnectionData.ssUrl}/api/passwordlists/";
-            using HttpClient client = new HttpClient();
-            client.DefaultRequestHeaders.Accept.Clear();
-            client.DefaultRequestHeaders.Add("User-Agent", "mRemote");
-            client.DefaultRequestHeaders.Add("APIKey", CPSConnectionData.ssPassword);
-            client.DefaultRequestHeaders.Add("OTP", CPSConnectionData.ssOTP);
-
-            var json = client.GetStringAsync(url).Result;
-            JsonNode? data = JsonSerializer.Deserialize<JsonNode>(json);
-            if (data == null)
-                return false;
-            return true;
-        }
-    }
-
-    private static JsonNode? FetchDataWinAuth(int secretID)
-    {
-        string url = $"{CPSConnectionData.ssUrl}/winapi/passwords/{secretID}";
-
-        using HttpClient client = new HttpClient(new HttpClientHandler() { UseDefaultCredentials = true });
-        client.DefaultRequestHeaders.Accept.Clear();
-        client.DefaultRequestHeaders.Add("User-Agent", "mRemote");
-        client.DefaultRequestHeaders.Add("OTP", CPSConnectionData.ssOTP);
-
-        var json = client.GetStringAsync(url).Result;
-        JsonNode? data = JsonSerializer.Deserialize<JsonNode>(json);
-        if (data == null)
-            return null;
-        JsonNode? element = data[0];
-        return element;
-    }
-    private static JsonNode? FetchDataAPIKeyAuth(int secretID)
-    {
-        string url = $"{CPSConnectionData.ssUrl}/api/passwords/{secretID}";
-
-        using HttpClient client = new HttpClient();
-        client.DefaultRequestHeaders.Accept.Clear();
-        client.DefaultRequestHeaders.Add("User-Agent", "mRemote");
-        client.DefaultRequestHeaders.Add("APIKey", CPSConnectionData.ssPassword);
-        client.DefaultRequestHeaders.Add("OTP", CPSConnectionData.ssOTP);
-
-        var json = client.GetStringAsync(url).Result;
-        JsonNode? data = JsonSerializer.Deserialize<JsonNode>(json);
-        if (data == null)
-            return null;
-        JsonNode? element = data[0];
-        return element;
-    }
-
-    private static void FetchSecret(int secretID, out string secretUsername, out string secretPassword, out string secretDomain, out string privatekey)
-    {
-        // clear return variables
-        secretDomain = "";
-        secretUsername = "";
-        secretPassword = "";
-        privatekey = "";
-        string privatekeypassphrase = "";
-        JsonNode? element = null;
-
-        if (CPSConnectionData.ssSSO)
-            element = FetchDataWinAuth(secretID);
-        else
-            element = FetchDataAPIKeyAuth(secretID);
-
-        if (element == null)
-            return;
-
-        var dom = element["Domain"];
-        if (dom != null) secretDomain = dom.ToString();
-
-        var user = element["UserName"];
-        if (user != null) secretUsername = user.ToString();
-
-        var pw = element["Password"];
-        if (pw != null) secretPassword = pw.ToString();
-
-        var privkey = element["GenericField1"];
-        if (privkey != null) privatekey = privkey.ToString();
-
-        var phrase = element["GenericField3"];
-        if (phrase != null) privatekeypassphrase = phrase.ToString();
-
-        // need to decode the private key?
-        if (!string.IsNullOrEmpty(privatekeypassphrase))
-        {
-            try
-            {
-                var key = DecodePrivateKey(privatekey, privatekeypassphrase);
-                privatekey = key;
-            }
-            catch(Exception)
-            {
-
-            }
-        }
-
-        // conversion to putty format necessary?
-        if (!string.IsNullOrEmpty(privatekey) && !privatekey.StartsWith("PuTTY-User-Key-File-2"))
-        {
-            try
-            {
-                RSACryptoServiceProvider key = ImportPrivateKey(privatekey);
-                privatekey = PuttyKeyFileGenerator.ToPuttyPrivateKey(key);
-            }
-            catch (Exception)
-            {
-
-            }
-        }
-    }
-
-    #region PUTTY KEY HANDLING
-    // decode rsa private key with encryption password
-    private static string DecodePrivateKey(string encryptedPrivateKey, string password)
-    {
-        TextReader textReader = new StringReader(encryptedPrivateKey);
-        PemReader pemReader = new PemReader(textReader, new PasswordFinder(password));
-
-        AsymmetricCipherKeyPair keyPair = (AsymmetricCipherKeyPair)pemReader.ReadObject();
-
-        TextWriter textWriter = new StringWriter();
-        var pemWriter = new PemWriter(textWriter);
-        pemWriter.WriteObject(keyPair.Private);
-        pemWriter.Writer.Flush();
-
-        return ""+textWriter.ToString();
-    }
-    private class PasswordFinder : IPasswordFinder
-    {
-        private string password;
-
-        public PasswordFinder(string password)
-        {
-            this.password = password;
-        }
-
-
-        public char[] GetPassword()
-        {
-            return password.ToCharArray();
-        }
-    }
-
-    // read private key pem string to rsacryptoserviceprovider
-    public static RSACryptoServiceProvider ImportPrivateKey(string pem)
-    {
-        PemReader pr = new PemReader(new StringReader(pem));
-        AsymmetricCipherKeyPair KeyPair = (AsymmetricCipherKeyPair)pr.ReadObject();
-        RSAParameters rsaParams = DotNetUtilities.ToRSAParameters((RsaPrivateCrtKeyParameters)KeyPair.Private);
-        RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
-        rsa.ImportParameters(rsaParams);
-        return rsa;
-    }
-    #endregion
-
-
-    // input: must be the secret id to fetch
-    public static void FetchSecretFromServer(string secretID, out string username, out string password, out string domain, out string privatekey)
-    {
-        // get secret id
-        int sid = Int32.Parse(secretID);
-
-        // init connection credentials, display popup if necessary
-        CPSConnectionData.Init();
-
-        // get the secret
-        FetchSecret(sid, out username, out password, out domain, out privatekey);
-    }
-}
--- a/ExternalConnectors/DSS/DSS.ico
+++ b/ExternalConnectors/DSS/DSS.ico
--- a/ExternalConnectors/DSS/SSConnectionForm.Designer.cs
+++ b/ExternalConnectors/DSS/SSConnectionForm.Designer.cs
@@ -1,281 +0,0 @@
-namespace ExternalConnectors.DSS
-{
-    partial class SSConnectionForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SSConnectionForm));
-            this.tbSSURL = new System.Windows.Forms.TextBox();
-            this.tbUsername = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.tbPassword = new System.Windows.Forms.TextBox();
-            this.btnOK = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.cbUseSSO = new System.Windows.Forms.CheckBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.tbOTP = new System.Windows.Forms.TextBox();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.label4 = new System.Windows.Forms.Label();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tbSSURL
-            // 
-            this.tbSSURL.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbSSURL.Location = new System.Drawing.Point(298, 5);
-            this.tbSSURL.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.tbSSURL.Name = "tbSSURL";
-            this.tbSSURL.Size = new System.Drawing.Size(611, 27);
-            this.tbSSURL.TabIndex = 0;
-            // 
-            // tbUsername
-            // 
-            this.tbUsername.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbUsername.Location = new System.Drawing.Point(298, 47);
-            this.tbUsername.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.tbUsername.Name = "tbUsername";
-            this.tbUsername.Size = new System.Drawing.Size(611, 27);
-            this.tbUsername.TabIndex = 2;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(5, 84);
-            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(283, 42);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "Password";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // tbPassword
-            // 
-            this.tbPassword.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbPassword.Location = new System.Drawing.Point(298, 89);
-            this.tbPassword.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.tbPassword.Name = "tbPassword";
-            this.tbPassword.Size = new System.Drawing.Size(611, 27);
-            this.tbPassword.TabIndex = 4;
-            this.tbPassword.UseSystemPasswordChar = true;
-            // 
-            // btnOK
-            // 
-            this.btnOK.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.btnOK.Location = new System.Drawing.Point(337, 16);
-            this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(101, 35);
-            this.btnOK.TabIndex = 6;
-            this.btnOK.Text = "OK";
-            this.btnOK.UseVisualStyleBackColor = true;
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(474, 16);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(101, 35);
-            this.btnCancel.TabIndex = 11;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.06997F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.93003F));
-            this.tableLayoutPanel1.Controls.Add(this.label5, 1, 4);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.tbSSURL, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.cbUseSSO, 0, 4);
-            this.tableLayoutPanel1.Controls.Add(this.tbUsername, 1, 1);
-            this.tableLayoutPanel1.Controls.Add(this.tbPassword, 1, 2);
-            this.tableLayoutPanel1.Controls.Add(this.label6, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.tbOTP, 1, 3);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 5;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(914, 212);
-            this.tableLayoutPanel1.TabIndex = 12;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label5.Location = new System.Drawing.Point(298, 168);
-            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(611, 44);
-            this.label5.TabIndex = 15;
-            this.label5.Text = "For SSO to work, additional IIS configuration is required!";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Location = new System.Drawing.Point(5, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(283, 42);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Secret Server URL";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(5, 42);
-            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(283, 42);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "DOMAIN\\Username";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // cbUseSSO
-            // 
-            this.cbUseSSO.AutoSize = true;
-            this.cbUseSSO.Location = new System.Drawing.Point(5, 173);
-            this.cbUseSSO.Margin = new System.Windows.Forms.Padding(5, 5, 5, 0);
-            this.cbUseSSO.Name = "cbUseSSO";
-            this.cbUseSSO.Size = new System.Drawing.Size(86, 24);
-            this.cbUseSSO.TabIndex = 14;
-            this.cbUseSSO.Text = "Use SSO";
-            this.cbUseSSO.UseVisualStyleBackColor = true;
-            this.cbUseSSO.CheckedChanged += new System.EventHandler(this.cbUseSSO_CheckedChanged);
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label6.Location = new System.Drawing.Point(3, 126);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(287, 42);
-            this.label6.TabIndex = 15;
-            this.label6.Text = "2FA OTP (Optional)";
-            // 
-            // tbOTP
-            // 
-            this.tbOTP.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbOTP.Location = new System.Drawing.Point(296, 130);
-            this.tbOTP.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.tbOTP.Name = "tbOTP";
-            this.tbOTP.Size = new System.Drawing.Size(615, 27);
-            this.tbOTP.TabIndex = 5;
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.ColumnCount = 5;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 106F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 26F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 107F));
-            this.tableLayoutPanel2.Controls.Add(this.btnOK, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.btnCancel, 3, 0);
-            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 300);
-            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(914, 67);
-            this.tableLayoutPanel2.TabIndex = 13;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(0, 212);
-            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(427, 20);
-            this.label4.TabIndex = 14;
-            this.label4.Text = "URL is the base URL, like https://cred.domain.local/SecretServer";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // SSConnectionForm
-            // 
-            this.AcceptButton = this.btnOK;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(914, 367);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.tableLayoutPanel2);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.Name = "SSConnectionForm";
-            this.Text = "Secret Server API Login Data";
-            this.Activated += new System.EventHandler(this.SSConnectionForm_Activated);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Label label3;
-
-        public System.Windows.Forms.TextBox tbSSURL;
-        public System.Windows.Forms.TextBox tbUsername;
-        public System.Windows.Forms.TextBox tbPassword;
-        private System.Windows.Forms.Button btnOK;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        public System.Windows.Forms.CheckBox cbUseSSO;
-        private System.Windows.Forms.Label label4;
-        private Label label5;
-        private Label label6;
-        public TextBox tbOTP;
-    }
-}
--- a/ExternalConnectors/DSS/SSConnectionForm.cs
+++ b/ExternalConnectors/DSS/SSConnectionForm.cs
@@ -1,35 +0,0 @@
-namespace ExternalConnectors.DSS
-{
-    public partial class SSConnectionForm : Form
-    {
-        public SSConnectionForm()
-        {
-            InitializeComponent();
-        }
-
-        private void SSConnectionForm_Activated(object sender, EventArgs e)
-        {
-            SetVisibility();
-            if (cbUseSSO.Checked)
-                btnOK.Focus();
-            else
-            {
-                if (tbPassword.Text.Length == 0)
-                    tbPassword.Focus(); 
-                else
-                    tbOTP.Focus();
-            }
-        }
-
-        private void cbUseSSO_CheckedChanged(object sender, EventArgs e)
-        {
-            SetVisibility();
-        }
-        private void SetVisibility()
-        {
-            bool ch = cbUseSSO.Checked;
-            tbPassword.Enabled = !ch;
-            tbUsername.Enabled = !ch;
-        }
-    }
-}
--- a/ExternalConnectors/DSS/SSConnectionForm.resx
+++ b/ExternalConnectors/DSS/SSConnectionForm.resx
@@ -1,615 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAQAQEAAAAEAIAAoQAAARgAAACAgAAABACAAKBAAAG5AAAAYGAAAAQAgACgJAACWUAAAEBAAAAEA
-        IAAoBAAAvlkAACgAAABAAAAAgAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD9/f3e/f397vz9
-        /e79/f3u7ezr7p6Xju5XTEHuNScV7i8hCe4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isf
-        CO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isf
-        CO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isf
-        CO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHAjuKx8I7jYoFu5XTUHumJGO7u3r6+79/f3u/f397v39
-        /e79/f3e/f399P//////////u7Wy/0M1KP8jEwD/KRgA/ywdBv8tHwj/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8sHAT/KRcA/yAR
-        AP9DNSX/ubOt/////////////f399Pv8/e7/////m5aK/xoMAP8lFAD/LSAI/y0gCv8uIAr/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cv8uIAr/LB4J/ysfCf8uIQj/JBYA/xoLAP+elYz///////z9/O79/f3uvLWw/xsNAP8rHAX/LiAK/y0f
-        Cf8tHwj/LR8I/y0fCf8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCf8tHwn/LR8J/y4gCv8pGgP/GgsA/7y3sP/9/f3u6unp7kM0
-        I/8nFwH/LiEL/yweCP8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAr/LR8J/yIU
-        AP9DNSL/6+nq7pqUju4fEQD/LiAI/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8uIAf/HxAA/5qTju5YTT7uJRYA/ywgCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/Kx8I/ygXAP9YTkDuOCkV7iweBv8sHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8sHQX/NykW7ioc
-        CO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8uIAn/Lh8I/yocCO4qHAjuLyEK/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8K/y4gCf8rHAjuKx8I7i4gCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8J/y0fCP8tHwn/LR8J/y0f
-        CP8tHwn/LR8J/y0fCP8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        CP8tHwj/LR8J/y0fCf8tHwj/LR8J/y0fCf8tHwn/LR8J/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8uIAj/Kx8I7isfCO4uIAn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8I/y8fCP8uHwj/LR8G/yweCP8uHgn/LR4H/yweB/8rHgf/Kx4H/yweCP8sHgj/Kx4I/yse
-        CP8sHgj/LB4I/yweCP8sHgn/LB4J/yoeCP8qHgj/LB4I/y4fCP8sIQj/LB8H/y0eCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysf
-        CO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tIAn/LiAK/y0WAf8sFgH/LRsG/ywbBv8uGwX/MR0B/y8cAv8uGwX/LRkG/ysZ
-        Bf8qGQX/KhkF/ygaBP8oGgX/JxoF/ycaBf8pGgX/KRkG/ykZBv8nGQT/JxkF/ygZCv8jFAb/IBUG/ywe
-        Cf8tHwf/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/Lh0I/y0XA/84Qyf/P31P/0aSXP9KkVv/UpJT/2OV
-        Sv93mUf/jJ9A/6CjPP+vpjv/rac4/6ilN/+ppDn/qaQ4/62jOP+uozj/sKI2/7KiNv+yojX/s6Az/7Wi
-        NP+0oDP/mIUs/1pIFv8lFQb/Kh4I/y4gCf8sHgn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR4I/ygWA/83b0X/SsOE/0zC
-        f/9QvHf/Ubp0/1e4b/9YtGz/WrJl/2KwZP96tWD/lL9X/7fNUf/b2E//3NhP/9nWTP/X00v/29NL/9vS
-        Sv/d0Ur/39FJ/9/RSP/j0Ej/5tBD/+3VRP/r0EX/jHYl/yMUBv8sHwb/LB4I/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysfCO4rHwjuLiAJ/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/ysV
-        AP8zWTb/ScmH/0e8ef9Ltnb/TrRx/1Cyb/9VsGr/Wa1m/1mrYf9dqV3/XqRc/1yfWf9ooVL/g6tQ/7XD
-        Tf/R0Ur/ys1H/87LR//Oykb/0MlG/9PKRf/Uy0X/18pF/9jJQf/byEH/4MtD/+7VRv9rWxz/HxMC/y8h
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4g
-        Cf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/Kx8I/y0cBv8vHQj/QKFs/0fEgP9IuHX/TLZ0/0+0cP9UsW3/Vq9o/1isZP9cqWD/X6hc/2Ok
-        Wf9loVX/aKBT/2iZUP9um0j/obZJ/87RTP/SzUz/yspI/8zLSP/Qykj/0stH/9XJR//VyUT/2clE/9fH
-        RP/izkn/vao2/ywdBv8rHAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tGwX/MCoV/0azfP9Fvnv/Sbh2/0y2c/9PtG//VbFs/1av
-        Z/9YrGT/XKlg/2KnXP9kpVr/ZaJX/2mhU/9unkz/bZtK/2qVR/+asUj/zdJM/8nOSf/JzUv/zcxJ/8/L
-        R//Rykf/0cpE/9XKRP/WykX/3c5G/9DBQv86Kw//KRoH/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LiAI/ysfCO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwr/LRoE/ywsGP9Dt3//R7x6/0q3
-        dv9OtHL/ULNu/1Wwa/9Xrmb/Watj/12pXv9hplv/ZaRY/2eiVP9qoFH/bp5M/3OcSf9ymUb/b5BC/6m5
-        SP/L0k7/yM5M/8vNS//LzEn/z8xJ/87LR//Rykf/08tH/9nNSP/RxkT/PS8R/ygZBv8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4g
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LB8K/y4a
-        A/8uLRj/RLZ9/0e8ev9LtnX/ULNy/1Gybf9VsGr/Wa5l/1mrYv9dqVz/YKZa/2WkVv9oolL/aqBQ/2+e
-        S/9zm0n/dJpE/3SUQ/+Dmj7/wMxM/8fPTP/IzUz/yc5L/8zNS//LzEr/z8tK/8/LSP/UzUj/0MZG/z0u
-        EP8oGgX/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8uIAj/Kx8I7isfCO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/ywfCv8uGgP/Li0Y/0W2fP9Iu3n/TLZ0/1Czcf9Rsm3/VbBq/1muZf9aq2L/Xqlc/2Gm
-        Wv9lpFb/aKJS/2ugUP9wnkv/c5tI/3WaQ/95l0H/do07/6m6Rf/F007/xM5N/8XOTP/IzUz/yM5L/8zN
-        S//MzEn/0c9J/83HR/89LhD/KBoG/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysfCO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwr/LRsE/zAsGP9HtHr/S7p3/061cv9Qs2//U7Fr/1Wv
-        af9arGP/XKlh/2GnW/9lpFn/ZaNV/2igUf9unk7/cpxK/3WbRv91mEH/e5Y//3mPOP+YrEH/wtVT/7/O
-        Uf/CzlD/xc1Q/8TOTP/IzUz/yc5L/87QTP/HyEn/PS8P/ykZBv8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8K/y0bBP8wLBj/R7R6/0u6
-        d/9OtXL/ULNv/1Oxa/9Vr2n/Wqxj/1ypYf9hp1v/ZaRZ/2WjVf9ooFH/bp5O/3KcSv91m0b/dZhB/3yW
-        P/97kDj/j6I9/7/VV/+90VH/wNBR/8PPUf/Bz0z/xM5M/8XOS//K0Uz/xclJ/z0vD/8pGQb/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isf
-        CO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tGwT/MCwa/0qzef9MuXb/TrRx/1Kybv9Tr2n/V61k/12qYP9fqF3/YKZZ/2SkVv9qoVL/bKBP/26d
-        TP9ym0b/dJpE/3iWQf98lD7/fY43/42gPf+111v/t9RU/7nSU/+/z1L/vtBQ/8HPUP/Cz03/xtFN/8HJ
-        TP88MA//KhsF/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LiAJ/ysfCO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LRsE/zAsGv9Ks3n/TLl2/060cf9Ssm7/U69p/1etZP9dqmD/X6hd/2Cm
-        Wf9kpFb/aqFS/2ygT/9unUz/cptG/3SaRP94lkH/fJQ+/36NNv+LpkP/qNxh/6zYWv+v1Ff/ttFV/7zS
-        Uf/A0VL/wNFP/8TUT//Ayk3/PDAP/yobBP8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4cA/8wLBn/SrN2/024dP9Ps3D/VLFs/1eu
-        Z/9Zq2T/XKlf/2KnXf9jpVj/ZaNV/2qgUf9unk7/cJ1K/3KbRf92mUP/e5U+/3mUPP9/jDP/ibRM/5zi
-        aP+g2mD/pdhe/6zVW/+01Ff/utNU/7vSUv/D1VH/vctN/zswEf8pGgb/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8uHQL/MCwY/0qz
-        df9NuHP/T7Nv/1Wwa/9arWb/Wqtj/1qpX/9jplz/ZKRY/2WiVf9qoFH/b55N/3CdSf9ym0T/d5hC/3yW
-        Pf98kjn/g441/4nRZP+N4mv/ld5n/5rcZf+g22D/p9hd/63XWf+y1Fb/utZU/7jMTv86MBH/KBoG/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LiAI/ysf
-        CO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/Lh0D/zAsF/9LsnT/Trdz/1Gybv9WsGr/WK1l/1uqYv9dqV3/YqZb/2WkVv9nolT/aqBQ/2+e
-        TP9ynEn/c5pD/3aXQf97lT3/gokz/3uvT/986nr/g+Rw/4nibf+O32v/lN5n/5rcY/+h22D/ptdd/6/Y
-        Wv+xzlX/Oi8R/ygZBv8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4cBf8wLRb/TbFz/1C2cv9TsWz/V7Bo/1etZP9cqmH/Yahb/2Gl
-        Wv9mo1T/aKFS/2ugTv9wnUr/dJpI/3WZQ/98kz3/gYo3/3WsUP9s7ID/but8/3fneP995XT/geJy/4fh
-        bf+O32r/lN5m/5rbZP+j3GL/pdJd/zkvEv8pFwX/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHAX/MC0W/02xc/9QtnL/U7Fs/1ev
-        aP9YrWT/XKpg/1+oW/9hpVr/ZqNV/2mhUv9sn03/cJxJ/3WVRP95kT3/eJZA/2TAYf9Y8Yj/XPOI/2fs
-        gv9r637/cel7/3bneP995XT/g+Nw/4nibP+P32r/l+Bo/5jXYf85MBL/KhgG/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysfCO4rHwjuLiAJ/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/KhsE/zAs
-        FP9NsXH/UbVv/1awav9arWf/Wqxi/12oXv9jo1v/Y6FU/2mcUP9tm0r/bptI/2+cSv9rp1P/YMNo/1Do
-        hf9G/ZX/SfaO/1PyjP9b8Ir/X+6F/2btgv9s637/cul6/3fmeP995XT/g+Nw/4vlbv+O22n/NjAU/yca
-        BP8uHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4g
-        Cf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/yobBP8wLBT/TbJy/1G1b/9WsGr/Wq1n/1uoX/9dp13/YKlf/2CvXv9gt2X/XcBq/1XQ
-        dv9P4YP/SPCO/0T3lP9J85L/R/SR/0n1kf9L9ZD/TfSP/1Tzi/9b8Yj/Yu+E/2ftgP9r637/cel6/3jn
-        dv+A6XT/geBs/zgxFf8pGwX/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y8fCf8rHAL/LisU/02ucv9Vs23/VLBp/1ipYP9XuGr/TtOA/0fg
-        if9H5Ir/RuqO/0Xukf9G7pL/Ru2Q/0Ttjf9J7I7/R+6N/0nwj/9L8ZD/S/KR/0nzkP9I85D/TPSN/1X0
-        if9d8If/Ye6D/2fsf/9s6nz/cux7/3Xic/81MRb/KxkE/ywfCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysfCO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8sHwn/Lh0D/y4gCP9PnWP/Vbdx/1eq
-        ZP9TwXP/RuSM/0fmjv9F4ov/Q+SJ/0bliv9F5or/RuaM/0bojP9G6or/R+uM/0jtjP9J7o3/SO+O/0nw
-        j/9I8o//RvKP/0f0j/9K947/S/WN/1Tyif9b8YT/YO6D/2n2hP9kz27/KyEM/y4dBv8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LB8J/y4e
-        B/8sFgH/PGU2/1i9dP9Utm3/RN6J/0Leif9J3on/SN+K/0Xgif9H4ov/R+KL/0fjjP9I5Yz/R+eL/0jo
-        jP9I6o3/SeuO/0jsjf9J7Y7/SO+O/0jwjv9J8Y//S/OQ/0r0kf9M9ZD/T/SO/1Pziv9h/5X/SIJE/yoP
-        Af8sHwf/LR8K/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8uIAn/Kx8I7isfCO4uIAj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwn/LBwH/ywdCf9IfEf/Tsx8/0Ddif9F14X/RduH/0bdiP9E3on/Rd+K/0fl
-        jf9I6JD/SOqQ/0jsj/9J7ZD/SO6R/0nvkv9H8JD/SPKR/0n0kf9K84//SPCP/0fxkP9J8pH/SvWS/0r3
-        lP9M/pn/RKxh/y0YBv8sHAf/LR8J/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LiAI/ysfCO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8sGgX/KhUE/0GsbP9E4Y7/QteG/0TZ
-        h/9F2oj/RdyI/0Teiv9Ez3//RMp7/0XNe/9Eznr/RM97/0TQff9F0H3/Q9J7/0PTfP9E0n3/SNyC/0zq
-        iv9M6Yr/TeqL/0zsiv9P8Iz/S7Vp/ywWB/8sGgT/LiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8sHwn/Lh8G/ywR
-        BP87m2b/ReCR/0PUiP9E1oj/RtiJ/0bZh/9D5o//Nlk1/ywZB/8vJg3/LyYM/y8mDP8vJQ3/LyUN/ywm
-        DP8sJgz/KhgH/z9sO/9c2Hr/Vslx/1fJcf9YyXL/XdF3/0yRUv8pEwT/LyEJ/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isf
-        CO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LB8J/y0eBv8sEwX/PJ1n/0Tej/9D0of/Q9SG/0TWiP9F2Ib/QuWO/zVPLv8sDgD/MBsI/y8b
-        B/8vGwb/LhsE/y4bBP8sGgb/KxoG/ywKAP87Zjr/U+CD/1HQe/9R0Hv/UtB7/1Pcg/9En17/KxMD/y4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LiAJ/ysfCO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4fCf8sHwj/LhUD/0CbZP9F2o7/RM+H/0TQhv9F0of/Q9WG/0bk
-        kf8yVzL/KxEA/y4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tDgD/O3ZF/0zslP9I2ob/SdqG/0na
-        hv9L5o7/QaNm/ywVAv8uHgf/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8sHwj/LiAJ/ywUAf89jlf/Q9qO/0LN
-        hf9Dz4T/RNCG/0LRg/9H4I//O4dQ/yoOAP8tIAj/LR8J/y0fCf8tHwn/LR8J/y0fCP8tHgj/LBMC/z+n
-        ZP9H6pH/RN+K/0Tfiv9E34r/RuyT/z2bXv8uEwH/LR8H/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LB8J/y0f
-        Cf8rDwD/NXNF/0PZjP9DyYX/RcuF/0XNhv9EzYT/RdSJ/0TFfv8uKRH/LBYC/ywfCP8tHwn/LR8J/ywf
-        Cf8sHwj/KBAA/zZAIf9H34n/R+GL/0Xdif9F3Yn/Rd2I/0nvlv86gU3/Kg4A/y0eCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysf
-        CO4rHwjuLiAI/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCf8rHwj/LRMB/zZRLv9H0ov/QsmE/0LKhP9Ey4X/Q8uE/0XMhP9H3I7/Pppj/ysa
-        Bv8sEQD/Lh0I/y0fB/8tGgX/Kg4A/y0lD/9AuXH/R+qQ/0Lci/9D34n/Rd6J/0PdiP9C65H/M1wx/y8U
-        Av8uIAf/LR8J/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y4gCP8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LB4I/y4bBv8uJQ//QLV4/0LNh/9Bx4P/Q8iE/0PJ
-        g/9Ey4P/RMuG/0Xajv9EpGn/MEoo/ysfC/8uFgr/LiUN/zNULf8+vHf/SOWQ/0TYh/9F3Ij/Rt6J/0fe
-        i/9E44z/Rc9//y0qDv8vGQX/LSAH/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCf8tHwn/KxEA/zt2
-        Sv9F047/QcOC/0PFg/9Cx4L/RMmD/0PKgv9EzIP/RdaL/0fUif8/t3P/Pqpv/0C+dv9H3I//Rt6O/0HW
-        hv9E1oj/RdiI/0Tah/9G3In/R+6U/zuET/8sDwD/LR8J/y0fCf8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LiAI/ysfCO4rHwjuLiAJ/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0aBP8wKhH/QLV4/0HKhv9BxIP/QsWB/0LHgv9CyIL/QsmD/0XKg/9FzoT/Q9KH/0LY
-        iP9G14r/Q9CH/0XRhf9F0oX/RNSI/0LXiP9C14X/ReGM/0XOgv8uKxT/KxgF/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4g
-        Cf8rHwjuKx8I7i4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwf/LRYA/zRTL/9Dy4v/QcWG/0HCgf9CxIL/QsSC/0PE
-        g/9CxoP/Q8iC/0TKhP9Dy4T/RsyF/0PNhf9Cz4b/RNCH/0XSiP9H0oj/QtiJ/0jikP8yWjX/KxAA/ywg
-        B/8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isfCO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LSAH/y8gBv8vEgD/OWlC/0PL
-        if8+xYP/P8KA/0DCgf9Bw4L/QsaC/0LHgf9DyIL/QsqC/0PLg/9CzIT/Q82F/0TOhf9Fz4X/RdaK/0fg
-        lf85dkf/KhEA/yseB/8uHwj/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysfCO4rHwjuLiAJ/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8vHwn/Kh4I/y8WAP82Yzj/P7+C/0LLiP9CwoL/QMGC/0HFhP9BxIH/Q8WD/0PGhP9Ex4X/RMmE/0bK
-        hf9DzYT/QtyN/0nTiP86aj3/LRIA/y4eCP8sIAr/Lh8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuKx8I7i4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8rIAj/KhQA/zU/IP9Bl2X/RseI/0LLiv8/x4b/QMaD/0DF
-        g/9CxoT/Q8mG/0LOh/9G1o3/RtSK/0WjaP8yQiD/LBEA/y8eCP8sIAn/LR8I/y0fCP8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8uIAn/Kx8I7isfCO4uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8sHwn/LR4I/y4gCv8sFQD/KxoE/zRJ
-        Kf9Cg1P/Q6tv/0O6ev9EwoL/QsOC/0a+fv9FsHD/QoZS/zZJJ/8sGgT/KxMB/y4fCf8wIAj/Lh8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LiAJ/ysfCO4rHwjuLiAI/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8J/y0f
-        Cf8tHwj/LR8J/y0dCP8rEwL/LBQA/zEjCf8yLxP/Njce/zQ3H/8yMBT/MiMJ/y8UAP8rEgD/LB0H/y4g
-        Cf8tHwn/LB8J/y0fCf8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y4gCP8rHwjuKx8I7i4gCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAI/yseB/8rHQj/LBoF/ysXAv8sGAP/KxsF/ygb
-        Bv8wHgf/LR8J/y4fCv8uIAr/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/Kx8I7isf
-        CO4uIAj/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8I/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LB8J/y0fCf8tHwj/LR8I/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LiAJ/ysfCO4rHwjuLyEJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHwjuLh8J7i8hCP8tIAj/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwj/LyEJ7jgqFu4sHgX/LR8H/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/LB4G/zUn
-        FO5YTT7uJhUA/y4gCv8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LSAL/yoZAP9XTD7um5SO7iMRAP8vIAn/LR8J/y0fCf8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwn/LR8I/ywfBv8iEgD/npeO7urq6e5ENSX/JBQA/y0hCP8tIAf/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/Kx0H/y4gCv8lFQD/QzYm/+vr6e79/f3uvLax/xoM
-        AP8pGwL/LiEI/y0fCf8tHwj/LR8J/y0fCf8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0f
-        CP8tHwj/LR8I/y0fCP8tHwj/LR8I/y0fCP8tHwj/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHQX/Gw0A/723
-        tP/9/f3u+vv87v////+ak4n/GQsA/yQUAP8uHwn/LR8J/y0fCP8uIAn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0eCf8sHgj/LB8J/y4g
-        B/8mFwD/Gw0A/5qViv//////+/z87v39/fT//////////7q1sP9DNCb/IxEA/ycWAP8rHgX/LiAH/y8h
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/zAh
-        Cv8uHwj/LB0G/yQWAP8fEQD/QzQm/7q0r/////////////39/fT9/f3e/f397vz9/e79/f3u6+rp7puU
-        ju5YTj/uOCkW7i4fCu4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isf
-        CO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isf
-        CO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isfCO4rHwjuKx8I7isf
-        CO4rHwjuKx8I7isfCO4rHwjuKyAI7jcpFu5YTj7umpOO7uvr6u79/f3u/Pz97v39/e79/f3eKAAAACAA
-        AABAAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/dzt6+vtdGte7TQmFu0rHQjtLR8I7S0f
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0f
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7SsdBu00Jhbtc2le7e3r6e39/f3c6ubl81ZKOP8dDgD/LB4G/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LyAK/ywdBf8dDgD/VUk4/+rn5vN0a13tHg4A/y4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8dDQD/dWtd7TQm
-        Eu0rHQb/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/ywd
-        Bf80JhLtKx0G7S8gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LiAJ/ysdBu0tHwjtLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwj/LBcC/ysT
-        AP8pFAH/JhMC/yISA/8hEQP/IBID/yASA/8gEgT/HxIE/x8RBP8jFgb/LB4I/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR4I/ywY
-        BP81QiP/Olw1/0RbLP9WXSb/bGMj/3RnIP9vZCD/bmIg/3FiIP9yYh7/dWMf/1ZFFv8lFwb/LB4I/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8rFgL/N2c//0vDgf9SwHr/W7pv/2a2Zf9+t13/p8RT/9bYT//g20z/3tZL/+LWSv/p10f/69RF/39r
-        Iv8iFQT/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/y0fCO0tHwjtLiAJ/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LBwG/y4lD/9Esnb/Sr55/1Kybv9XrWf/Xahe/1+iWP9imlH/faJJ/8DHSv/Pz0r/z8tI/9PK
-        Rf/f0Uf/z75A/zQmC/8pGwj/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8sGgX/Ly0W/0S0ef9NuHb/U7Fs/1itZP9ep1z/ZqNW/2yfTv9slUb/hqFE/8fP
-        TP/Lzkv/zcxJ/9TOSf/Ow0T/PS4P/ygaB/8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/ywbBf8wLBX/RrF1/0+4dP9UsGv/Wqxj/2CmWv9molT/b55N/3WZ
-        RP93kTz/r8BI/8fST//Hzkz/zdFM/8bERv87LQ7/KRoH/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/y0f
-        CO0tHwjtLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LBsF/zAsFf9Jr3T/ULdz/1WvaP9dqmD/YqVZ/2mg
-        Uv9wnEv/dplD/3mOOf+iuEn/wNZV/8HPT//H0k7/v8ZJ/zstDv8pGgf/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8sGwX/MCwV/0mvc/9RtnH/Vq1m/16p
-        Xv9jpFf/bKBQ/3CcSP93mEH/fIw2/5bCU/+q3F//tdNW/8HWUv+7yEv/Oi4O/ykaB/8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/ywbBf8wLRT/S65w/1O1
-        bv9ZrGT/YKdc/2ajVv9sn0//cpxG/3uPOf+AmT7/hd5t/5Hhav+e22L/rdtc/6/KUf85LQ//KRoH/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LiAJ/y0fCO0tHwjtLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LBsG/zAs
-        E/9NrW7/VrRt/1qrYf9ipFj/aZ5R/3GXR/94kj//dKFI/2bddv9t74H/eeZ2/4Xib/+U4mr/mdFe/zgt
-        EP8qGQb/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8sGwb/LiwU/06ubf9ZsGn/Xahf/2CqXv9jr13/YLtj/1jRdP9K8o7/SvqT/1byi/9j7oP/b+p8/3zq
-        d/+D22r/NjAS/yoaBv8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/ywcBv8vJw7/Ualp/1e3bP9N0n//R+GJ/0bojf9E75H/RPKR/0jwj/9J8ZD/R/OR/0z1
-        jv9W8on/ZfWF/2vhd/8yKg//KxoG/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/y0fCO0tHwjtLiAJ/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8I/ysXAv9CaTr/TNSC/0PijP9F34n/RueP/0n0lv9J95b/SvqY/0n9
-        mP9J+5b/R/OR/0j4lP9Q/pb/RI5N/ysTAv8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/LR8I7S0f
-        CO0uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LRwG/ywbB/9Aunf/RN6M/0bijf9At3D/OXJC/zp7
-        Rf86fEb/NnhD/z+SUv9S3H//U+KD/068bf8sGgj/LRsH/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4g
-        Cf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHQf/LRwI/0CydP9E2oz/RuWR/zqO
-        Vv8qAAD/LA8A/ywOAP8pAgD/Mzkb/0/bhP9Q24T/SLRs/y0dCP8tHQf/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LiAJ/y0fCO0tHwjtLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0eCP8tGQT/PqZp/0TW
-        jP9F1or/Qbh0/ywbBv8sFQL/LBwG/ykGAP86eEX/Ru6U/0Xpkf9At3H/LRkE/y0eB/8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/ysR
-        AP86fk//RNeP/0TJg/9G14z/PI1Y/y4pEP8tHQn/M1ky/0TWhv9F4Yz/R/CV/zqOU/8sEAD/LR8I/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LBcD/zE5HP9CxoX/QsqF/0PIgv9F1ov/QsR+/0C7d/9F2oz/RNmK/0Xdiv9G34z/MT0d/ywW
-        A/8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/y0fCO0tHwjtLiAJ/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LBQA/zdmPf9C0Iz/QcmG/0LFgv9DzIX/RNGI/0POhv9F14v/R+WU/zdv
-        Qv8qEQD/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHgj/LBUB/zVeNv9Ct3v/Q8+M/0LRjP9E1I7/RteO/0TE
-        fv84ZDr/LRQB/y0eCP8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHgj/LBMA/y8qEf84Xjb/O3lM/zt6
-        Tf86YDf/MCoR/ysSAP8tHgj/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LiAJ/y0f
-        CO0tHwjtLiAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LBoF/ysT
-        AP8sEQD/KxEA/ysSAP8sGgX/LSAJ/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8uIAn/LR8I7SweBu0vIAn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y4gCf8rHQbtNCYT7SwdBv8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LB4G/zQmEu11a17tHQ4A/y4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0gCf8dDgD/dmxe7ern5vNVSTf/Hg4A/ywdBv8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8rHQX/Hg4A/1ZKOP/q5+fz/f393Ozr6e10aV7tNSYU7Swe
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0f
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLB4I7TQmFO1zaV7t7evp7f39/dwoAAAAGAAAADAA
-        AAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f393JSPhO00JhbtKx0G7S0fCO0tHwjtLR8I7S0f
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0rHQbtMyUW7ZSO
-        g+39/f3ckouC8yESAP8qHAT/LyAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8vIAn/KhwE/yERAP+Si4LzMyUR7SocBP8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/yocBP8zJRLtKx0F7S4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0eCP8sGgX/KxoG/yka
-        B/8oGgf/KBoH/ygaB/8nGgf/KBoH/yweCP8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8rHQXtLR8I7S4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LRwH/y0aBf8wLRP/Ni8Q/0ExDv9FMw3/PjAN/z4vDv8/MA3/PS4N/ycZ
-        B/8qHAj/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHQf/LB8K/z6E
-        VP9NsnL/Wapi/3GoVv+bskv/x8VG/87FRP/PwkL/2cZB/6GMLf8tHwj/Kx0I/y0fCf8tHwn/LR8J/y4g
-        Cf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8sFgH/MkYn/0nIhP9Rt3L/WK9m/16nXf9jnlP/iKlK/8nO
-        S//T0Er/2M9H/+jYSv9XSRf/IxUF/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0f
-        Cf8sFQH/M0os/0vBfv9Tsm3/Wqxi/2OlWP9sn07/bJJD/5uuRP/M0k3/y81L/9nWTP9cTxv/IhQF/y0f
-        Cf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8rFQH/NEkq/02+e/9UsGr/Xalg/2Wj
-        Vv9unkz/dJRB/4ufPv+/01P/xM9O/8/XT/9YThr/IxQE/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4g
-        Cf8tHwn/LR8J/y0fCf8rFgH/NUkp/068ef9Xrmf/X6dc/2iiVP9wnUn/eI86/4ilRP+k3mL/tNVX/8ba
-        U/9WTxv/JBQE/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8rFgH/Nkgo/1K7
-        dv9ZrWT/YqRZ/2ycTf93kj//epU+/3bVa/+D53T/lN5n/63hYv9RTx//JRMD/y0fCf8tHwn/LR8J/y4g
-        Cf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8qFQL/NUop/1a6c/9cqWH/Yatd/2SwW/9gv2b/UeeE/1L4
-        kP9k7oL/dOh5/4vvdf9JViX/JxIC/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0f
-        Cf8rFwP/NT4e/1a5cP9N0H3/R+GI/0fwkv9F+5n/SPuY/0j7lv9J95H/VfaM/2f6iP88SyH/KhQC/y0f
-        Cf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHgj/LBUC/z6ETv9E6JL/Rd+L/0LG
-        ef9DwHP/QsR1/0LHdP9L4oX/T/aS/0KaV/8rFgT/LR4I/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/Kw8A/zVgOv9F4pL/Rd+N/zJGJP8tEAD/LRoF/ywaBv9Lum3/VOeL/zle
-        M/8qDwD/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHwn/KxMA/zVX
-        Mf9F2I7/RtuO/zl3R/8qBQD/KQQA/zJDIv9F4Iv/RvCW/zVfNf8rEQD/LR8J/y0fCf8tHwn/LR8J/y4g
-        Cf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHwn/LBoF/zAtE/9Cv3//RNCJ/0TNhf86g1D/N29C/0LF
-        fP9G6JH/RNeF/y8wFP8sGQT/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/ywTAP82Yzv/QtKN/0PPif9F2I3/Rd2Q/0XekP9H5ZP/N2w//ysRAP8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0eCP8sFQH/NVs1/0Cu
-        dP9CxoT/RMqG/0O3dv83YTj/LBQB/y0eCP8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtLR8I7S4g
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHgj/LBMA/y4iC/8zPB7/Mj0e/y8hCv8rEgD/LR4I/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4gCf8tHwjtKx0F7S4gCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/ywcB/8sFwP/LBcD/ywcB/8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y4g
-        Cf8rHQbtNCUS7SocBP8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0f
-        Cf8tHwn/LR8J/y0fCf8tHwn/LR8J/y0fCf8tHwn/LR8J/yocBP80JhLtkouD8yERAP8qHAT/LyAJ/y4g
-        Cf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4gCf8uIAn/LiAJ/y4g
-        Cf8vIAn/KhwE/yERAP+VjITz/f393JSOhO00JhbtKx0G7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0f
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0rHQbtMyUW7ZSOg+39/f3cKAAAABAA
-        AAAgAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL65stw/MR/tKBkF7S0fCO0tHwjtLR8I7S0f
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0oGQXtPzEf7b65stw8MR3zJxgA/y8gCf8uIAn/LiAJ/y4g
-        Cf8uHwn/Lh8J/y4fCf8uHwn/LiAJ/y4gCf8uIAn/LyAJ/ycYAP88MR3zKBoE7S8gCf8tHwn/LSAJ/ywa
-        Bf8rFAH/LBcD/ysXBP8kFQT/IxUF/yATBP8oGgf/LiAJ/y0fCf8vIQn/KBkE7S0fCO0uIAn/LR8J/ywa
-        Bf8wMxj/QYNR/1OFSP94iTr/npg0/6aYM/+hji7/RDQP/ycaB/8tHwn/LiAJ/y0fCO0tHwjtLiAJ/y0f
-        Cf8rEQD/OW9F/1LNhP9dtGj/aahY/5u2TP/Z2U3/7+ZP/4V2KP8eEAT/LR8J/y4gCf8tHwjtLR8I7S4g
-        Cf8tHwn/KxIA/ztvRf9Tv3f/Xqhd/2ufT/91kj7/tMNK/9fgU/+AeSr/IBAD/y0fCf8uIAn/LR8I7S0f
-        CO0uIAn/LR8J/ysTAP89bUL/Vrxz/2OjWP9ylkX/fZQ7/5XTX/+952D/d3ot/yEQA/8tHwn/LiAJ/y0f
-        CO0tHwjtLiAJ/y0fCf8qEwD/P29C/1y6bv9iqlv/Z7Fa/1zad/9l8oX/ifZ6/2OGPP8lDgH/LR8J/y4g
-        Cf8tHwjtLR8I7S4gCf8tHwn/KhQB/zxULf9P0oD/SOSL/0b1lf9F/Jn/SPaS/1j7kP9DbTb/KRAB/y0f
-        Cf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0cB/8uIwz/QcuC/0HCef8zRSL/MD0e/0SmYP9M0n7/LSMN/ywc
-        Bv8tHwn/LiAJ/y0fCO0tHwjtLiAJ/y0fCf8tHQj/LRsG/0Cxc/9Ez4b/MDca/yweCf9Cxnr/Qsd6/y0b
-        Bv8tHQj/LR8J/y4gCf8tHwjtLR8I7S4gCf8tHwn/LR8J/ywUAf81XTf/RNiR/0TTiv9E1In/R+2Y/zZn
-        Ov8rEgH/LR8J/y0fCf8uIAn/LR8I7S0fCO0uIAn/LR8J/y0fCf8tHgj/LBcC/zRWMv8+nWb/P6Jo/zZb
-        NP8sFgL/LR4I/y0fCf8tHwn/LiAJ/y0fCO0oGgTtLyEJ/y0fCf8tHwn/LR8J/y0fCP8sFAH/LBYC/ywW
-        Av8rEwD/LR4I/y0fCf8tHwn/LR8J/y8hCf8oGQTtPTEd8ycYAP8vIAn/LiAJ/y4gCf8uIAn/LiAJ/y4f
-        CP8uHwn/LiAJ/y4gCf8uIAn/LiAJ/y8gCf8nGAD/PTEd87u5stw/MR/tKBkF7S0fCO0tHwjtLR8I7S0f
-        CO0tHwjtLR8I7S0fCO0tHwjtLR8I7S0fCO0oGQXtPzEf7b65stwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-</value>
-  </data>
-</root>
--- a/ExternalConnectors/DSS/SecretServerAuthentication.cs
+++ b/ExternalConnectors/DSS/SecretServerAuthentication.cs
@@ -1,383 +0,0 @@
-//----------------------
-// <auto-generated>
-//     Generated using the NSwag toolchain v13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org)
-// </auto-generated>
-//----------------------
-
-#pragma warning disable 108 // Disable "CS0108 '{derivedDto}.ToJson()' hides inherited member '{dtoBase}.ToJson()'. Use the new keyword if hiding was intended."
-#pragma warning disable 114 // Disable "CS0114 '{derivedDto}.RaisePropertyChanged(String)' hides inherited member 'dtoBase.RaisePropertyChanged(String)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword."
-#pragma warning disable 472 // Disable "CS0472 The result of the expression is always 'false' since a value of type 'Int32' is never equal to 'null' of type 'Int32?'
-#pragma warning disable 1573 // Disable "CS1573 Parameter '...' has no matching param tag in the XML comment for ...
-#pragma warning disable 1591 // Disable "CS1591 Missing XML comment for publicly visible type or member ..."
-#pragma warning disable 8073 // Disable "CS8073 The result of the expression is always 'false' since a value of type 'T' is never equal to 'null' of type 'T?'"
-#pragma warning disable 3016 // Disable "CS3016 Arrays as attribute arguments is not CLS-compliant"
-
-namespace SecretServerAuthentication.DSS
-{
-    using System = global::System;
-
-    [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")]
-    public partial class OAuth2ServiceClient
-    {
-        private string _baseUrl = "";
-        private System.Net.Http.HttpClient _httpClient;
-        private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
-
-        public OAuth2ServiceClient(string baseUrl, System.Net.Http.HttpClient httpClient)
-        {
-            BaseUrl = baseUrl;
-            _httpClient = httpClient;
-            _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
-        }
-
-        private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
-        {
-            var settings = new Newtonsoft.Json.JsonSerializerSettings();
-            UpdateJsonSerializerSettings(settings);
-            return settings;
-        }
-
-        public string BaseUrl
-        {
-            get { return _baseUrl; }
-            set { _baseUrl = value; }
-        }
-
-        protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } }
-
-        partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings);
-
-
-        partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url);
-        partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder);
-        partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response);
-        /// <summary>Retrieve or Refresh Access Token</summary>
-        /// <param name="grant_type">Authentication grant type.  Use 'password' when authenticating, and 'refresh_token' when refreshing a token.</param>
-        /// <param name="username">Secret Server authentication username.  Required when authenticating.</param>
-        /// <param name="password">Secret Server authentication password.  Required when authenticating.</param>
-        /// <param name="refresh_token">The refresh token.  Required when refreshing a token.</param>
-        /// <returns>Successful retrieval of an access token</returns>
-        /// <exception cref="ApiException">A server side error occurred.</exception>
-        public System.Threading.Tasks.Task<TokenResponse> AuthorizeAsync(Grant_type grant_type, string username, string password, string refresh_token, string OTP)
-        {
-            return AuthorizeAsync(grant_type, username, password, refresh_token, System.Threading.CancellationToken.None, OTP);
-        }
-
-        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <summary>Retrieve or Refresh Access Token</summary>
-        /// <param name="grant_type">Authentication grant type.  Use 'password' when authenticating, and 'refresh_token' when refreshing a token.</param>
-        /// <param name="username">Secret Server authentication username.  Required when authenticating.</param>
-        /// <param name="password">Secret Server authentication password.  Required when authenticating.</param>
-        /// <param name="refresh_token">The refresh token.  Required when refreshing a token.</param>
-        /// <returns>Successful retrieval of an access token</returns>
-        /// <exception cref="ApiException">A server side error occurred.</exception>
-        public async System.Threading.Tasks.Task<TokenResponse> AuthorizeAsync(Grant_type grant_type, string username, string password, string refresh_token, System.Threading.CancellationToken cancellationToken, string OTP)
-        {
-            var urlBuilder_ = new System.Text.StringBuilder();
-            urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/oauth2/token");
-
-            var client_ = _httpClient;
-            var disposeClient_ = false;
-            try
-            {
-                using (var request_ = new System.Net.Http.HttpRequestMessage())
-                {
-                    var keyValues_ = new System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<string, string>>();
-                    if (grant_type == null)
-                        throw new System.ArgumentNullException("grant_type");
-                    else
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("grant_type", ConvertToString(grant_type, System.Globalization.CultureInfo.InvariantCulture)));
-                    if (username != null)
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("username", ConvertToString(username, System.Globalization.CultureInfo.InvariantCulture)));
-                    if (password != null)
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("password", ConvertToString(password, System.Globalization.CultureInfo.InvariantCulture)));
-                    if (refresh_token != null)
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("refresh_token", ConvertToString(refresh_token, System.Globalization.CultureInfo.InvariantCulture)));
-                    if (OTP != null)
-                        request_.Headers.Add("OTP", ConvertToString(OTP, System.Globalization.CultureInfo.InvariantCulture));
-
-                    request_.Content = new System.Net.Http.FormUrlEncodedContent(keyValues_);
-                    request_.Method = new System.Net.Http.HttpMethod("POST");
-                    request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
-
-                    PrepareRequest(client_, request_, urlBuilder_);
-
-                    var url_ = urlBuilder_.ToString();
-                    request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute);
-
-                    PrepareRequest(client_, request_, url_);
-
-                    var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-                    var disposeResponse_ = true;
-                    try
-                    {
-                        var headers_ = System.Linq.Enumerable.ToDictionary(response_.Headers, h_ => h_.Key, h_ => h_.Value);
-                        if (response_.Content != null && response_.Content.Headers != null)
-                        {
-                            foreach (var item_ in response_.Content.Headers)
-                                headers_[item_.Key] = item_.Value;
-                        }
-
-                        ProcessResponse(client_, response_);
-
-                        var status_ = (int)response_.StatusCode;
-                        if (status_ == 200)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<TokenResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-
-                            return objectResponse_.Object;
-                        }
-                        else
-                        if (status_ == 400)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<TokenErrorResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-                            throw new ApiException<TokenErrorResponse>("An error occurred", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
-                        }
-                        else
-                        {
-                            var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false);
-                            throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null);
-                        }
-                    }
-                    finally
-                    {
-                        if (disposeResponse_)
-                            response_.Dispose();
-                    }
-                }
-            }
-            finally
-            {
-                if (disposeClient_)
-                    client_.Dispose();
-            }
-        }
-
-        protected struct ObjectResponseResult<T>
-        {
-            public ObjectResponseResult(T responseObject, string responseText)
-            {
-                this.Object = responseObject;
-                this.Text = responseText;
-            }
-
-            public T Object { get; }
-
-            public string Text { get; }
-        }
-
-        public bool ReadResponseAsString { get; set; }
-
-        protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
-        {
-            if (response == null || response.Content == null)
-            {
-                return new ObjectResponseResult<T>(default(T), string.Empty);
-            }
-
-            if (ReadResponseAsString)
-            {
-                var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    var typedBody = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(responseText, JsonSerializerSettings);
-                    return new ObjectResponseResult<T>(typedBody, responseText);
-                }
-                catch (Newtonsoft.Json.JsonException exception)
-                {
-                    var message = "Could not deserialize the response body string as " + typeof(T).FullName + ".";
-                    throw new ApiException(message, (int)response.StatusCode, responseText, headers, exception);
-                }
-            }
-            else
-            {
-                try
-                {
-                    using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                    using (var streamReader = new System.IO.StreamReader(responseStream))
-                    using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader))
-                    {
-                        var serializer = Newtonsoft.Json.JsonSerializer.Create(JsonSerializerSettings);
-                        var typedBody = serializer.Deserialize<T>(jsonTextReader);
-                        return new ObjectResponseResult<T>(typedBody, string.Empty);
-                    }
-                }
-                catch (Newtonsoft.Json.JsonException exception)
-                {
-                    var message = "Could not deserialize the response body stream as " + typeof(T).FullName + ".";
-                    throw new ApiException(message, (int)response.StatusCode, string.Empty, headers, exception);
-                }
-            }
-        }
-
-        private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo)
-        {
-            if (value == null)
-            {
-                return "";
-            }
-
-            if (value is System.Enum)
-            {
-                var name = System.Enum.GetName(value.GetType(), value);
-                if (name != null)
-                {
-                    var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name);
-                    if (field != null)
-                    {
-                        var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field, typeof(System.Runtime.Serialization.EnumMemberAttribute))
-                            as System.Runtime.Serialization.EnumMemberAttribute;
-                        if (attribute != null)
-                        {
-                            return attribute.Value != null ? attribute.Value : name;
-                        }
-                    }
-
-                    var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo));
-                    return converted == null ? string.Empty : converted;
-                }
-            }
-            else if (value is bool)
-            {
-                return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant();
-            }
-            else if (value is byte[])
-            {
-                return System.Convert.ToBase64String((byte[])value);
-            }
-            else if (value.GetType().IsArray)
-            {
-                var array = System.Linq.Enumerable.OfType<object>((System.Array)value);
-                return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo)));
-            }
-
-            var result = System.Convert.ToString(value, cultureInfo);
-            return result == null ? "" : result;
-        }
-    }
-
-    /// <summary>API access token response</summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public partial class TokenResponse
-    {
-        /// <summary>Authentication token</summary>
-        [Newtonsoft.Json.JsonProperty("access_token", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-        public string Access_token { get; set; }
-
-        /// <summary>Authentication token type</summary>
-        [Newtonsoft.Json.JsonProperty("token_type", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-        [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-        public TokenResponseToken_type Token_type { get; set; }
-
-      
-        private string _Expires_in;
-        /// <summary>Authentication token expiration time, in seconds</summary>
-        [Newtonsoft.Json.JsonProperty("expires_in", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-       // public string Expires_in { get; set; }
-
-        public string Expires_in
-        {
-            get { return _Expires_in; }
-            set 
-            {
-                _Expires_in = value;
-                Expires_on = DateTime.UtcNow.AddSeconds(Double.Parse(value) - 60); 
-            }
-        }
-
-        /// <summary>Authentication token expiration time in UTC</summary>              
-        public DateTime Expires_on { get; set; }
-
-        /// <summary>Refresh token.  This is only provided when the server is set to allow refresh tokens for web services and when the session timeout duration is not set to Unlimited.</summary>
-        [Newtonsoft.Json.JsonProperty("refresh_token", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public string Refresh_token { get; set; }
-
-
-    }
-
-    /// <summary>API access token error response</summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public partial class TokenErrorResponse
-    {
-        /// <summary>Authentication token</summary>
-        [Newtonsoft.Json.JsonProperty("message", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-        public string Message { get; set; }
-
-
-    }
-
-    /// <summary>Authentication grant type.  Use 'password' when authenticating, and 'refresh_token' when refreshing a token.</summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public enum Grant_type
-    {
-        [System.Runtime.Serialization.EnumMember(Value = @"password")]
-        Password = 0,
-
-        [System.Runtime.Serialization.EnumMember(Value = @"refresh_token")]
-        Refresh_token = 1,
-
-    }
-
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public enum TokenResponseToken_type
-    {
-        [System.Runtime.Serialization.EnumMember(Value = @"bearer")]
-        Bearer = 0,
-
-    }
-
-    [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")]
-    public partial class ApiException : System.Exception
-    {
-        public int StatusCode { get; private set; }
-
-        public string Response { get; private set; }
-
-        public System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> Headers { get; private set; }
-
-        public ApiException(string message, int statusCode, string response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Exception innerException)
-            : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException)
-        {
-            StatusCode = statusCode;
-            Response = response;
-            Headers = headers;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("HTTP Response: \n\n{0}\n\n{1}", Response, base.ToString());
-        }
-    }
-
-    [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")]
-    public partial class ApiException<TResult> : ApiException
-    {
-        public TResult Result { get; private set; }
-
-        public ApiException(string message, int statusCode, string response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, TResult result, System.Exception innerException)
-            : base(message, statusCode, response, headers, innerException)
-        {
-            Result = result;
-        }
-    }
-
-}
-
-#pragma warning restore 1591
-#pragma warning restore 1573
-#pragma warning restore 472
-#pragma warning restore 114
-#pragma warning restore 108
-#pragma warning restore 3016
--- a/ExternalConnectors/DSS/SecretServerInterface.cs
+++ b/ExternalConnectors/DSS/SecretServerInterface.cs
@@ -1,341 +0,0 @@
-using Microsoft.Win32;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.OpenSsl;
-using Org.BouncyCastle.Security;
-using SecretServerAuthentication.DSS;
-using SecretServerRestClient.DSS;
-using System.Security.Cryptography;
-
-namespace ExternalConnectors.DSS;
-
-public class SecretServerInterface
-{
-    private static class SSConnectionData
-    {
-        public static string ssUsername = "";
-        public static string ssPassword = "";
-        public static string ssUrl = "";
-        public static string ssOTP = "";
-        public static bool ssSSO = false;
-        public static bool initdone = false;
-
-        //token 
-        public static string ssTokenBearer = "";
-        public static DateTime ssTokenExpiresOn = DateTime.UtcNow;
-        public static string ssTokenRefresh = "";
-
-        public static void Init()
-        {
-            if (initdone == true)
-                return;
-
-                RegistryKey key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\mRemoteSSInterface");
-                try
-                {
-                    // display gui and ask for data
-                    SSConnectionForm f = new();
-                    string? un = key.GetValue("Username") as string;
-                    f.tbUsername.Text = un ?? "";
-                    f.tbPassword.Text = SSConnectionData.ssPassword;    // in OTP refresh cases, this value might already be filled
-
-                string? url = key.GetValue("URL") as string;
-                if (url == null || !url.Contains("://"))
-                    url = "https://cred.domain.local/SecretServer";
-                f.tbSSURL.Text = url;
-
-                var b = key.GetValue("SSO");
-                if (b == null || (string)b != "True")
-                    ssSSO = false;
-                else
-                    ssSSO = true;
-                f.cbUseSSO.Checked = ssSSO;
-                
-                // show dialog
-                while (true)
-                {
-                    _ = f.ShowDialog();
-
-                    if (f.DialogResult != DialogResult.OK)
-                        return;
-
-                    // store values to memory
-                    ssUsername = f.tbUsername.Text;
-                    ssPassword = f.tbPassword.Text;
-                    ssUrl = f.tbSSURL.Text;
-                    ssSSO = f.cbUseSSO.Checked;
-                    ssOTP = f.tbOTP.Text;
-                    // check connection first
-                    try
-                    {
-                        if (TestCredentials() == true)
-                        {
-                            initdone = true;
-                            break;
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        MessageBox.Show("Test Credentials failed - please check your credentials");
-                    }
-                }
-
-
-                // write values to registry
-                key.SetValue("Username", ssUsername);
-                key.SetValue("URL", ssUrl);
-                key.SetValue("SSO", ssSSO);
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-            finally
-            {
-                key.Close();
-            }
-
-        }
-    }
-
-    private static bool TestCredentials()
-    {
-        if (SSConnectionData.ssSSO)
-        {
-            // checking creds doesn't really make sense here, as we can't modify them anyway if something is wrong
-            return true;
-        }
-        else
-        {
-
-            if (!String.IsNullOrEmpty(GetToken()))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-    }
-
-    private static SecretsServiceClient ConstructSecretsServiceClient()
-    {
-        string baseURL = SSConnectionData.ssUrl;
-        if (SSConnectionData.ssSSO)
-        {
-            // REQUIRES IIS CONFIG! https://docs.thycotic.com/ss/11.0.0/api-scripting/webservice-iwa-powershell
-            var handler = new HttpClientHandler() { UseDefaultCredentials = true };
-            var httpClient = new HttpClient(handler);
-            {
-                // Call REST API:
-                return new SecretsServiceClient($"{baseURL}/winauthwebservices/api", httpClient);
-            }
-        }
-        else
-        {
-            var httpClient = new HttpClient();
-            {
-
-                var token = GetToken();
-                // Set credentials (token):
-                httpClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
-
-                // Call REST API:
-                return new SecretsServiceClient($"{baseURL}/api", httpClient);
-            }
-        }
-
-    }
-    private static void FetchSecret(int secretID, out string secretUsername, out string secretPassword, out string secretDomain, out string privatekey)
-    {
-        var client = ConstructSecretsServiceClient();
-        SecretModel secret = client.GetSecretAsync(false, true, secretID, null).Result;
-
-        // clear return variables
-        secretDomain = "";
-        secretUsername = "";
-        secretPassword = "";
-        privatekey = "";
-        string privatekeypassphrase = "";
-
-        // parse data and extract what we need
-        foreach (var item in secret.Items)
-        {
-            if (item.FieldName.ToLower().Equals("domain"))
-                secretDomain = item.ItemValue;
-            else if (item.FieldName.ToLower().Equals("username"))
-                secretUsername = item.ItemValue;
-            else if (item.FieldName.ToLower().Equals("password"))
-                secretPassword = item.ItemValue;
-            else if (item.FieldName.ToLower().Equals("private key"))
-            {
-                client.ReadResponseNoJSONConvert = true;
-                privatekey = client.GetFieldAsync(false, false, secretID, "private-key").Result;
-                client.ReadResponseNoJSONConvert = false;
-            }
-            else if (item.FieldName.ToLower().Equals("private key passphrase"))
-                privatekeypassphrase = item.ItemValue;
-        }
-
-        // need to decode the private key?
-        if (!string.IsNullOrEmpty(privatekeypassphrase))
-        {
-            try
-            {
-                var key = DecodePrivateKey(privatekey, privatekeypassphrase);
-                privatekey = key;
-            }
-            catch(Exception)
-            {
-
-            }
-        }
-
-        // conversion to putty format necessary?
-        if (!string.IsNullOrEmpty(privatekey) && !privatekey.StartsWith("PuTTY-User-Key-File-2"))
-        {
-            try
-            {
-                RSACryptoServiceProvider key = ImportPrivateKey(privatekey);
-                privatekey = PuttyKeyFileGenerator.ToPuttyPrivateKey(key);
-            }
-            catch (Exception)
-            {
-
-            }
-        }
-    }
-
-        #region PUTTY KEY HANDLING
-        // decode rsa private key with encryption password
-        private static string DecodePrivateKey(string encryptedPrivateKey, string password)
-        {
-            TextReader textReader = new StringReader(encryptedPrivateKey);
-            PemReader pemReader = new(textReader, new PasswordFinder(password));
-
-        AsymmetricCipherKeyPair keyPair = (AsymmetricCipherKeyPair)pemReader.ReadObject();
-
-        TextWriter textWriter = new StringWriter();
-        var pemWriter = new PemWriter(textWriter);
-        pemWriter.WriteObject(keyPair.Private);
-        pemWriter.Writer.Flush();
-
-        return ""+textWriter.ToString();
-    }
-    private class PasswordFinder : IPasswordFinder
-    {
-        private string password;
-
-        public PasswordFinder(string password)
-        {
-            this.password = password;
-        }
-
-
-        public char[] GetPassword()
-        {
-            return password.ToCharArray();
-        }
-    }
-
-        // read private key pem string to rsacryptoserviceprovider
-        public static RSACryptoServiceProvider ImportPrivateKey(string pem)
-        {
-            PemReader pr = new(new StringReader(pem));
-            AsymmetricCipherKeyPair KeyPair = (AsymmetricCipherKeyPair)pr.ReadObject();
-            RSAParameters rsaParams = DotNetUtilities.ToRSAParameters((RsaPrivateCrtKeyParameters)KeyPair.Private);
-            RSACryptoServiceProvider rsa = new();
-            rsa.ImportParameters(rsaParams);
-            return rsa;
-        }
-        #endregion
-
-
-    #region TOKEN
-    private static string GetToken()
-    {
-        // if there is no token, fetch a fresh one
-        if (String.IsNullOrEmpty(SSConnectionData.ssTokenBearer))
-        {
-            return GetTokenFresh();
-        }
-        // if there is a token, check if it is valid
-        if (SSConnectionData.ssTokenExpiresOn >= DateTime.UtcNow)
-        {
-            return SSConnectionData.ssTokenBearer;
-        }
-        else
-        {
-            // try using refresh token
-            using (var httpClient = new HttpClient())
-            {
-                var tokenClient = new OAuth2ServiceClient(SSConnectionData.ssUrl, httpClient);
-                TokenResponse token = new();
-                try
-                {
-                    token = tokenClient.AuthorizeAsync(Grant_type.Refresh_token, null, null, SSConnectionData.ssTokenRefresh, null).Result;
-                    var tokenResult = token.Access_token;
-
-                    SSConnectionData.ssTokenBearer = tokenResult;
-                    SSConnectionData.ssTokenRefresh = token.Refresh_token;
-                    SSConnectionData.ssTokenExpiresOn = token.Expires_on;
-                    return tokenResult;
-                }
-                catch (Exception)
-                {
-                    // refresh token failed. clean memory and start fresh
-                    SSConnectionData.ssTokenBearer = "";
-                    SSConnectionData.ssTokenRefresh = "";
-                    SSConnectionData.ssTokenExpiresOn = DateTime.Now;
-                    // if OTP is required we need to ask user for a new OTP
-                    if (!String.IsNullOrEmpty(SSConnectionData.ssOTP))
-                    {
-                        SSConnectionData.initdone = false;
-                        // the call below executes a connection test, which fetches a valid token
-                        SSConnectionData.Init();
-                        // we now have a fresh token in memory. return it to caller
-                        return SSConnectionData.ssTokenBearer;
-                    }
-                    else
-                    {
-                        // no user interaction required. get a fresh token and return it to caller
-                        return GetTokenFresh();
-                    }
-                }
-            }
-        }
-    }
-    static string GetTokenFresh()
-    {
-        using (var httpClient = new HttpClient())
-        {
-            // Authenticate:
-            var tokenClient = new OAuth2ServiceClient(SSConnectionData.ssUrl, httpClient);
-            // call below will throw an exception if the creds are invalid
-            var token = tokenClient.AuthorizeAsync(Grant_type.Password, SSConnectionData.ssUsername, SSConnectionData.ssPassword, null, SSConnectionData.ssOTP).Result;
-            // here we can be sure the creds are ok - return success state                   
-            var tokenResult = token.Access_token;
-
-            SSConnectionData.ssTokenBearer = tokenResult;
-            SSConnectionData.ssTokenRefresh = token.Refresh_token;
-            SSConnectionData.ssTokenExpiresOn = token.Expires_on;
-            return tokenResult;
-        }
-    }
-    #endregion
-
-
-    // input must be the secret id to fetch
-    public static void FetchSecretFromServer(string input, out string username, out string password, out string domain, out string privatekey)
-    {
-        // get secret id
-        int secretID = Int32.Parse(input);
-
-        // init connection credentials, display popup if necessary
-        SSConnectionData.Init();
-
-        // get the secret
-        FetchSecret(secretID, out username, out password, out domain, out privatekey);
-    }
-}
--- a/ExternalConnectors/DSS/SecretServerRestClient.cs
+++ b/ExternalConnectors/DSS/SecretServerRestClient.cs
--- a/ExternalConnectors/ExternalConnectors.csproj
+++ b/ExternalConnectors/ExternalConnectors.csproj
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <OutputType>Library</OutputType>
-    <UseWindowsForms>True</UseWindowsForms>
-    <Platforms>x64</Platforms>
-    <Configurations>Debug;Release;Debug Portable;Release Portable;Deploy to github</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Portable|x64'">
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AWSSDK.Core" Version="3.7.401.6" />
-    <PackageReference Include="AWSSDK.EC2" Version="3.7.429.1" />
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="AWS\AWSConnectionForm.cs" />
-    <Compile Update="CPS\CPSConnectionForm.cs" />
-    <Compile Update="DSS\SSConnectionForm.cs" />
-  </ItemGroup>
-
-</Project>
--- a/ExternalConnectors/PuttyKeyFileGenerator.cs
+++ b/ExternalConnectors/PuttyKeyFileGenerator.cs
@@ -1,111 +0,0 @@
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace ExternalConnectors;
-
-public class PuttyKeyFileGenerator
-{
-    private const int prefixSize = 4;
-    private const int paddedPrefixSize = prefixSize + 1;
-    private const int lineLength = 64;
-    private const string keyType = "ssh-rsa";
-    private const string encryptionType = "none";
-
-    public static string ToPuttyPrivateKey(RSACryptoServiceProvider cryptoServiceProvider, string Comment = "imported-openssh-key")
-    {
-        var publicParameters = cryptoServiceProvider.ExportParameters(false);
-        byte[] publicBuffer = new byte[3 + keyType.Length + GetPrefixSize(publicParameters.Exponent) + publicParameters.Exponent!.Length + GetPrefixSize(publicParameters.Modulus) + publicParameters.Modulus!.Length + 1];
-
-        using (var bw = new BinaryWriter(new MemoryStream(publicBuffer)))
-        {
-            bw.Write(new byte[] { 0x00, 0x00, 0x00 });
-            bw.Write(Encoding.ASCII.GetBytes(keyType));
-            PutPrefixed(bw, publicParameters.Exponent, CheckIsNeddPadding(publicParameters.Exponent));
-            PutPrefixed(bw, publicParameters.Modulus, CheckIsNeddPadding(publicParameters.Modulus));
-        }
-        var publicBlob = System.Convert.ToBase64String(publicBuffer);
-
-        var privateParameters = cryptoServiceProvider.ExportParameters(true);
-
-        byte[] privateBuffer = new byte[paddedPrefixSize + privateParameters.D!.Length + paddedPrefixSize + privateParameters.P!.Length + paddedPrefixSize + privateParameters.Q!.Length + paddedPrefixSize + privateParameters.InverseQ!.Length];
-
-        using (var bw = new BinaryWriter(new MemoryStream(privateBuffer)))
-        {
-            PutPrefixed(bw, privateParameters.D, true);
-            PutPrefixed(bw, privateParameters.P, true);
-            PutPrefixed(bw, privateParameters.Q, true);
-            PutPrefixed(bw, privateParameters.InverseQ, true);
-        }
-        var privateBlob = System.Convert.ToBase64String(privateBuffer);
-
-        HMACSHA1 hmacSha1 = new(SHA1.Create().ComputeHash(Encoding.ASCII.GetBytes("putty-private-key-file-mac-key")));
-        byte[] bytesToHash = new byte[prefixSize + keyType.Length + prefixSize + encryptionType.Length + prefixSize + Comment.Length + prefixSize + publicBuffer.Length + prefixSize + privateBuffer.Length];
-
-        using (var bw = new BinaryWriter(new MemoryStream(bytesToHash)))
-        {
-            PutPrefixed(bw, Encoding.ASCII.GetBytes(keyType));
-            PutPrefixed(bw, Encoding.ASCII.GetBytes(encryptionType));
-            PutPrefixed(bw, Encoding.ASCII.GetBytes(Comment));
-            PutPrefixed(bw, publicBuffer);
-            PutPrefixed(bw, privateBuffer);
-        }
-
-        var hash = string.Join("", hmacSha1.ComputeHash(bytesToHash).Select(x => $"{x:x2}"));
-
-        var sb = new StringBuilder();
-        sb.AppendLine("PuTTY-User-Key-File-2: " + keyType);
-        sb.AppendLine("Encryption: " + encryptionType);
-        sb.AppendLine("Comment: " + Comment);
-
-        var publicLines = SpliceText(publicBlob, lineLength);
-        sb.AppendLine("Public-Lines: " + publicLines.Length);
-        foreach (var line in publicLines)
-        {
-            sb.AppendLine(line);
-        }
-
-        var privateLines = SpliceText(privateBlob, lineLength);
-        sb.AppendLine("Private-Lines: " + privateLines.Length);
-        foreach (var line in privateLines)
-        {
-            sb.AppendLine(line);
-        }
-
-        sb.AppendLine("Private-MAC: " + hash);
-
-        return sb.ToString();
-    }
-
-    private static void PutPrefixed(BinaryWriter bw, byte[] bytes, bool addLeadingNull = false)
-    {
-        bw.Write(BitConverter.GetBytes(bytes.Length + (addLeadingNull ? 1 : 0)).Reverse().ToArray());
-        if (addLeadingNull)
-            bw.Write(new byte[] { 0x00 });
-        bw.Write(bytes);
-    }
-
-    private static string[] SpliceText(string text, int lineLength)
-    {
-        return Regex.Matches(text, ".{1," + lineLength + "}").Cast<Match>().Select(m => m.Value).ToArray();
-    }
-
-    private static int GetPrefixSize(byte[]? bytes)
-    {
-        if (bytes is null)
-            return 0;
-
-        return CheckIsNeddPadding(bytes) ? paddedPrefixSize : prefixSize;
-    }
-
-    private static bool CheckIsNeddPadding(byte[] bytes)
-    {
-        if (bytes is null || bytes.Length == 0)
-            return false;
-
-        // 128 == 10000000
-        // This means that the number of bits can be divided by 8.
-        // According to the algorithm in putty, you need to add a padding.
-        return bytes[0] >= 128;
-    }
-}
--- a/README.MD
+++ b/README.MD
@@ -2,7 +2,7 @@

 <br/><br/>
 <p align="center">
-  <img width="450" src="https://github.com/mRemoteNG/mRemoteNG/blob/mRemoteNGProjectFiles/Header_dark.png">
+  <img width="500" src="https://github.com/mRemoteNG/mRemoteNG/blob/develop/mRemoteNGProjectFiles/Header_dark.png">
 </p>
  
 <p align="center">
@@ -20,12 +20,10 @@
  <a href="https://twitter.com/mremoteng">
    <img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/mremoteng?color=%231DA1F2&label=Twitter&logo=Twitter&style=flat-square">
  </a>
-  <a href="https://app.element.io/#/room/#mremoteng:matrix.org">
-    <img alt="Element" src="https://img.shields.io/matrix/mremoteng:matrix.org?label=Join%20to%20chat%20about%20mRemoteNG&logo=element&style=social&link=https://app.element.io/#/room/#mremoteng:matrix.org">
+  <a href="https://gitter.im/mRemoteNG/PublicChat">
+    <img alt="Gitter" src="https://img.shields.io/gitter/room/mRemoteNG/PublicChat?label=Join%20the%20Chat&logo=Gitter&style=flat-square">
  </a>  
-</p>
-<p align="center">
-  <a href="https://www.paypal.com/paypalme/mremoteng">
+  <a href="https://www.paypal.me/DavidSparer">
    <img alt="PayPal" src="https://img.shields.io/badge/%24-PayPal-blue.svg?label=Donate&logo=PayPal&style=flat-square">
  </a>
  <a href="bitcoin:16fUnHUM3k7W9Fvpc6dug7TAdfeGEcLbSg">
@@ -43,18 +41,15 @@
  <a href='https://mremoteng.readthedocs.io/en/latest/?badge=latest'>
    <img src='https://readthedocs.org/projects/mremoteng/badge/?version=latest' alt='Documentation Status' />
  </a>
-  <a href="https://gurubase.io/g/mremoteng">
-    <img alt="Gurubase" src="https://img.shields.io/badge/Gurubase-Ask%20mRemoteNG%20Guru-006BFF?style=flat-square">
-  </a>
 </p>

 ---

-| Channel | Build Status | Downloads |
+| Update Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
-| Stable | ![Build status](https://ci.appveyor.com/api/projects/status/rqwxjxldail7btcf?svg=true) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) |
-| Preview | ![Build status](https://ci.appveyor.com/api/projects/status/rqwxjxldail7btcf/branch/preview?svg=true) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) |
-| Nightly | ![Build status](https://ci.appveyor.com/api/projects/status/rqwxjxldail7btcf/branch/develop?svg=true) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/2023.03.03-v1.77.3-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/2023.03.03-v1.77.3-nb) |
+| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) |
+| Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) |
+| Nightly build | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) |

 ## Features

@@ -78,11 +73,24 @@ For a detailed feature list and general usage support, refer to the [Documentati
 - [Windows 11](https://en.wikipedia.org/wiki/Windows_11)
 - [Windows 10](https://en.wikipedia.org/wiki/Windows_10)
 - [Windows 8.1](https://en.wikipedia.org/wiki/Windows_8.1)
- [Windows Server 2022](https://en.wikipedia.org/wiki/Windows_Server_2022)
 - [Windows Server 2019](https://en.wikipedia.org/wiki/Windows_Server_2019)
 - [Windows Server 2016](https://en.wikipedia.org/wiki/Windows_Server_2016)
 - [Windows Server 2012 R2](https://en.wikipedia.org/wiki/Windows_Server_2012_R2)

+### Packaging
+
+Downloads are provided in three different packages.
+
+#### Binary package
+
+The binary package of mRemoteNG is a compiled version of mRemoteNG which comes in an MSI installer.
+This is the most common way to install mRemoteNG and get up and running.
+
+#### Portable package
+
+The portable package contains a modified version of the executable which stores and loads all your settings from files in the application's directory.
+This package can be used to run mRemoteNG from a USB stick and preserve your configuration wherever you go.
+
 #### Source package

 This contains the source code from which mRemoteNG is build.
@@ -90,15 +98,13 @@ You will need to compile it yourself using Visual Studio.

 ### Minimum Requirements

-* [Microsoft Visual C++ Redistributable for Visual Studio 2015 - 2022](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
-* [Microsoft .NET 6.0 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet/6.0)
+* [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
+* [Microsoft .NET Framework 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=17851)
 * Microsoft Terminal Service Client 6.0 or later
  * Needed if you use RDP. mstscax.dll and/or msrdp.ocx be registered.

 ### Download

-> :star: Starting Windows 11 you can use winget to install mRemoteNG. Just run `winget install -e --id mRemoteNG.mRemoteNG`
-
 mRemoteNG is available as a redistributable MSI package or as a portable ZIP package and can be downloaded from the following locations:
 * [GitHub](https://github.com/mRemoteNG/mRemoteNG/releases)
 * [Project Website](https://mremoteng.org/download)
@@ -107,31 +113,52 @@ mRemoteNG is available as a redistributable MSI package or as a portable ZIP pac

 The MSI package of mRemoteNG can be installed using the command line:

-`msiexec /i [/qn] C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value] [/lv* <log path>]`
+`msiexec /i C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value]`

-| Argument/Property | Value | Description |
+| Property | Value | Description |
 |-|-|-|
-| /qn | `Silent Installation` | Will run the installer silently in the background. |
-| /lv* | `Silent Installation` | Will write a logfile to the specified location. (For paths that contain spaces, enclose the path in double quotes) |
-| INSTALLDIR | `folder path` | Allows you to set the installation directory from the command line. (For paths that contain spaces, enclose the path in double quotes) |
+| INSTALLDIR | `folder path` | This allows you to set the installation directory from the command line. For paths that contain spaces, enclose the path in double quotes (""). This overrides any value found in the registry. |
 | IGNOREPREREQUISITES | `0` or `1` | When set to `1`, the installer will not be halted if any prerequisite check is not met. You must still run the installer as administrator. |

-## Manual Uninstall
+#### Examples
+
+**Install to a custom folder**
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi INSTALLDIR="D:\Work Apps\mRemoteNG"`
+
+**Ignore prerequisites during a normal install**
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi IGNOREPREREQUISITES=1`
+
+**Ignore prerequisites during a silent install**
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /qn IGNOREPREREQUISITES=1`
+
+### Troubleshooting installation
+
+Turn on verbose logging by using the `/lv* <log path>` argument at the command line.
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /l*v C:\mremoteng_install.log`
+
+## Uninstall
+
+### Standard Uninstall
+
+mRemoteNG basic binary package can be uninstalled with Windows Control Panel. If for some reason it does not work please
+follow information provided below for Manual Uninstall.
+
+### Manual Uninstall

 _If you are using the Portable version, simply deleting the folder that contains mRemoteNG should be sufficient. These uninstall instructions are only necessary for the normal binary .MSI installed version of mRemoteNG_

 * Delete the folder where mRemoteNG was installed. By default, this is:
-	`%PROGRAMFILES%\mRemoteNG` (for versions before 1.77 on a x64 Windows its `%programfiles(x86)%\mRemoteNG`)
+	`%PROGRAMFILES%\mRemoteNG`

-* Delete the mRemoteNG install entry from the following location. You may search for "mRemoteNG" in the DisplayName field:
-  * x86 Windows or mRemoteNG starting with v1.77: `HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\`
-  * x64 Windows and mRemoteNG before 1.77: `HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\`
-* Remove the following registry key: `HKLM\SOFTWARE\mRemoteNG` (on x64 Windows with mRemoteNG before 1.77 it's `HKLM\SOFTWARE\WOW6432Node\mRemoteNG`)
+* Delete the mRemoteNG install entry from one of the following locations. Search for "mRemoteNG" in the DisplayName field:
+  * x86: ``HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\``
+  * x64: ``HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\``

 * (Optional) If you would also like to delete user data remove `%LOCALAPPDATA%\mRemoteNG`
-* (Optional) If you would also like to remove the connection configuration, delete `%APPDATA%\mRemoteNG`
-
-* (Optional) If no other software uses it, the "Microsoft Windows Desktop Runtime" may be uninstalled too.

 ## Featured Projects

@@ -150,5 +177,5 @@ Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to

 </br>
 <p align="center">
-  <img alt="Developed with ReSharper" src="https://github.com/mRemoteNG/mRemoteNG/blob/mRemoteNGProjectFiles/icon_ReSharper.png">
+  <img alt="Developed with ReSharper" src="https://github.com/mRemoteNG/mRemoteNG/blob/develop/mRemoteNGProjectFiles/icon_ReSharper.png">
 </p>
--- a/Tools/cert/CodeSigning_Cert_mRemoteNG_Certum.enc
+++ b/Tools/cert/CodeSigning_Cert_mRemoteNG_Certum.enc
@@ -1,38 +0,0 @@
-U2FsdGVkX1/uEeToOEIrunpoPNl7NUYNQfI+ixMzGgKX0DlHZxa/PonAVd9NoAE+
-dqWegkN8fa/M2HcW8moN5sN0yS88amG8cfwRZNRSgRB4IxDdYPjM/iX7y8FjUh9R
-OZnGhq1rAkqcf7ASAdZfQDSFOAEDPQgByN4IB2j/G3ueqV3jf5sWWiM0ielcorWX
-jXuEL7uIk9diI3Qh3BVqmrotzErzqTTLB4DWoL1aWqRRYH+exKahfcMT3C9r+tul
-ETH6o1im3kdYzFgHl58FmihbHa+h1+c+DWVGGXRxJPw1DZfg8/+ldIy8J75aWimz
-2MX+PiBVQj+wYlSSkQLj2EdbpSERlinE1O55ldwpbnMPAlYCgFRdO3/hiB6LiLLt
-n9s8f32HLNG20Mk1oxXdN9VPOw+RwQpUf6Zfcyps6e/9EFKBLnwq4cYwM/dHRuez
-w48EJX5wKzpukHn2UFg5aCRGYU/4NyUn+AlIjjCMBWY1R0uBhC340cl6YqoPFN12
-clzbS6JdQS+ktusCeaKcsj2iknVqQrGY81LKrTaQZdfehGwAn9pMWE3iWRX80yzO
-s08lpmHfPK4uhtlyIbdReLn4n7hvB8KRVa7Foms+4wpEwKrL8KF/8CYc89Tm3PSD
-LCrLr7rzCHh51ncJXHAwZqY2ZRLnQBVwhIRsFYyZ595b89tuDY00sYpWnTKzWubK
-UD993CmYKg1cA+mj6NR6iSmecawsUz68nI/nmHM2APE5cCCHSK3lz40e9Z9Hmy5Y
-kVS6c86a+gwNyn4F9t3iISdj2vIOwGMVWQLeY+nwpiKnnOuI0XPtIMjNbhoaDToT
-kph2ZVjqbpmYHgTSX71v8Y16Stl+p/dZn0dE2d4JhxOJxDN//H6y7mOwg8DYX9GP
-rFBMIEWyEQyEFYTmWgztQ5KU89w0lV1qiWpaiWR/IDkGbUzHR8ELp4NHYPbZnuYa
-FFXooJGPsQ02ioXPm18Lkhloo63lANgyBE0jc1x9hPrI0oVn1wTkKdeW13IbHzrn
-VsGXeZz06bB46QChXUPmQ49sNkAXcMDnfNFM9ayUa8eVmNx9fWabtBy8qs7rpdv0
-1y/2ud4Da9t7SAUvxwI65+b2Ytk05pLFLmQYb01g4BpBDxbJW3yw3CqKgMnLoZ3t
-s2kiUpn7FEQU8jbpbFV+UB4DdJgm8S7o1gbTEWYTscZ7l+oLCmQgMYoi/EJDDIa2
-cCSdGy4p7kLlLUoO438Mz36+FDf6qX2B86ezVdNnXQb3UPljjDxiOFM6NkI3HTpl
-RqxjBg8JdrwoQ1UMha6ucDKhPXq1xkg0dpO9QyjxywssG3krgQ5Py64s5Xu7IgQm
-AzmwGTZ6gFZlDTr9SpJkiucF9vexCo6JHHkF8OjhS49FanqB8otJvg5JclVugP51
-LcqqvuMkAsFago261SNcOhgtR6nV5B9QgHyr66c6YnTlwt07T1Qq3S1lw2x0Eccs
-PKbJDVU5rAHiM71QYmwsuoC8qkYPTtVPIoUTs+5u5aLywVoLejr1dE5twNXy5PYY
-fDwubg0YG3kchvv85N3epZ1h50ADq3W3msU9bWDKWwdwIbpGq+dwjkLssBQmjVtI
-R8rGbt1DgL7xtRNF9ESnWVkfHJvJu/5oD6wGAU/oIfBxVON0VYb1evc8wRdQTbDH
-Dnt+aKwcSPYdyGVRKfRtBGvEZ8rB5hzCXQnS795L0imdfXjBSJn7Pnl9VwpcB3Pr
-aZ6s0GcB8kYDEXzjv+o7JF6k5i2I+sVGwvFVGIoVd/Igq2ysrk/GfWVov0SUu78A
-JeHYdtRuKwXOdZw2cjZQ72bvFaHOuoXrQnyKyZDWRyu0NB5HLW75v/YEbr4msIm9
-E+3HFwRvKSTfUx/M4NgVKrgsHDeBRD4tLNx/SerQvqaplunM7OfAtULucveUhwSo
-vT6uNK3URe1qDgX554cz8c6+KrkglTLFMuKfNWj3q/uSM0BxTTD9QgorNdlMmErH
-TfV/ZpZACpuMFRbC5xQRkCG1x4U12pdPbtIkGtVBJROEXhP1aw3BDWwrIN7zSgfj
-8I4OF4fbj/rSuvI4klzi1zlUMQQnenlRURE+7DKRxtWipJhW9vtDI0LXN7gGfmbR
-73uR3YUny6zUJ0svqaWj4Eo6t3g99nmk4D2hm/622dRksv2HqEQiq29jJxlcbdZB
-PU96wOp54s/BzgodyI5dh+xL06Obr9AltLV9vw3iK0VBZqquj9FuhvWC1tYlZQJF
-AOgVDOGUZzmAJXftI7gaohFBwsT5tAHQtBuY7tB3b1hrnfrFb9FTNxGZJKcIH3p4
-dOAvedsfuq+2/lU9iM4tX9fjSzfnGRZRuKCGDSdhE6EDik9/f2kSCoY9z0zJwdZH
-324TpGbZNbgcwgHDL9i5Nsnaua5yxtr0/Fr1We1tvn0=
--- a/Tools/cert/CodeSigning_Cert_mRemoteNG_DigiCert.p12.enc
+++ b/Tools/cert/CodeSigning_Cert_mRemoteNG_DigiCert.p12.enc
--- a/Tools/copy_release_installer.ps1
+++ b/Tools/copy_release_installer.ps1
@@ -0,0 +1,21 @@
+param (
+    [string]
+    $SourcePath,
+
+    [string]
+    $DestinationDir
+)
+
+Write-Host $SourcePath
+Write-Host $DestinationDir
+
+if (!(Test-Path -Path $DestinationDir))
+{
+    New-Item -Path $DestinationDir -ItemType "directory"
+}
+
+$sourceFiles = Get-ChildItem -Path $SourcePath -Recurse | ?{$_.Extension -match "exe|msi"}
+foreach ($item in $sourceFiles)
+{
+    Copy-Item -Path $item.FullName -Destination $DestinationDir -Force
+}
--- a/Tools/create_upg_chk_files.ps1
+++ b/Tools/create_upg_chk_files.ps1
@@ -1,27 +1,17 @@
 #Requires -Version 4.0
 param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $WebsiteTargetOwner,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $WebsiteTargetRepository,
-
-    [string]
-    [Parameter(Mandatory=$false)]
-    $PreTagName = "",
-
    [string]
    [Parameter(Mandatory=$true)]
    $TagName,

    [string]
    [Parameter(Mandatory=$true)]
-    $ProjectName
+    [ValidateSet("Stable","Beta","Development")]
+    $UpdateChannel
 )


+
 function New-MsiUpdateFileContent {
    param (
        [System.IO.FileInfo]
@@ -35,7 +25,7 @@ function New-MsiUpdateFileContent {
    
    $version = $MsiFile.BaseName -replace "[a-zA-Z-]*"
    $certThumbprint = (Get-AuthenticodeSignature -FilePath $MsiFile).SignerCertificate.Thumbprint
-    $hash = Get-FileHash -Algorithm SHA512 $MsiFile | ForEach-Object { $_.Hash }
+    $hash = Get-FileHash -Algorithm SHA512 $MsiFile | % { $_.Hash }

    $fileContents = `
 "Version: $version
@@ -59,7 +49,7 @@ function New-ZipUpdateFileContent {
    )
    
    $version = $ZipFile.BaseName -replace "[a-zA-Z-]*"
-    $hash = Get-FileHash -Algorithm SHA512 $ZipFile | ForEach-Object { $_.Hash }
+    $hash = Get-FileHash -Algorithm SHA512 $ZipFile | % { $_.Hash }

    $fileContents = `
 "Version: $version
@@ -74,7 +64,7 @@ function Resolve-UpdateCheckFileName {
    param (
        [string]
        [Parameter(Mandatory=$true)]
-        [ValidateSet("Stable","Preview","Nightly")]
+        [ValidateSet("Stable","Beta","Development")]
        $UpdateChannel,

        [string]
@@ -85,8 +75,8 @@ function Resolve-UpdateCheckFileName {

    $fileName = ""

-    if ($UpdateChannel -eq "Preview") { $fileName += "preview-" }
-    elseif ($UpdateChannel -eq "Nightly") { $fileName += "nightly-" }
+    if ($UpdateChannel -eq "Beta") { $fileName += "beta-" }
+    elseif ($UpdateChannel -eq "Development") { $fileName += "dev-" }

    $fileName += "update"

@@ -97,72 +87,23 @@ function Resolve-UpdateCheckFileName {
    Write-Output $fileName
 }

-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="

-# determine update channel
-if ($env:APPVEYOR_PROJECT_NAME -match "(Nightly)") {
-    Write-Output "UpdateChannel = Nightly"
-    $UpdateChannel = "Nightly"
-    $ModifiedTagName = "$PreTagName-$TagName-NB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Preview)") {
-    Write-Output "UpdateChannel = Preview"
-    $UpdateChannel = "Preview"
-    $ModifiedTagName = "v$TagName-PB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Stable)") {
-    Write-Output "UpdateChannel = Stable"
-    $UpdateChannel = "Stable"
-    $ModifiedTagName = "v" + $TagName.Split("-")[0]
-} else {
-    $UpdateChannel = ""
-}

-#$buildFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\mRemoteNG\bin\x64\Release" -Resolve -ErrorAction Ignore
-$ReleaseFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\Release" -Resolve

-if ($UpdateChannel -ne "" -and $ReleaseFolder -ne "" -and $WebsiteTargetOwner -and $WebsiteTargetRepository) {

-    $msiFile = Get-ChildItem -Path "$ReleaseFolder\*.msi" -Exclude "*-symbols-*.zip" | Sort-Object LastWriteTime | Select-Object -last 1
-    if (![string]::IsNullOrEmpty($msiFile)) {
-        $msiUpdateContents = New-MsiUpdateFileContent -MsiFile $msiFile -TagName $ModifiedTagName
-        $msiUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Normal
-        Write-Output "`n`nMSI Update Check File Contents ($msiUpdateFileName)`n------------------------------"
-        Tee-Object -InputObject $msiUpdateContents -FilePath "$ReleaseFolder\$msiUpdateFileName"
-        
-        # commit msi update txt file
-        if ($env:WEBSITE_UPDATE_ENABLED.ToLower() -eq "true") {
-            if ((Test-Path -Path "$ReleaseFolder\$msiUpdateFileName") -and (-not [string]::IsNullOrEmpty($WebsiteTargetRepository))) {
-                Write-Output "Publish Update File $msiUpdateFileName to $WebsiteTargetRepository"
-                $update_file_content_string = Get-Content "$ReleaseFolder\$msiUpdateFileName" | Out-String
-                Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path $msiUpdateFileName -CommitMessage "Build $ModifiedTagName" -Content $update_file_content_string -BranchName main
-            } else {
-                Write-Warning "WARNING: Update file does not exist: $ReleaseFolder\$msiUpdateFileName"
-            }
-        }
-    }
+$releaseFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\Release" -Resolve

-    # build zip update file
-    $zipFile = Get-ChildItem -Path "$ReleaseFolder\*.zip" -Exclude "*-symbols-*.zip" | Sort-Object LastWriteTime | Select-Object -last 1
-    if (![string]::IsNullOrEmpty($zipFile)) {
-        $zipUpdateContents = New-ZipUpdateFileContent -ZipFile $zipFile -TagName $ModifiedTagName
-        $zipUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Portable
-        Write-Output "`n`nZip Update Check File Contents ($zipUpdateFileName)`n------------------------------"
-        Tee-Object -InputObject $zipUpdateContents -FilePath "$ReleaseFolder\$zipUpdateFileName"
-        
-        # commit zip update txt file
-        if ($env:WEBSITE_UPDATE_ENABLED.ToLower() -eq "true") {
-            if ((Test-Path -Path "$ReleaseFolder\$zipUpdateFileName") -and (-not [string]::IsNullOrEmpty($WebsiteTargetRepository))) {
-                Write-Output "Publish Update File $zipUpdateFileName to $WebsiteTargetRepository"
-                $update_file_content_string = Get-Content "$ReleaseFolder\$zipUpdateFileName" | Out-String
-                Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path $zipUpdateFileName -CommitMessage "Build $ModifiedTagName" -Content $update_file_content_string -BranchName main
-            } else {
-                Write-Warning "WARNING: Update file does not exist: $ReleaseFolder\$zipUpdateFileName"
-            }
-        }
-    }
-} else {
-    Write-Output "ReleaseFolder not found"
-}
+# build msi update file
+$msiFile = Get-ChildItem -Path "$releaseFolder\*.msi" | sort LastWriteTime | select -last 1
+$msiUpdateContents = New-MsiUpdateFileContent -MsiFile $msiFile -TagName $TagName
+$msiUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Normal
+Write-Output "`n`nMSI Update Check File Contents ($msiUpdateFileName)`n------------------------------"
+Tee-Object -InputObject $msiUpdateContents -FilePath "$releaseFolder\$msiUpdateFileName"

-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
+
+# build zip update file
+$zipFile = Get-ChildItem -Path "$releaseFolder\*.zip" | sort LastWriteTime | select -last 1
+$zipUpdateContents = New-ZipUpdateFileContent -ZipFile $zipFile -TagName $TagName
+$zipUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Portable
+Write-Output "`n`nZip Update Check File Contents ($zipUpdateFileName)`n------------------------------"
+Tee-Object -InputObject $zipUpdateContents -FilePath "$releaseFolder\$zipUpdateFileName"
--- a/Tools/decrypt.bat
+++ b/Tools/decrypt.bat
@@ -1,2 +0,0 @@
-openssl enc -base64 -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -d -in cert/CodeSigning_Cert_mRemoteNG_Certum.enc -out cert/CodeSigning_Cert_mRemoteNG_Certum.cer
-pause
--- a/Tools/encrypt.bat
+++ b/Tools/encrypt.bat
@@ -1,2 +0,0 @@
-openssl enc -base64 -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -e -in cert/CodeSigning_Cert_mRemoteNG_Certum.cer -out cert/CodeSigning_Cert_mRemoteNG_Certum.enc
-pause
--- a/Tools/find_vstool.ps1
+++ b/Tools/find_vstool.ps1
@@ -19,28 +19,27 @@ function EditBinCertificateIsValid() {
        "3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC",
        "98ED99A67886D020C564923B7DF25E9AC019DF26",
        "108E2BA23632620C427C570B6D9DB51AC31387FE",
-        "5EAD300DC7E4D637948ECB0ED829A072BD152E17",
-        "97221B97098F37A135DCC212E2B41E452BCE51F2"
+        "5EAD300DC7E4D637948ECB0ED829A072BD152E17"
    )
    $file_signature = Get-AuthenticodeSignature -FilePath $Path
    if (($file_signature.Status -ne "Valid") -or ($valid_microsoft_cert_thumbprints -notcontains $file_signature.SignerCertificate.Thumbprint)) {
-        Write-Warning "Could not validate the signature of $Path $($file_signature.SignerCertificate.Thumbprint)"
-        Write-Output "file_signature.SignerCertificate.Thumbprint: $($file_signature.SignerCertificate.Thumbprint)"
+        Write-Warning "Could not validate the signature of $Path"
        return $false
    } else {
        return $true
    }
 }

+
 function ToolCanBeExecuted {
    param (
        [string]
        $Path
    )
-    $env:PATHEXT.Contains((Get-Item $Path).Extension.ToUpper())
+    $null = & $Path
+    Write-Output ($LASTEXITCODE -gt 0)
 }

-
 $rootSearchPaths = @(
    [System.IO.Directory]::EnumerateFileSystemEntries("C:\Program Files", "*Visual Studio*", [System.IO.SearchOption]::TopDirectoryOnly),
    [System.IO.Directory]::EnumerateFileSystemEntries("C:\Program Files (x86)", "*Visual Studio*", [System.IO.SearchOption]::TopDirectoryOnly)
@@ -52,8 +51,7 @@ foreach ($searchPath in $rootSearchPaths) {
        Write-Verbose "Searching in folder '$visualStudioFolder'"
        $matchingExes = [System.IO.Directory]::EnumerateFileSystemEntries($visualStudioFolder, $FileName, [System.IO.SearchOption]::AllDirectories)
        foreach ($matchingExe in $matchingExes) {
-            #if ((EditBinCertificateIsValid -Path $matchingExe) -and (ToolCanBeExecuted -Path $matchingExe)) {
-            if (ToolCanBeExecuted -Path $matchingExe) {
+            if ((EditBinCertificateIsValid -Path $matchingExe) -and (ToolCanBeExecuted -Path $matchingExe)) {
                return $matchingExe
            }
        }
--- a/Tools/github_functions.ps1
+++ b/Tools/github_functions.ps1
@@ -2,32 +2,6 @@ $githubUrl = 'https://api.github.com'
 # GitHub doesn't support the default powershell protocol (TLS 1.0)
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

-$IsAppVeyor = !([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))
-
-if ($IsAppVeyor) {
-    #$CURRENT_GITHUB_USER = $env:APPVEYOR_REPO_NAME.Split("/")[0]
-    Install-Module -Name PowerShellForGitHub -Scope CurrentUser
-    Set-GitHubConfiguration -DisableTelemetry
-    $PSDefaultParameterValues["*-GitHub*:AccessToken"] = "$env:ACCESS_TOKEN"
-    #New-Item -Path "$Env:APPVEYOR_BUILD_FOLDER\Release" -ItemType Directory -Force
-}
-
-function New-TemporaryDirectory {
-    $parent = [System.IO.Path]::GetTempPath()
-    [string] $name = [System.Guid]::NewGuid()
-    $fullTempPath = (Join-Path $parent $name)
-    New-Item -ItemType Directory -Path $fullTempPath
-    return $fullTempPath
-}
-
-Function ConvertFrom-Base64($base64) {
-    return [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($base64))
-}
-
-Function ConvertTo-Base64($plain) {
-    return [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($plain))
-}
-
 function Publish-GitHubRelease {
    param (
        [string]
@@ -258,4 +232,4 @@ function New-GitHubReleaseRequestBody {

    $json_body = ConvertTo-Json -InputObject $body_params -Compress
    Write-Output $json_body
-}
+}
--- a/Tools/postbuild.ps1
+++ b/Tools/postbuild.ps1
@@ -1,76 +0,0 @@
-param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $SolutionDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TargetDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TargetFileName,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $ConfigurationName,
-
-    [string]
-    $CertificatePath,
-
-    [string]
-    $CertificatePassword,
-
-    [string[]]
-    $ExcludeFromSigning
-)
-
-. "$PSScriptRoot\github_functions.ps1"
-
-Write-Output ""
-Write-Output "+============================================================+"
-Write-Output "|             Beginning mRemoteNG Post Build                 |"
-Write-Output "+============================================================+"
-Format-Table -AutoSize -Wrap -InputObject @{
-    "SolutionDir" = $SolutionDir
-    "TargetDir" = $TargetDir
-    "TargetFileName" = $TargetFileName
-    "ConfigurationName" = $ConfigurationName
-    "CertificatePath" = $CertificatePath
-    "ExcludeFromSigning" = $ExcludeFromSigning
-}
-
-
-if ( $ConfigurationName -match "Debug" -and ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) { return; } #skip when Debug local developer build
-if ( $env:APPVEYOR_PROJECT_NAME -match "(CI)" -and -not ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) { return; } #skip when AppVeyor (CI) build
-
-$dstPath = "$($SolutionDir)Release"
-New-Item -Path $dstPath -ItemType Directory -Force
-
-# $RunInstaller = $TargetDir -match "\\mRemoteNGInstaller\\Installer\\bin\\"
-# $RunPortable = ( ($Targetdir -match "\\mRemoteNG\\bin\\") -and -not ($TargetDir -match "\\mRemoteNGInstaller\\Installer\\bin\\") )
-
-if ( ($ConfigurationName -match "Release") -and ($env:APPVEYOR_PROJECT_NAME -notmatch "(CI)") -and -not ([string]::IsNullOrEmpty($env:WEBSITE_TARGET_OWNER)) -and -not ([string]::IsNullOrEmpty($env:WEBSITE_TARGET_REPOSITORY)) ) {
-
-    Write-Output "-Begin Release Portable"
-
-    & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
-
-    & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
-
-    & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
-
-    & "$PSScriptRoot\zip_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
-
-    & "$PSScriptRoot\create_upg_chk_files.ps1" -WebsiteTargetOwner $env:WEBSITE_TARGET_OWNER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
-
-    & "$PSScriptRoot\update_and_upload_website_release_json_file.ps1" -WebsiteTargetOwner $env:WEBSITE_TARGET_OWNER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
-
-    Write-Output "-End Release Portable"
-
-}
-
-
-Write-Output "End mRemoteNG Post Build"
-Write-Output ""
-
--- a/Tools/postbuild_installer.ps1
+++ b/Tools/postbuild_installer.ps1
@@ -25,12 +25,9 @@ param (
    $ExcludeFromSigning
 )

-. "$PSScriptRoot\github_functions.ps1"
-
-Write-Output ""
-Write-Output "+===========================================================================================+"
-Write-Output "|                          Beginning mRemoteNG Installer Post Build                         |"
-Write-Output "+===========================================================================================+"
+Write-Output "+=================================================================+"
+Write-Output "|             Beginning mRemoteNG Installer Post Build            |"
+Write-Output "+=================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
    "SolutionDir" = $SolutionDir
    "TargetDir" = $TargetDir
@@ -40,24 +37,8 @@ Format-Table -AutoSize -Wrap -InputObject @{
    "ExcludeFromSigning" = $ExcludeFromSigning
 }

-$IsAppVeyor = !([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))

-if ( $IsAppVeyor -and ($ConfigurationName.ToUpper() -match "RELEASE") -and (($env:APPVEYOR_PROJECT_NAME).ToUpper() -notmatch "(CI)") ) {
-
-    & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
-
-    & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
-    
-    & "$PSScriptRoot\rename_and_copy_installer.ps1" -SolutionDir $SolutionDir -BuildConfiguration $ConfigurationName.Trim()
-    
-    & "$PSScriptRoot\create_upg_chk_files.ps1" -WebsiteTargetOwner $env:WEBSITE_TARGET_OWNER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
-    
-    & "$PSScriptRoot\update_and_upload_website_release_json_file.ps1" -WebsiteTargetOwner $env:WEBSITE_TARGET_OWNER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
-
-    & "$PSScriptRoot\update_and_upload_assemblyinfocs.ps1"
-
-}
-
-
-Write-Output "End mRemoteNG Installer Post Build"
-Write-Output ""
+& "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
+& "$PSScriptRoot\rename_installer_with_version.ps1" -SolutionDir $SolutionDir
+& "$PSScriptRoot\copy_release_installer.ps1" -SourcePath $TargetDir -DestinationDir (Join-Path -Path $SolutionDir -ChildPath "Release")
--- a/Tools/postbuild_mremoteng.ps1
+++ b/Tools/postbuild_mremoteng.ps1
@@ -0,0 +1,45 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetFileName,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $ConfigurationName,
+
+    [string]
+    $CertificatePath,
+
+    [string]
+    $CertificatePassword,
+
+    [string[]]
+    $ExcludeFromSigning
+)
+
+Write-Output "+=================================================================+"
+Write-Output "|                  Beginning mRemoteNG Post Build                 |"
+Write-Output "+=================================================================+"
+Format-Table -AutoSize -Wrap -InputObject @{
+    "SolutionDir" = $SolutionDir
+    "TargetDir" = $TargetDir
+    "TargetFileName" = $TargetFileName
+    "ConfigurationName" = $ConfigurationName
+    "CertificatePath" = $CertificatePath
+    "ExcludeFromSigning" = $ExcludeFromSigning
+}
+
+& "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
+& "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
+& "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
+& "$PSScriptRoot\zip_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
--- a/Tools/postbuild_portable.ps1
+++ b/Tools/postbuild_portable.ps1
@@ -1,91 +0,0 @@
-param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $SolutionDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TargetDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TargetFileName,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $ConfigurationName,
-
-    [string]
-    $CertificatePath,
-
-    [string]
-    $CertificatePassword,
-
-    [string[]]
-    $ExcludeFromSigning
-)
-
-. "$PSScriptRoot\github_functions.ps1"
-
-Write-Output ""
-Write-Output "+===========================================================================================+"
-Write-Output "|                          Beginning mRemoteNG Portable Post Build                          |"
-Write-Output "+===========================================================================================+"
-Format-Table -AutoSize -Wrap -InputObject @{
-    "SolutionDir" = $SolutionDir
-    "TargetDir" = $TargetDir
-    "TargetFileName" = $TargetFileName
-    "ConfigurationName" = $ConfigurationName
-    "CertificatePath" = $CertificatePath
-    "ExcludeFromSigning" = $ExcludeFromSigning
-}
-
-# Move dlls resurses into folder
-#Remove-Item -Path "$TargetDir\libs" -Recurse -ErrorAction Ignore
-#New-Item -ItemType "directory" -Force -Path $TargetDir -Name "libs"
-#Move-Item -Path "$TargetDir\*.dll" -Destination "$TargetDir\libs" -force
-
-
-###
-
-# Move lang resurses into folder
-#Remove-Item -Path "$TargetDir\languages" -Recurse -ErrorAction Ignore
-#New-Item -ItemType "directory" -Force -Path $TargetDir -Name "languages"
-#"cs-CZ,de,el,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk,tr-TR,zh-CN,zh-TW,fi-FI".Split(",") | ForEach {
-#    Move-Item -Path "$TargetDir\$_" -Destination "$TargetDir\languages" -force
-# }
-###
-
-# Currently targeting x64, shouldn't need to manually set LargeAddressAware...
-#& "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
-#& "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
-
-if (!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) {
-    $postbuild_installer_executed = Get-ItemPropertyValue -Path 'HKLM:\SOFTWARE\AppVeyor_mRemoteNG' -Name postbuild_installer_executed
-} else {
-    $postbuild_installer_executed = ""
-}
-
-write-host "-SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName "
-
-& "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
-
-if ($postbuild_installer_executed -ne "true" -or $env:postbuild_installer_executed -ne "true") {
-
-    & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
-
-    & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
-}
-
-& "$PSScriptRoot\zip_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
-
-if ( ![string]::IsNullOrEmpty($env:WEBSITE_TARGET_OWNER) -and ![string]::IsNullOrEmpty($env:WEBSITE_TARGET_REPOSITORY) ) {
-
-    & "$PSScriptRoot\create_upg_chk_files.ps1" -WebsiteTargetOwner $env:WEBSITE_TARGET_OWNER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
-
-    & "$PSScriptRoot\update_and_upload_website_release_json_file.ps1" -WebsiteTargetOwner $env:WEBSITE_TARGET_OWNER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
-
-}
-
-Write-Output "End mRemoteNG Portable Post Build"
-Write-Output ""
--- a/Tools/rename_and_copy_installer.ps1
+++ b/Tools/rename_and_copy_installer.ps1
@@ -1,61 +0,0 @@
-param (
-    [string]
-    $SolutionDir,
-    [string]
-    $BuildConfiguration
-)
-
-$ErrorActionPreference = "Stop"
-
-Write-Output ""
-Write-Output "    /===== Begin rename_and_copy_installer =====/"
-
-$targetVersionedFile = "$SolutionDir\mRemoteNG\bin\x64\$BuildConfiguration\mRemoteNG.exe"
-#$fileversion = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
-#$prodversion = ((Get-Item -Path $targetVersionedFile).VersionInfo | Select-Object -Property ProductVersion)."ProductVersion"
-$fileversion = ((Get-Item -Path $targetVersionedFile).VersionInfo | Select-Object -Property FileVersion)."FileVersion"
-
-Write-Output "fileversion: $fileversion"
-$msiversion = $fileversion
-
-# determine update channel
-if ($env:APPVEYOR_PROJECT_NAME -match "(Nightly)") {
-    Write-Output "        UpdateChannel = Nightly"
-    $msiversion = "$msiversion-NB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Preview)") {
-    Write-Output "        UpdateChannel = Preview"
-    $msiversion = "$msiversion-PB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Stable)") {
-    Write-Output "        UpdateChannel = Stable"
-} else {
-}
-
-$dstPath = "$($SolutionDir)Release"
-New-Item -Path $dstPath -ItemType Directory -Force
-$srcMsi = $SolutionDir + "mRemoteNGInstaller\Installer\bin\x64\$BuildConfiguration\en-US\mRemoteNG-Installer.msi"
-$dstMsi = $dstPath + "\mRemoteNG-Installer-" + $msiversion + ".msi"
-#$srcSymbols = $SolutionDir + "mRemoteNGInstaller\Installer\bin\x64\$BuildConfiguration\en-US\mRemoteNG-Installer-Symbols*.zip"
-#$dstSymbols = $SolutionDir + "Release\mRemoteNG-Installer-Symbols-" + $msiversion + ".zip"
-
-Write-Output "        Copy Installer file:"
-Write-Output "          From: $srcMsi"
-Write-Output "            To: $dstMsi"
-Write-Output ""
-# Copy file
-try
-{
-    Copy-Item $srcMsi -Destination $dstMsi -Force -ErrorAction Stop
-    #Copy-Item $srcSymbols -Destination $dstSymbols -Force -ErrorAction Stop
-    Write-Host "        [Success!]" -ForegroundColor green
-}
-catch
-{
-    Write-Host "        [Failure!]" -ForegroundColor red
-    Write-Output $Error[0]
-    $PSCmdlet.ThrowTerminatingError()
-}
-
-
-Write-Output ""
-Write-Output "    /===== End rename_and_copy_installer.ps1 =====/"
-Write-Output ""
--- a/Tools/rename_installer_with_version.ps1
+++ b/Tools/rename_installer_with_version.ps1
@@ -0,0 +1,29 @@
+param (
+    [string]
+    $SolutionDir
+)
+
+$renameTarget = $SolutionDir + "mRemoteNGInstaller\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
+
+Write-Host $SolutionDir
+Write-Host $renameTarget
+
+$targetVersionedFile = "$SolutionDir\mRemoteNG\bin\Release\mRemoteNG.exe"
+$version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
+
+
+$renameTargetFileObject = Get-Item -Path $renameTarget -ErrorAction SilentlyContinue
+if ($renameTargetFileObject)
+{
+    # Build the new file name
+    $oldFileName = $renameTargetFileObject.Name
+    $newFileName = $oldFileName -replace "$("\"+$renameTargetFileObject.Extension)",$("-"+$version+$renameTargetFileObject.Extension)
+    Write-Host $oldFileName
+    Write-Host $newFileName
+
+    # Delete any items that already exist with the new name (effectively an overwrite)
+    Remove-Item -Path "$($renameTargetFileObject.Directory.FullName)\$newFileName" -ErrorAction SilentlyContinue
+
+    # Rename file
+    Rename-Item -Path $renameTarget -NewName $newFileName -ErrorAction SilentlyContinue
+}
--- a/Tools/sign_binaries.ps1
+++ b/Tools/sign_binaries.ps1
@@ -24,80 +24,65 @@ param (
    $SolutionDir
 )

-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+

 $timeserver = "http://timestamp.verisign.com/scripts/timstamp.dll"

-$IsAppVeyor = !([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))

-try {
-	#  validate release versions and if the certificate value was passed
-	if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
+#  validate release versions and if the certificate value was passed
+if ($ConfigurationName -match "Release" -And ($CertificatePath)) {

-		if($IsAppVeyor) {
-			$CertificatePath = Join-Path -Path $SolutionDir -ChildPath $CertificatePath
-			 Write-Output "Decrypt Cert"
-			 & appveyor-tools\secure-file -decrypt "$($Env:cert_path).enc" -secret "$Env:cert_decrypt_pwd"
-			 if(-Not (Test-Path $Env:cert_path)) {
-			 		Write-Output "decrypt cert does not exist..."
-			 		Throw "Could not decrypt cert"
-			 }
-			 Write-Output "Restoring NuGets"
-		}
-
-		# make sure the cert is actually available
-		if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf))
-		{
-			Write-Output "Certificate is not present - we won't sign files."
-			return
-		}
-
-		if ($CertificatePassword -eq "") {
-			Write-Output "No certificate password was provided - we won't sign files."
-			return
-		}
-
-		try {
-			$certKeyStore = [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeySet
-			$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($CertificatePath, $CertificatePassword, $certKeyStore) -ErrorAction Stop
-		} catch {
-			Write-Output "Error loading certificate file - we won't sign files."
-			Write-Output $Error[0]
-			return
-		}
-
-		# Sign MSI if we are building a release version and the certificate is available
-		Write-Output "Signing Binaries"
-		Write-Output "Getting files from path: $TargetDir"
-		$signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -notcontains $_.Name}
-
-		$excluded_files = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -contains $_.Name}
-		$excluded_files | ForEach-Object `
-			-Begin { Write-Output "The following files were excluded from signing due to being on the exclusion list:" } `
-			-Process { Write-Output "-- $($_.FullName)" }
-
-		Write-Output "Signable files count: $($signableFiles.Count)"
-
-
-		foreach ($file in $signableFiles) {
-			Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
-		}
-
-
-		# Release certificate
-		if ($null -ne $cert) {
-			$cert.Dispose()
-		}
-	} else {
-		Write-Output "This is not a release build or CertificatePath wasn't provided - we won't sign files."
-		Write-Output "Config: $($ConfigurationName)`tCertPath: $($CertificatePath)"
+	if(-Not ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) {
+		$CertificatePath = Join-Path -Path $SolutionDir -ChildPath $CertificatePath
 	}
-	
-}
-catch {
-	Write-Output $Error[0]
+
+	# make sure the cert is actually available
+	if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf))
+	{
+	    Write-Output "Certificate is not present - we won't sign files."
+	    return
+	}
+
+	if ($CertificatePassword -eq "") {
+	    Write-Output "No certificate password was provided - we won't sign files."
+	    return
+	}
+
+	try {
+	    $certKeyStore = [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeySet
+	    $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($CertificatePath, $CertificatePassword, $certKeyStore) -ErrorAction Stop
+	} catch {
+	    Write-Output "Error loading certificate file - we won't sign files."
+	    Write-Output $Error[0]
+	    return
+	}
+
+	# Sign MSI if we are building a release version and the certificate is available
+	Write-Output "Signing Binaries"
+	Write-Output "Getting files from path: $TargetDir"
+	$signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -notcontains $_.Name}
+
+	$excluded_files = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -contains $_.Name}
+	$excluded_files | ForEach-Object `
+	    -Begin { Write-Output "The following files were excluded from signing due to being on the exclusion list:" } `
+	    -Process { Write-Output "-- $($_.FullName)" }
+
+	Write-Output "Signable files count: $($signableFiles.Count)"
+
+
+	foreach ($file in $signableFiles) {
+	    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
+	}
+
+
+	# Release certificate
+	if ($cert -ne $null) {
+	    $cert.Dispose()
+	}
+} else {
+    Write-Output "This is not a release build or CertificatePath wasn't provided - we won't sign files."
+    Write-Output "Config: $($ConfigurationName)`tCertPath: $($CertificatePath)"
 }

-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
+Write-Output ""
--- a/Tools/signfiles.ps1
+++ b/Tools/signfiles.ps1
@@ -28,6 +28,4 @@ Write-Output "Signable files count: $($signableFiles.Count)"

 foreach ($file in $signableFiles) {
    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
-}
-
-Write-Output ""
+}
--- a/Tools/tidy_files_for_release.ps1
+++ b/Tools/tidy_files_for_release.ps1
@@ -8,14 +8,14 @@ param (
    $ConfigurationName
 )

-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="

 # Remove unnecessary files from Release versions
 if ($ConfigurationName -match "Release") {
+    Write-Output "Removing unnecessary files from Release versions"
+
    $test = Join-Path -Path $TargetDir -ChildPath "app.publish"
-    if (Test-Path  $test -PathType Container) 
-	{
+    if (Test-Path  $test -PathType Container) {
        Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
    }

@@ -29,18 +29,11 @@ if ($ConfigurationName -match "Release") {
    ) -Exclude @(
        "mRemoteNG.VisualElementsManifest.xml"
 	)
-
-	if ($filesToDelete) 
-	{ 
-		Write-Output "Unnecessary files are detected and will be removed" 
-		Remove-Item -Path $filesToDelete.FullName
-		Write-Output $filesToDelete.FullName
-	} else {
-		Write-Output "  No unnecessary files are detected"
-	}
-} else {
+    Remove-Item -Path $filesToDelete.FullName
+    Write-Output $filesToDelete.FullName
+}
+else {
    Write-Output "We will not remove anything - this is not a release build."
 }

-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
+Write-Output ""
--- a/Tools/update_and_upload_assemblyinfocs.ps1
+++ b/Tools/update_and_upload_assemblyinfocs.ps1
@@ -1,53 +0,0 @@
-#Requires -Version 4.0
-
-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-$MainRepository = $Env:APPVEYOR_REPO_NAME.Split("/\")[1]
-$IsAppVeyor = !([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))
-
-Write-Output "MainRepository: $MainRepository"
-
-if ($IsAppVeyor) {
-        
-    # determine update channel
-    if ($env:APPVEYOR_PROJECT_NAME -match "(Nightly)") {
-        Write-Output "UpdateChannel = Nightly"
-        $UpdateChannel = "Nightly"
-        $ModifiedTagName = "$PreTagName-$TagName-NB"
-    } elseif ($env:APPVEYOR_PROJECT_NAME -match "(Preview)") {
-        Write-Output "UpdateChannel = Preview"
-        $UpdateChannel = "Preview"
-        $ModifiedTagName = "v$TagName-PB"
-    } elseif ($env:APPVEYOR_PROJECT_NAME -match "(Stable)") {
-        Write-Output "UpdateChannel = Stable"
-        $UpdateChannel = "Stable"
-        $ModifiedTagName = "v" + $TagName.Split("-")[0]
-    } else {
-        $UpdateChannel = ""
-    }
-
-    if ($UpdateChannel -ne "" -and $MainRepository -ne "" ) {
-
-        # commit AssemblyInfo.cs change
-        Write-Output "publish AssemblyInfo.cs"
-
-        $buildFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\" -Resolve -ErrorAction Ignore
-
-        if (Test-Path -Path "$buildFolder\mRemoteNG\Properties\AssemblyInfo.cs") {
-
-            $assemblyinfocs_content = [System.String]::Join("`r`n", (Get-Content "$buildFolder\mRemoteNG\Properties\AssemblyInfo.cs"))
-
-            Set-GitHubContent -OwnerName $MainRepository -RepositoryName $MainRepository -Path "mRemoteNG\Properties\AssemblyInfo.cs" -CommitMessage "AssemblyInfo.cs updated for  $UpdateChannel $ModifiedTagName" -Content $assemblyinfocs_content -BranchName main
-
-            Write-Output "publish completed"
-
-        }
-    } else {
-        Write-Output "Source folder not found"
-    }
-}
-
-
-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
--- a/Tools/update_and_upload_website_release_json_file.ps1
+++ b/Tools/update_and_upload_website_release_json_file.ps1
@@ -1,178 +0,0 @@
-#Requires -Version 4.0
-param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $WebsiteTargetOwner,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $WebsiteTargetRepository,
-
-    [string]
-    [Parameter(Mandatory=$false)]
-    $PreTagName = "",
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TagName,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $ProjectName
-)
-
-
-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-$MainRepository = $Env:APPVEYOR_REPO_NAME.Split("/\")[1]
-
-# determine update channel
-if ($env:APPVEYOR_PROJECT_NAME -match "(Nightly)") {
-    Write-Output "UpdateChannel = Nightly"
-    $UpdateChannel = "Nightly"
-    $ModifiedTagName = "$PreTagName-$TagName-NB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Preview)") {
-    Write-Output "UpdateChannel = Preview"
-    $UpdateChannel = "Preview"
-    $ModifiedTagName = "v$TagName-PB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Stable)") {
-    Write-Output "UpdateChannel = Stable"
-    $UpdateChannel = "Stable"
-    $ModifiedTagName = "v" + $TagName.Split("-")[0]
-} else {
-    $UpdateChannel = ""
-}
-
-$IsAppVeyor = !([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))
-
-if ($IsAppVeyor) {
-
-    #$buildFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\mRemoteNG\bin\x64\Release" -Resolve -ErrorAction Ignore
-    $ReleaseFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\Release" -Resolve
-
-    if ($UpdateChannel -ne "" -and $ReleaseFolder -ne "" -and $MainRepository -ne "" -and $WebsiteTargetOwner -ne "" -and $WebsiteTargetRepository -ne "" ) {
-
-        $published_at = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
-        
-        # get releases.json from github
-        $releases_json = Get-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path _data\releases.json
-        ConvertFrom-Base64($releases_json.content) | Out-File -FilePath "$ReleaseFolder\releases.json"
-        $websiteJsonReleaseFile = Get-ChildItem -Path "$ReleaseFolder\releases.json"
-
-        # installer
-        $msiFile = Get-ChildItem -Path "$ReleaseFolder\*.msi" | Sort-Object LastWriteTime | Select-Object -last 1
-        if (![string]::IsNullOrEmpty($msiFile)) {
-            Write-Output "UpdateChannel: $UpdateChannel"
-            Write-Output "msiFile: $msiFile"
-            $checksum = (Get-FileHash $msiFile -Algorithm SHA512).Hash
-            $file_size = (Get-ChildItem $msiFile).Length
-            $a = Get-Content $websiteJsonReleaseFile | ConvertFrom-Json
-            switch ($UpdateChannel) {
-                "Nightly" {
-                    $GithubTag = "$((Get-Date).ToUniversalTime().ToString("yyyyMMdd"))-$TagName-NB"
-                    $html_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/tag/$GithubTag"
-                    $browser_download_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/download/$GithubTag/$($msiFile.Name)"
-                    $a.nightlybuild.name = "v$TagName-NB"
-                    $a.nightlybuild.published_at = $published_at
-                    $a.nightlybuild.html_url = $html_url
-                    $a.nightlybuild.assets.installer.browser_download_url = $browser_download_url
-                    $a.nightlybuild.assets.installer.checksum = $checksum
-                    $a.nightlybuild.assets.installer.size = $file_size
-                    break
-                }
-                "Preview" {
-                    $GithubTag = "$TagName-PB"
-                    $html_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/tag/$GithubTag"
-                    $browser_download_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/download/$GithubTag/$($msiFile.Name)"
-                    $a.prerelease.name = "v$TagName-PB"
-                    $a.prerelease.published_at = $published_at
-                    $a.prerelease.html_url = $html_url
-                    $a.prerelease.assets.installer.browser_download_url = $browser_download_url
-                    $a.prerelease.assets.installer.checksum = $checksum
-                    $a.prerelease.assets.installer.size = $file_size
-                    break
-                }
-                "Stable" {
-                    $GithubTag = "$TagName"
-                    $html_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/tag/$GithubTag"
-                    $browser_download_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/download/$GithubTag/$($msiFile.Name)"
-                    $a.stable.name = "v$TagName"
-                    $a.stable.published_at = $published_at
-                    $a.stable.html_url = $html_url
-                    $a.stable.assets.installer.browser_download_url = $browser_download_url
-                    $a.stable.assets.installer.checksum = $checksum
-                    $a.stable.assets.installer.size = $file_size
-                    break
-                }
-            }
-        }
-
-
-        # portable
-        $zipFile = Get-ChildItem -Path "$ReleaseFolder\*.zip" -Exclude "*-symbols-*.zip" | Sort-Object LastWriteTime | Select-Object -last 1
-        if (![string]::IsNullOrEmpty($zipFile)) {
-            Write-Output "UpdateChannel: $UpdateChannel"
-            Write-Output "zipFile: $zipFile"
-            $checksum = (Get-FileHash $zipFile -Algorithm SHA512).Hash
-            $file_size = (Get-ChildItem $zipFile).Length
-            $a = Get-Content $websiteJsonReleaseFile | ConvertFrom-Json
-            switch ($UpdateChannel) {
-                "Nightly" {
-                    $GithubTag = "$((Get-Date).ToUniversalTime().ToString("yyyyMMdd"))-$TagName-NB"
-                    $html_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/tag/$GithubTag"
-                    $browser_download_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/download/$GithubTag/$($zipFile.Name)"
-                    $a.nightlybuild.name = "v$TagName-NB"
-                    $a.nightlybuild.published_at = $published_at
-                    $a.nightlybuild.html_url = $html_url
-                    $a.nightlybuild.assets.portable.browser_download_url = $browser_download_url
-                    $a.nightlybuild.assets.portable.checksum = $checksum
-                    $a.nightlybuild.assets.portable.size = $file_size
-                    break
-                }
-                "Preview" {
-                    $GithubTag = "$TagName-PB"
-                    $html_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/tag/$GithubTag"
-                    $browser_download_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/download/$GithubTag/$($zipFile.Name)"
-                    $a.prerelease.name = "v$TagName-PB"
-                    $a.prerelease.published_at = $published_at
-                    $a.prerelease.html_url = $html_url
-                    $a.prerelease.assets.portable.browser_download_url = $browser_download_url
-                    $a.prerelease.assets.portable.checksum = $checksum
-                    $a.prerelease.assets.portable.size = $file_size
-                    break
-                }
-                "Stable" {
-                    $GithubTag = "$TagName"
-                    $html_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/tag/$GithubTag"
-                    $browser_download_url = "https://github.com/$WebsiteTargetOwner/$MainRepository/releases/download/$GithubTag/$($zipFile.Name)"
-                    $a.stable.name = "v$TagName"
-                    $a.stable.published_at = $published_at
-                    $a.stable.html_url = $html_url
-                    $a.stable.assets.portable.browser_download_url = $browser_download_url
-                    $a.stable.assets.portable.checksum = $checksum
-                    $a.stable.assets.portable.size = $file_size
-                    break
-                }
-            }
-        }
-
-        $a | ConvertTo-Json -Depth 10 | Set-Content $websiteJsonReleaseFile
-
-        # commit releases.json change
-        if ($env:WEBSITE_UPDATE_ENABLED.ToLower() -eq "true") {
-            Write-Output "publish releases.json"
-            if (Test-Path -Path "$ReleaseFolder\releases.json") {
-                $releases_json_string = Get-Content "$ReleaseFolder\releases.json" | Out-String
-                Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path _data\releases.json -CommitMessage "Updated for $UpdateChannel $ModifiedTagName" -Content $releases_json_string -BranchName main
-                Write-Output "publish completed"
-            }
-        }
-    } else {
-        Write-Output "ReleaseFolder not found"
-    }
-}
-
-
-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
--- a/Tools/validate_microsoft_tool.ps1
+++ b/Tools/validate_microsoft_tool.ps1
@@ -5,13 +5,7 @@ param (
    $FullPath
 )

-$validMSCertThumbprints = @(
-    "3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC", 
-    "108E2BA23632620C427C570B6D9DB51AC31387FE", 
-    "98ED99A67886D020C564923B7DF25E9AC019DF26", 
-    "5EAD300DC7E4D637948ECB0ED829A072BD152E17",
-    "97221B97098F37A135DCC212E2B41E452BCE51F2"
-)
+$validMSCertThumbprints = @("3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC", "108E2BA23632620C427C570B6D9DB51AC31387FE", "98ED99A67886D020C564923B7DF25E9AC019DF26", "5EAD300DC7E4D637948ECB0ED829A072BD152E17")
 $exeSignature = Get-AuthenticodeSignature -FilePath $FullPath
 $baseErrorMsg = "Could not validate the certificate of $FullPath. "

@@ -20,4 +14,4 @@ if ($exeSignature.Status -ne "Valid") {
 }
 elseif ($validMSCertThumbprints -notcontains $exeSignature.SignerCertificate.Thumbprint) {
    Write-Error -Message ($baseErrorMsg+"The certificate thumbprint ($($exeSignature.SignerCertificate.Thumbprint)) is not trusted.") -ErrorAction Stop
-}
+}
--- a/Tools/verify_LargeAddressAware.ps1
+++ b/Tools/verify_LargeAddressAware.ps1
@@ -10,8 +10,7 @@ param (
    $TargetFileName
 )

-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="

 $path_dumpBin = Join-Path -Path $PSScriptRoot -ChildPath "exes\dumpbin.exe"
 $path_outputExe = Join-Path -Path $TargetDir -ChildPath $TargetFileName
@@ -19,7 +18,7 @@ $path_outputExe = Join-Path -Path $TargetDir -ChildPath $TargetFileName
 # Dump exe header
 $output = & "$path_dumpBin" /NOLOGO /HEADERS "$path_outputExe" | Select-String large

-if ($null -eq $output)
+if ($output -eq $null)
 {
    Write-Warning "Could not validate LargeAddressAware"
 }
@@ -28,5 +27,4 @@ else
    Write-Output $output.ToString().TrimStart(" ")
 }

-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
+Write-Output ""
--- a/Tools/verify_binary_signatures.ps1
+++ b/Tools/verify_binary_signatures.ps1
@@ -18,15 +18,12 @@ param (
    $SolutionDir
 )

-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-$IsAppVeyor = !([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="

 #  validate release versions and if the certificate value was passed
 if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
 	
-	if($IsAppVeyor) {
+	if(-Not ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) {
 		$CertificatePath = Join-Path -Path $SolutionDir -ChildPath $CertificatePath
 	}
 	
@@ -39,10 +36,9 @@ if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
 		
    Write-Output "Verifying signature of binaries"
    Write-Output "Getting files from path: $TargetDir"
-    $signableFiles = Get-ChildItem -Path $TargetDir -Recurse | Where-Object {$_.Extension -match "dll|exe|msi"}
+    $signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"}
    Write-Output "Signable files count: $($signableFiles.Count)"
    $badSignatureFound = $false
-
    foreach ($file in $signableFiles) {
        $signature = Get-AuthenticodeSignature -FilePath $file.FullName
        if ($signature.Status -ne "Valid") {
@@ -50,7 +46,6 @@ if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
            $badSignatureFound = $true
        }
    }
-
    if ($badSignatureFound) {
        Write-Output "One or more files were improperly signed."
    } else {
@@ -61,5 +56,4 @@ if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
    Write-Output "Config: $($ConfigurationName)`tCertPath: $($CertificatePath)"
 }

-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
+Write-Output ""
--- a/Tools/zip_files.ps1
+++ b/Tools/zip_files.ps1
@@ -12,82 +12,61 @@
    $ConfigurationName
 )

-Write-Output ""
-Write-Output "===== Begin $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-$IsAppVeyor = !([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="

 $ConfigurationName = $ConfigurationName.Trim()
+Write-Output "Config Name (trimmed): '$($ConfigurationName)'"
 $exe = Join-Path -Path $TargetDir -ChildPath $TargetFileName
-#$version = ((Get-Item -Path $exe).VersionInfo | Select-Object -Property ProductVersion)."ProductVersion"
-$version = $(Get-Item -Path $exe).VersionInfo.FileVersion
-Write-Output "FileVersion: $version"
-
-
-# determine update channel
-if ($env:APPVEYOR_PROJECT_NAME -match "(Nightly)") {
-    Write-Output "UpdateChannel = Nightly"
-    $ModifiedVersion = "$version-NB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Preview)") {
-    Write-Output "UpdateChannel = Preview"
-    $ModifiedVersion = "$version-PB"
-} elseif ($env:APPVEYOR_PROJECT_NAME -match "(Stable)") {
-    Write-Output "UpdateChannel = Stable"
-    $ModifiedVersion = $version
-} else {
-}
+$Version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($exe).FileVersion
+Write-Output "Version is $($version)"

 # Fix for AppVeyor
-if($IsAppVeyor) {
-    if(!(Test-Path "Release")) {
+if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) {
+    if(!(test-path "Release")) {
        New-Item -ItemType Directory -Force -Path "Release" | Out-Null
    }
 }

 # Package debug symbols zip file
-Write-Output "Packaging debug symbols"
-$zipFilePrefix = "mRemoteNG-symbols"
-$pdbFiles = Get-ChildItem -Path  $SolutionDir -Filter *.pdb -Recurse
-$tempPdbPath = (New-TemporaryDirectory)[0]
-foreach ($pdbFile in $pdbFiles) {
-    if (($pdbFile.FullName).Contains("\$ConfigurationName\")) {
-        Copy-Item $pdbFile.FullName -Destination $tempPdbPath -Force
+if ($ConfigurationName -match "Release") {
+    Write-Output "Packaging debug symbols"
+
+    if ($ConfigurationName -match "Portable") {
+        $zipFilePrefix = "mRemoteNG-Portable-symbols"
+    } else {
+        $zipFilePrefix = "mRemoteNG-symbols"
    }
-}

-if ($IsAppVeyor) {
+    $debugFile = Join-Path -Path $TargetDir -ChildPath "mRemoteNG.pdb"
+
    # AppVeyor build
-    $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\$zipFilePrefix-$($ModifiedVersion).zip"
-    Write-Output "outputZipPath: $outputZipPath"
-    7z a $outputZipPath "$tempPdbPath\*.pdb"
-} 
-# else {
-#     # Local build
-#     $outputZipPath = "$($SolutionDir)Release\$zipFilePrefix-$($ModifiedVersion).zip"
-#     Write-Output "outputZipPath: $outputZipPath"
-#     Compress-Archive -Path $tempPdbPath -DestinationPath $outputZipPath -Force
-# }
+    if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) {
+        $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\$zipFilePrefix-$($version).zip"
+        7z a $outputZipPath $debugFile
+    }
+    # Local build
+    else {
+        $outputZipPath = "$($SolutionDir)Release\$zipFilePrefix-$($version).zip"
+        Compress-Archive $debugFile $outputZipPath -Force
+    }

+    Remove-Item $debugFile
+}

 # Package portable release zip file
-Write-Output "Packaging portable ZIP file"
-# AppVeyor build
-if ($IsAppVeyor) {
-    $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\mRemoteNG-Portable-$($ModifiedVersion).zip"
-    7z a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath $TargetDir\*
-    Write-Output "Portable ZIP: $outputZipPath"
-}
-# Local build
-else {
-    if ($Source)
-    {
-        $outputZipPath="$($SolutionDir)\Release\mRemoteNG-Portable-$($ModifiedVersion).zip"
+if ($ConfigurationName -eq "Release Portable") {
+    Write-Output "Packaging portable ZIP file"
+
+    # AppVeyor build
+    if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) {
+        $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\mRemoteNG-Portable-$($version).zip"
+        7z a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath $TargetDir\*
+    }
+    # Local build
+    else {
+        $outputZipPath="$($SolutionDir)\Release\mRemoteNG-Portable-$($version).zip"
        Compress-Archive $Source $outputZipPath -Force
-    } else {
-        Write-Output "Files do not exist:" $Source", nothing to compress"
    }
 }

-
-Write-Output "End $($PSCmdlet.MyInvocation.MyCommand)"
-Write-Output ""
+Write-Output ""
--- a/mRemoteNG.lutconfig
+++ b/mRemoteNG.lutconfig
@@ -1,6 +0,0 @@
-<LUTConfig Version="1.0">
-  <Repository />
-  <ParallelBuilds>true</ParallelBuilds>
-  <ParallelTestRuns>true</ParallelTestRuns>
-  <TestCaseTimeout>180000</TestCaseTimeout>
-</LUTConfig>
--- a/mRemoteNG.sln
+++ b/mRemoteNG.sln
@@ -1,11 +1,11 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31912.275
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 14.0.25420.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mRemoteNGInstaller", "mRemoteNGInstaller", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}"
 EndProject
@@ -13,52 +13,111 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomActions", "mRemoteNGI
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "mRemoteNGInstaller\Installer\Installer.wixproj", "{F0168B9F-6815-40DF-BA53-46CEE7683B68}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4934A491-40BC-4E5B-9166-EA1169A220F6} = {4934A491-40BC-4E5B-9166-EA1169A220F6}
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04} = {5423D985-CB48-4344-B47F-E8C6D60C8B04}
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD} = {A56A2029-79B8-492A-ABE5-D2BFE05801BD}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExternalConnectors", "ExternalConnectors\ExternalConnectors.csproj", "{A56A2029-79B8-492A-ABE5-D2BFE05801BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release Installer and Portable|x64 = Release Installer and Portable|x64
-		Release|x64 = Release|x64
+		Debug Portable|Any CPU = Debug Portable|Any CPU
+		Debug Portable|x86 = Debug Portable|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
+		Release Installer|Any CPU = Release Installer|Any CPU
+		Release Installer|x86 = Release Installer|x86
+		Release Portable|Any CPU = Release Portable|Any CPU
+		Release Portable|x86 = Release Portable|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.ActiveCfg = Debug|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.Build.0 = Debug|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer and Portable|x64.ActiveCfg = Release|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer and Portable|x64.Build.0 = Release|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.ActiveCfg = Release|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.Build.0 = Release|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.ActiveCfg = Debug|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.Build.0 = Debug|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer and Portable|x64.ActiveCfg = Release|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.ActiveCfg = Release|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.Build.0 = Debug|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer and Portable|x64.ActiveCfg = Release|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer and Portable|x64.Build.0 = Release|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.Build.0 = Debug|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer and Portable|x64.ActiveCfg = Release|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer and Portable|x64.Build.0 = Release|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.ActiveCfg = Debug|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.Build.0 = Debug|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer and Portable|x64.ActiveCfg = Release|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release Installer|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug|x64.ActiveCfg = Debug|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug|x64.Build.0 = Debug|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release Installer and Portable|x64.ActiveCfg = Release|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release Installer and Portable|x64.Build.0 = Release|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release|x64.ActiveCfg = Release|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release|x64.Build.0 = Release|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.Build.0 = Debug Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.ActiveCfg = Debug|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.Build.0 = Debug|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.ActiveCfg = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.Build.0 = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.ActiveCfg = Release Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.Build.0 = Release Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.ActiveCfg = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.Build.0 = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.Build.0 = Debug Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.ActiveCfg = Debug|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.Build.0 = Debug|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.ActiveCfg = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.Build.0 = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.ActiveCfg = Release Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.Build.0 = Release Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.ActiveCfg = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.Build.0 = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x86.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.Build.0 = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.Build.0 = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.Build.0 = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x86.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x86.ActiveCfg = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x86.ActiveCfg = Debug|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.ActiveCfg = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.Build.0 = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x86.ActiveCfg = Release Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.ActiveCfg = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x86.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.ActiveCfg = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.Build.0 = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.Build.0 = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/mRemoteNG/App.config
+++ b/mRemoteNG/App.config
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <appSettings>
-    <add key="LanguageFolder" value="Language"/>
-  </appSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="Languages"/>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/mRemoteNG/App/CompatibilityChecker.cs
+++ b/mRemoteNG/App/CompatibilityChecker.cs
@@ -7,12 +7,9 @@ using mRemoteNG.Messages;
 using mRemoteNG.Properties;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.TaskDialog;
-using mRemoteNG.Resources.Language;
-using System.Runtime.Versioning;

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class CompatibilityChecker
    {
        public static void CheckCompatibility(MessageCollector messageCollector)
@@ -35,13 +32,18 @@ namespace mRemoteNG.App

            if (!FipsPolicyEnabledForServer2003() && !FipsPolicyEnabledForServer2008AndNewer()) return;

-            string errorText = string.Format(Language.ErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
+            var errorText = string.Format(Language.ErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
            messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);

            //About to pop up a message, let's not block it...
-            FrmSplashScreenNew.GetInstance().Close();
+            FrmSplashScreen.getInstance().Close();

-            DialogResult ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName, Language.CompatibilityProblemDetected, errorText, "", "", Language.CheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.OkCancel, ESysIcons.Warning, ESysIcons.Warning);
+            var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName,
+                                                                Language.CompatibilityProblemDetected, errorText, "",
+                                                                "",
+                                                                Language.CheckboxDoNotShowThisMessageAgain,
+                                                                ETaskDialogButtons.OkCancel, ESysIcons.Warning,
+                                                                ESysIcons.Warning);
            if (CTaskDialog.VerificationChecked && ShouldIStayOrShouldIGo == DialogResult.OK)
            {
                messageCollector.AddMessage(MessageClass.ErrorMsg, "User requests that FIPS check be overridden", true);
@@ -56,7 +58,7 @@ namespace mRemoteNG.App

        private static bool FipsPolicyEnabledForServer2003()
        {
-            RegistryKey regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa");
+            var regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa");
            if (!(regKey?.GetValue("FIPSAlgorithmPolicy") is int fipsPolicy))
                return false;
            return fipsPolicy != 0;
@@ -64,7 +66,7 @@ namespace mRemoteNG.App

        private static bool FipsPolicyEnabledForServer2008AndNewer()
        {
-            RegistryKey regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy");
+            var regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy");
            if (!(regKey?.GetValue("Enabled") is int fipsPolicy))
                return false;
            return fipsPolicy != 0;
@@ -77,7 +79,7 @@ namespace mRemoteNG.App
            if (!Settings.Default.CompatibilityWarnLenovoAutoScrollUtility)
                return;

-            Process[] proccesses = new Process[] { };
+            var proccesses = new Process[] { };
            try
            {
                proccesses = Process.GetProcessesByName("virtscrl");
--- a/mRemoteNG/App/Export.cs
+++ b/mRemoteNG/App/Export.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Runtime.Versioning;
 using System.Windows.Forms;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.DataProviders;
@@ -18,16 +17,15 @@ using mRemoteNG.UI.Forms;

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class Export
    {
-        public static void ExportToFile(ConnectionInfo selectedNode, ConnectionTreeModel connectionTreeModel)
+		public static void ExportToFile(ConnectionInfo selectedNode, IConnectionTreeModel connectionTreeModel)
        {
            try
            {
-                SaveFilter saveFilter = new();
+                var saveFilter = new SaveFilter();

-                using (FrmExport exportForm = new())
+                using (var exportForm = new FrmExport())
                {
                    if (selectedNode?.GetTreeNodeType() == TreeNodeType.Container)
                        exportForm.SelectedFolder = selectedNode as ContainerInfo;
@@ -81,9 +79,9 @@ namespace mRemoteNG.App
                switch (saveFormat)
                {
                    case SaveFormat.mRXML:
-                        ICryptographyProvider cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
-                        RootNodeInfo rootNode = exportTarget.GetRootParent() as RootNodeInfo;
-                        XmlConnectionNodeSerializer28 connectionNodeSerializer = new(
+                        var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
+                        var rootNode = exportTarget.GetRootParent() as RootNodeInfo;
+                        var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
                                                                                         cryptographyProvider,
                                                                                         rootNode?.PasswordString
                                                                                                 .ConvertToSecureString() ??
@@ -95,15 +93,14 @@ namespace mRemoteNG.App
                        serializer = new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer);
                        break;
                    case SaveFormat.mRCSV:
-                        serializer =
-                            new CsvConnectionsSerializerMremotengFormat(saveFilter, Runtime.CredentialProviderCatalog);
+			            serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter, Runtime.CredentialService.RepositoryList);
                        break;
                    default:
                        throw new ArgumentOutOfRangeException(nameof(saveFormat), saveFormat, null);
                }

-                string serializedData = serializer.Serialize(exportTarget);
-                FileDataProvider fileDataProvider = new(fileName);
+                var serializedData = serializer.Serialize(exportTarget);
+                var fileDataProvider = new FileDataProvider(fileName);
                fileDataProvider.Save(serializedData);
            }
            catch (Exception ex)
--- a/mRemoteNG/App/Import.cs
+++ b/mRemoteNG/App/Import.cs
@@ -7,25 +7,22 @@ using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;
-using mRemoteNG.Resources.Language;
-using System.Runtime.Versioning;

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class Import
    {
        public static void ImportFromFile(ContainerInfo importDestinationContainer)
        {
            try
            {
-                using (OpenFileDialog openFileDialog = new())
+                using (var openFileDialog = new OpenFileDialog())
                {
                    openFileDialog.CheckFileExists = true;
                    openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
                    openFileDialog.Multiselect = true;

-                    List<string> fileTypes = new();
+                    var fileTypes = new List<string>();
                    fileTypes.AddRange(new[] {Language.FilterAllImportable, "*.xml;*.rdp;*.rdg;*.dat;*.csv"});
                    fileTypes.AddRange(new[] {Language.FiltermRemoteXML, "*.xml"});
                    fileTypes.AddRange(new[] {Language.FiltermRemoteCSV, "*.csv"});
@@ -33,7 +30,6 @@ namespace mRemoteNG.App
                    fileTypes.AddRange(new[] {Language.FilterRdgFiles, "*.rdg"});
                    fileTypes.AddRange(new[] {Language.FilterPuttyConnectionManager, "*.dat"});
                    fileTypes.AddRange(new[] {Language.FilterAll, "*.*"});
-                    fileTypes.AddRange(new[] { Language.FilterSecureCRT, "*.crt" });

                    openFileDialog.Filter = string.Join("|", fileTypes.ToArray());

@@ -41,8 +37,8 @@ namespace mRemoteNG.App
                        return;

 					HeadlessFileImport(
-						openFileDialog.FileNames,
-						importDestinationContainer,
+						openFileDialog.FileNames, 
+						importDestinationContainer, 
 						Runtime.ConnectionsService,
 						fileName => MessageBox.Show(string.Format(Language.ImportFileFailedContent, fileName), Language.AskUpdatesMainInstruction,
 							MessageBoxButtons.OK, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1));
@@ -54,50 +50,19 @@ namespace mRemoteNG.App
            }
        }

-        public static void ImportFromRemoteDesktopManagerCsv(ContainerInfo importDestinationContainer)
-        {
-            try
-            {
-                using (Runtime.ConnectionsService.BatchedSavingContext())
-                {
-                    using (OpenFileDialog openFileDialog = new())
-                    {
-                        openFileDialog.CheckFileExists = true;
-                        openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-                        openFileDialog.Multiselect = false;
-
-                        List<string> fileTypes = new();
-                        fileTypes.AddRange(new[] {Language.FiltermRemoteRemoteDesktopManagerCSV, "*.csv"});
-
-                        openFileDialog.Filter = string.Join("|", fileTypes.ToArray());
-
-                        if (openFileDialog.ShowDialog() != DialogResult.OK)
-                            return;
-
-                        RemoteDesktopManagerImporter importer = new();
-                        importer.Import(openFileDialog.FileName, importDestinationContainer);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddExceptionMessage("App.Import.ImportFromRemoteDesktopManagerCsv() failed.", ex);
-            }
-        }
-
        public static void HeadlessFileImport(
-	        IEnumerable<string> filePaths,
-	        ContainerInfo importDestinationContainer,
+	        IEnumerable<string> filePaths, 
+	        ContainerInfo importDestinationContainer, 
 	        ConnectionsService connectionsService,
 	        Action<string> exceptionAction = null)
        {
 	        using (connectionsService.BatchedSavingContext())
 	        {
-		        foreach (string fileName in filePaths)
+		        foreach (var fileName in filePaths)
 		        {
 			        try
 			        {
-                        IConnectionImporter<string> importer = BuildConnectionImporterFromFileExtension(fileName);
+				        var importer = BuildConnectionImporterFromFileExtension(fileName);
 				        importer.Import(fileName, importDestinationContainer);
 			        }
 			        catch (Exception ex)
@@ -134,7 +99,7 @@ namespace mRemoteNG.App
            {
 	            using (Runtime.ConnectionsService.BatchedSavingContext())
 	            {
-                    PortScanImporter importer = new(protocol);
+					var importer = new PortScanImporter(protocol);
 					importer.Import(hosts, importDestinationContainer);
 	            }
            }
@@ -144,25 +109,10 @@ namespace mRemoteNG.App
            }
        }

-        internal static void ImportFromPutty(ContainerInfo selectedNodeAsContainer)
-        {
-            try
-            {
-                using (Runtime.ConnectionsService.BatchedSavingContext())
-                {
-                    RegistryImporter.Import("Software\\SimonTatham\\PuTTY\\Sessions", selectedNodeAsContainer);
-                }
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddExceptionMessage("App.Import.ImportFromPutty() failed.", ex);
-            }
-        }
-
        private static IConnectionImporter<string> BuildConnectionImporterFromFileExtension(string fileName)
        {
            // TODO: Use the file contents to determine the file type instead of trusting the extension
-            string extension = Path.GetExtension(fileName) ?? "";
+            var extension = Path.GetExtension(fileName) ?? "";
            switch (extension.ToLowerInvariant())
            {
                case ".xml":
@@ -175,8 +125,6 @@ namespace mRemoteNG.App
                    return new RemoteDesktopConnectionManagerImporter();
                case ".dat":
                    return new PuttyConnectionManagerImporter();
-                case ".crt":
-                    return new SecureCRTImporter();
                default:
                    throw new FileFormatException("Unrecognized file format.");
            }
--- a/mRemoteNG/App/Info/ConnectionsFileInfo.cs
+++ b/mRemoteNG/App/Info/ConnectionsFileInfo.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Runtime.Versioning;
-
-namespace mRemoteNG.App.Info
-{
-    [SupportedOSPlatform("windows")]
-    public static class ConnectionsFileInfo
-    {
-        public static readonly string DefaultConnectionsPath = SettingsFileInfo.SettingsPath;
-        public static readonly string DefaultConnectionsFile = "confCons.xml";
-        public static readonly string DefaultConnectionsFileNew = "confConsNew.xml";
-        public static readonly Version ConnectionFileVersion = new(3, 0);
-    }
+namespace mRemoteNG.App.Info
+{
+    public static class ConnectionsFileInfo
+    {
+        public static readonly string DefaultConnectionsPath = SettingsFileInfo.SettingsPath;
+        public static readonly string DefaultConnectionsFile = "confCons.xml";
+        public static readonly string DefaultConnectionsFileNew = "confConsNew.xml";
+        public static readonly double ConnectionFileVersion = 2.8;
+    }
 }
--- a/mRemoteNG/App/Info/CredentialsFileInfo.cs
+++ b/mRemoteNG/App/Info/CredentialsFileInfo.cs
@@ -1,8 +1,5 @@
-using System.Runtime.Versioning;
-
-namespace mRemoteNG.App.Info
+namespace mRemoteNG.App.Info
 {
-    [SupportedOSPlatform("windows")]
    public class CredentialsFileInfo
    {
        public static readonly string CredentialsPath = SettingsFileInfo.SettingsPath;
--- a/mRemoteNG/App/Info/GeneralAppInfo.cs
+++ b/mRemoteNG/App/Info/GeneralAppInfo.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Runtime.Versioning;
 using System.Threading;
 using System.Windows.Forms;
 using static System.Environment;
@@ -10,33 +9,37 @@ using static System.Environment;

 namespace mRemoteNG.App.Info
 {
-    [SupportedOSPlatform("windows")]
    public static class GeneralAppInfo
    {
-        public const string UrlHome = "https://mremoteng.org";
+        public const string UrlHome = "https://www.mremoteng.org";
        public const string UrlDonate = "https://mremoteng.org/contribute";
        public const string UrlForum = "https://www.reddit.com/r/mRemoteNG";
        public const string UrlBugs = "https://bugs.mremoteng.org";
        public const string UrlDocumentation = "https://mremoteng.readthedocs.io/en/latest/";
-        public static readonly string ApplicationVersion = Application.ProductVersion;
+        public static string ApplicationVersion = Application.ProductVersion;
        public static readonly string ProductName = Application.ProductName;
-        public static readonly string Copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(AssemblyCopyrightAttribute), false))?.Copyright;
+
+        public static readonly string Copyright =
+            ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(),
+                                                                      typeof(AssemblyCopyrightAttribute), false))
+            .Copyright;
+
        public static readonly string HomePath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);

        //public static string ReportingFilePath = "";
-        private static readonly string puttyPath = HomePath + "\\PuTTYNG.exe";
+        public static readonly string PuttyPath = HomePath + "\\PuTTYNG.exe";

        public static string UserAgent
        {
            get
            {
-                List<string> details =
-                [
+                var details = new List<string>
+                {
                    "compatible",
                    OSVersion.Platform == PlatformID.Win32NT
                        ? $"Windows NT {OSVersion.Version.Major}.{OSVersion.Version.Minor}"
                        : OSVersion.VersionString
-                ];
+                };
                if (Is64BitProcess)
                {
                    details.Add("WOW64");
@@ -44,17 +47,15 @@ namespace mRemoteNG.App.Info

                details.Add(Thread.CurrentThread.CurrentUICulture.Name);
                details.Add($".NET CLR {Environment.Version}");
-                string detailsString = string.Join("; ", [.. details]);
+                var detailsString = string.Join("; ", details.ToArray());

                return $"Mozilla/5.0 ({detailsString}) {ProductName}/{ApplicationVersion}";
            }
        }

-        public static string PuttyPath => puttyPath;
-
        public static Version GetApplicationVersion()
        {
-            _ = System.Version.TryParse(ApplicationVersion, out Version v);
+            System.Version.TryParse(ApplicationVersion, out var v);
            return v;
        }
    }
--- a/mRemoteNG/App/Info/SettingsFileInfo.cs
+++ b/mRemoteNG/App/Info/SettingsFileInfo.cs
@@ -1,23 +1,24 @@
 using System;
 using System.IO;
 using System.Reflection;
-using System.Runtime.Versioning;
 using System.Windows.Forms;
 using mRemoteNG.Connection;

 namespace mRemoteNG.App.Info
 {
-    [SupportedOSPlatform("windows")]
    public static class SettingsFileInfo
    {
-        private static readonly string ExePath = Path.GetDirectoryName(Assembly.GetAssembly(typeof(ConnectionInfo))?.Location);
+        private static readonly string ExePath =
+            Path.GetDirectoryName(Assembly.GetAssembly(typeof(ConnectionInfo))?.Location);

-        public static string SettingsPath => Runtime.IsPortableEdition ? ExePath : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName;
+        public static string SettingsPath =>
+            Runtime.IsPortableEdition
+                ? ExePath
+                : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName;

        public static string LayoutFileName { get; } = "pnlLayout.xml";
        public static string ExtAppsFilesName { get; } = "extApps.xml";
        public static string ThemesFileName { get; } = "Themes.xml";
-        public static string LocalConnectionProperties { get; } = "LocalConnectionProperties.xml";

        public static string ThemeFolder { get; } =
            SettingsPath != null ? Path.Combine(SettingsPath, "Themes") : String.Empty;
--- a/mRemoteNG/App/Info/UpdateChannelInfo.cs
+++ b/mRemoteNG/App/Info/UpdateChannelInfo.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Runtime.Versioning;
 using mRemoteNG.Properties;

 // ReSharper disable InconsistentNaming

 namespace mRemoteNG.App.Info
 {
-    [SupportedOSPlatform("windows")]
    public static class UpdateChannelInfo
    {
        public const string STABLE = "Stable";
@@ -24,7 +22,7 @@ namespace mRemoteNG.App.Info

        public static Uri GetUpdateChannelInfo()
        {
-            string channel = IsValidChannel(Properties.OptionsUpdatesPage.Default.UpdateChannel) ? Properties.OptionsUpdatesPage.Default.UpdateChannel : STABLE;
+            var channel = IsValidChannel(Settings.Default.UpdateChannel) ? Settings.Default.UpdateChannel : STABLE;
            return GetUpdateTxtUri(channel);
        }

@@ -67,7 +65,7 @@ namespace mRemoteNG.App.Info

        private static Uri GetUpdateTxtUri(string channel)
        {
-            return new Uri(new Uri(Properties.OptionsUpdatesPage.Default.UpdateAddress),
+            return new Uri(new Uri(Settings.Default.UpdateAddress),
                           new Uri(GetChannelFileName(channel), UriKind.Relative));
        }

--- a/mRemoteNG/App/Info/WindowsRegistryInfo.cs
+++ b/mRemoteNG/App/Info/WindowsRegistryInfo.cs
@@ -1,87 +0,0 @@
-using Microsoft.Win32;
-using System.Runtime.Versioning;
-
-namespace mRemoteNG.App.Info
-{
-    [SupportedOSPlatform("windows")]
-    public static class WindowsRegistryInfo
-    {
-        #region General Parameters
-
-        public const RegistryHive Hive = RegistryHive.LocalMachine;
-        public const string RootKey = "SOFTWARE\\mRemoteNG";
-        private const string OptionsSubKey = "Options";
-
-        #endregion
-
-        #region Key Locations
-
-        // StartupExit
-        // Registry subkey for general application startup and exit settings
-        // Registry subkey for startup and exit options page settings
-        public const string StartupExit = RootKey + "\\StartupExit";
-        public const string StartupExitOptions = StartupExit + "\\" + OptionsSubKey;
-
-        // Appearance
-        // Registry subkey for general application appearance settings
-        // Registry subkey for appearance options page settings
-        public const string Appearance = RootKey + "\\Appearance";
-        public const string AppearanceOptions = Appearance + "\\" + OptionsSubKey;
-
-        // Connections
-        // Registry subkey for general application connection settings
-        // Registry subkey for connections options page settings
-        public const string Connection = RootKey + "\\Connections";
-        public const string ConnectionOptions = Connection + "\\" + OptionsSubKey;
-
-        // Tabs & Panels
-        // Registry subkey for general application tabs and panels settings
-        // Registry subkey for tabs and panels options page settings
-        public const string TabsAndPanels = RootKey + "\\TabsAndPanels";
-        public const string TabsAndPanelsOptions = TabsAndPanels + "\\" + OptionsSubKey;
-
-        // Notifications
-        // Registry subkey for general application notifications settings
-        // Registry subkey for notifications options page settings
-        public const string Notification = RootKey + "\\Notifications";
-        public const string NotificationOptions = Notification + "\\" + OptionsSubKey;
-
-        // Credential
-        // Registry subkey for general application credentials settings
-        // Registry subkey for credentials options page settings
-        public const string Credential = RootKey + "\\Credentials";
-        public const string CredentialOptions = Credential + "\\" + OptionsSubKey;
-
-        // SQL Server
-        // Registry subkey for general application SQL server settings
-        // Registry subkey for SQL server options page settings
-        public const string SQLServer = RootKey + "\\SQLServer";
-        public const string SQLServerOptions = SQLServer + "\\" + OptionsSubKey;
-
-        // Updates
-        // Registry subkey for general application update settings
-        // Registry subkey for updates options page settings
-        public const string Update = RootKey + "\\Updates";
-        public const string UpdateOptions = Update + "\\" + OptionsSubKey;
-
-        // Security
-        // Registry subkey for general application security settings
-        // Registry subkey for security options page settings
-        public const string Security = RootKey + "\\Security";
-        public const string SecurityOptions = Security + "\\" + OptionsSubKey;
-
-        // Advanced
-        // Registry subkey for general application advanced settings
-        // Registry subkey for advanced options page settings
-        public const string Advanced = RootKey + "\\Advanced";
-        public const string AdvancedOptions = Advanced + "\\" + OptionsSubKey;
-
-        // Backup
-        // Registry subkey for general application backup settings
-        // Registry subkey for backup options page settings
-        public const string Backup = RootKey + "\\Backup";
-        public const string BackupOptions = Backup + "\\" + OptionsSubKey;
-
-        #endregion
-    }
-}
--- a/mRemoteNG/App/Initialization/ConnectionIconLoader.cs
+++ b/mRemoteNG/App/Initialization/ConnectionIconLoader.cs
@@ -1,12 +1,10 @@
 using System;
 using System.IO;
-using System.Runtime.Versioning;
 using mRemoteNG.Connection;


 namespace mRemoteNG.App.Initialization
 {
-    [SupportedOSPlatform("windows")]
    public class ConnectionIconLoader
    {
        private readonly string _path;
@@ -24,9 +22,9 @@ namespace mRemoteNG.App.Initialization
            if (Directory.Exists(_path) == false)
                return;

-            foreach (string f in Directory.GetFiles(_path, "*.ico", SearchOption.AllDirectories))
+            foreach (var f in Directory.GetFiles(_path, "*.ico", SearchOption.AllDirectories))
            {
-                FileInfo fInfo = new(f);
+                var fInfo = new FileInfo(f);
                Array.Resize(ref ConnectionIcon.Icons, ConnectionIcon.Icons.Length + 1);
                ConnectionIcon.Icons.SetValue(fInfo.Name.Replace(".ico", ""), ConnectionIcon.Icons.Length - 1);
            }
--- a/mRemoteNG/App/Initialization/CredsAndConsSetup.cs
+++ b/mRemoteNG/App/Initialization/CredsAndConsSetup.cs
@@ -1,21 +1,38 @@
-using System.IO;
-using System.Runtime.Versioning;
+using System;
+using System.IO;
+using System.Linq;
 using mRemoteNG.Config.Connections;
+using mRemoteNG.Connection;
+using mRemoteNG.Credential;
+using mRemoteNG.Tools;
 using mRemoteNG.Properties;

 namespace mRemoteNG.App.Initialization
 {
-    [SupportedOSPlatform("windows")]
    public class CredsAndConsSetup
    {
-        public void LoadCredsAndCons()
+        public void LoadCredsAndCons(ConnectionsService connectionsService, CredentialService credentialService, SaveConnectionsOnEdit connectionsOnEdit)
        {
-            new SaveConnectionsOnEdit(Runtime.ConnectionsService);
+            connectionsOnEdit.Subscribe(connectionsService);

-            if (Properties.App.Default.FirstStart && !Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation && !File.Exists(Runtime.ConnectionsService.GetStartupConnectionFileName()))
-                Runtime.ConnectionsService.NewConnectionsFile(Runtime.ConnectionsService.GetStartupConnectionFileName());
+            if (Settings.Default.FirstStart && !Settings.Default.LoadConsFromCustomLocation && 
+				!File.Exists(connectionsService.GetStartupConnectionFileName()))
+                connectionsService.NewConnectionsFile(connectionsService.GetStartupConnectionFileName());

+            credentialService.LoadRepositoryList();
+            LoadDefaultConnectionCredentials(credentialService);
            Runtime.LoadConnections();
        }
+
+        private void LoadDefaultConnectionCredentials(CredentialService credentialService)
+        {
+            var defaultCredId = Settings.Default.ConDefaultCredentialRecord;
+            var matchedCredentials = credentialService
+                .GetCredentialRecords()
+                .Where(record => record.Id.Equals(defaultCredId))
+                .ToArray();
+
+            DefaultConnectionInfo.Instance.CredentialRecordId = Optional<Guid>.FromNullable(matchedCredentials.FirstOrDefault()?.Id);
+        }
    }
 }
--- a/mRemoteNG/App/Initialization/MessageCollectorSetup.cs
+++ b/mRemoteNG/App/Initialization/MessageCollectorSetup.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Versioning;
 using mRemoteNG.Messages;
 using mRemoteNG.Messages.MessageFilteringOptions;
 using mRemoteNG.Messages.MessageWriters;
@@ -8,24 +7,17 @@ using mRemoteNG.Messages.WriterDecorators;

 namespace mRemoteNG.App.Initialization
 {
-    [SupportedOSPlatform("windows")]
    public class MessageCollectorSetup
    {
-        public static void SetupMessageCollector(MessageCollector messageCollector, IList<IMessageWriter> messageWriterList)
+        public static void SetupMessageCollector(MessageCollector messageCollector,
+                                                 IList<IMessageWriter> messageWriterList)
        {
            messageCollector.CollectionChanged += (o, args) =>
            {
-                if (args.NewItems == null) return;
-
-                IMessage[] messages = args.NewItems.Cast<IMessage>().ToArray();
-
-                foreach (IMessageWriter printer in messageWriterList)
-                {
-                    foreach (IMessage message in messages)
-                    {
+                var messages = args.NewItems.Cast<IMessage>().ToArray();
+                foreach (var printer in messageWriterList)
+                    foreach (var message in messages)
                        printer.Write(message);
-                    }
-                }
            };
        }

@@ -47,30 +39,37 @@ namespace mRemoteNG.App.Initialization
        private static IMessageWriter BuildTextLogMessageWriter()
        {
            return new MessageTypeFilterDecorator(
-                new LogMessageTypeFilteringOptions(),
-                new TextLogMessageWriter(Logger.Instance)
-                );
+                                                  new LogMessageTypeFilteringOptions(),
+                                                  new TextLogMessageWriter(Logger.Instance)
+                                                 );
        }

        private static IMessageWriter BuildNotificationPanelMessageWriter()
        {
            return new OnlyLogMessageFilter(
-                new MessageTypeFilterDecorator(
-                    new NotificationPanelMessageFilteringOptions(),
-                    new MessageFocusDecorator(Windows.ErrorsForm,
-                    new NotificationPanelSwitchOnMessageFilteringOptions(),
-                    new NotificationPanelMessageWriter(Windows.ErrorsForm))
-                    )
-                );
+                                            new MessageTypeFilterDecorator(
+                                                                           new
+                                                                               NotificationPanelMessageFilteringOptions(),
+                                                                           new MessageFocusDecorator(
+                                                                                                     Windows.ErrorsForm,
+                                                                                                     new
+                                                                                                         NotificationPanelSwitchOnMessageFilteringOptions(),
+                                                                                                     new
+                                                                                                         NotificationPanelMessageWriter(Windows
+                                                                                                                                            .ErrorsForm)
+                                                                                                    )
+                                                                          )
+                                           );
        }

        private static IMessageWriter BuildPopupMessageWriter()
        {
            return new OnlyLogMessageFilter(
-                new MessageTypeFilterDecorator(
-                    new PopupMessageFilteringOptions(),
-                    new PopupMessageWriter())
-                );
+                                            new MessageTypeFilterDecorator(
+                                                                           new PopupMessageFilteringOptions(),
+                                                                           new PopupMessageWriter()
+                                                                          )
+                                           );
        }
    }
 }
--- a/mRemoteNG/App/Initialization/StartupDataLogger.cs
+++ b/mRemoteNG/App/Initialization/StartupDataLogger.cs
@@ -1,21 +1,21 @@
 using System;
 using System.Management;
-using System.Runtime.Versioning;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.Messages;
-using mRemoteNG.Resources.Language;

 namespace mRemoteNG.App.Initialization
 {
-    [SupportedOSPlatform("windows")]
    public class StartupDataLogger
    {
        private readonly MessageCollector _messageCollector;

        public StartupDataLogger(MessageCollector messageCollector)
        {
-            _messageCollector = messageCollector ?? throw new ArgumentNullException(nameof(messageCollector));
+            if (messageCollector == null)
+                throw new ArgumentNullException(nameof(messageCollector));
+
+            _messageCollector = messageCollector;
        }

        public void LogStartupData()
@@ -29,25 +29,25 @@ namespace mRemoteNG.App.Initialization

        private void LogSystemData()
        {
-            string osData = GetOperatingSystemData();
-            string architecture = GetArchitectureData();
-            string[] nonEmptyData = Array.FindAll(new[] {osData, architecture}, s => !string.IsNullOrEmpty(s));
-            string data = string.Join(" ", nonEmptyData);
+            var osData = GetOperatingSystemData();
+            var architecture = GetArchitectureData();
+            var nonEmptyData = Array.FindAll(new[] {osData, architecture}, s => !string.IsNullOrEmpty(s));
+            var data = string.Join(" ", nonEmptyData);
            _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
        }

        private string GetOperatingSystemData()
        {
-            string osVersion = string.Empty;
-            string servicePack = string.Empty;
+            var osVersion = string.Empty;
+            var servicePack = string.Empty;

            try
            {
-                foreach (ManagementBaseObject o in new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem WHERE Primary=True")
+                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem WHERE Primary=True")
                    .Get())
                {
-                    ManagementObject managementObject = (ManagementObject)o;
-                    osVersion = Convert.ToString(managementObject.GetPropertyValue("Caption"))?.Trim();
+                    var managementObject = (ManagementObject)o;
+                    osVersion = Convert.ToString(managementObject.GetPropertyValue("Caption")).Trim();
                    servicePack = GetOSServicePack(servicePack, managementObject);
                }
            }
@@ -56,13 +56,13 @@ namespace mRemoteNG.App.Initialization
                _messageCollector.AddExceptionMessage("Error retrieving operating system information from WMI.", ex);
            }

-            string osData = string.Join(" ", osVersion, servicePack);
+            var osData = string.Join(" ", osVersion, servicePack);
            return osData;
        }

        private string GetOSServicePack(string servicePack, ManagementObject managementObject)
        {
-            int servicePackNumber = Convert.ToInt32(managementObject.GetPropertyValue("ServicePackMajorVersion"));
+            var servicePackNumber = Convert.ToInt32(managementObject.GetPropertyValue("ServicePackMajorVersion"));
            if (servicePackNumber != 0)
            {
                servicePack = $"Service Pack {servicePackNumber}";
@@ -73,13 +73,14 @@ namespace mRemoteNG.App.Initialization

        private string GetArchitectureData()
        {
-            string architecture = string.Empty;
+            var architecture = string.Empty;
            try
            {
-                foreach (ManagementBaseObject o in new ManagementObjectSearcher("SELECT AddressWidth FROM Win32_Processor WHERE DeviceID=\'CPU0\'").Get())
+                foreach (var o in new ManagementObjectSearcher("SELECT AddressWidth FROM Win32_Processor WHERE DeviceID=\'CPU0\'")
+                    .Get())
                {
-                    ManagementObject managementObject = (ManagementObject)o;
-                    int addressWidth = Convert.ToInt32(managementObject.GetPropertyValue("AddressWidth"));
+                    var managementObject = (ManagementObject)o;
+                    var addressWidth = Convert.ToInt32(managementObject.GetPropertyValue("AddressWidth"));
                    architecture = $"{addressWidth}-bit";
                }
            }
@@ -93,7 +94,7 @@ namespace mRemoteNG.App.Initialization

        private void LogApplicationData()
        {
-            string data = $"{Application.ProductName} {Application.ProductVersion}";
+            var data = $"{Application.ProductName} {Application.ProductVersion}";
            if (Runtime.IsPortableEdition)
                data += $" {Language.PortableEdition}";
            data += " starting.";
@@ -102,19 +103,20 @@ namespace mRemoteNG.App.Initialization

        private void LogCmdLineArgs()
        {
-            string data = $"Command Line: {string.Join(" ", Environment.GetCommandLineArgs())}";
+            var data = $"Command Line: {string.Join(" ", Environment.GetCommandLineArgs())}";
            _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
        }

        private void LogClrData()
        {
-            string data = $"Microsoft .NET CLR {Environment.Version}";
+            var data = $"Microsoft .NET CLR {Environment.Version}";
            _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
        }

        private void LogCultureData()
        {
-            string data = $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}";
+            var data =
+                $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}";
            _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
        }
    }
--- a/mRemoteNG/App/Logger.cs
+++ b/mRemoteNG/App/Logger.cs
@@ -1,18 +1,18 @@
-using System;
+using System;
 using System.IO;
-using System.Runtime.Versioning;
 using System.Windows.Forms;
 using log4net;
 using log4net.Appender;
 using log4net.Config;
-using log4net.Repository;
+using mRemoteNG.Properties;
+
+// ReSharper disable ArrangeAccessorOwnerBody

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public class Logger
    {
-        public static readonly Logger Instance = new();
+        public static readonly Logger Instance = new Logger();

        public ILog Log { get; private set; }

@@ -26,27 +26,21 @@ namespace mRemoteNG.App
        private void Initialize()
        {
            XmlConfigurator.Configure(LogManager.CreateRepository("mRemoteNG"));
+            if (string.IsNullOrEmpty(Settings.Default.LogFilePath))
+                Settings.Default.LogFilePath = BuildLogFilePath();

-            if (string.IsNullOrEmpty(Properties.OptionsNotificationsPage.Default.LogFilePath))
-            {
-                Properties.OptionsNotificationsPage.Default.LogFilePath = BuildLogFilePath();
-            }
-
-            SetLogPath(Properties.OptionsNotificationsPage.Default.LogToApplicationDirectory ? DefaultLogPath : Properties.OptionsNotificationsPage.Default.LogFilePath);
+            SetLogPath(Settings.Default.LogToApplicationDirectory ? DefaultLogPath : Settings.Default.LogFilePath);
        }

        public void SetLogPath(string path)
        {
-            ILoggerRepository repository = LogManager.GetRepository("mRemoteNG");
+            var repository = LogManager.GetRepository("mRemoteNG");
+            var appenders = repository.GetAppenders();

-            XmlConfigurator.Configure(repository, new FileInfo("log4net.config"));
-
-            IAppender[] appenders = repository.GetAppenders();
-
-            foreach (IAppender appender in appenders)
+            foreach (var appender in appenders)
            {
-                RollingFileAppender fileAppender = (RollingFileAppender)appender;
-                if (fileAppender is not { Name: "LogFileAppender" }) continue;
+                var fileAppender = (RollingFileAppender)appender;
+                if (fileAppender == null || fileAppender.Name != "LogFileAppender") continue;
                fileAppender.File = path;
                fileAppender.ActivateOptions();
            }
@@ -56,26 +50,22 @@ namespace mRemoteNG.App

        private static string BuildLogFilePath()
        {
-            string logFilePath = Runtime.IsPortableEdition ? GetLogPathPortableEdition() : GetLogPathNormalEdition();
-
-            string logFileName = Path.ChangeExtension(Application.ProductName, ".log");
-
+            var logFilePath = Runtime.IsPortableEdition ? GetLogPathPortableEdition() : GetLogPathNormalEdition();
+            var logFileName = Path.ChangeExtension(Application.ProductName, ".log");
            if (logFileName == null) return "mRemoteNG.log";
-
-            string logFile = Path.Combine(logFilePath, logFileName);
-
+            var logFile = Path.Combine(logFilePath, logFileName);
            return logFile;
        }

        private static string GetLogPathNormalEdition()
        {
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName);
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                                Application.ProductName);
        }

        private static string GetLogPathPortableEdition()
        {
            return Application.StartupPath;
        }
-
    }
 }
--- a/mRemoteNG/App/NativeMethods.cs
+++ b/mRemoteNG/App/NativeMethods.cs
@@ -1,8 +1,7 @@
-using System;
+using System;
 using System.Drawing;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
 using System.Text;

 #pragma warning disable 649
@@ -10,7 +9,6 @@ using System.Text;

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class NativeMethods
    {
        #region Functions
@@ -73,12 +71,6 @@ namespace mRemoteNG.App
        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
        internal static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer);

-        [DllImport("User32.dll", CharSet = CharSet.Auto)]
-        internal static extern bool ChangeClipboardChain(
-            IntPtr hWndRemove,  // handle to window to remove
-            IntPtr hWndNewNext  // handle to next window
-        );
-
        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
        internal static extern bool SetForegroundWindow(IntPtr hWnd);

@@ -114,6 +106,7 @@ namespace mRemoteNG.App
        internal static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);

        [DllImport("kernel32", SetLastError = true)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
        internal static extern bool CloseHandle(IntPtr handle);

        #endregion
--- a/mRemoteNG/App/ProgramRoot.cs
+++ b/mRemoteNG/App/ProgramRoot.cs
@@ -1,22 +1,15 @@
 using System;
 using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Reflection;
-using System.Runtime.Versioning;
 using System.Threading;
 using System.Windows.Forms;
-using mRemoteNG.Config.Settings;
+using mRemoteNG.Properties;
 using mRemoteNG.UI.Forms;

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class ProgramRoot
    {
        private static Mutex _mutex;
-        private static FrmSplashScreenNew _frmSplashScreen = null;
-        private static string customResourcePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Languages");

        /// <summary>
        /// The main entry point for the application.
@@ -24,79 +17,19 @@ namespace mRemoteNG.App
        [STAThread]
        public static void Main(string[] args)
        {
-            Trace.WriteLine("!!!!!!=============== TEST ==================!!!!!!!!!!!!!");
-            // Forcing to load System.Configuration.ConfigurationManager before any other assembly to be able to check settings 
-            try
-            {
-                string assemblyFile = "System.Configuration.ConfigurationManager" + ".dll";
-                string assemblyPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assemblies", assemblyFile);
-
-
-                if (File.Exists(assemblyPath))
-                {
-                    Assembly.LoadFrom(assemblyPath);
-                }
-            }
-            catch (FileNotFoundException ex)
-            {
-               Trace.WriteLine("Error occured: " + ex.Message);
-            }
-
-            //Subscribe to AssemblyResolve event
-            AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;
-
-            //Check if local settings DB exist or accessible
-            CheckLockalDB();
-
-            Lazy<bool> singleInstanceOption = new Lazy<bool>(() => Properties.OptionsStartupExitPage.Default.SingleInstance);
-
-            if (singleInstanceOption.Value)
-            {
+            if (Settings.Default.SingleInstance)
                StartApplicationAsSingleInstance();
-            }
            else
-            {
                StartApplication();
-            }
        }

-        private static void CheckLockalDB()
-        {
-            LocalSettingsDBManager settingsManager = new LocalSettingsDBManager(dbPath: "mRemoteNG.appSettings", useEncryption: false, schemaFilePath: "");
-        }
-        private static Assembly OnAssemblyResolve(object sender, ResolveEventArgs resolveArgs)
-        {
-            string assemblyName = new AssemblyName(resolveArgs.Name).Name.Replace(".resources", string.Empty);
-            string assemblyFile = assemblyName + ".dll";
-            string assemblyPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assemblies", assemblyFile);
-
-
-            if (File.Exists(assemblyPath))
-            {
-                return Assembly.LoadFrom(assemblyPath);
-            }
-            return null;
-        }
-        
        private static void StartApplication()
        {
            CatchAllUnhandledExceptions();
            Application.EnableVisualStyles();
            Application.SetCompatibleTextRenderingDefault(false);
-
-            _frmSplashScreen = FrmSplashScreenNew.GetInstance();
-
-            Screen targetScreen = Screen.PrimaryScreen;
-
-            Rectangle viewport = targetScreen.WorkingArea;
-            _frmSplashScreen.Top = viewport.Top;
-            _frmSplashScreen.Left = viewport.Left;
-            // normally it should be screens[1] however due DPI apply 1 size "same" as default with 100%
-            _frmSplashScreen.Left = viewport.Left + (targetScreen.Bounds.Size.Width - _frmSplashScreen.Width) / 2;
-            _frmSplashScreen.Top = viewport.Top + (targetScreen.Bounds.Size.Height - _frmSplashScreen.Height) / 2;
-            _frmSplashScreen.ShowInTaskbar = false;
-            _frmSplashScreen.Show();
-
+            var frmSplashScreen = FrmSplashScreen.getInstance();
+            frmSplashScreen.Show();
            Application.Run(FrmMain.Default);
        }

@@ -108,7 +41,7 @@ namespace mRemoteNG.App
        private static void StartApplicationAsSingleInstance()
        {
            const string mutexID = "mRemoteNG_SingleInstanceMutex";
-            _mutex = new Mutex(false, mutexID, out bool newInstanceCreated);
+            _mutex = new Mutex(false, mutexID, out var newInstanceCreated);
            if (!newInstanceCreated)
            {
                SwitchToCurrentInstance();
@@ -121,18 +54,18 @@ namespace mRemoteNG.App

        private static void SwitchToCurrentInstance()
        {
-            IntPtr singletonInstanceWindowHandle = GetRunningSingletonInstanceWindowHandle();
+            var singletonInstanceWindowHandle = GetRunningSingletonInstanceWindowHandle();
            if (singletonInstanceWindowHandle == IntPtr.Zero) return;
            if (NativeMethods.IsIconic(singletonInstanceWindowHandle) != 0)
-                _ = NativeMethods.ShowWindow(singletonInstanceWindowHandle, (int)NativeMethods.SW_RESTORE);
+                NativeMethods.ShowWindow(singletonInstanceWindowHandle, (int)NativeMethods.SW_RESTORE);
            NativeMethods.SetForegroundWindow(singletonInstanceWindowHandle);
        }

        private static IntPtr GetRunningSingletonInstanceWindowHandle()
        {
-            IntPtr windowHandle = IntPtr.Zero;
-            Process currentProcess = Process.GetCurrentProcess();
-            foreach (Process enumeratedProcess in Process.GetProcessesByName(currentProcess.ProcessName))
+            var windowHandle = IntPtr.Zero;
+            var currentProcess = Process.GetCurrentProcess();
+            foreach (var enumeratedProcess in Process.GetProcessesByName(currentProcess.ProcessName))
            {
                if (enumeratedProcess.Id != currentProcess.Id &&
                    enumeratedProcess.MainModule.FileName == currentProcess.MainModule.FileName &&
@@ -145,31 +78,30 @@ namespace mRemoteNG.App

        private static void CatchAllUnhandledExceptions()
        {
-            System.Windows.Forms.Application.ThreadException += ApplicationOnThreadException;
-            System.Windows.Forms.Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+            Application.ThreadException += ApplicationOnThreadException;
+            Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
            AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledException;
        }

        private static void ApplicationOnThreadException(object sender, ThreadExceptionEventArgs e)
        {
-            // if (PresentationSource.FromVisual(FrmSplashScreenNew))
-            FrmSplashScreenNew.GetInstance().Close();
+            if (!FrmSplashScreen.getInstance().IsDisposed)
+                FrmSplashScreen.getInstance().Close();

            if (FrmMain.Default.IsDisposed) return;
-
-            FrmUnhandledException window = new(e.Exception, false);
+            
+            var window = new FrmUnhandledException(e.Exception, false);
            window.ShowDialog(FrmMain.Default);
+            
        }

        private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e)
        {
-            //TODO: Check if splash closed properly
-            //if (!FrmSplashScreenNew.GetInstance().IsDisposed)
-            //    FrmSplashScreenNew.GetInstance().Close();
+            if (!FrmSplashScreen.getInstance().IsDisposed)
+                FrmSplashScreen.getInstance().Close();

-            FrmUnhandledException window = new(e.ExceptionObject as Exception, e.IsTerminating);
+            var window = new FrmUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
            window.ShowDialog(FrmMain.Default);
        }
-        
    }
 }
--- a/mRemoteNG/App/Runtime.cs
+++ b/mRemoteNG/App/Runtime.cs
@@ -2,7 +2,6 @@
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection;
 using mRemoteNG.Credential;
-using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Messages;
 using mRemoteNG.Security;
 using mRemoteNG.Tools;
@@ -16,12 +15,9 @@ using System.Security;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.Properties;
-using mRemoteNG.Resources.Language;
-using System.Runtime.Versioning;

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class Runtime
    {
        public static bool IsPortableEdition
@@ -39,26 +35,25 @@ namespace mRemoteNG.App
        /// <summary>
        /// Feature flag to enable the credential manager feature
        /// </summary>
-        public static bool UseCredentialManager => false;
+        public static bool UseCredentialManager => true;

        public static WindowList WindowList { get; set; }
        public static MessageCollector MessageCollector { get; } = new MessageCollector();
        public static NotificationAreaIcon NotificationAreaIcon { get; set; }
        public static ExternalToolsService ExternalToolsService { get; } = new ExternalToolsService();

-        public static SecureString EncryptionKey { get; set; } = new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString();
+        public static SecureString EncryptionKey { get; set; } =
+            new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString();

-        public static ICredentialRepositoryList CredentialProviderCatalog { get; } = new CredentialRepositoryList();
+        public static CredentialService CredentialService { get; } = new CredentialServiceFactory().Build();

-        public static ConnectionInitiator ConnectionInitiator { get; set; } = new ConnectionInitiator();
-
-        public static ConnectionsService ConnectionsService { get; } = new ConnectionsService(PuttySessionsManager.Instance);
+        public static ConnectionsService ConnectionsService { get; } = new ConnectionsService(PuttySessionsManager.Instance, CredentialService);

        #region Connections Loading/Saving

        public static void LoadConnectionsAsync()
        {
-            Thread t = new(LoadConnectionsBGd);
+            var t = new Thread(LoadConnectionsBGd);
            t.SetApartmentState(ApartmentState.STA);
            t.Start();
        }
@@ -77,7 +72,7 @@ namespace mRemoteNG.App
        /// </param>
        public static void LoadConnections(bool withDialog = false)
        {
-            string connectionFileName = "";
+            var connectionFileName = "";

            try
            {
@@ -86,28 +81,24 @@ namespace mRemoteNG.App

                if (withDialog)
                {
-                    OpenFileDialog loadDialog = DialogFactory.BuildLoadConnectionsDialog();
+                    var loadDialog = DialogFactory.BuildLoadConnectionsDialog();
                    if (loadDialog.ShowDialog() != DialogResult.OK)
                        return;

                    connectionFileName = loadDialog.FileName;
-                    Properties.OptionsDBsPage.Default.UseSQLServer = false;
-                    Properties.OptionsDBsPage.Default.Save();
+                    Settings.Default.UseSQLServer = false;
+                    Settings.Default.Save();
                }
-                else if (!Properties.OptionsDBsPage.Default.UseSQLServer)
+                else if (!Settings.Default.UseSQLServer)
                {
                    connectionFileName = ConnectionsService.GetStartupConnectionFileName();
                }

-                ConnectionsService.LoadConnections(Properties.OptionsDBsPage.Default.UseSQLServer, false, connectionFileName);
+                ConnectionsService.LoadConnections(Settings.Default.UseSQLServer, connectionFileName);

-                if (Properties.OptionsDBsPage.Default.UseSQLServer)
+                if (Settings.Default.UseSQLServer)
                {
-                    ConnectionsService.LastSqlUpdate = DateTime.Now.ToUniversalTime();
-                } 
-				else
-                {
-                    ConnectionsService.LastFileUpdate =  System.IO.File.GetLastWriteTime(connectionFileName);
+                    ConnectionsService.LastSqlUpdate = DateTime.Now;
                }

                // re-enable sql update checking after updates are loaded
@@ -115,20 +106,26 @@ namespace mRemoteNG.App
            }
            catch (Exception ex)
            {
-                FrmSplashScreenNew.GetInstance().Close();
+                FrmSplashScreen.getInstance().Close();

-                if (Properties.OptionsDBsPage.Default.UseSQLServer)
+                if (Settings.Default.UseSQLServer)
                {
                    MessageCollector.AddExceptionMessage(Language.LoadFromSqlFailed, ex);
-                    string commandButtons = string.Join("|", Language._TryAgain, Language.CommandOpenConnectionFile, string.Format(Language.CommandExitProgram, Application.ProductName));
-                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.LoadFromSqlFailed, Language.LoadFromSqlFailedContent, MiscTools.GetExceptionMessageRecursive(ex), "", "", commandButtons, false, ESysIcons.Error, ESysIcons.Error);
+                    var commandButtons = string.Join("|", Language._TryAgain,
+                                                     Language.CommandOpenConnectionFile,
+                                                     string.Format(Language.CommandExitProgram,
+                                                                   Application.ProductName));
+                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.LoadFromSqlFailed,
+                                               Language.LoadFromSqlFailedContent,
+                                               MiscTools.GetExceptionMessageRecursive(ex), "", "",
+                                               commandButtons, false, ESysIcons.Error, ESysIcons.Error);
                    switch (CTaskDialog.CommandButtonResult)
                    {
                        case 0:
                            LoadConnections(withDialog);
                            return;
                        case 1:
-                            Properties.OptionsDBsPage.Default.UseSQLServer = false;
+                            Settings.Default.UseSQLServer = false;
                            LoadConnections(true);
                            return;
                        default:
@@ -152,12 +149,19 @@ namespace mRemoteNG.App
                        Language.Exit
                    };

-                    bool answered = false;
+                    var answered = false;
                    while (!answered)
                    {
                        try
                        {
-                            CTaskDialog.ShowTaskDialogBox(GeneralAppInfo.ProductName, Language.ConnectionFileNotFound, "", "", "", "", "", string.Join(" | ", commandButtons), ETaskDialogButtons.None, ESysIcons.Question, ESysIcons.Question);
+                            CTaskDialog.ShowTaskDialogBox(
+                                                          GeneralAppInfo.ProductName,
+                                                          Language.ConnectionFileNotFound,
+                                                          "", "", "", "", "",
+                                                          string.Join(" | ", commandButtons),
+                                                          ETaskDialogButtons.None,
+                                                          ESysIcons.Question,
+                                                          ESysIcons.Question);

                            switch (CTaskDialog.CommandButtonResult)
                            {
@@ -182,7 +186,11 @@ namespace mRemoteNG.App
                        }
                        catch (Exception exc)
                        {
-                            MessageCollector.AddExceptionMessage(string.Format(Language.ConnectionsFileCouldNotBeLoadedNew, connectionFileName), exc, MessageClass.InformationMsg);
+                            MessageCollector.AddExceptionMessage(
+                                                                 string
+                                                                     .Format(Language.ConnectionsFileCouldNotBeLoadedNew,
+                                                                             connectionFileName), exc,
+                                                                 MessageClass.InformationMsg);
                        }
                    }

@@ -198,7 +206,12 @@ namespace mRemoteNG.App
                }
                else
                {
-                    MessageBox.Show(FrmMain.Default, string.Format(Language.ErrorStartupConnectionFileLoad, Environment.NewLine, Application.ProductName, ConnectionsService.GetStartupConnectionFileName(), MiscTools.GetExceptionMessageRecursive(ex)), @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show(FrmMain.Default,
+                                    string.Format(Language.ErrorStartupConnectionFileLoad, Environment.NewLine,
+                                                  Application.ProductName,
+                                                  ConnectionsService.GetStartupConnectionFileName(),
+                                                  MiscTools.GetExceptionMessageRecursive(ex)),
+                                    @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error);
                    Application.Exit();
                }
            }
--- a/mRemoteNG/App/Screens.cs
+++ b/mRemoteNG/App/Screens.cs
@@ -1,5 +1,4 @@
-using System.Runtime.Versioning;
-using System.Windows.Forms;
+using System.Windows.Forms;
 using mRemoteNG.UI.Forms;
 using WeifenLuo.WinFormsUI.Docking;

@@ -7,11 +6,10 @@ namespace mRemoteNG.App
 {
    public static class Screens
    {
-        [SupportedOSPlatform("windows")]
        public static void SendFormToScreen(Screen screen)
        {
-            FrmMain frmMain = FrmMain.Default;
-            bool wasMax = false;
+            var frmMain = FrmMain.Default;
+            var wasMax = false;

            if (frmMain.WindowState == FormWindowState.Maximized)
            {
--- a/mRemoteNG/App/Shutdown.cs
+++ b/mRemoteNG/App/Shutdown.cs
@@ -2,19 +2,15 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
-using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Properties;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
-using mRemoteNG.Resources.Language;
-using System.Runtime.Versioning;

 // ReSharper disable ArrangeAccessorOwnerBody

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class Shutdown
    {
        private static string _updateFilePath;
@@ -63,33 +59,8 @@ namespace mRemoteNG.App

        private static void SaveConnections()
        {
-            DateTime lastUpdate;
-            DateTime updateDate;
-            DateTime currentDate = DateTime.Now;
-
-            if ((Properties.OptionsBackupPage.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnExit))
-            {
+            if (Settings.Default.SaveConsOnExit)
                Runtime.ConnectionsService.SaveConnections();
-				return;
-            }	
-			lastUpdate = Runtime.ConnectionsService.UsingDatabase ? Runtime.ConnectionsService.LastSqlUpdate : Runtime.ConnectionsService.LastFileUpdate;
-
-            switch (Properties.OptionsBackupPage.Default.SaveConnectionsFrequency)
-            {
-                case (int)ConnectionsBackupFrequencyEnum.Daily:
-                    updateDate = lastUpdate.AddDays(1);
-                    break;
-                case (int)ConnectionsBackupFrequencyEnum.Weekly:
-                    updateDate = lastUpdate.AddDays(7);
-                    break;
-                default:
-                    return;
-            }
-
-            if (currentDate >= updateDate)
-            {
-                Runtime.ConnectionsService.SaveConnections();
-            }
        }

        private static void SaveSettings(Control quickConnectToolStrip,
@@ -121,7 +92,7 @@ namespace mRemoteNG.App
        private static void RunUpdateFile()
        {
            if (UpdatePending)
-                Process.Start(new ProcessStartInfo(_updateFilePath) { UseShellExecute = true });
+                Process.Start(_updateFilePath);
        }
    }
 }
--- a/mRemoteNG/App/Startup.cs
+++ b/mRemoteNG/App/Startup.cs
@@ -1,13 +1,11 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
-using System.Runtime.Versioning;
-using System.Threading.Tasks;
 using mRemoteNG.App.Info;
 using mRemoteNG.App.Initialization;
 using mRemoteNG.App.Update;
 using mRemoteNG.Config.Connections.Multiuser;
-using mRemoteNG.Config.Settings.Registry;
 using mRemoteNG.Connection;
 using mRemoteNG.Messages;
 using mRemoteNG.Properties;
@@ -19,10 +17,8 @@ using mRemoteNG.UI.Forms;

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public class Startup
    {
-        private RegistryLoader _RegistryLoader;
        private AppUpdater _appUpdate;
        private readonly ConnectionIconLoader _connectionIconLoader;
        private readonly FrmMain _frmMain = FrmMain.Default;
@@ -31,15 +27,19 @@ namespace mRemoteNG.App

        private Startup()
        {
-            _RegistryLoader = RegistryLoader.Instance; //created instance
-            _appUpdate = new AppUpdater(); 
+            _appUpdate = new AppUpdater();
            _connectionIconLoader = new ConnectionIconLoader(GeneralAppInfo.HomePath + "\\Icons\\");
        }

+        static Startup()
+        {
+        }
+
        public void InitializeProgram(MessageCollector messageCollector)
        {
-            Debug.Print("---------------------------" + Environment.NewLine + "[START] - " + Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture));
-            StartupDataLogger startupLogger = new(messageCollector);
+            Debug.Print("---------------------------" + Environment.NewLine + "[START] - " +
+                        Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture));
+            var startupLogger = new StartupDataLogger(messageCollector);
            startupLogger.LogStartupData();
            CompatibilityChecker.CheckCompatibility(messageCollector);
            ParseCommandLineArgs(messageCollector);
@@ -51,20 +51,21 @@ namespace mRemoteNG.App

        private static void ParseCommandLineArgs(MessageCollector messageCollector)
        {
-            StartupArgumentsInterpreter interpreter = new(messageCollector);
+            var interpreter = new StartupArgumentsInterpreter(messageCollector);
            interpreter.ParseArguments(Environment.GetCommandLineArgs());
        }

        public void CreateConnectionsProvider(MessageCollector messageCollector)
        {
            messageCollector.AddMessage(MessageClass.DebugMsg, "Determining if we need a database syncronizer");
-            if (!Properties.OptionsDBsPage.Default.UseSQLServer) return;
+            if (!Settings.Default.UseSQLServer) return;
            messageCollector.AddMessage(MessageClass.DebugMsg, "Creating database syncronizer");
-            Runtime.ConnectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker());
+            Runtime.ConnectionsService.RemoteConnectionsSyncronizer =
+                new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker());
            Runtime.ConnectionsService.RemoteConnectionsSyncronizer.Enable();
        }

-        public async Task CheckForUpdate()
+        public void CheckForUpdate()
        {
            if (_appUpdate == null)
            {
@@ -75,15 +76,43 @@ namespace mRemoteNG.App
                return;
            }

-            DateTime nextUpdateCheck = Convert.ToDateTime(Properties.OptionsUpdatesPage.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays))));
-            if (!Properties.OptionsUpdatesPage.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck)
+            var nextUpdateCheck =
+                Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add(
+                                                                                 TimeSpan
+                                                                                     .FromDays(Convert.ToDouble(Settings
+                                                                                                                .Default
+                                                                                                                .CheckForUpdatesFrequencyDays))));
+            if (!Settings.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck)
            {
                return;
            }

+            _appUpdate.GetUpdateInfoCompletedEvent += GetUpdateInfoCompleted;
+            _appUpdate.GetUpdateInfoAsync();
+        }
+
+        private void GetUpdateInfoCompleted(object sender, AsyncCompletedEventArgs e)
+        {
+            if (_frmMain.InvokeRequired)
+            {
+                _frmMain.Invoke(new AsyncCompletedEventHandler(GetUpdateInfoCompleted), sender, e);
+                return;
+            }
+
            try
            {
-                await _appUpdate.GetUpdateInfoAsync();
+                _appUpdate.GetUpdateInfoCompletedEvent -= GetUpdateInfoCompleted;
+
+                if (e.Cancelled)
+                {
+                    return;
+                }
+
+                if (e.Error != null)
+                {
+                    throw e.Error;
+                }
+
                if (_appUpdate.IsUpdateAvailable())
                {
                    Windows.Show(WindowType.Update);
@@ -91,7 +120,7 @@ namespace mRemoteNG.App
            }
            catch (Exception ex)
            {
-                Runtime.MessageCollector.AddExceptionMessage("CheckForUpdate() failed.", ex);
+                Runtime.MessageCollector.AddExceptionMessage("GetUpdateInfoCompleted() failed.", ex);
            }
        }
    }
--- a/mRemoteNG/App/SupportedCultures.cs
+++ b/mRemoteNG/App/SupportedCultures.cs
@@ -1,16 +1,14 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Runtime.Serialization;
-using System.Runtime.Versioning;
 using mRemoteNG.Properties;

 // ReSharper disable ArrangeAccessorOwnerBody

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    [Serializable]
    public sealed class SupportedCultures : Dictionary<string, string>
    {
@@ -24,11 +22,11 @@ namespace mRemoteNG.App

        private SupportedCultures()
        {
-            foreach (string CultureName in Properties.AppUI.Default.SupportedUICultures.Split(','))
+            foreach (var CultureName in Settings.Default.SupportedUICultures.Split(','))
            {
                try
                {
-                    CultureInfo CultureInfo = new(CultureName.Trim());
+                    var CultureInfo = new CultureInfo(CultureName.Trim());
                    Add(CultureInfo.Name, CultureInfo.TextInfo.ToTitleCase(CultureInfo.NativeName));
                }
                catch (Exception ex)
@@ -57,13 +55,13 @@ namespace mRemoteNG.App

        public static string get_CultureName(string CultureNativeName)
        {
-            string[] Names = new string[SingletonInstance.Count + 1];
-            string[] NativeNames = new string[SingletonInstance.Count + 1];
+            var Names = new string[SingletonInstance.Count + 1];
+            var NativeNames = new string[SingletonInstance.Count + 1];

            SingletonInstance.Keys.CopyTo(Names, 0);
            SingletonInstance.Values.CopyTo(NativeNames, 0);

-            for (int Index = 0; Index <= SingletonInstance.Count; Index++)
+            for (var Index = 0; Index <= SingletonInstance.Count; Index++)
            {
                if (NativeNames[Index] == CultureNativeName)
                {
@@ -83,8 +81,8 @@ namespace mRemoteNG.App
        {
            get
            {
-                List<string> ValueList = new();
-                foreach (string Value in SingletonInstance.Values)
+                var ValueList = new List<string>();
+                foreach (var Value in SingletonInstance.Values)
                {
                    ValueList.Add(Value);
                }
--- a/mRemoteNG/App/Update/AppUpdater.cs
+++ b/mRemoteNG/App/Update/AppUpdater.cs
@@ -1,14 +1,13 @@
 using System;
 using System.IO;
 using System.Net;
-using System.Net.Http;
+using System.ComponentModel;
 using System.Threading;
+using System.Reflection;
 using mRemoteNG.App.Info;
 using mRemoteNG.Security.SymmetricEncryption;
 using System.Security.Cryptography;
-using System.Threading.Tasks;
 using mRemoteNG.Properties;
-using System.Runtime.Versioning;
 #if !PORTABLE
 using mRemoteNG.Tools;

@@ -20,33 +19,31 @@ using System.Windows.Forms;

 namespace mRemoteNG.App.Update
 {
-    [SupportedOSPlatform("windows")]
    public class AppUpdater
    {
-        private const int _bufferLength = 8192;
        private WebProxy _webProxy;
-        private HttpClient _httpClient;
-        private CancellationTokenSource _changeLogCancelToken;
-        private CancellationTokenSource _getUpdateInfoCancelToken;
+        private Thread _getUpdateInfoThread;
+        private Thread _getChangeLogThread;

        #region Public Properties

        public UpdateInfo CurrentUpdateInfo { get; private set; }

+        public string ChangeLog { get; private set; }
+
        public bool IsGetUpdateInfoRunning
        {
-            get
-            {
-                return _getUpdateInfoCancelToken != null;
-            }
+            get { return _getUpdateInfoThread != null && _getUpdateInfoThread.IsAlive; }
        }

        private bool IsGetChangeLogRunning
        {
-            get
-            {
-                return _changeLogCancelToken != null;
-            }
+            get { return _getChangeLogThread != null && _getChangeLogThread.IsAlive; }
+        }
+
+        public bool IsDownloadUpdateRunning
+        {
+            get { return _downloadUpdateWebClient != null; }
        }

        #endregion
@@ -55,35 +52,39 @@ namespace mRemoteNG.App.Update

        public AppUpdater()
        {
-            SetDefaultProxySettings();
+            SetProxySettings();
        }

-        private void SetDefaultProxySettings()
+        private void SetProxySettings()
        {
-            bool shouldWeUseProxy = Properties.OptionsUpdatesPage.Default.UpdateUseProxy;
-            string proxyAddress = Properties.OptionsUpdatesPage.Default.UpdateProxyAddress;
-            int port = Properties.OptionsUpdatesPage.Default.UpdateProxyPort;
-            bool useAuthentication = Properties.OptionsUpdatesPage.Default.UpdateProxyUseAuthentication;
-            string username = Properties.OptionsUpdatesPage.Default.UpdateProxyAuthUser;
-            LegacyRijndaelCryptographyProvider cryptographyProvider = new();
-            string password = cryptographyProvider.Decrypt(Properties.OptionsUpdatesPage.Default.UpdateProxyAuthPass, Runtime.EncryptionKey);
+            var shouldWeUseProxy = Settings.Default.UpdateUseProxy;
+            var proxyAddress = Settings.Default.UpdateProxyAddress;
+            var port = Settings.Default.UpdateProxyPort;
+            var useAuthentication = Settings.Default.UpdateProxyUseAuthentication;
+            var username = Settings.Default.UpdateProxyAuthUser;
+            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+            var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey);

            SetProxySettings(shouldWeUseProxy, proxyAddress, port, useAuthentication, username, password);
        }

-        public void SetProxySettings(bool useProxy, string address, int port, bool useAuthentication, string username, string password)
+        public void SetProxySettings(bool useProxy,
+                                     string address,
+                                     int port,
+                                     bool useAuthentication,
+                                     string username,
+                                     string password)
        {
            if (useProxy && !string.IsNullOrEmpty(address))
            {
                _webProxy = port != 0 ? new WebProxy(address, port) : new WebProxy(address);
+
                _webProxy.Credentials = useAuthentication ? new NetworkCredential(username, password) : null;
            }
            else
            {
                _webProxy = null;
            }
-
-            UpdateHttpClient();
        }

        public bool IsUpdateAvailable()
@@ -95,24 +96,54 @@ namespace mRemoteNG.App.Update

            return CurrentUpdateInfo.Version > GeneralAppInfo.GetApplicationVersion();
        }
-        
-        public async Task DownloadUpdateAsync(IProgress<int> progress)
+
+        public void GetUpdateInfoAsync()
        {
            if (IsGetUpdateInfoRunning)
            {
-                _getUpdateInfoCancelToken.Cancel();
-                _getUpdateInfoCancelToken.Dispose();
-                _getUpdateInfoCancelToken = null;
+                _getUpdateInfoThread.Abort();
+            }

+            _getUpdateInfoThread = new Thread(GetUpdateInfo);
+            _getUpdateInfoThread.SetApartmentState(ApartmentState.STA);
+            _getUpdateInfoThread.IsBackground = true;
+            _getUpdateInfoThread.Start();
+        }
+
+        public void GetChangeLogAsync()
+        {
+            if (CurrentUpdateInfo == null || !CurrentUpdateInfo.IsValid)
+            {
+                throw new InvalidOperationException(
+                                                    "CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync().");
+            }
+
+            if (IsGetChangeLogRunning)
+            {
+                _getChangeLogThread.Abort();
+            }
+
+            _getChangeLogThread = new Thread(GetChangeLog);
+            _getChangeLogThread.SetApartmentState(ApartmentState.STA);
+            _getChangeLogThread.IsBackground = true;
+            _getChangeLogThread.Start();
+        }
+
+        public void DownloadUpdateAsync()
+        {
+            if (_downloadUpdateWebClient != null)
+            {
                throw new InvalidOperationException("A previous call to DownloadUpdateAsync() is still in progress.");
            }

            if (CurrentUpdateInfo == null || !CurrentUpdateInfo.IsValid)
            {
-                throw new InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().");
+                throw new InvalidOperationException(
+                                                    "CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().");
            }
 #if !PORTABLE
-            CurrentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "msi"));
+            CurrentUpdateInfo.UpdateFilePath =
+ Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "msi"));
 #else
            var sfd = new SaveFileDialog
            {
@@ -129,40 +160,137 @@ namespace mRemoteNG.App.Update
                return;
            }
 #endif
-            try
+            DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress,
+                                                      CurrentUpdateInfo.UpdateFilePath);
+        }
+
+        #endregion
+
+        #region Private Properties
+
+        private WebClient _downloadUpdateWebClient;
+
+        private WebClient DownloadUpdateWebClient
+        {
+            get
            {
-                _getUpdateInfoCancelToken = new CancellationTokenSource();
-                using HttpResponseMessage response = await _httpClient.GetAsync(CurrentUpdateInfo.DownloadAddress, HttpCompletionOption.ResponseHeadersRead, _getUpdateInfoCancelToken.Token);
-                byte[] buffer = new byte[_bufferLength];
-                long totalBytes = response.Content.Headers.ContentLength ?? 0;
-                long readBytes = 0L;
-
-                await using (Stream httpStream = await response.Content.ReadAsStreamAsync(_getUpdateInfoCancelToken.Token))
+                if (_downloadUpdateWebClient != null)
                {
-                    await using FileStream fileStream = new(CurrentUpdateInfo.UpdateFilePath, FileMode.Create,
-                        FileAccess.Write, FileShare.None, _bufferLength, true);
-
-                    while (readBytes <= totalBytes || !_getUpdateInfoCancelToken.IsCancellationRequested)
-                    {
-                        int bytesRead =
-                            await httpStream.ReadAsync(buffer.AsMemory(0, _bufferLength), _getUpdateInfoCancelToken.Token);
-                        if (bytesRead == 0)
-                        {
-                            progress.Report(100);
-                            break;
-                        }
-
-                        await fileStream.WriteAsync(buffer.AsMemory(0, bytesRead), _getUpdateInfoCancelToken.Token);
-
-                        readBytes += bytesRead;
-
-                        int percentComplete = (int)(readBytes * 100 / totalBytes);
-                        progress.Report(percentComplete);
-                    }
+                    return _downloadUpdateWebClient;
                }

+                _downloadUpdateWebClient = CreateWebClient();
+
+                _downloadUpdateWebClient.DownloadProgressChanged += DownloadUpdateProgressChanged;
+                _downloadUpdateWebClient.DownloadFileCompleted += DownloadUpdateCompleted;
+
+                return _downloadUpdateWebClient;
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private WebClient CreateWebClient()
+        {
+            var webClient = new WebClient();
+            webClient.Headers.Add("user-agent", GeneralAppInfo.UserAgent);
+            webClient.Proxy = _webProxy;
+            return webClient;
+        }
+
+        private static DownloadStringCompletedEventArgs NewDownloadStringCompletedEventArgs(string result,
+                                                                                            Exception exception,
+                                                                                            bool cancelled,
+                                                                                            object userToken)
+        {
+            var type = typeof(DownloadStringCompletedEventArgs);
+            const BindingFlags bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance;
+            Type[] argumentTypes = {typeof(string), typeof(Exception), typeof(bool), typeof(object)};
+            var constructor = type.GetConstructor(bindingFlags, null, argumentTypes, null);
+            object[] arguments = {result, exception, cancelled, userToken};
+
+            if (constructor == null)
+                return null;
+            return (DownloadStringCompletedEventArgs)constructor.Invoke(arguments);
+        }
+
+        private DownloadStringCompletedEventArgs DownloadString(Uri address)
+        {
+            var webClient = CreateWebClient();
+            var result = string.Empty;
+            Exception exception = null;
+            var cancelled = false;
+
+            try
+            {
+                result = webClient.DownloadString(address);
+            }
+            catch (ThreadAbortException)
+            {
+                cancelled = true;
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
+
+            return NewDownloadStringCompletedEventArgs(result, exception, cancelled, null);
+        }
+
+        private void GetUpdateInfo()
+        {
+            var e = DownloadString(UpdateChannelInfo.GetUpdateChannelInfo());
+
+            if (!e.Cancelled && e.Error == null)
+            {
+                try
+                {
+                    CurrentUpdateInfo = UpdateInfo.FromString(e.Result);
+
+                    Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
+                    if (!Settings.Default.UpdatePending)
+                    {
+                        Settings.Default.UpdatePending = IsUpdateAvailable();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    e = NewDownloadStringCompletedEventArgs(e.Result, ex, e.Cancelled, null);
+                }
+            }
+
+            GetUpdateInfoCompletedEventEvent?.Invoke(this, e);
+        }
+
+        private void GetChangeLog()
+        {
+            var e = DownloadString(CurrentUpdateInfo.ChangeLogAddress);
+
+            if (!e.Cancelled && e.Error == null)
+            {
+                ChangeLog = e.Result;
+            }
+
+            GetChangeLogCompletedEventEvent?.Invoke(this, e);
+        }
+
+        private void DownloadUpdateProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        {
+            DownloadUpdateProgressChangedEventEvent?.Invoke(sender, e);
+        }
+
+        private void DownloadUpdateCompleted(object sender, AsyncCompletedEventArgs e)
+        {
+            var raiseEventArgs = e;
+
+            if (!e.Cancelled && e.Error == null)
+            {
+                try
+                {
 #if !PORTABLE
-                Authenticode updateAuthenticode = new(CurrentUpdateInfo.UpdateFilePath)
+                    var updateAuthenticode = new Authenticode(CurrentUpdateInfo.UpdateFilePath)
                    {
                        RequireThumbprintMatch = true,
                        ThumbprintToMatch = CurrentUpdateInfo.CertificateThumbprint
@@ -179,85 +307,101 @@ namespace mRemoteNG.App.Update
                    }
 #endif

-                using SHA512 checksum = SHA512.Create();
-                await using FileStream stream = File.OpenRead(CurrentUpdateInfo.UpdateFilePath);
-                byte[] hash = await checksum.ComputeHashAsync(stream);
-                string hashString = BitConverter.ToString(hash).Replace("-", "").ToUpperInvariant();
-                if (!hashString.Equals(CurrentUpdateInfo.Checksum))
-                    throw new Exception("SHA512 Hashes didn't match!");
-            } finally{
-                _getUpdateInfoCancelToken?.Dispose();
-                _getUpdateInfoCancelToken = null;
+                    using (var cksum = SHA512.Create())
+                    {
+                        using (var stream = File.OpenRead(CurrentUpdateInfo.UpdateFilePath))
+                        {
+                            var hash = cksum.ComputeHash(stream);
+                            var hashString = BitConverter.ToString(hash).Replace("-", "").ToUpperInvariant();
+                            if (!hashString.Equals(CurrentUpdateInfo.Checksum))
+                                throw new Exception("SHA512 Hashes didn't match!");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    raiseEventArgs = new AsyncCompletedEventArgs(ex, false, null);
+                }
            }
+
+            if (raiseEventArgs.Cancelled || raiseEventArgs.Error != null)
+            {
+                File.Delete(CurrentUpdateInfo.UpdateFilePath);
+            }
+
+            DownloadUpdateCompletedEventEvent?.Invoke(this, raiseEventArgs);
+
+            _downloadUpdateWebClient.Dispose();
+            _downloadUpdateWebClient = null;
        }

        #endregion

-        #region Private Methods
+        #region Events

-        private void UpdateHttpClient()
+        private AsyncCompletedEventHandler GetUpdateInfoCompletedEventEvent;
+
+        public event AsyncCompletedEventHandler GetUpdateInfoCompletedEvent
        {
-            if (_httpClient != null)
+            add
            {
-                _httpClient.Dispose();
+                GetUpdateInfoCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Combine(GetUpdateInfoCompletedEventEvent, value);
            }
-
-            HttpClientHandler httpClientHandler = new();
-            if (_webProxy != null)
+            remove
            {
-                httpClientHandler.UseProxy = true;
-                httpClientHandler.Proxy = _webProxy;
-            }
-            _httpClient = new HttpClient(httpClientHandler);
-            _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(GeneralAppInfo.UserAgent);
-        }
-
-        public async Task GetUpdateInfoAsync()
-        {
-            if (IsGetUpdateInfoRunning)
-            {
-                _getUpdateInfoCancelToken.Cancel();
-                _getUpdateInfoCancelToken.Dispose();
-                _getUpdateInfoCancelToken = null;
-            }
-
-            try
-            {
-                _getUpdateInfoCancelToken = new CancellationTokenSource();
-                string updateInfo = await _httpClient.GetStringAsync(UpdateChannelInfo.GetUpdateChannelInfo(), _getUpdateInfoCancelToken.Token);
-                CurrentUpdateInfo = UpdateInfo.FromString(updateInfo);
-                Properties.OptionsUpdatesPage.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
-
-                if (!Properties.OptionsUpdatesPage.Default.UpdatePending)
-                {
-                    Properties.OptionsUpdatesPage.Default.UpdatePending = IsUpdateAvailable();
-                }
-            }
-            finally
-            {
-                _getUpdateInfoCancelToken?.Dispose();
-                _getUpdateInfoCancelToken = null;
+                GetUpdateInfoCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Remove(GetUpdateInfoCompletedEventEvent, value);
            }
        }

-        public async Task<string> GetChangeLogAsync()
-        {
-            if (IsGetChangeLogRunning)
-            {
-                _changeLogCancelToken.Cancel();
-                _changeLogCancelToken.Dispose();
-                _changeLogCancelToken = null;
-            }
+        private AsyncCompletedEventHandler GetChangeLogCompletedEventEvent;

-            try
+        public event AsyncCompletedEventHandler GetChangeLogCompletedEvent
+        {
+            add
            {
-                _changeLogCancelToken = new CancellationTokenSource();
-                return await _httpClient.GetStringAsync(CurrentUpdateInfo.ChangeLogAddress, _changeLogCancelToken.Token);
+                GetChangeLogCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Combine(GetChangeLogCompletedEventEvent, value);
            }
-            finally
+            remove
            {
-                _changeLogCancelToken?.Dispose();
-                _changeLogCancelToken = null;
+                GetChangeLogCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Remove(GetChangeLogCompletedEventEvent, value);
+            }
+        }
+
+        private DownloadProgressChangedEventHandler DownloadUpdateProgressChangedEventEvent;
+
+        public event DownloadProgressChangedEventHandler DownloadUpdateProgressChangedEvent
+        {
+            add
+            {
+                DownloadUpdateProgressChangedEventEvent =
+                    (DownloadProgressChangedEventHandler)Delegate.Combine(DownloadUpdateProgressChangedEventEvent,
+                                                                          value);
+            }
+            remove
+            {
+                DownloadUpdateProgressChangedEventEvent =
+                    (DownloadProgressChangedEventHandler)Delegate.Remove(DownloadUpdateProgressChangedEventEvent,
+                                                                         value);
+            }
+        }
+
+        private AsyncCompletedEventHandler DownloadUpdateCompletedEventEvent;
+
+        public event AsyncCompletedEventHandler DownloadUpdateCompletedEvent
+        {
+            add
+            {
+                DownloadUpdateCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Combine(DownloadUpdateCompletedEventEvent, value);
+            }
+            remove
+            {
+                DownloadUpdateCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Remove(DownloadUpdateCompletedEventEvent, value);
            }
        }

--- a/mRemoteNG/App/Update/UpdateFile.cs
+++ b/mRemoteNG/App/Update/UpdateFile.cs
@@ -34,19 +34,19 @@ namespace mRemoteNG.App.Update
            // no separators means no valid update data...
            if (content.Trim().IndexOfAny(keyValueSeparators) == -1) return;

-            using (StringReader sr = new(content))
+            using (var sr = new StringReader(content))
            {
                string line;
                while ((line = sr.ReadLine()) != null)
                {
-                    string trimmedLine = line.Trim();
+                    var trimmedLine = line.Trim();
                    if (trimmedLine.Length == 0)
                        continue;

                    if (trimmedLine.Substring(0, 1).IndexOfAny(commentCharacters) != -1)
                        continue;

-                    string[] parts = trimmedLine.Split(keyValueSeparators, 2);
+                    var parts = trimmedLine.Split(keyValueSeparators, 2);
                    if (parts.Length != 2)
                        continue;

@@ -68,13 +68,13 @@ namespace mRemoteNG.App.Update

        public Version GetVersion(string key = "Version")
        {
-            string value = GetString(key);
+            var value = GetString(key);
            return string.IsNullOrEmpty(value) ? null : new Version(value);
        }

        public Uri GetUri(string key)
        {
-            string value = GetString(key);
+            var value = GetString(key);
            return string.IsNullOrEmpty(value) ? null : new Uri(value);
        }

@@ -85,8 +85,8 @@ namespace mRemoteNG.App.Update

        public string GetFileName()
        {
-            string value = GetString("dURL");
-            string[] sv = value.Split('/');
+            var value = GetString("dURL");
+            var sv = value.Split('/');
            return sv[sv.Length - 1];
        }

--- a/mRemoteNG/App/Update/UpdateInfo.cs
+++ b/mRemoteNG/App/Update/UpdateInfo.cs
@@ -22,14 +22,14 @@ namespace mRemoteNG.App.Update

        public static UpdateInfo FromString(string input)
        {
-            UpdateInfo newInfo = new();
+            var newInfo = new UpdateInfo();
            if (string.IsNullOrEmpty(input))
            {
                newInfo.IsValid = false;
            }
            else
            {
-                UpdateFile updateFile = new(input);
+                var updateFile = new UpdateFile(input);
                newInfo.Version = updateFile.GetVersion();
                newInfo.DownloadAddress = updateFile.GetUri("dURL");
                newInfo.ChangeLogAddress = updateFile.GetUri("clURL");
--- a/mRemoteNG/App/Windows.cs
+++ b/mRemoteNG/App/Windows.cs
@@ -1,15 +1,10 @@
-#region Usings
-using System;
-using System.Runtime.Versioning;
-using mRemoteNG.Resources.Language;
+using System;
 using mRemoteNG.UI;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Window;
-#endregion

 namespace mRemoteNG.App
 {
-    [SupportedOSPlatform("windows")]
    public static class Windows
    {
        private static ActiveDirectoryImportWindow _adimportForm;
@@ -34,7 +29,7 @@ namespace mRemoteNG.App
        {
            try
            {
-                WeifenLuo.WinFormsUI.Docking.DockPanel dockPanel = FrmMain.Default.pnlDock;
+                var dockPanel = FrmMain.Default.pnlDock;
                // ReSharper disable once SwitchStatementMissingSomeCases
                switch (windowType)
                {
@@ -44,8 +39,11 @@ namespace mRemoteNG.App
                        _adimportForm.Show(dockPanel);
                        break;
                    case WindowType.Options:
-                        FrmMain.OptionsForm.SetActivatedPage(Language.StartupExit);
-                        FrmMain.OptionsForm.Visible = true;
+                        using (var optionsForm = new FrmOptions())
+                        {
+                            optionsForm.ShowDialog(dockPanel);
+                        }
+
                        break;
                    case WindowType.SSHTransfer:
                        if (SshtransferForm == null || SshtransferForm.IsDisposed)
--- a/mRemoteNG/Config/ACLPermissions.cs
+++ b/mRemoteNG/Config/ACLPermissions.cs
@@ -1,9 +0,0 @@
-namespace mRemoteNG.Config.ACL
-{
-    public enum ACLPermissions
-    {
-        Hidden = 0,
-        ReadOnly = 1,
-        WriteAllow = 2
-    }
-}
--- a/mRemoteNG/Config/ConnectionToCredentialMap.cs
+++ b/mRemoteNG/Config/ConnectionToCredentialMap.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using mRemoteNG.Credential;
+
+namespace mRemoteNG.Config
+{
+    public class ConnectionToCredentialMap : Dictionary<Guid, ICredentialRecord>
+    {
+        private readonly IEqualityComparer<ICredentialRecord> _credentialComparer = new CredentialDomainUserPasswordComparer();
+
+        public IEnumerable<ICredentialRecord> DistinctCredentialRecords => Values.Distinct(_credentialComparer);
+    }
+}
--- a/mRemoteNG/Config/Connections/ConnectionsBackupFrequencyEnum.cs
+++ b/mRemoteNG/Config/Connections/ConnectionsBackupFrequencyEnum.cs
@@ -1,13 +0,0 @@
-namespace mRemoteNG.Config.Connections
-{
-    public enum ConnectionsBackupFrequencyEnum
-    {
-        Unassigned = 0,
-        Never = 1,
-        OnEdit = 2,
-        OnExit = 3,
-        Daily = 4,
-        Weekly = 5,
-        Custom = 6
-    }
-}
--- a/mRemoteNG/Config/Connections/ConnectionsLoadedEventArgs.cs
+++ b/mRemoteNG/Config/Connections/ConnectionsLoadedEventArgs.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using mRemoteNG.Connection;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;

@@ -10,7 +12,7 @@ namespace mRemoteNG.Config.Connections
        /// The previous <see cref="ConnectionTreeModel"/> that is being
        /// unloaded.
        /// </summary>
-        public Optional<ConnectionTreeModel> PreviousConnectionTreeModel { get; }
+        public List<ConnectionInfo> RemovedConnections { get; }

        /// <summary>
        /// True if the previous <see cref="ConnectionTreeModel"/> was loaded from
@@ -21,7 +23,7 @@ namespace mRemoteNG.Config.Connections
        /// <summary>
        /// The new <see cref="ConnectionTreeModel"/> that is being loaded.
        /// </summary>
-        public ConnectionTreeModel NewConnectionTreeModel { get; }
+        public List<ConnectionInfo> AddedConnections { get; }

        /// <summary>
        /// True if the new <see cref="ConnectionTreeModel"/> was loaded from
@@ -36,24 +38,18 @@ namespace mRemoteNG.Config.Connections
        /// </summary>
        public string NewSourcePath { get; }

-        public ConnectionsLoadedEventArgs(Optional<ConnectionTreeModel> previousTreeModelModel,
-                                          ConnectionTreeModel newTreeModelModel,
-                                          bool previousSourceWasDatabase,
-                                          bool newSourceIsDatabase,
-                                          string newSourcePath)
-        {
-            if (previousTreeModelModel == null)
-                throw new ArgumentNullException(nameof(previousTreeModelModel));
-            if (newTreeModelModel == null)
-                throw new ArgumentNullException(nameof(newTreeModelModel));
-            if (newSourcePath == null)
-                throw new ArgumentNullException(nameof(newSourcePath));
+        public IConnectionTreeModel NewConnectionTreeModel { get; set; } = new ConnectionTreeModel();

-            PreviousConnectionTreeModel = previousTreeModelModel;
+        public ConnectionsLoadedEventArgs(
+            List<ConnectionInfo> removedConnections, List<ConnectionInfo> addedConnections,
+            bool previousSourceWasDatabase, bool newSourceIsDatabase,
+            string newSourcePath)
+        {
+            RemovedConnections = removedConnections.ThrowIfNull(nameof(removedConnections));
            PreviousSourceWasDatabase = previousSourceWasDatabase;
-            NewConnectionTreeModel = newTreeModelModel;
+            AddedConnections = addedConnections.ThrowIfNull(nameof(addedConnections));
            NewSourceIsDatabase = newSourceIsDatabase;
-            NewSourcePath = newSourcePath;
+            NewSourcePath = newSourcePath.ThrowIfNull(nameof(newSourcePath));
        }
    }
-}
+}
--- a/mRemoteNG/Config/Connections/ConnectionsSavedEventArgs.cs
+++ b/mRemoteNG/Config/Connections/ConnectionsSavedEventArgs.cs
@@ -5,12 +5,12 @@ namespace mRemoteNG.Config.Connections
 {
    public class ConnectionsSavedEventArgs
    {
-        public ConnectionTreeModel ModelThatWasSaved { get; }
+        public IConnectionTreeModel ModelThatWasSaved { get; }
        public bool PreviouslyUsingDatabase { get; }
        public bool UsingDatabase { get; }
        public string ConnectionFileName { get; }

-        public ConnectionsSavedEventArgs(ConnectionTreeModel modelThatWasSaved,
+        public ConnectionsSavedEventArgs(IConnectionTreeModel modelThatWasSaved,
                                         bool previouslyUsingDatabase,
                                         bool usingDatabase,
                                         string connectionFileName)
@@ -24,4 +24,4 @@ namespace mRemoteNG.Config.Connections
            ConnectionFileName = connectionFileName;
        }
    }
-}
+}
--- a/mRemoteNG/Config/Connections/CsvConnectionsSaver.cs
+++ b/mRemoteNG/Config/Connections/CsvConnectionsSaver.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.Versioning;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
@@ -8,7 +7,6 @@ using mRemoteNG.Tree;

 namespace mRemoteNG.Config.Connections
 {
-    [SupportedOSPlatform("windows")]
    public class CsvConnectionsSaver : ISaver<ConnectionTreeModel>
    {
        private readonly string _connectionFileName;
@@ -27,11 +25,10 @@ namespace mRemoteNG.Config.Connections

        public void Save(ConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
        {
-            CsvConnectionsSerializerMremotengFormat csvConnectionsSerializer =
-                new(_saveFilter, Runtime.CredentialProviderCatalog);
-            FileDataProvider dataProvider = new(_connectionFileName);
-            string csvContent = csvConnectionsSerializer.Serialize(connectionTreeModel);
+            var csvConnectionsSerializer = new CsvConnectionsSerializerMremotengFormat(_saveFilter, Runtime.CredentialService.RepositoryList);
+            var dataProvider = new FileDataProvider(_connectionFileName);
+            var csvContent = csvConnectionsSerializer.Serialize(connectionTreeModel);
            dataProvider.Save(csvContent);
        }
    }
-}
+}
--- a/mRemoteNG/Config/Connections/IConnectionsLoader.cs
+++ b/mRemoteNG/Config/Connections/IConnectionsLoader.cs
@@ -1,9 +1,9 @@
-using mRemoteNG.Tree;
+using mRemoteNG.Config.Serializers;

 namespace mRemoteNG.Config.Connections
 {
    public interface IConnectionsLoader
    {
-        ConnectionTreeModel Load();
+        SerializationResult Load();
    }
 }
--- a/mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs
+++ b/mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs
@@ -1,16 +1,14 @@
 using mRemoteNG.App;
 using System;
-using System.Runtime.Versioning;
 using System.Timers;

 // ReSharper disable ArrangeAccessorOwnerBody

 namespace mRemoteNG.Config.Connections.Multiuser
 {
-    [SupportedOSPlatform("windows")]
    public class RemoteConnectionsSyncronizer : IConnectionsUpdateChecker
    {
-        private readonly System.Timers.Timer _updateTimer;
+        private readonly Timer _updateTimer;
        private readonly IConnectionsUpdateChecker _updateChecker;

        public double TimerIntervalInMilliseconds
@@ -21,7 +19,7 @@ namespace mRemoteNG.Config.Connections.Multiuser
        public RemoteConnectionsSyncronizer(IConnectionsUpdateChecker updateChecker)
        {
            _updateChecker = updateChecker;
-            _updateTimer = new System.Timers.Timer(3000);
+            _updateTimer = new Timer(3000);
            SetEventListeners();
        }

@@ -29,14 +27,15 @@ namespace mRemoteNG.Config.Connections.Multiuser
        {
            _updateChecker.UpdateCheckStarted += OnUpdateCheckStarted;
            _updateChecker.UpdateCheckFinished += OnUpdateCheckFinished;
-            _updateChecker.ConnectionsUpdateAvailable += (sender, args) => ConnectionsUpdateAvailable?.Invoke(sender, args);
+            _updateChecker.ConnectionsUpdateAvailable +=
+                (sender, args) => ConnectionsUpdateAvailable?.Invoke(sender, args);
            _updateTimer.Elapsed += (sender, args) => _updateChecker.IsUpdateAvailableAsync();
            ConnectionsUpdateAvailable += Load;
        }

        private void Load(object sender, ConnectionsUpdateAvailableEventArgs args)
        {
-            Runtime.ConnectionsService.LoadConnections(true, false, "");
+            Runtime.ConnectionsService.LoadConnections(true, "");
            args.Handled = true;
        }

--- a/mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs
+++ b/mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Runtime.Versioning;
 using System.Threading;
 using mRemoteNG.App;
 using mRemoteNG.Config.DatabaseConnectors;
@@ -9,7 +8,6 @@ using mRemoteNG.Messages;

 namespace mRemoteNG.Config.Connections.Multiuser
 {
-    [SupportedOSPlatform("windows")]
    public class SqlConnectionsUpdateChecker : IConnectionsUpdateChecker
    {
        private readonly IDatabaseConnector _dbConnector;
@@ -29,7 +27,7 @@ namespace mRemoteNG.Config.Connections.Multiuser
        {
            RaiseUpdateCheckStartedEvent();
            ConnectToSqlDb();
-            bool updateIsAvailable = DatabaseIsMoreUpToDateThanUs();
+            var updateIsAvailable = DatabaseIsMoreUpToDateThanUs();
            if (updateIsAvailable)
                RaiseConnectionsUpdateAvailableEvent();
            RaiseUpdateCheckFinishedEvent(updateIsAvailable);
@@ -38,7 +36,7 @@ namespace mRemoteNG.Config.Connections.Multiuser

        public void IsUpdateAvailableAsync()
        {
-            Thread thread = new(() => IsUpdateAvailable());
+            var thread = new Thread(() => IsUpdateAvailable());
            thread.SetApartmentState(ApartmentState.STA);
            thread.Start();
        }
@@ -51,44 +49,46 @@ namespace mRemoteNG.Config.Connections.Multiuser
            }
            catch (Exception e)
            {
-                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, $"Unable to connect to SQL DB to check for updates.{Environment.NewLine}{e.Message}", true);
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
+                                                    "Unable to connect to Sql DB to check for updates." +
+                                                    Environment.NewLine + e.Message, true);
            }
        }

        private bool DatabaseIsMoreUpToDateThanUs()
        {
-            DateTime lastUpdateInDb = GetLastUpdateTimeFromDbResponse();
-            bool amTheLastoneUpdated = CheckIfIAmTheLastOneUpdated(lastUpdateInDb);
+            var lastUpdateInDb = GetLastUpdateTimeFromDbResponse();
+            var amTheLastoneUpdated = CheckIfIAmTheLastOneUpdated(lastUpdateInDb);
            return (lastUpdateInDb > LastUpdateTime && !amTheLastoneUpdated);
        }

        private bool CheckIfIAmTheLastOneUpdated(DateTime lastUpdateInDb)
        {
-            DateTime lastSqlUpdateWithoutMilliseconds = new(LastUpdateTime.Ticks - (LastUpdateTime.Ticks % TimeSpan.TicksPerSecond), LastUpdateTime.Kind);
+            DateTime lastSqlUpdateWithoutMilliseconds =
+                new DateTime(LastUpdateTime.Ticks - (LastUpdateTime.Ticks % TimeSpan.TicksPerSecond),
+                             LastUpdateTime.Kind);
            return lastUpdateInDb == lastSqlUpdateWithoutMilliseconds;
        }

        private DateTime GetLastUpdateTimeFromDbResponse()
        {
-            DateTime lastUpdateInDb = default(DateTime);
-
+            var lastUpdateInDb = default(DateTime);
            try
            {
-                DbDataReader sqlReader = _dbQuery.ExecuteReader(CommandBehavior.CloseConnection);
+                var sqlReader = _dbQuery.ExecuteReader(CommandBehavior.CloseConnection);
                sqlReader.Read();
                if (sqlReader.HasRows)
-                {
                    lastUpdateInDb = Convert.ToDateTime(sqlReader["LastUpdate"]);
-                }
                sqlReader.Close();
            }
            catch (Exception ex)
            {
-                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Error executing SQL query to get updates from the DB." + Environment.NewLine + ex.Message, true);
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
+                                                    "Error executing Sql query to get updates from the DB." +
+                                                    Environment.NewLine + ex.Message, true);
            }

            _lastDatabaseUpdateTime = lastUpdateInDb;
-
            return lastUpdateInDb;
        }

@@ -104,7 +104,7 @@ namespace mRemoteNG.Config.Connections.Multiuser

        private void RaiseUpdateCheckFinishedEvent(bool updateAvailable)
        {
-            ConnectionsUpdateCheckFinishedEventArgs args = new() { UpdateAvailable = updateAvailable};
+            var args = new ConnectionsUpdateCheckFinishedEventArgs {UpdateAvailable = updateAvailable};
            UpdateCheckFinished?.Invoke(this, args);
        }

@@ -113,7 +113,7 @@ namespace mRemoteNG.Config.Connections.Multiuser
        private void RaiseConnectionsUpdateAvailableEvent()
        {
            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Remote connection update is available");
-            ConnectionsUpdateAvailableEventArgs args = new(_dbConnector, _lastDatabaseUpdateTime);
+            var args = new ConnectionsUpdateAvailableEventArgs(_dbConnector, _lastDatabaseUpdateTime);
            ConnectionsUpdateAvailable?.Invoke(this, args);
        }

--- a/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs
+++ b/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs
@@ -1,59 +1,47 @@
-using System;
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using mRemoteNG.Connection;
-using mRemoteNG.UI.Forms;
-using mRemoteNG.Properties;
-using System.Runtime.Versioning;
+using mRemoteNG.Tools;

 namespace mRemoteNG.Config.Connections
 {
-    [SupportedOSPlatform("windows")]
    public class SaveConnectionsOnEdit
    {
-        private readonly ConnectionsService _connectionsService;
+        private IConnectionsService _connectionsService;

-        public SaveConnectionsOnEdit(ConnectionsService connectionsService)
+        public void Subscribe(IConnectionsService connectionsService)
        {
-            if (connectionsService == null)
-                throw new ArgumentNullException(nameof(connectionsService));
-
-            _connectionsService = connectionsService;
-            connectionsService.ConnectionsLoaded += ConnectionsServiceOnConnectionsLoaded;
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+            connectionsService.ConnectionTreeModel.CollectionChanged += ConnectionTreeModelOnCollectionChanged;
+            connectionsService.ConnectionTreeModel.PropertyChanged += ConnectionTreeModelOnPropertyChanged;
        }

-        private void ConnectionsServiceOnConnectionsLoaded(object sender, ConnectionsLoadedEventArgs connectionsLoadedEventArgs)
+        public void Unsubscribe()
        {
-            connectionsLoadedEventArgs.NewConnectionTreeModel.CollectionChanged += ConnectionTreeModelOnCollectionChanged;
-            connectionsLoadedEventArgs.NewConnectionTreeModel.PropertyChanged += ConnectionTreeModelOnPropertyChanged;
-
-            foreach (Tree.ConnectionTreeModel oldTree in connectionsLoadedEventArgs.PreviousConnectionTreeModel)
-            {
-                oldTree.CollectionChanged -= ConnectionTreeModelOnCollectionChanged;
-                oldTree.PropertyChanged -= ConnectionTreeModelOnPropertyChanged;
-            }
+            _connectionsService.ConnectionTreeModel.CollectionChanged -= ConnectionTreeModelOnCollectionChanged;
+            _connectionsService.ConnectionTreeModel.PropertyChanged -= ConnectionTreeModelOnPropertyChanged;
+            _connectionsService = null;
        }

-        private void ConnectionTreeModelOnPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs)
+        private void ConnectionTreeModelOnPropertyChanged(object sender,
+                                                          PropertyChangedEventArgs propertyChangedEventArgs)
        {
            SaveConnectionOnEdit(propertyChangedEventArgs.PropertyName);
        }

-        private void ConnectionTreeModelOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
+        private void ConnectionTreeModelOnCollectionChanged(object sender,
+                                                            NotifyCollectionChangedEventArgs
+                                                                notifyCollectionChangedEventArgs)
        {
            SaveConnectionOnEdit();
        }

        private void SaveConnectionOnEdit(string propertyName = "")
        {
-            //OBSOLETE: mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit is obsolete and should be removed in a future release
-            if (Properties.OptionsBackupPage.Default.SaveConnectionsAfterEveryEdit || (Properties.OptionsBackupPage.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnEdit))
-            {
-                if (FrmMain.Default.IsClosing)
-                    return;
+            if (!Properties.Settings.Default.SaveConnectionsAfterEveryEdit)
+                return;

-                _connectionsService.SaveConnectionsAsync(propertyName);
-            }
+            _connectionsService?.SaveConnectionsAsync(propertyName);
        }
    }
-}
+}
--- a/mRemoteNG/Config/Connections/SqlConnectionsLoader.cs
+++ b/mRemoteNG/Config/Connections/SqlConnectionsLoader.cs
@@ -1,75 +1,81 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Versioning;
 using System.Security;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.ConnectionSerializers.Sql;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Authentication;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
-using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;

 namespace mRemoteNG.Config.Connections
 {
-    [SupportedOSPlatform("windows")]
    public class SqlConnectionsLoader : IConnectionsLoader
    {
-        private readonly IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>> _localConnectionPropertiesDeserializer;
+        private readonly IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>>
+            _localConnectionPropertiesDeserializer;

        private readonly IDataProvider<string> _dataProvider;

-        private Func<Optional<SecureString>> AuthenticationRequestor { get; set; } = () => MiscTools.PasswordDialog("", false);
+        public Func<Optional<SecureString>> AuthenticationRequestor { get; set; } =
+            () => MiscTools.PasswordDialog("", false);

        public SqlConnectionsLoader(
            IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>> localConnectionPropertiesDeserializer,
            IDataProvider<string> dataProvider)
        {
-            _localConnectionPropertiesDeserializer = localConnectionPropertiesDeserializer.ThrowIfNull(nameof(localConnectionPropertiesDeserializer));
+            _localConnectionPropertiesDeserializer =
+                localConnectionPropertiesDeserializer.ThrowIfNull(nameof(localConnectionPropertiesDeserializer));
            _dataProvider = dataProvider.ThrowIfNull(nameof(dataProvider));
        }

-        public ConnectionTreeModel Load()
+        public SerializationResult Load()
        {
-            IDatabaseConnector connector = DatabaseConnectorFactory.DatabaseConnectorFromSettings();
-            SqlDataProvider dataProvider = new(connector);
-            SqlDatabaseMetaDataRetriever metaDataRetriever = new();
-            SqlDatabaseVersionVerifier databaseVersionVerifier = new(connector);
-            LegacyRijndaelCryptographyProvider cryptoProvider = new();
-            SqlConnectionListMetaData metaData = metaDataRetriever.GetDatabaseMetaData(connector) ?? HandleFirstRun(metaDataRetriever, connector);
-            Optional<SecureString> decryptionKey = GetDecryptionKey(metaData);
+            var connector = DatabaseConnectorFactory.DatabaseConnectorFromSettings();
+            var dataProvider = new SqlDataProvider(connector);
+            var metaDataRetriever = new SqlDatabaseMetaDataRetriever();
+            var databaseVersionVerifier = new SqlDatabaseVersionVerifier(connector);
+            var cryptoProvider = new LegacyRijndaelCryptographyProvider();
+
+            var metaData = metaDataRetriever.GetDatabaseMetaData(connector) ?? 
+                           HandleFirstRun(metaDataRetriever, connector);
+            var decryptionKey = GetDecryptionKey(metaData);

            if (!decryptionKey.Any())
                throw new Exception("Could not load SQL connections");

            databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion);
-            System.Data.DataTable dataTable = dataProvider.Load();
-            DataTableDeserializer deserializer = new(cryptoProvider, decryptionKey.First());
-            ConnectionTreeModel connectionTree = deserializer.Deserialize(dataTable);
-            ApplyLocalConnectionProperties(connectionTree.RootNodes.First(i => i is RootNodeInfo));
-            return connectionTree;
+            var dataTable = dataProvider.Load();
+            var deserializer = new DataTableDeserializer(cryptoProvider, decryptionKey.First());
+            var serializationResult = deserializer.Deserialize(dataTable);
+            ApplyLocalConnectionProperties(serializationResult.ConnectionRecords.OfType<RootNodeInfo>().First());
+            return serializationResult;
        }

        private Optional<SecureString> GetDecryptionKey(SqlConnectionListMetaData metaData)
        {
-            LegacyRijndaelCryptographyProvider cryptographyProvider = new();
-            string cipherText = metaData.Protected;
-            PasswordAuthenticator authenticator = new(cryptographyProvider, cipherText, AuthenticationRequestor);
-            bool authenticated = authenticator.Authenticate(new RootNodeInfo(RootNodeType.Connection).DefaultPassword.ConvertToSecureString());
+            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+            var cipherText = metaData.Protected;
+            var authenticator = new PasswordAuthenticator(cryptographyProvider, cipherText, AuthenticationRequestor);
+            var authenticated =
+                authenticator.Authenticate(new RootNodeInfo(RootNodeType.Connection).DefaultPassword
+                                                                                    .ConvertToSecureString());

-            return authenticated ? authenticator.LastAuthenticatedPassword : Optional<SecureString>.Empty;
+            if (authenticated)
+                return authenticator.LastAuthenticatedPassword;
+            return Optional<SecureString>.Empty;
        }

        private void ApplyLocalConnectionProperties(ContainerInfo rootNode)
        {
-            string localPropertiesXml = _dataProvider.Load();
-            IEnumerable<LocalConnectionPropertiesModel> localConnectionProperties = _localConnectionPropertiesDeserializer.Deserialize(localPropertiesXml);
+            var localPropertiesXml = _dataProvider.Load();
+            var localConnectionProperties = _localConnectionPropertiesDeserializer.Deserialize(localPropertiesXml);

            rootNode
                .GetRecursiveChildList()
--- a/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs
+++ b/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
+using System.Globalization;
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.App.Info;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
@@ -16,54 +17,58 @@ using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using mRemoteNG.Resources.Language;
-using System.Runtime.Versioning;
-using mRemoteNG.Config.Serializers.ConnectionSerializers.Sql;

 namespace mRemoteNG.Config.Connections
 {
-    [SupportedOSPlatform("windows")]
-    public class SqlConnectionsSaver : ISaver<ConnectionTreeModel>
+    public class SqlConnectionsSaver : ISaver<IConnectionTreeModel>
    {
        private readonly SaveFilter _saveFilter;
        private readonly ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string> _localPropertiesSerializer;
        private readonly IDataProvider<string> _dataProvider;

-        public SqlConnectionsSaver(SaveFilter saveFilter, ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string> localPropertieSerializer, IDataProvider<string> localPropertiesDataProvider)
+        public SqlConnectionsSaver(SaveFilter saveFilter,
+                                   ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string>
+                                       localPropertieSerializer,
+                                   IDataProvider<string> localPropertiesDataProvider)
        {
-            _saveFilter = saveFilter ?? throw new ArgumentNullException(nameof(saveFilter));
+            if (saveFilter == null)
+                throw new ArgumentNullException(nameof(saveFilter));
+            _saveFilter = saveFilter;
            _localPropertiesSerializer = localPropertieSerializer.ThrowIfNull(nameof(localPropertieSerializer));
            _dataProvider = localPropertiesDataProvider.ThrowIfNull(nameof(localPropertiesDataProvider));
        }

-        public void Save(ConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
+        public void Save(IConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
        {
-            RootNodeInfo rootTreeNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
+            var rootTreeNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();

            UpdateLocalConnectionProperties(rootTreeNode);

            if (PropertyIsLocalOnly(propertyNameTrigger))
            {
-                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Property {propertyNameTrigger} is local only. Not saving to database.");
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg,
+                                                    $"Property {propertyNameTrigger} is local only. Not saving to database.");
                return;
            }

            if (SqlUserIsReadOnly())
            {
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Trying to save connection tree but the SQL read only checkbox is checked, aborting!");
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
+                                                    "Trying to save connection tree but the SQL read only checkbox is checked, aborting!");
                return;
            }

-            using (IDatabaseConnector dbConnector = DatabaseConnectorFactory.DatabaseConnectorFromSettings())
+            using (var dbConnector = DatabaseConnectorFactory.DatabaseConnectorFromSettings())
            {
                dbConnector.Connect();
-                SqlDatabaseVersionVerifier databaseVersionVerifier = new(dbConnector);
-                SqlDatabaseMetaDataRetriever metaDataRetriever = new();
-                SqlConnectionListMetaData metaData = metaDataRetriever.GetDatabaseMetaData(dbConnector);
+                var databaseVersionVerifier = new SqlDatabaseVersionVerifier(dbConnector);
+                var metaDataRetriever = new SqlDatabaseMetaDataRetriever();
+                var metaData = metaDataRetriever.GetDatabaseMetaData(dbConnector);

                if (!databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion))
                {
-                    Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.ErrorConnectionListSaveFailed);
+                    Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
+                                                        Language.ErrorConnectionListSaveFailed);
                    return;
                }

@@ -93,7 +98,7 @@ namespace mRemoteNG.Config.Connections

        private void UpdateLocalConnectionProperties(ContainerInfo rootNode)
        {
-            IEnumerable<LocalConnectionPropertiesModel> a = rootNode.GetRecursiveChildList().Select(info => new LocalConnectionPropertiesModel
+            var a = rootNode.GetRecursiveChildList().Select(info => new LocalConnectionPropertiesModel
            {
                ConnectionId = info.ConstantID,
                Connected = info.OpenConnections.Count > 0,
@@ -101,21 +106,20 @@ namespace mRemoteNG.Config.Connections
                Favorite = info.Favorite,
            });

-            string serializedProperties = _localPropertiesSerializer.Serialize(a);
+            var serializedProperties = _localPropertiesSerializer.Serialize(a);
            _dataProvider.Save(serializedProperties);
            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Saved local connection properties");
        }

        private void UpdateRootNodeTable(RootNodeInfo rootTreeNode, IDatabaseConnector databaseConnector)
        {
-            // TODO: use transaction, but method not used at all?
-            LegacyRijndaelCryptographyProvider cryptographyProvider = new();
+            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
            string strProtected;
            if (rootTreeNode != null)
            {
                if (rootTreeNode.Password)
                {
-                    System.Security.SecureString password = rootTreeNode.PasswordString.ConvertToSecureString();
+                    var password = rootTreeNode.PasswordString.ConvertToSecureString();
                    strProtected = cryptographyProvider.Encrypt("ThisIsProtected", password);
                }
                else
@@ -128,50 +132,52 @@ namespace mRemoteNG.Config.Connections
                strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", Runtime.EncryptionKey);
            }

-            System.Data.Common.DbCommand dbQuery = databaseConnector.DbCommand("TRUNCATE TABLE tblRoot");
+            var dbQuery = databaseConnector.DbCommand("DELETE FROM tblRoot");
            dbQuery.ExecuteNonQuery();

            if (rootTreeNode != null)
            {
                dbQuery =
                    databaseConnector.DbCommand(
-                        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES('" +
-                        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "', 0, '" + strProtected + "','" +
-                        ConnectionsFileInfo.ConnectionFileVersion + "')");
+                        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES(\'" +
+                        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "\', 0, \'" + strProtected + "\'," +
+                        ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) + ")");
                dbQuery.ExecuteNonQuery();
            }
            else
            {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, $"UpdateRootNodeTable: rootTreeNode was null. Could not insert!");
+                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
+                                                    $"UpdateRootNodeTable: rootTreeNode was null. Could not insert!");
            }
        }

        private void UpdateConnectionsTable(RootNodeInfo rootTreeNode, IDatabaseConnector databaseConnector)
        {
-            SqlDataProvider dataProvider = new(databaseConnector);
-            DataTable currentDataTable = dataProvider.Load();
+            var dataProvider = new SqlDataProvider(databaseConnector);
+            var currentDataTable = dataProvider.Load();

-            LegacyRijndaelCryptographyProvider cryptoProvider = new();
-            DataTableSerializer serializer = new(_saveFilter, cryptoProvider, rootTreeNode.PasswordString.ConvertToSecureString());
+            var cryptoProvider = new LegacyRijndaelCryptographyProvider();
+            var serializer = new DataTableSerializer(_saveFilter, cryptoProvider,
+                                                     rootTreeNode.PasswordString.ConvertToSecureString());
            serializer.SetSourceDataTable(currentDataTable);
+            var dataTable = serializer.Serialize(rootTreeNode);
+            //var dbQuery = databaseConnector.DbCommand("DELETE FROM tblCons");
+            //dbQuery.ExecuteNonQuery();

-            DataTable dataTable = serializer.Serialize(rootTreeNode);
-            
            dataProvider.Save(dataTable);
        }

        private void UpdateUpdatesTable(IDatabaseConnector databaseConnector)
        {
-            // TODO: use transaction
-            System.Data.Common.DbCommand dbQuery = databaseConnector.DbCommand("TRUNCATE TABLE tblUpdate");
+            var dbQuery = databaseConnector.DbCommand("DELETE FROM tblUpdate");
            dbQuery.ExecuteNonQuery();
-            dbQuery = databaseConnector.DbCommand("INSERT INTO tblUpdate (LastUpdate) VALUES('" + MiscTools.DBDate(DateTime.Now.ToUniversalTime()) + "')");
+            dbQuery = databaseConnector.DbCommand("INSERT INTO tblUpdate (LastUpdate) VALUES(\'" + MiscTools.DBDate(DateTime.Now) + "\')");
            dbQuery.ExecuteNonQuery();
        }

        private bool SqlUserIsReadOnly()
        {
-            return Properties.OptionsDBsPage.Default.SQLReadOnly;
+            return Properties.Settings.Default.SQLReadOnly;
        }
    }
 }
--- a/mRemoteNG/Config/Connections/XmlConnectionsLoader.cs
+++ b/mRemoteNG/Config/Connections/XmlConnectionsLoader.cs
@@ -1,20 +1,25 @@
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Tools;
-using mRemoteNG.Tree;
 using System;
 using System.IO;
 using System.Security;
 using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
-using System.Runtime.Versioning;
+using mRemoteNG.App.Info;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Credential;
+using mRemoteNG.UI.Forms;

 namespace mRemoteNG.Config.Connections
 {
-    [SupportedOSPlatform("windows")]
    public class XmlConnectionsLoader : IConnectionsLoader
    {
+        private readonly string _credentialFilePath = Path.Combine(CredentialsFileInfo.CredentialsPath, CredentialsFileInfo.CredentialsFile);
        private readonly string _connectionFilePath;
+        private readonly ConnectionsService _connectionsService;
+        private readonly ICredentialService _credentialService;

-        public XmlConnectionsLoader(string connectionFilePath)
+        public XmlConnectionsLoader(string connectionFilePath, ICredentialService credentialService, ConnectionsService connectionsService)
        {
            if (string.IsNullOrEmpty(connectionFilePath))
                throw new ArgumentException($"{nameof(connectionFilePath)} cannot be null or empty");
@@ -23,19 +28,31 @@ namespace mRemoteNG.Config.Connections
                throw new FileNotFoundException($"{connectionFilePath} does not exist");

            _connectionFilePath = connectionFilePath;
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+            _credentialService = credentialService.ThrowIfNull(nameof(credentialService));
        }

-        public ConnectionTreeModel Load()
+        public SerializationResult Load()
        {
-            FileDataProvider dataProvider = new(_connectionFilePath);
-            string xmlString = dataProvider.Load();
-            XmlConnectionsDeserializer deserializer = new(PromptForPassword);
-            return deserializer.Deserialize(xmlString);
+            var dataProvider = new FileDataProvider(_connectionFilePath);
+            var xmlString = dataProvider.Load();
+            var deserializer = new CredentialManagerUpgradeForm
+            {
+                ConnectionFilePath = _connectionFilePath,
+                NewCredentialRepoPath = _credentialFilePath,
+                ConnectionsService = _connectionsService,
+                CredentialService = _credentialService,
+                ConnectionDeserializer = new XmlConnectionsDeserializer(PromptForPassword)
+            };
+
+            var serializationResult = deserializer.Deserialize(xmlString);
+
+            return serializationResult;
        }

        private Optional<SecureString> PromptForPassword()
        {
-            Optional<SecureString> password = MiscTools.PasswordDialog(Path.GetFileName(_connectionFilePath), false);
+            var password = MiscTools.PasswordDialog(Path.GetFileName(_connectionFilePath), false);
            return password;
        }
    }
--- a/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs
+++ b/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs
@@ -7,13 +7,10 @@ using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using mRemoteNG.Properties;
-using System.Runtime.Versioning;

 namespace mRemoteNG.Config.Connections
 {
-    [SupportedOSPlatform("windows")]
-    public class XmlConnectionsSaver : ISaver<ConnectionTreeModel>
+    public class XmlConnectionsSaver : ISaver<IConnectionTreeModel>
    {
        private readonly string _connectionFileName;
        private readonly SaveFilter _saveFilter;
@@ -22,23 +19,30 @@ namespace mRemoteNG.Config.Connections
        {
            if (string.IsNullOrEmpty(connectionFileName))
                throw new ArgumentException($"Argument '{nameof(connectionFileName)}' cannot be null or empty");
+            if (saveFilter == null)
+                throw new ArgumentNullException(nameof(saveFilter));
+
            _connectionFileName = connectionFileName;
-            _saveFilter = saveFilter ?? throw new ArgumentNullException(nameof(saveFilter));
+            _saveFilter = saveFilter;
        }

-        public void Save(ConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
+        public void Save(IConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
        {
            try
            {
-                ICryptographyProvider cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
-                XmlConnectionSerializerFactory serializerFactory = new();
+                var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
+                var serializerFactory = new XmlConnectionSerializerFactory();
+                
+                var xmlConnectionsSerializer = serializerFactory.Build(
+                    cryptographyProvider,
+                    connectionTreeModel,
+                    _saveFilter,
+                    Properties.Settings.Default.EncryptCompleteConnectionsFile);

-                Serializers.ISerializer<Connection.ConnectionInfo, string> xmlConnectionsSerializer = serializerFactory.Build(cryptographyProvider, connectionTreeModel, _saveFilter, Properties.OptionsSecurityPage.Default.EncryptCompleteConnectionsFile);
+                var rootNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
+                var xml = xmlConnectionsSerializer.Serialize(rootNode);

-                RootNodeInfo rootNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
-                string xml = xmlConnectionsSerializer.Serialize(rootNode);
-
-                FileDataProviderWithRollingBackup fileDataProvider = new(_connectionFileName);
+                var fileDataProvider = new FileDataProviderWithRollingBackup(_connectionFileName);
                fileDataProvider.Save(xml);
            }
            catch (Exception ex)
--- a/mRemoteNG/Config/CredentialHarvester.cs
+++ b/mRemoteNG/Config/CredentialHarvester.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Versioning;
 using System.Security;
 using System.Xml.Linq;
 using mRemoteNG.Credential;
@@ -10,26 +9,25 @@ using mRemoteNG.Security.Factories;

 namespace mRemoteNG.Config
 {
-    [SupportedOSPlatform("windows")]
    public class CredentialHarvester
    {
        private readonly IEqualityComparer<ICredentialRecord> _credentialComparer = new CredentialDomainUserComparer();

        // maps a connectioninfo (by its id) to the credential object that was harvested
        public Dictionary<Guid, ICredentialRecord> ConnectionToCredentialMap { get; } =
-            [];
+            new Dictionary<Guid, ICredentialRecord>();

        public IEnumerable<ICredentialRecord> Harvest(XDocument xDocument, SecureString decryptionKey)
        {
            if (xDocument == null)
                throw new ArgumentNullException(nameof(xDocument));

-            ICryptographyProvider cryptoProvider = new CryptoProviderFactoryFromXml(xDocument.Root).Build();
+            var cryptoProvider = new CryptoProviderFactoryFromXml(xDocument.Root).Build();

-            foreach (XElement element in xDocument.Descendants("Node"))
+            foreach (var element in xDocument.Descendants("Node"))
            {
                if (!EntryHasSomeCredentialData(element)) continue;
-                ICredentialRecord newCredential = BuildCredential(element, cryptoProvider, decryptionKey);
+                var newCredential = BuildCredential(element, cryptoProvider, decryptionKey);

                Guid connectionId;
                Guid.TryParse(element.Attribute("Id")?.Value, out connectionId);
@@ -40,7 +38,9 @@ namespace mRemoteNG.Config

                if (ConnectionToCredentialMap.Values.Contains(newCredential, _credentialComparer))
                {
-                    ICredentialRecord existingCredential = ConnectionToCredentialMap.Values.First(record => _credentialComparer.Equals(newCredential, record));
+                    var existingCredential =
+                        ConnectionToCredentialMap.Values.First(record =>
+                                                                   _credentialComparer.Equals(newCredential, record));
                    ConnectionToCredentialMap.Add(connectionId, existingCredential);
                }
                else
@@ -50,14 +50,17 @@ namespace mRemoteNG.Config
            return ConnectionToCredentialMap.Values.Distinct(_credentialComparer);
        }

-        private ICredentialRecord BuildCredential(XElement element, ICryptographyProvider cryptographyProvider, SecureString decryptionKey)
+        private ICredentialRecord BuildCredential(XElement element,
+                                                  ICryptographyProvider cryptographyProvider,
+                                                  SecureString decryptionKey)
        {
-            CredentialRecord credential = new()
+            var credential = new CredentialRecord
            {
                Title = $"{element.Attribute("Username")?.Value}\\{element.Attribute("Domain")?.Value}",
                Username = element.Attribute("Username")?.Value,
                Domain = element.Attribute("Domain")?.Value,
-                Password = cryptographyProvider.Decrypt(element.Attribute("Password")?.Value, decryptionKey).ConvertToSecureString()
+                Password = cryptographyProvider.Decrypt(element.Attribute("Password")?.Value, decryptionKey)
+                                               .ConvertToSecureString()
            };
            return credential;
        }
--- a/mRemoteNG/Config/CredentialRecordLoader.cs
+++ b/mRemoteNG/Config/CredentialRecordLoader.cs
@@ -27,7 +27,7 @@ namespace mRemoteNG.Config

        public IEnumerable<ICredentialRecord> Load(SecureString key)
        {
-            string serializedCredentials = _dataProvider.Load();
+            var serializedCredentials = _dataProvider.Load();
            return _deserializer.Deserialize(serializedCredentials, key);
        }
    }
--- a/mRemoteNG/Config/CredentialRecordSaver.cs
+++ b/mRemoteNG/Config/CredentialRecordSaver.cs
@@ -13,7 +13,8 @@ namespace mRemoteNG.Config
        private readonly IDataProvider<string> _dataProvider;
        private readonly ISecureSerializer<IEnumerable<ICredentialRecord>, string> _serializer;

-        public CredentialRecordSaver(IDataProvider<string> dataProvider, ISecureSerializer<IEnumerable<ICredentialRecord>, string> serializer)
+        public CredentialRecordSaver(IDataProvider<string> dataProvider,
+                                     ISecureSerializer<IEnumerable<ICredentialRecord>, string> serializer)
        {
            if (dataProvider == null)
                throw new ArgumentNullException(nameof(dataProvider));
@@ -26,7 +27,7 @@ namespace mRemoteNG.Config

        public void Save(IEnumerable<ICredentialRecord> credentialRecords, SecureString key)
        {
-            string serializedCredentials = _serializer.Serialize(credentialRecords, key);
+            var serializedCredentials = _serializer.Serialize(credentialRecords, key);
            _dataProvider.Save(serializedCredentials);
        }
    }
--- a/mRemoteNG/Config/CredentialRepositoryListLoader.cs
+++ b/mRemoteNG/Config/CredentialRepositoryListLoader.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.Versioning;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers.CredentialProviderSerializer;
 using mRemoteNG.Credential;
@@ -12,7 +11,8 @@ namespace mRemoteNG.Config
        private readonly IDataProvider<string> _dataProvider;
        private readonly CredentialRepositoryListDeserializer _deserializer;

-        public CredentialRepositoryListLoader(IDataProvider<string> dataProvider, CredentialRepositoryListDeserializer deserializer)
+        public CredentialRepositoryListLoader(IDataProvider<string> dataProvider,
+                                              CredentialRepositoryListDeserializer deserializer)
        {
            if (dataProvider == null)
                throw new ArgumentNullException(nameof(dataProvider));
@@ -23,10 +23,9 @@ namespace mRemoteNG.Config
            _deserializer = deserializer;
        }

-        [SupportedOSPlatform("windows")]
        public IEnumerable<ICredentialRepository> Load()
        {
-            string data = _dataProvider.Load();
+            var data = _dataProvider.Load();
            return _deserializer.Deserialize(data);
        }
    }
--- a/mRemoteNG/Config/CredentialRepositoryListPersistor.cs
+++ b/mRemoteNG/Config/CredentialRepositoryListPersistor.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.Serializers.CredentialProviderSerializer;
+using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Config
+{
+    public class CredentialRepositoryListPersistor : ISaver<IEnumerable<ICredentialRepository>>, ILoader<IEnumerable<ICredentialRepository>>
+    {
+        private readonly IReadOnlyCollection<ICredentialRepositoryFactory> _repositoryFactories;
+        private readonly IDataProvider<string> _dataProvider;
+        private readonly CredentialRepositoryListDeserializer _deserializer;
+        private readonly CredentialRepositoryListSerializer _serializer;
+
+        public CredentialRepositoryListPersistor(
+            IDataProvider<string> dataProvider, 
+            IReadOnlyCollection<ICredentialRepositoryFactory> repositoryFactories)
+        {
+            _repositoryFactories = repositoryFactories.ThrowIfNull(nameof(repositoryFactories));
+            _dataProvider = dataProvider.ThrowIfNull(nameof(dataProvider));
+            _deserializer = new CredentialRepositoryListDeserializer();
+            _serializer = new CredentialRepositoryListSerializer();
+        }
+
+        public IEnumerable<ICredentialRepository> Load()
+        {
+            var data = _dataProvider.Load();
+            return _deserializer.Deserialize(data, _repositoryFactories);
+        }
+
+        public void Save(IEnumerable<ICredentialRepository> repositories, string propertyNameTrigger = "")
+        {
+            var data = _serializer.Serialize(repositories);
+            _dataProvider.Save(data);
+        }
+    }
+}
--- a/mRemoteNG/Config/CredentialRepositoryListSaver.cs
+++ b/mRemoteNG/Config/CredentialRepositoryListSaver.cs
@@ -20,8 +20,8 @@ namespace mRemoteNG.Config

        public void Save(IEnumerable<ICredentialRepository> repositories, string propertyNameTrigger = "")
        {
-            CredentialRepositoryListSerializer serializer = new();
-            string data = serializer.Serialize(repositories);
+            var serializer = new CredentialRepositoryListSerializer();
+            var data = serializer.Serialize(repositories);
            _dataProvider.Save(data);
        }
    }
--- a/mRemoteNG/Config/DataProviders/FileBackupCreator.cs
+++ b/mRemoteNG/Config/DataProviders/FileBackupCreator.cs
@@ -1,15 +1,12 @@
 using System;
 using System.IO;
-using System.Runtime.Versioning;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
-using mRemoteNG.Resources.Language;

 namespace mRemoteNG.Config.DataProviders
 {
    public class FileBackupCreator
    {
-        [SupportedOSPlatform("windows")]
        public void CreateBackupFile(string fileName)
        {
            try
@@ -17,8 +14,8 @@ namespace mRemoteNG.Config.DataProviders
                if (WeDontNeedToBackup(fileName))
                    return;

-                string backupFileName =
-                    string.Format(Properties.OptionsBackupPage.Default.BackupFileNameFormat, fileName, DateTime.Now);
+                var backupFileName =
+                    string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now);
                File.Copy(fileName, backupFileName);
            }
            catch (Exception ex)
@@ -41,7 +38,7 @@ namespace mRemoteNG.Config.DataProviders

        private bool FeatureIsTurnedOff()
        {
-            return Properties.OptionsBackupPage.Default.BackupFileKeepCount == 0;
+            return Properties.Settings.Default.BackupFileKeepCount == 0;
        }
    }
 }
--- a/mRemoteNG/Config/DataProviders/FileBackupPruner.cs
+++ b/mRemoteNG/Config/DataProviders/FileBackupPruner.cs
@@ -7,23 +7,23 @@ namespace mRemoteNG.Config.DataProviders
    {
        public void PruneBackupFiles(string filePath, int maxBackupsToKeep)
        {
-            string fileName = Path.GetFileName(filePath);
-            string directoryName = Path.GetDirectoryName(filePath);
+            var fileName = Path.GetFileName(filePath);
+            var directoryName = Path.GetDirectoryName(filePath);

            if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName))
                return;

-            string searchPattern = string.Format(Properties.OptionsBackupPage.Default.BackupFileNameFormat, fileName, "*");
-            string[] files = Directory.GetFiles(directoryName, searchPattern);
+            var searchPattern = string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, "*");
+            var files = Directory.GetFiles(directoryName, searchPattern);

            if (files.Length <= maxBackupsToKeep)
                return;

-            System.Collections.Generic.IEnumerable<string> filesToDelete = files
+            var filesToDelete = files
                                .OrderByDescending(s => s)
                                .Skip(maxBackupsToKeep);

-            foreach (string file in filesToDelete)
+            foreach (var file in filesToDelete)
            {
                File.Delete(file);
            }
--- a/mRemoteNG/Config/DataProviders/FileDataProvider.cs
+++ b/mRemoteNG/Config/DataProviders/FileDataProvider.cs
@@ -1,14 +1,11 @@
 using System;
 using System.IO;
-using System.Runtime.Versioning;
 using mRemoteNG.App;

 namespace mRemoteNG.Config.DataProviders
 {
-    [SupportedOSPlatform("windows")]
    public class FileDataProvider : IDataProvider<string>
    {
-        [SupportedOSPlatform("windows")]
        public string FilePath { get; set; }

        public FileDataProvider(string filePath)
@@ -18,14 +15,9 @@ namespace mRemoteNG.Config.DataProviders

        public virtual string Load()
        {
-            string fileContents = "";
+            var fileContents = "";
            try
            {
-                if (!File.Exists(FilePath))
-                {
-                    CreateMissingDirectories();
-                    File.WriteAllLines(FilePath, new []{ $@"<?xml version=""1.0"" encoding=""UTF-8""?>", $@"<LocalConnections/>" });
-                }
                fileContents = File.ReadAllText(FilePath);
            }
            catch (FileNotFoundException ex)
@@ -70,7 +62,7 @@ namespace mRemoteNG.Config.DataProviders

        private void CreateMissingDirectories()
        {
-            string dirname = Path.GetDirectoryName(FilePath);
+            var dirname = Path.GetDirectoryName(FilePath);
            if (dirname == null) return;
            Directory.CreateDirectory(dirname);
        }
--- a/mRemoteNG/Config/DataProviders/FileDataProviderWithRollingBackup.cs
+++ b/mRemoteNG/Config/DataProviders/FileDataProviderWithRollingBackup.cs
@@ -1,8 +1,5 @@
-using System.Runtime.Versioning;
-
-namespace mRemoteNG.Config.DataProviders
+namespace mRemoteNG.Config.DataProviders
 {
-    [SupportedOSPlatform("windows")]
    public class FileDataProviderWithRollingBackup : FileDataProvider
    {
        private readonly FileBackupCreator _fileBackupCreator;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Faryan Rezagholi	8a5f0f248e	open credential manager from connection tree window	2021-09-04 00:52:04 +02:00
Faryan Rezagholi	c1931ff4cd	hide password/username/domain fields in connection properties	2021-09-04 00:27:42 +02:00
Faryan Rezagholi	12cb7ad7b0	merged from develop	2021-09-01 01:26:21 +02:00
David Sparer	4349b1b65b	dont save settings on individual settings pages	2019-05-19 16:23:00 -05:00
David Sparer	bb04605dc3	Merge branch 'develop' into reapply_credential_manager # Conflicts: # mRemoteNGTests/Connection/DefaultConnectionInheritanceTests.cs # mRemoteNGTests/TestHelpers/ConnectionInfoHelpers.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs # mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs # mRemoteV1/Connection/AbstractConnectionRecord.cs # mRemoteV1/Connection/ConnectionInitiator.cs # mRemoteV1/Connection/Protocol/RDP/RdpProtocol.cs # mRemoteV1/Resources/Help/ui_external_tools.htm # mRemoteV1/Resources/Language/Language.resx # mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs # mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.Designer.cs # mRemoteV1/UI/Window/ConfigWindow.cs # mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs # mRemoteV1/mRemoteV1.csproj	2019-05-19 16:19:18 -05:00
David Sparer	294bd2f7a4	fixed event invocator warnings	2019-03-19 20:25:59 -05:00
David Sparer	a3aa323cce	updated html documentation for #680	2019-03-19 20:15:16 -05:00
David Sparer	355cd63acb	Merge branch 'develop' into reapply_credential_manager	2019-03-19 18:01:37 -05:00
David Sparer	93d50b0818	Merge branch 'develop' into reapply_credential_manager # Conflicts: # mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs # mRemoteNGTests/packages.config # mRemoteV1/Config/Connections/SqlConnectionsSaver.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs # mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs # mRemoteV1/Connection/AbstractConnectionRecord.cs # mRemoteV1/Connection/ConnectionInfoInheritance.cs # mRemoteV1/Connection/ConnectionsService.cs # mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs # mRemoteV1/Properties/Settings.settings # mRemoteV1/Resources/Language/Language.de.resx # mRemoteV1/Resources/Language/Language.resx # mRemoteV1/Resources/Language/Language.ru.resx # mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs # mRemoteV1/mRemoteV1.csproj	2019-03-09 13:49:23 -06:00
Faryan Rezagholi	8779776ad5	removed minimize button from credentials manager	2019-02-20 19:45:18 +01:00
Faryan Rezagholi	3bb285d180	removed unused form	2019-02-20 19:42:30 +01:00
Faryan Rezagholi	052796c794	adjusted text box positioning	2019-02-20 19:08:25 +01:00
Faryan Rezagholi	33a6dbb4c3	made more hardcoded strings translateable	2019-02-20 18:32:35 +01:00
Faryan Rezagholi	953ddaa292	merged develop	2019-02-19 22:39:58 +01:00
Faryan Rezagholi	c065b86dbd	revised credential manager forms design	2019-02-19 22:38:12 +01:00
David Sparer	95859b96ff	Merge branch 'develop' into reapply_credential_manager # Conflicts: # mRemoteV1/App/Export.cs # mRemoteV1/App/Initialization/CredsAndConsSetup.cs # mRemoteV1/App/Runtime.cs # mRemoteV1/Config/Connections/ConnectionsLoadedEventArgs.cs # mRemoteV1/Config/Connections/ConnectionsSavedEventArgs.cs # mRemoteV1/Config/Connections/CsvConnectionsSaver.cs # mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs # mRemoteV1/Config/CredentialHarvester.cs # mRemoteV1/Config/CredentialRepositoryListLoader.cs # mRemoteV1/Config/CredentialRepositoryListSaver.cs # mRemoteV1/Config/DataProviders/FileDataProvider.cs # mRemoteV1/Config/Import/MRemoteNGCsvImporter.cs # mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs # mRemoteV1/Config/Import/RemoteDesktopConnectionImporter.cs # mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs # mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs # mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializer.cs # mRemoteV1/Config/Serializers/CredentialProviderSerializer/CredentialRepositoryListDeserializer.cs # mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs # mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs # mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs # mRemoteV1/Connection/AbstractConnectionRecord.cs # mRemoteV1/Connection/ConnectionInfo.cs # mRemoteV1/Connection/ConnectionInfoInheritance.cs # mRemoteV1/Connection/ConnectionInitiator.cs # mRemoteV1/Connection/ConnectionsService.cs # mRemoteV1/Connection/DefaultConnectionInfo.cs # mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs # mRemoteV1/Connection/Protocol/ICA/IcaProtocol.cs # mRemoteV1/Connection/Protocol/IntegratedProgram.cs # mRemoteV1/Connection/Protocol/ProtocolBase.cs # mRemoteV1/Connection/Protocol/PuttyBase.cs # mRemoteV1/Connection/Protocol/RDP/RdpProtocol.cs # mRemoteV1/Connection/Protocol/VNC/Connection.Protocol.VNC.cs # mRemoteV1/Connection/PuttySessionInfo.cs # mRemoteV1/Credential/CredentialRecordTypeConverter.cs # mRemoteV1/Credential/CredentialServiceFacade.cs # mRemoteV1/Credential/CredentialServiceFactory.cs # mRemoteV1/Credential/Records/UnavailableCredentialRecord.cs # mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs # mRemoteV1/Credential/Repositories/XmlCredentialRepositoryFactory.cs # mRemoteV1/Properties/Settings.settings # mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd # mRemoteV1/Tools/CustomCollections/FullyObservableCollection.cs # mRemoteV1/Tools/Extensions.cs # mRemoteV1/Tools/ExternalTool.cs # mRemoteV1/Tools/ExternalToolArgumentParser.cs # mRemoteV1/UI/Controls/Base/NGComboBox.cs # mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs # mRemoteV1/UI/Controls/CredentialRecordListBox.cs # mRemoteV1/UI/Controls/QuickConnectToolStrip.cs # mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs # mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs # mRemoteV1/UI/Forms/frmMain.cs # mRemoteV1/UI/Forms/frmOptions.cs # mRemoteV1/UI/Menu/ToolsMenu.cs # mRemoteV1/UI/Window/ConfigWindow.cs # mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs # mRemoteV1/UI/Window/ConnectionTreeWindow.cs # mRemoteV1/UI/Window/ConnectionWindow.cs # mRemoteV1/app.config	2019-02-17 11:21:22 -06:00
David Sparer	ba62c17ea2	added some interface documentation	2019-01-27 18:01:34 -06:00
David Sparer	1f296f2f72	slight fix to the optional<T> tests	2019-01-27 16:59:02 -06:00
David Sparer	89bb4d45b3	minor tweaks to the import form	2019-01-27 16:58:39 -06:00
David Sparer	6e417ed47e	ensure specified creds can be parsed even if no connectioninfo is selected	2019-01-27 12:33:14 -06:00
David Sparer	f3a7d97016	allow specifying specific credential record in external tool arguments related to #680	2019-01-27 11:31:41 -06:00
David Sparer	530a4e165d	extracted interface from credential service to make testing easier	2019-01-27 09:58:28 -06:00
David Sparer	9e217dba79	began creating cred import form	2019-01-23 22:16:08 -06:00
David Sparer	d524df6315	minor efficiency gain	2019-01-22 13:04:58 -06:00
David Sparer	5e224f5b5b	ensure assigned cred id property cannot be null	2019-01-22 12:51:41 -06:00
David Sparer	3649927618	fixed bug with connection tree not appearing	2019-01-22 12:48:12 -06:00
David Sparer	4b736176bf	request iconnectiontree interface in more places	2019-01-22 06:01:33 -06:00
David Sparer	f78ca1e9fd	some more deserialization refactoring	2019-01-21 17:52:18 -06:00
David Sparer	739112a3ff	added tests for SaveConnectionsOnEdit had to create some new interfaces and refactor a bit to make it testable	2019-01-20 15:45:09 -06:00
David Sparer	923b9efd40	began converting the database serializers to work with cred manager	2019-01-20 14:51:09 -06:00
David Sparer	f0d0b5ae21	reduced duplication in rdcm tests	2019-01-20 13:46:34 -06:00
David Sparer	8906e08704	made the rdcm 2.7 importer compatible with credential management	2019-01-20 12:38:39 -06:00
David Sparer	9ead7e8e16	fixed an issue with putty session importing cred id was not being set. also added a test for it	2019-01-20 11:18:40 -06:00
David Sparer	788ca79ece	fixed rdp file importer to support cred manager	2019-01-20 11:15:33 -06:00
David Sparer	88558a353c	fixed putty connection manager credential serialization	2019-01-19 14:22:04 -06:00
David Sparer	7fd9abbbc8	resolved csv deserializer test	2019-01-19 13:19:06 -06:00
David Sparer	b029b35df7	Merge remote-tracking branch 'origin/develop' into reapply_credential_manager # Conflicts: # mRemoteV1/Properties/Settings.Designer.cs # mRemoteV1/Properties/Settings.settings # mRemoteV1/app.config	2019-01-19 12:51:43 -06:00
David Sparer	187ca5e55b	started to redo how cred harvesting works in order to apply it to all importers/deserializers	2019-01-14 16:32:51 -06:00
David Sparer	53c26d8a91	updated tests and references to using cred records rather than user/domain/pass of the connection	2019-01-14 14:02:41 -06:00
David Sparer	159f25b8a1	fixed exttools arg parser tests	2019-01-14 09:54:19 -06:00
David Sparer	f4904f350e	minor cleanup	2019-01-14 07:59:09 -06:00
David Sparer	ea59f6ad9d	centralized credential lookup logic	2019-01-14 07:56:31 -06:00
David Sparer	4bba05f737	minor cleanup of cred harvester, slightly more efficient	2019-01-14 07:35:37 -06:00
David Sparer	569cf38f24	fixed a cred harvester test	2019-01-14 07:35:13 -06:00
David Sparer	6f8cde4d8e	added a method comment	2019-01-13 14:45:07 -06:00
David Sparer	753ea9b421	connections now correctly use default cred if no credential is supplied	2019-01-13 14:42:24 -06:00
David Sparer	a5ea867b6d	began hooking up the default credential to the manager	2019-01-13 12:14:28 -06:00
David Sparer	80228966f9	double clicking cred repo tree item opens editor page	2019-01-13 11:27:42 -06:00
David Sparer	b8298ecb14	minor display changes of the repo manager	2019-01-13 11:19:03 -06:00
David Sparer	ee1db6ff8b	refactored some methods/fields to be more descriptive	2019-01-13 11:07:58 -06:00
David Sparer	aab1fb1dd2	minor cleanup	2019-01-13 11:05:45 -06:00
David Sparer	fbea9d1ede	hooked up remaining cred repo management buttons	2019-01-13 10:57:33 -06:00
David Sparer	75cfc9c75c	Merge branch 'develop' into reapply_credential_manager # Conflicts: # mRemoteV1/Properties/Settings.Designer.cs # mRemoteV1/Properties/Settings.settings # mRemoteV1/UI/Forms/frmMain.cs # mRemoteV1/app.config	2019-01-13 08:52:51 -06:00
David Sparer	f60a481902	Merge branch 'develop' into reapply_credential_manager	2019-01-09 10:27:26 -06:00
David Sparer	e89c77a1bc	fixed mis-merge	2019-01-09 10:26:40 -06:00
David Sparer	45766b8c12	Merge branch 'develop' into reapply_credential_manager # Conflicts: # mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.Designer.cs	2019-01-09 07:32:09 -06:00
David Sparer	1c44fcb070	Merge branch 'develop' into reapply_credential_manager # Conflicts: # mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs # mRemoteV1/UI/Controls/Base/NGComboBox.cs # mRemoteV1/UI/Controls/NewPasswordWithVerification.Designer.cs # mRemoteV1/mRemoteV1.csproj	2019-01-05 07:48:43 -06:00
David Sparer	25aa815a82	began reworking the repo list management screen	2018-12-31 14:17:31 -06:00
David Sparer	a2542f1b18	rearranged some cred manager UI files	2018-12-31 11:13:48 -06:00
David Sparer	2e0979dc5a	simplified screens for creating and editing creds	2018-12-31 11:05:36 -06:00
David Sparer	e2ebf25b7b	Merge branch 'develop' into reapply_credential_manager	2018-12-31 09:32:47 -06:00
David Sparer	cc44b830a2	scaled images in the unlocker form	2018-12-30 15:28:47 -06:00
David Sparer	687cb6c7bc	cred unlocker wont appear if there are no repos to unlock	2018-12-30 14:42:37 -06:00
David Sparer	15f028157e	inserted a new page in the upgrade process to view harvested credentials	2018-12-30 14:33:42 -06:00
David Sparer	63ebef56b0	updated cred manager upgrade text with correct version	2018-12-30 11:32:24 -06:00
David Sparer	258093e52a	when harvesting creds, consider Password when determining if a credential set is a duplicate This prevents issues when the username and domain are the same but passwords are different (such as for local admin accounts)	2018-12-28 16:25:33 -06:00
David Sparer	b09fdcd5f5	credential objects now used when establishing connections	2018-12-28 16:25:33 -06:00
David Sparer	2277e95dd2	fixed tests	2018-12-28 16:25:33 -06:00
David Sparer	e0486bec7d	simplified some of the credential management classes	2018-12-28 16:25:33 -06:00
David Sparer	29d44d103d	fixed bug preventing FullyObservableCollection from generating events	2018-12-28 16:25:32 -06:00
David Sparer	44aa100566	minor change to chkbox location	2018-12-28 16:25:32 -06:00
David Sparer	23eb9cc44b	added option to auto close the cred unlocker form when all repos are unlocked	2018-12-28 16:25:32 -06:00
David Sparer	f1797282d9	readded option to unlock cred repos on startup	2018-12-28 16:25:32 -06:00
David Sparer	0c0740d488	cred upgrade form now only lets you upgrade if all required fields are filled in	2018-12-28 16:25:32 -06:00
David Sparer	a4faaa20c3	cred manager upgrader now correctly uses custom password provided during upgrade	2018-12-28 16:25:29 -06:00
David Sparer	ce03b74d48	serialization is now working as expected	2018-12-28 16:25:29 -06:00
David Sparer	ce8ada05f5	hooked up the credential manager upgrader	2018-12-28 16:25:29 -06:00
David Sparer	b4dfe5beb6	hooked up tools menu button for cred manager	2018-12-28 16:25:29 -06:00
David Sparer	22ecf0d06f	readded forms and controls for the credential manager	2018-12-28 16:25:29 -06:00
David Sparer	1e66787422	readded the credential record property to the connection info class	2018-12-28 16:25:28 -06:00